From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 29 Dec 2004 13:54:36 +0000 (+0000)
Subject: * scripts/convert-ly.py (conv): add ancient rules.
X-Git-Tag: release/2.5.14~340
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=285a7a361c8bbf1ad5d66e63e49b154434ef6aaf;p=lilypond.git

* scripts/convert-ly.py (conv): add ancient rules.

* scm/clef.scm (c0-pitch-alist): replace - with .
---

diff --git a/ChangeLog b/ChangeLog
index 9200ad6054..ee188cfce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scripts/convert-ly.py (conv): add ancient rules.
+
+	* scm/clef.scm (c0-pitch-alist): replace - with .
+
 	* scripts/lilypond-book.py (process_snippets): add texstr support.
 
 	* scm/framework-texstr.scm (header): change extension to .textmetrics
diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 4ffb7b6246..02986da90a 100644
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.4.0"
+\version "2.5.2"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -19,49 +19,49 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
      \transpose c c {
 	\override Staff.KeySignature  #'style = #'vaticana
 	\override Staff.Accidental  #'style = #'vaticana
-	\override NoteHead  #'style = #'vaticana-punctum
+	\override NoteHead  #'style = #'vaticana.punctum
 	\key es \major
 	\clef "vaticana-fa2"
 	c!1 des! e! f! ges!
 
-	\override NoteHead  #'style = #'vaticana-inclinatum
+	\override NoteHead  #'style = #'vaticana.inclinatum
 	a! b! ces'
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 1 (8*1)
 
-	\override NoteHead  #'style = #'vaticana-quilisma
+	\override NoteHead  #'style = #'vaticana.quilisma
 	b! des'! ges! fes!
 	\breathe
 	\clef "vaticana-fa1"
-	\override NoteHead  #'style = #'vaticana-plica
+	\override NoteHead  #'style = #'vaticana.plica
 	es d
-	\override NoteHead  #'style = #'vaticana-reverse-plica
+	\override NoteHead  #'style = #'vaticana.reverse.plica
 	c d
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break %2 (8*1)
 
-	\override NoteHead  #'style = #'vaticana-punctum-cavum
+	\override NoteHead  #'style = #'vaticana.punctum.cavum
 	es f
-	\override NoteHead  #'style = #'vaticana-lpes
+	\override NoteHead  #'style = #'vaticana.lpes
 	g as
-	\override NoteHead  #'style = #'vaticana-upes
+	\override NoteHead  #'style = #'vaticana.upes
 	bes as
-	\override NoteHead  #'style = #'vaticana-vupes
+	\override NoteHead  #'style = #'vaticana.vupes
 	g f
-	\override NoteHead  #'style = #'vaticana-linea-punctum
+	\override NoteHead  #'style = #'vaticana.linea.punctum
 	\override Staff.BarLine  #'bar-size = #2.0 \bar "|"
 %	\break % 3 (8*1)
 
 	es d
-	\override NoteHead  #'style = #'vaticana-epiphonus
+	\override NoteHead  #'style = #'vaticana.epiphonus
 	c d
-	\override NoteHead  #'style = #'vaticana-cephalicus
+	\override NoteHead  #'style = #'vaticana.cephalicus
 	es f
 
 	\override Staff.KeySignature  #'style = #'medicaea
 	\override Staff.Accidental  #'style = #'medicaea
 	\override Staff.Custos  #'style = #'medicaea
-	\override NoteHead  #'style = #'medicaea-punctum
+	\override NoteHead  #'style = #'medicaea.punctum
 	\clef "medicaea-fa2"
 	ces! des!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
@@ -69,39 +69,39 @@ upperStaff = \context GregorianStaff = "upperStaff" <<
 
 	e! f! ges!
 	\clef "medicaea-do2"
-	\override NoteHead  #'style = #'medicaea-inclinatum
+	\override NoteHead  #'style = #'medicaea.inclinatum
 	a! b! ces'!
-	\override NoteHead  #'style = #'medicaea-virga
+	\override NoteHead  #'style = #'medicaea.virga
 	b! a!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 5 (8*1)
 
 	ges! fes!
 	\clef "medicaea-fa1"
-	\override NoteHead  #'style = #'medicaea-rvirga
+	\override NoteHead  #'style = #'medicaea.rvirga
 	e! des! ces!
 
 	\override Staff.KeySignature  #'style = #'hufnagel
 	\override Staff.Accidental  #'style = #'hufnagel
 	\override Staff.Custos  #'style = #'hufnagel
-	\override NoteHead  #'style = #'hufnagel-punctum
+	\override NoteHead  #'style = #'hufnagel.punctum
 	\clef "hufnagel-fa2"
 	ces! des! es!
-	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
+	\override Staff.BarLine  #'bar.size = #3.0 \bar "|"
 %	\break % 6 (8*1)
 
 	fes! ges!
 	\clef "hufnagel-do2"
-	\override NoteHead  #'style = #'hufnagel-lpes
+	\override NoteHead  #'style = #'hufnagel.lpes
 	as! bes! ces'!
-	\override NoteHead  #'style = #'hufnagel-virga
+	\override NoteHead  #'style = #'hufnagel.virga
 	bes! as!
 	\override Staff.BarLine  #'bar-size = #3.0 \bar "|"
 %	\break % 7 (8*1)
 
 	ges! fes!
-	\clef "hufnagel-do-fa"
-	\override NoteHead  #'style = #'hufnagel-punctum
+	\clef "hufnagel.do.fa"
+	\override NoteHead  #'style = #'hufnagel.punctum
 	es! des! ces! des! es! fes!
 	\bar "||"
 %	\break % 8 (8*1)
@@ -248,7 +248,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 %	    \consists Gregorian_ligature_engraver %%%%%%%% TODO: not yet implemented
-	    \override NoteHead #'style = #'vaticana-punctum
+	    \override NoteHead #'style = #'vaticana.punctum
 	    autoBeaming = ##f
 	}
 	\context {
@@ -263,7 +263,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
 	    \override Custos #'style = #'mensural
 	    \override Custos #'neutral-position = #3
 	    \override Custos #'neutral-direction = #-1
-	    clefGlyph = #"clefs-petrucci-c2"
+	    clefGlyph = #"clefs.petrucci-c2"
 	    clefPosition = #-2
 	    clefOctavation = #0 
 	}
