lilypond-1.3.114

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 6bd96bbf5a9988650f4599ba4aba2fa92a307daa..e0c92780f385d7acf5bbb5a6ecb9198bf2f4005d 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -38,7 +38,7 @@ which substitutes some @AT_VARIABLES@ as well.
       <tr><td bgcolor="#e8e8ff"><a href="@INDEX@"><b>Home</b></a></td></tr>
       <tr><td><font size=-1>
         <a href="http://www.cs.uu.nl/~hanwen/lilypond">Development</a><br>
-        <a href="http://appel.lilypond.org/wiki/index.php3?LilyPond">WikiWikiWeb</a><br>
+        <a href="http://appel.lilypond.org/wiki?LilyPond">WikiWikiWeb</a><br>
         <a href="http://www.gnu.org">GNU Project</a><br>
         <a href="http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations</a><br>
         <a href="http://www.lilypond.org">LilyPond dot org</a><br>
@@ -49,10 +49,11 @@ which substitutes some @AT_VARIABLES@ as well.
       </td></tr>
       <tr><td><font size=-1>
        <a href="@TOP@Documentation/out-www/CHANGES.html">Change Log</a><br>
-       <a href="http://appel.lilypond.org/wiki/index.php3?LilyPondFaqs">FAQ</a><br>
+       <a href="@TOP@Documentation/topdocs/out-www/FAQ.html">Small FAQ</a><br>
+       <a href="http://appel.lilypond.org/wiki?LilyPondFaqs">Full FAQ</a><br>
        <a href="@TOP@Documentation/user/out-www/lilypond/lilypond.html">User manual</a><br>
        <a href="@TOP@Documentation/out-www/regression-test.html">Features</a><br>
-       <a href="http://appel.lilypond.org/wiki/index.php3?LilyPondToDo">To do</a><br>
+       <a href="http://appel.lilypond.org/wiki?LilyPondToDo">To do</a><br>
 <br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">
@@ -83,7 +84,7 @@ which substitutes some @AT_VARIABLES@ as well.
        <a href="@TOP@long-examples.html">Longer examples</a><br>
        <a href="http://www.mutopiaproject.org/">Mutopia Project</a><br>
 
-       <a href="http://appel.lilypond.org/wiki/index.php?DownloadLilyPondScores">Other URLs</a><br>
+       <a href="http://appel.lilypond.org/wiki?DownloadLilyPondScores">Other URLs</a><br>
        <br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">

diff --git a/Documentation/index.texi b/Documentation/index.texi
index 16bdae85a3ea1da3891be0c3dd75021d901e7248..91a60d6e0149533e96aaab2f78ab8e7307c44d70 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -14,7 +14,8 @@
 @item @uref{../topdocs/out-www/README.html, Readme file}
 @item @uref{../topdocs/out-www/INSTALL.html, Installation instructions}
 @item @uref{CHANGES.html, Things recently done}
