]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.3.113.jcn1
authorJan Nieuwenhuizen <janneke@gnu.org>
Thu, 30 Nov 2000 12:33:27 +0000 (13:33 +0100)
committerJan Nieuwenhuizen <janneke@gnu.org>
Thu, 30 Nov 2000 12:33:27 +0000 (13:33 +0100)
1.3.113.jcn1
============

* Reincluded simple FAQ in tarball.

* Fixed lyrics with bar-enrgaver example (?).

* Renamed LyricVoice to LyricsVoice.

17 files changed:
CHANGES
Documentation/header.html.in
Documentation/index.texi
Documentation/topdocs/FAQ.texi [new file with mode: 0644]
Documentation/topdocs/index.tely
Documentation/user/bugs.itexi
VERSION
input/star-spangled-banner.ly
input/test/lyrics-bar.ly
lily/lyric-phrasing-engraver.cc
lily/stanza-number-engraver.cc
lilypond-mode.el
ly/engraver.ly
ly/performer.ly
scm/translator-description.scm
scripts/convert-ly.py
stepmake/stepmake/toplevel-targets.make

diff --git a/CHANGES b/CHANGES
index 8f22b247881909a75a26bff40e59f6dc5334d988..ea5f6b019ffa00d5d3d15baf82650cefda2e66bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.3.113.jcn1
+============
+
+* Reincluded simple FAQ in tarball.
+
+* Fixed lyrics with bar-enrgaver example (?).
+
+* Renamed LyricVoice to LyricsVoice.
+
 1.3.112.jcn3
 ============
 
