From: hanwen <hanwen>
Date: Fri, 30 Jul 2004 11:59:13 +0000 (+0000)
Subject: * scripts/convert-ly.py (conv): remove \lyrics from \lyricsto.
X-Git-Tag: release/2.3.9~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4b43d969c042060dc49b9fb5470df285834d7bd8;p=lilypond.git

* scripts/convert-ly.py (conv): remove \lyrics from \lyricsto.

* ly/gregorian-init.ly (neumeDemoPaper): remove duplication from
manual.

* Documentation/user/tutorial.itely (Integrating text and music):
remove \score and \notes from manual.
---

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 2191ac4fca..c2e6351de4 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -114,8 +114,7 @@ newer).  EGCS and 2.x are known to cause crashes.
 @item @uref{http://www.gnu.org/software/bison/,Bison} (version 1.25 or
 newer, but not 1.50 or 1.75).
 
-@item gettext
-
+@item @uref{http://www.gnu.org/software/gettext/gettext.html,gettext}.
 @end itemize
 
 @subsection Running requirements
diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 71383c3638..62ae5cd3ed 100644
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -243,10 +243,10 @@ abc2ly ignores the ABC beaming.
 @cindex MuseData
 @cindex CCARH
 
-MuseData (see @uref{http://www.musedata.org/}) is an electronic
-library of classical music scores, comprising at the time of writing
-about 800 composition dating from 1700 to 1825.  The music is encoded
-in so-called MuseData format.  musedata2ly converts a set of MuseData
+@uref{http://www.musedata.org/,MuseData} is an electronic library of
+classical music scores, comprising at the time of writing about 800
+composition dating from 1700 to 1825.  The music is encoded in
+so-called MuseData format.  musedata2ly converts a set of MuseData
 files to one .ly file, and will include a @code{\header} field if a
 @file{.ref} file is supplied. It is invoked as follows:
 
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 40b7d1fe7e..7758aaa490 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -3435,8 +3435,8 @@ This aligns the lyrics to the
 notes of the @internalsref{Voice} context called @var{name}, which has
 to exist. Therefore, normally the @code{Voice} is specified first, and
 then the lyrics are specified with @code{\lyricsto}. The command
-@code{\lyricsto} switches to @code{\lyrics} mode automatically, so
-@code{\lyrics} may be skipped.
+@code{\lyricsto} switches to @code{\lyrics} mode automatically, so the
+@code{\lyrics} keyword may be omitted.
 
 For different or more complex orderings, the best way is to setup the
 hierarchy of staves and lyrics first, e.g.
@@ -6704,7 +6704,7 @@ settings.  Hence, the MIDI file should not have more than 15 staves
 
 Not all MIDI players correctly handle tempo change in the MIDI
 output. Players that are known to work include
-@uref{timidity,http://timidity.sourceforge.net/}
+@uref{http://timidity.sourceforge.net/,timidity}
 
 
 @menu
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 1a93fe2552..486ad980a8 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -278,8 +278,7 @@ printing.
 @cindex DVI driver
 } which you can print or with the standard facilities of your
 operating system.@footnote{If your system does not have any tools
-installed, you can try @uref{Ghostscript,
-http://www.cs.wisc.edu/~ghost/}, a freely available package for
+installed, you can try @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript}, a freely available package for
 viewing and printing PDF and PostScript files.}
 
 On Windows, start up a text-editor@footnote{Any simple or
diff --git a/input/regression/allfontstyle.lyinc b/input/regression/allfontstyle.lyinc
index 39e84e1ee1..97520e9236 100644
--- a/input/regression/allfontstyle.lyinc
+++ b/input/regression/allfontstyle.lyinc
@@ -1,23 +1,22 @@
-\version "2.2.0"
+\version "2.3.8"
 
 \header{
-texidoc="
+    texidoc="
 Different text styles are used for various purposes.
 "
 }
 
-\score {  \notes
-	\relative c'' \context Staff {
-		\emptyText
-		\repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
-		 \alternative {
-		 	{
-			    d-4_\markup { \italic "cantabile"  } }
-		 	{  e }  } \acciaccatura { c16 }
-			  
-			 f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
-	}
-	\paper { raggedright = ##t
-	% \context {\BarNumberingStaffContext} }
-	}
+\paper {
+    raggedright = ##t
+}
+
+\relative c'' \context Staff {
+    \emptyText
+    \repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
+    \alternative {
+	{
+	    d-4_\markup { \italic "cantabile"  } }
+	{  e }  } \acciaccatura { c16 }
+
+    f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
 }
diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 069a8d07fc..e13a9baf53 100644
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
 
     texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
@@ -13,8 +13,8 @@
 	\autoBeamOff
 	c2( d4) e8[ c b c] f4
     }
-    \lyricsto "bla" \new Lyrics \lyrics { bla ab blob blob }
-    \lyricsto "bla" \new Lyrics \lyrics {
+    \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
+    \lyricsto "bla"  \new Lyrics  {
 	bla 
 
 	\set ignoreMelismata = ##t
@@ -28,7 +28,7 @@
 	blob
     }
     
-    \lyricsto "bla" \new Lyrics \lyrics {
+    \lyricsto "bla"  \new Lyrics  {
 	nes ted lyrics voice with more words than no tes
     }
     >>
diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 0c2a3ae6c8..eefa0a6b3c 100644
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
 
 texidoc ="Polyphonic rhythms and rests do not disturb
@@ -12,7 +12,7 @@ texidoc ="Polyphonic rhythms and rests do not disturb
        \time 8/8
        \key des \major
        <<
-	 \lyricsto "one" \new Lyrics \lyrics {
+	 \lyricsto "one"  \new Lyrics  {
 	     Do mi nus ex
 	 }
 	   \context Voice = one {
@@ -24,7 +24,7 @@ texidoc ="Polyphonic rhythms and rests do not disturb
 	      \voiceTwo
 	      ees'8 r8 r8 r8 ees' r8 r8 r8 
           }
-          \lyricsto "two" \new Lyrics \lyrics {
+          \lyricsto "two"  \new Lyrics  {
 	      Do na
          }
        >>
diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index 6cf8dc12c1..f04c106e46 100644
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header
 {
 
diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index a4fd43c7a8..42806506bd 100644
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header { texidoc= "In lyric extenders, a syllable may be extended over several notes. "}
 
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index a6cc56ed38..6640f24476 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
 
 texidoc = "
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 74a6b33393..62653c2151 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header
 {
     texidoc = "Melismata are triggered by manual beams." 
diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index 8176c7c4e1..30c99200c9 100644
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
 texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column."
@@ -7,12 +7,12 @@ texidoc = "Stanza numbers are put left of their lyric. They are aligned in a col
 \score {
 <<
     \context Voice = "A"  \relative c'' { r4 r4 c4  c4 }
-    \lyricsto A \new Lyrics \lyrics  {
+    \lyricsto A  \new Lyrics   {
 	\skip 2
 	\set stanza = "1."
 	Foo8 
     }
-    \lyricsto A \new Lyrics \lyrics {
+    \lyricsto A  \new Lyrics  {
 	\skip 2
 	\set stanza = "2."
 	FFFooooo8
diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly
index 9946bd9c7b..8cbe53ba72 100644
--- a/input/template/gregorian-transcription.ly
+++ b/input/template/gregorian-transcription.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 
 \header {
diff --git a/input/template/header.ly b/input/template/header.ly
index 39da5fa25a..5910072e3a 100644
--- a/input/template/header.ly
+++ b/input/template/header.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
   dedication = "dedication"
   title = "Title"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index 6cded29a39..efb098def1 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
         title = "Song"
         subtitle = "(tune)"
diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly
index 040588fe5f..00736ebe58 100644
--- a/input/template/melody-chords.ly
+++ b/input/template/melody-chords.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc = "Lead sheet format: chords with melody."
diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 0f723e27b3..2fdb820908 100644
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header
 {
     texidoc = "Popsong format: chords, melody and lyrics."
diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index 4691f1d1af..9b58697add 100644
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc = "Melody and lyrics."
diff --git a/input/template/melody.ly b/input/template/melody.ly
index bbda02ab12..8c9bc5b942 100644
--- a/input/template/melody.ly
+++ b/input/template/melody.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc = "Only a melody."
diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly
index 42f778655f..54597d8488 100644
--- a/input/template/piano-4-voices.ly
+++ b/input/template/piano-4-voices.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc ="Polyphonic piano music."
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index 7ae094ce57..a01fbc01b6 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
 texidoc ="
   Dynamics on a separate line, neatly centered between staffs.
@@ -55,7 +55,7 @@ pedal =  {
 
       \consists "Skip_event_swallow_translator"
 
-      \consistsend "Axis_group_engraver"
+      \consists "Axis_group_engraver"
     }
     \context {
       \PianoStaff
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 61714faf67..2e85dd09ef 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc ="Lyrics between two staffs."
diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index 3f2fa70b58..aecc82398e 100644
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,5 +1,5 @@
 
-\version "2.3.4"
+\version "2.3.8"
 \header {
   texidoc ="Classical song format: one staff with melody and lyrics,
 and piano accompaniment."
diff --git a/input/template/piano.ly b/input/template/piano.ly
index 54ccffa848..5b530d5260 100644
--- a/input/template/piano.ly
+++ b/input/template/piano.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 
 \header {
   texidoc = "Simple piano music." 
diff --git a/input/template/satb.ly b/input/template/satb.ly
index 468c045af8..2f7fc19bcd 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.8"
 \header {
 
     texidoc = "
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 739b68b09c..e8124d145f 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -68,4 +68,4 @@ Ambitus::print (SCM smob)
 
 ADD_INTERFACE (Ambitus, "ambitus-interface",
   "The line between note heads for a pitch range.",
-  "note-heads join-heads");
+  "thickness note-heads join-heads");
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 2f7800d8c9..3dbb171395 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -64,7 +64,9 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
   if (Rhythmic_head::has_interface (inf.grob_))
     {
       Music * note_ev =inf.music_cause ();
-
+      if (!note_ev)
+	return;
+      
       SCM arts = note_ev->get_property ("articulations");
 
       for (SCM s = arts; ly_c_pair_p (s); s = ly_cdr  (s))
diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index 3483bab450..bfc7f1fbe6 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -106,11 +106,15 @@ Stem_engraver::acknowledge_grob (Grob_info gi)
     {
       if (Rhythmic_head::get_stem (gi.grob_))
 	return;
+
+      Music * cause = gi.music_cause ();
+      if (!cause)
+	return ;
       
       if (!stem_)
 	make_stem (gi);
       
-      int duration_log = gi.music_cause ()->duration_log ();
+      int duration_log = cause->duration_log ();
       if (Stem::duration_log (stem_) != duration_log)
 	{
 	  // FIXME: 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 26590d3422..1c028c320c 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -78,7 +78,7 @@
 	(X-extent-callback . ,Note_head::extent)
 	(Y-extent-callback . ,Note_head::extent)
 	(Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-	(meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface item-interface ))))
+	(meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface rhythmic-head-interface item-interface ))))
 	))
     
     (Arpeggio
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9ea4fcd27e..2921d5b574 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2119,12 +2119,31 @@ conversions.append (((2, 3, 4), conv,
 
 def conv (str):
 	str = re.sub (r'\\consistsend', '\\consists', str)
+	str = re.sub (r'\\lyricsto\s+("?[a-zA-Z]+"?)(\s*\\new Lyrics\s*)?\\lyrics',
+		      r'\\lyricsto \1 \2', str)
 	return str
 
 conversions.append (((2, 3, 8), conv,
-		     '''remove \\consistsend'''))
+		     '''remove \\consistsend, strip \\lyrics from \\lyricsto.'''))
 
 
+def conv_mode_experiment (str):
+	str = re.sub (r'\\chords\b', r'\\chordmode', str)
+	str = re.sub (r'\\lyrics\b', r'\\lyricmode', str)
+	str = re.sub (r'\\figures\b', r'\\figuremode', str)
+	str = re.sub (r'\\drums\b', r'\\drummode', str)
+	str = re.sub (r'\\chordmode\s*\\new ChordNames', r'\\chords', str)
+	str = re.sub (r'\\new ChordNames\s*\\chordmode', r'\\chords', str)
+	str = re.sub (r'\\new FiguredBass\s*\\figuremode', r'\\figures', str)
+	str = re.sub (r'\\figuremode\s*\new FiguredBass', r'\\figures', str)
+	str = re.sub (r'\\new DrumStaff\s*\\drummode', r'\\drums', str)
+	str = re.sub (r'\\drummode\s*\\new DrumStaff', r'\\drums', str)
+
+	return str
+
+#conversions.append (((2, 3, 9), conv,
+#		     '''fold \new FooContext \foomode into \foo.'''))
+
 ################################
 #	END OF CONVERSIONS	
 ################################