From: Jan Nieuwenhuizen Date: Thu, 30 Nov 2000 12:33:27 +0000 (+0100) Subject: patch::: 1.3.113.jcn1 X-Git-Tag: release/1.3.114~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f39b7378afe664207db00d7c9b8ea926e2c6840a;p=lilypond.git patch::: 1.3.113.jcn1 1.3.113.jcn1 ============ * Reincluded simple FAQ in tarball. * Fixed lyrics with bar-enrgaver example (?). * Renamed LyricVoice to LyricsVoice. --- diff --git a/CHANGES b/CHANGES index 8f22b24788..ea5f6b019f 100644 --- 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 ============ diff --git a/Documentation/header.html.in b/Documentation/header.html.in index 6bd96bbf5a..e0c92780f3 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -38,7 +38,7 @@ which substitutes some @AT_VARIABLES@ as well. Home Development
- WikiWikiWeb
+ WikiWikiWeb
GNU Project
Translations
LilyPond dot org
@@ -49,10 +49,11 @@ which substitutes some @AT_VARIABLES@ as well. Change Log
- FAQ
+ Small FAQ
+ Full FAQ
User manual
Features
- To do
+ To do

@@ -83,7 +84,7 @@ which substitutes some @AT_VARIABLES@ as well. Longer examples
Mutopia Project
- Other URLs
+ Other URLs

diff --git a/Documentation/index.texi b/Documentation/index.texi index 16bdae85a3..91a60d6e01 100644 --- 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/FAQ.texi b/Documentation/topdocs/FAQ.texi new file mode 100644 index 0000000000..16f819b100 --- /dev/null +++ b/Documentation/topdocs/FAQ.texi @@ -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 diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index ce76388365..9372b7299b 100644 --- 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 @@ -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 1ba2b39783..d9ba1abeeb 100644 --- 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/VERSION b/VERSION index 0647cd6d6f..b512f995d8 100644 --- 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. diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 8af0d07ce2..554628f613 100644 --- 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/input/test/lyrics-bar.ly b/input/test/lyrics-bar.ly index 0e714c34f6..ad47fbc19b 100644 --- a/input/test/lyrics-bar.ly +++ b/input/test/lyrics-bar.ly @@ -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 diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc index a931d3508f..a40c6149db 100644 --- 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/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index e08808f02e..7110c459be 100644 --- 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 ac73591801..a2540e9175 100644 --- 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 eb328cb685..210299c3b0 100644 --- 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 2b731e183c..4b300caf9f 100644 --- 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 bf132b61c5..3f2816cd8b 100644 --- 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 c16c1809a4..462c51a673 100644 --- 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 eb763be8af..9877a6771b 100644 --- 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