index 6bd96bbf5a9988650f4599ba4aba2fa92a307daa..e0c92780f385d7acf5bbb5a6ecb9198bf2f4005d 100644 (file)
@@ -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">
index 16bdae85a3ea1da3891be0c3dd75021d901e7248..91a60d6e0149533e96aaab2f78ab8e7307c44d70 100644 (file)
@@ -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/FAQ.texi b/Documentation/topdocs/FAQ.texi
new file mode 100644 (file)
index 0000000..16f819b
--- /dev/null
@@ -0,0 +1,113 @@
+\input texinfo @c -*-texinfo-*-
+@setfilename FAQ.info
+@settitle FAQ - GNU LilyPond Frequently Asked Questions
+
+
+@node Top
+@chapter FAQ - GNU LilyPond Frequently Asked Questions
+
+
+@menu
+* General::                      General questions
+* Installation::                 Installation questions
+@end menu
+
+
+@node General
+@section General
+
+@subsection I'm stuck, HELP!
+
+Please read the
+@uref{http://appel.lilypond.org/wiki?LilyPondFaqs, full online
+FAQs}.  Also, please look in the searchable mailinglist archives:
+
+@itemize @bullet
+@item
+@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org,help-gnu-music}
+@item
+@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org,bug-gnu-music}
+@item
+@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org,gnu-music-discuss}
+@end itemize
+
+If you are still at loss, send your questions to the @strong{mailing
+list}, and not to authors directly.
+
+@subsection My symbols are all messed up!
+
+After I upgraded, I get the wrong symbols and dvi-checksum errors!
+
+We obviously mucked with the fonts in the upgrade.  Remove @strong{all}
+previous fonts, including the @file{.pk} and @file{.tfm} fonts in
+@file{/var/lib/texmf} and your current directory.  A script automating
+this has been included, see @file{buildscripts/clean-fonts.sh}.
+
+@subsection Dvips spews weird error messages!
+
+Warnings that look like 
+
+@example
+        dvips: Couldn't find figure file src:XX:YY; continuing
+@end example
+
+are harmless.  Dvips does not yet grok the
+@uref{http://appel.lilypond.org/wiki?PointAndClick,
+PointAndClick} feature.
+
+
+@node Installation
+@section Installation
+
+@subsection Where is guile, libguileX, guile-config?
+
+RedHat users need to install guile-1.4 and guile-devel-1.4, Debian
+users need to get guile1.4, libguile9 and libguile9-dev.
+
+If you're building from source, you need guile 1.3.4 or newer.  Verify
+that the correct guile, guile-config, and libguile* in your PATH and
+LD_LIBRARY_PATH (or @file{/etc/ld.so.conf}).
+
+@subsection I get all kinds of errors while compiling @file{parser.cc}
+
+LilyPond uses features of bison version 1.25. Please confirm that
+you are using a version 1.25 or better, that is @strong{GNU} bison
+@strong{1.25}. Don't forget to do "make clean" after installing it. Don't
+forget to remove the stale @file{bison.simple} as well.
+
+If the problem persists, then please send a bug report to the mailing list.
+
+@subsection I upgraded by applying a patch, and now my configure/build breaks.
+
+Patches don't include automatically generated files, i.e. 
+@file{configure} and files generated by @file{configure}.  Regenerate them 
+yourself:
+@example 
+
+    autoconf
+    configure
+@end example 
+
+@subsection Is there an emacs mode?
+
+Yes.  It is included with the source archive as
+@file{lilypond-mode.el} and @file{lilypond-font-lock.el}.  If you have
+an RPM or .deb it is in @file{/usr/share/doc/lilypond-X/}.  You have
+to install it yourself.
+
+Add this to your .emacs.el:
+@example 
+    (load-library "lilypond-mode.el")
+    (setq auto-mode-alist
+     (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
+@end example 
+
+
+@subsection I downloaded the windows32 port, and it doesn't match the website!
+
+The website is usually made from the latest snapshots.  Binary releases,
+in particular the windows32 binaries, are only made every once in a while.
+They may lag several versions behind the latest version.
+
+@bye
index ce7638836551d9dc69e5ecc974d09f9c86d475ad..9372b7299b4dab5b6db63818d04536d59aad6b63 100644 (file)
@@ -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
index 1ba2b397830c6347b30cf9f64a9c41bb4a3f581b..d9ba1abeeb0b026e35c0649b06a9465f13c97c48 100644 (file)
@@ -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/VERSION b/VERSION
index 0647cd6d6f74f44005dfd8c78c3a05c9de1ea089..b512f995d829483cddd531680bf48f132488998c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=113
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index 8af0d07ce221376595c5f9c5d401beeb8c9a5399..554628f613372f53eeb640f3920c82fe1c2d40bc 100644 (file)
@@ -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;
index 0e714c34f607c1184584d61766f8e71a397fb05a..ad47fbc19b534b0db903ec29fdb5ddceab531ed3 100644 (file)
@@ -1,27 +1,29 @@
 
 \score {
-
        \context StaffGroup <
-        \notes \context Staff { b1 b1 \bar "|."; }
-        \lyrics\context Lyrics <
-               \context BarLV  { thisContextHasBarEngraver1 added }
-                \context LyricVoice { this4 one has no barEngraverAddedToContext1 }
-               >
-        \notes \context Staff = SB { b1 b1 }
-
-               >
-
+       \notes \context Staff {
+               b1 b1 \bar "|.";
+       }
+       \lyrics\context Lyrics <
+               \context LyricsVoiceWithBars {
+                       thisContextHasSpanBarEngraver1 added
+               }
+               \context LyricsVoice {
+                       this4 one has no SpanBarEngraverAddedToContext1
+               }
+       >
+       \notes \context Staff = SB { b1 b1 }
+       >
        \paper {
                linewidth = -1.0\cm;
                \translator {
                        \LyricsContext
-                       \consists "Bar_engraver";
-                       \accepts "BarLV";
+                       \consists "Span_bar_engraver";
+                       \accepts "LyricsVoiceWithBars";
                }
                \translator {
                        \LyricsVoiceContext
-                       \consists "Bar_engraver";
-                       \name "BarLV";
+                       \name "LyricsVoiceWithBars";
                }
                \translator {
                        \LyricsVoiceContext
index a931d3508f28e33444229cb4c6036e181d81cdc1..a40c6149db7a2d5ec32867a0d0892e856e75047f 100644 (file)
@@ -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;
   }
index e08808f02ea49f43eb6f2ef0651458853a0e3714..7110c459be72b46d384db210bdbe71f67c42aa5f 100644 (file)
@@ -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))
index ac735918016ab94c5c99f47e80b3ecf93f6f1177..a2540e91750edc7c6d176e5a8931aa9237974979 100644 (file)
@@ -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")
 
index eb328cb68547f0b25a225a30e4bafe26bade47fe..210299c3b0e23a224ee2d3d2a83ad9740fb53435 100644 (file)
@@ -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 {
index 2b731e183cd8bea2143c1a6a1fb102e371c84231..4b300caf9fe7f6e07e94e9dd1dd58be64b15e2d0 100644 (file)
@@ -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";
index bf132b61c570c1a90b2bad528a92a04f4ba0ccb5..3f2816cd8ba041096d3081af736704e48c48d316 100644 (file)
@@ -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
index c16c1809a48cb2da428ea37f5aa2ee4200463a58..462c51a673e9471d37d60e9973f0d170f81c377f 100644 (file)
@@ -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'))
+
 
 ############################
        
index eb763be8af57eb4a98a7bc087b08d5e702a0a7ce..9877a6771b56a95666aacf4631e9facd42a178bd 100644 (file)
@@ -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