-@item @uref{http://appel.lilypond.org/wiki/index.php3?LilyPondFaqs,Frequently asked questions}, with answers
+@item @uref{../topdocs/out-www/FAQ.html,Very Frequently Asked Questions}, with answers
+@item @uref{http://appel.lilypond.org/wiki?LilyPondFaqs,Full Frequently asked questions}, with answers
 @end itemize
 
 @unnumberedsubsec Manuals

diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index ce7638836551d9dc69e5ecc974d09f9c86d475ad..9372b7299b4dab5b6db63818d04536d59aad6b63 100644 (file)
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -72,7 +72,7 @@ the examples included. We have @uref{short-examples.html,short
 examples} and @uref{long-examples.html,longer examples}. The
 examples include sound bites  in MIDI, pictures in PNG, printable scores
 in PostScript, and LilyPond input. Others use LilyPond too, and have put
-scores on the web. Head over to @uref{http://appel.lilypond.org/wiki/index.php?DownloadLilyPondScores}
+scores on the web. Head over to @uref{http://appel.lilypond.org/wiki?DownloadLilyPondScores}
 
 @html
 <a name="download-source">
@@ -120,10 +120,10 @@ Testing}
 @end html
 @unnumberedsec Mailing lists
 
-If you have questions, do write to the mailing lists!
- (But don't forget to read the
-@uref{http://appel.dyndns.org/wiki?LilyPondFaqs,
-Frequently Asked Questions} first.)
+If you have questions, do write to the mailing lists.  But don't forget
+to read the @uref{Documentation/topdocs/out-www/FAQ.html,Very Frequently
+Asked Questions} and @uref{http://appel.dyndns.org/wiki?LilyPondFaqs,
+Frequently Asked Questions} first.
 
 
 @itemize @bullet

diff --git a/Documentation/user/bugs.itexi b/Documentation/user/bugs.itexi
index 1ba2b397830c6347b30cf9f64a9c41bb4a3f581b..d9ba1abeeb0b026e35c0649b06a9465f13c97c48 100644 (file)
--- a/Documentation/user/bugs.itexi
+++ b/Documentation/user/bugs.itexi
@@ -27,5 +27,5 @@ system libraries, whether you downloaded a binary release)
 You can send the report to @email{bug-gnu-music@@gnu.org}---You don't
 have to be subscribed to this mailinglist, or you can enter the bug in
 the LilyPond wiki, at
-@uref{http://appel.lilypond.org/wiki/index.php?LilyPondBugs}. 
+@uref{http://appel.lilypond.org/wiki?LilyPondBugs}. 
 

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index 8af0d07ce221376595c5f9c5d401beeb8c9a5399..554628f613372f53eeb640f3920c82fe1c2d40bc 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -114,7 +114,7 @@ text = \lyrics {
       % Ugly fix:
       Whose broad \bar "|.";
     }
-    \context LyricVoice = "one-2" 
+    \context LyricsVoice = "one-2" 
     { 
       stripes and bright stars, through the per -- il -- ous fight,
       O'er the ram -- parts we watched, were so gal -- lant -- ly
@@ -148,7 +148,7 @@ text = \lyrics {
                                \$staff1_voice_2
                        }
                >
-               \context LyricVoice = "one-1" \text
+               \context LyricsVoice = "one-1" \text
                \context Staff=lower <
                        \global
                        \clef bass;

diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc
index a931d3508f28e33444229cb4c6036e181d81cdc1..a40c6149db7a2d5ec32867a0d0892e856e75047f 100644 (file)
--- a/lily/lyric-phrasing-engraver.cc
+++ b/lily/lyric-phrasing-engraver.cc
@@ -188,14 +188,14 @@ Lyric_phrasing_engraver::acknowledge_grob(Grob_info i)
   /* now try for a lyric */
   if (h->has_interface (ly_symbol2scm ("lyric-syllable-interface"))) {
 
-    /* what's its LyricVoice context name? */
+    /* what's its LyricsVoice context name? */
     String voice_context_id;
     SCM voice_context_scm = i.origin_trans_l_->get_property("associatedVoice");
     if (gh_string_p (voice_context_scm)) {
       voice_context_id = ly_scm2string(voice_context_scm);
     }
     else {
-      voice_context_id = get_context_id(i.origin_trans_l_->daddy_trans_l_, "LyricVoice");
+      voice_context_id = get_context_id(i.origin_trans_l_->daddy_trans_l_, "LyricsVoice");
       voice_context_id = trim_suffix(voice_context_id);
     }
     record_lyric(voice_context_id, h);
@@ -216,7 +216,7 @@ Lyric_phrasing_engraver::acknowledge_grob(Grob_info i)
      lyric).
   */
   if(h->has_interface (ly_symbol2scm ("lyric-extender-interface"))) {
-    String voice_context_id = get_context_id(i.origin_trans_l_->daddy_trans_l_, "LyricVoice");
+    String voice_context_id = get_context_id(i.origin_trans_l_->daddy_trans_l_, "LyricsVoice");
     record_extender(trim_suffix(voice_context_id), h);
     return;
   }

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2d498222d4a2e055f42847a9a26dd1ae7700a5c9..4e8f1725dd9c3725e6e161fea203f99466573758 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -193,7 +193,7 @@ Mark_engraver::create_grobs ()
            }
        }
       SCM st = ly_symbol2scm (style.ch_C());
-      text_p_->set_grob_property ("style",  st);
+      text_p_->set_grob_property ("font-style",  st);
     }
 }
 

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index e08808f02ea49f43eb6f2ef0651458853a0e3714..7110c459be72b46d384db210bdbe71f67c42aa5f 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -51,7 +51,7 @@ Stanza_number_engraver::acknowledge_grob(Grob_info i)
 //       if (i.elem_l_->has_interface (symbol ("lyric-syllable-interface")))
         // Tried catching lyric items to generate stanza numbers, but it spoils lyric spacing.
        if (Bar::has_interface (i.elem_l_) || now_mom() == Moment(0))
-       // Works, but requires bar_engraver in LyricVoice context apart from at beginning.
+       // Works, but requires bar_engraver in LyricsVoice context apart from at beginning.
        // Is there any score element we can catch that will do the trick?
 //       if (! i.elem_l_->has_interface (symbol ("lyric-syllable-interface")) ||
 //       now_mom() == Moment(0))

diff --git a/lilypond-mode.el b/lilypond-mode.el
index ac735918016ab94c5c99f47e80b3ecf93f6f1177..a2540e91750edc7c6d176e5a8931aa9237974979 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -7,6 +7,12 @@
 
 ;;; Inspired on auctex
 
+;;;
+;;; Add this to your .emacs.el
+;;;     (load-library "lilypond-mode.el")
+;;;     (setq auto-mode-alist
+;;;      (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
+;;; 
 
 (load-library "lilypond-font-lock")
 

diff --git a/ly/engraver.ly b/ly/engraver.ly
index eb328cb68547f0b25a225a30e4bafe26bade47fe..210299c3b0e23a224ee2d3d2a83ad9740fb53435 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -238,9 +238,9 @@ StaffGroupContext= \translator {
 LyricsVoiceContext= \translator{
        \type "Engraver_group_engraver";
        \consistsend "Axis_group_engraver";
-       LyricVoiceMinimumVerticalExtent = #(cons -1.2 1.2)
+       LyricsVoiceMinimumVerticalExtent = #(cons -1.2 1.2)
 
-       \name LyricVoice ;
+       \name LyricsVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
        \consists "Extender_engraver";
@@ -265,7 +265,7 @@ LyricsContext = \translator {
        \consists "Property_engraver";
        \consistsend "Axis_group_engraver";
        
-       \accepts "LyricVoice";
+       \accepts "LyricsVoice";
 }
 
 ChordNamesVoiceContext = \translator {

diff --git a/ly/performer.ly b/ly/performer.ly
index 2b731e183cd8bea2143c1a6a1fb102e371c84231..4b300caf9fe7f6e07e94e9dd1dd58be64b15e2d0 100644 (file)
--- a/ly/performer.ly
+++ b/ly/performer.ly
@@ -71,7 +71,7 @@ PianoStaffContext = \translator {
 \translator {
        \type "Performer_group_performer";
        \consists "Lyric_performer";
-       \name LyricVoice;
+       \name LyricsVoice;
 }
 
 \translator{
@@ -81,7 +81,7 @@ PianoStaffContext = \translator {
 }
 \translator { 
        \type "Staff_performer";
-       \accepts LyricVoice;
+       \accepts LyricsVoice;
        \name Lyrics;
        \consists "Time_signature_performer";
        \consists "Tempo_performer";

diff --git a/scm/translator-description.scm b/scm/translator-description.scm
index bf132b61c570c1a90b2bad528a92a04f4ba0ccb5..3f2816cd8ba041096d3081af736704e48c48d316 100644 (file)
--- a/scm/translator-description.scm
+++ b/scm/translator-description.scm
@@ -791,7 +791,7 @@ either unison, unisilence or soloADue is set"
     needs special interaction with the rest of LilyPond, you should
     not explicitly instantiate it.
 ")
-(LyricVoice . "
+(LyricsVoice . "
     Corresponds to a voice with lyrics.  Handles the printing of a
     single line of lyrics.
 ")
@@ -817,7 +817,7 @@ either unison, unisilence or soloADue is set"
     contexts.")
 
 (Lyrics . "
-    Typesets lyrics.  It can contain @code{LyricVoice} contexts.
+    Typesets lyrics.  It can contain @code{LyricsVoice} contexts.
 ")
 (Staff . "
     Handles clefs, bar lines, keys, accidentals.  It can contain

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index c16c1809a48cb2da428ea37f5aa2ee4200463a58..462c51a673e9471d37d60e9973f0d170f81c377f 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -572,6 +572,15 @@ if 1:
        
     conversions.append (((1,3,110), conv, '\\push -> \\override, \\pop -> \\revert'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('LyricVoice', 'LyricsVoice', str)
+               % old fix
+               str = re.sub ('ChordNames*.ChordNames*', 'Chordnames.Chordname', str)
+               return str
+       
+    conversions.append (((1,3,113), conv, 'LyricVoice -> LyricsVoice'))
+
 
 ############################
        

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index eb763be8af57eb4a98a7bc087b08d5e702a0a7ce..9877a6771b56a95666aacf4631e9facd42a178bd 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -23,7 +23,7 @@ endif
 local-WWW: #index.html 
 
 index.html: check-top-web NEWS
-       $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
+##     $(sed-version) < Documentation/topdocs/$(outdir)/topweb.html > $@
 
 WWW-clean: local-WWW-clean
        $(MAKE) out='www' clean