@@ -281,7 +281,7 @@ lowerStaff = \context MensuralStaff = "lowerStaff" <<
 	    \override Custos #'style = #'vaticana
 	    \override Custos #'neutral-position = #4
 	    \override Custos #'neutral-direction = #-1
-	    clefGlyph = #"clefs-vaticana-do"
+	    clefGlyph = #"clefs.vaticana-do"
 	    clefPosition = #1
 	    clefOctavation = #0 
 	}
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index aa1161a37d..fa0ad5f8e0 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -195,7 +195,7 @@ LY_DEFINE (ly_warn, "ly:warn",
   progress_indication ("\n");
 
   str = scm_simple_format (SCM_BOOL_F, str, rest);
-  warning ("lily-guile: " + ly_scm2string (str));
+  warning (ly_scm2string (str));
   return SCM_UNSPECIFIED;
 }
 
diff --git a/scm/clef.scm b/scm/clef.scm
index 60dc397083..34023da458 100644
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -121,7 +121,7 @@
 	       (csp (make-music 'ContextSpeccedMusic)))
 	  (context-spec-music seq 'Staff))
 	(begin
-	  (ly:warn (_ "Unknown clef type `~a' clef-name"))
+	  (ly:warn (_ "Unknown clef type `~a'") clef-name)
 	  (ly:warn (_ "See scm/lily.scm for supported clefs"))
 	  (make-music 'Music)))))
 
diff --git a/scm/lily.scm b/scm/lily.scm
index 958f10087e..c5fda582e2 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -136,6 +136,7 @@ predicates. Print a message at LOCATION if any predicate failed."
     text
     white-dot
     white-text
+    embedded-ps
     zigzag-line))
 
 ;; TODO:
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 880fd23415..b7cc7b51f0 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2287,8 +2287,9 @@ conversions.append (((2, 5, 2),
 
 def conv (str):
 	str = re.sub ('ly:find-glyph-by-name', 'ly:font-get-glyph', str)
-	str = re.sub ('"accidentals-', '"accidentals.', str)
-	str = re.sub ('"scripts-', '"scripts.', str)
+	str = re.sub ('"(scripts|clefs|accidentals)-', r'"\1.', str)
+	str = re.sub ("'hufnagel-do-fa", "'hufnagel.do.fa", str) 
+	str = re.sub ("'(vaticana|hufnagel|medicaea|petrucci|neomensural|mensural)-", r"'\1.", str) 
 	return str
 
 conversions.append (((2, 5, 2),