From: Jan Nieuwenhuizen Date: Sat, 14 Nov 1998 13:22:21 +0000 (+0100) Subject: patch::: 1.1.5.jcn3: wat fixjes X-Git-Tag: release/1.1.6~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc3bc44e1ed45ae010c40c0adaac334bcae15036;p=lilypond.git patch::: 1.1.5.jcn3: wat fixjes pl5.jcn3 - website fixes --- diff --git a/Documentation/COPERTINA.in b/Documentation/COPERTINA.in index 5344413eca..546352483b 100644 --- a/Documentation/COPERTINA.in +++ b/Documentation/COPERTINA.in @@ -1,8 +1,8 @@ -LilyPond è il tipografo musicale del progetto GNU. Questo programma -puo' stampare delle belle partiture a partire da un documento di -definizioni musicali. Puo' anche creare meccaniche rappresentazioni -della partitura in un documento in formato MIDI. Le caratteristiche del +LilyPond è il tipografo musicale del progetto GNU. Questo programma +può stampare delle belle partiture a partire da un documento di +definizioni musicali. Può anche creare meccaniche rappresentazioni +della partitura in un documento in formato MIDI. Le caratteristiche del programma includono pentagrammi multipli, segni di divisione, chiavi, tasti, parole, versatile linguaggio di definizione, cadenze, legature, acciaccature, terzine, segni di formattazione, estrazione delle -parte. è compresa una seria completa di caratteri musicali. +parte. È compresa una seria completa di caratteri musicali. diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo index 18b5a8c053..bf386aa4b4 100644 --- a/Documentation/topdocs/index.yo +++ b/Documentation/topdocs/index.yo @@ -3,8 +3,12 @@ DEFINEMACRO(docdir)(0)(Documentation) DEFINEMACRO(pic)(1)(url(ARG1)(DOEXPAND(docdir)/pictures/DOEXPAND(outdir)/ARG1.png )) +DEFINEMACRO(beginbold)(0)(whenhtml(htmlcommand())) +DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand())) +redef(htmlnewfile)(0)() +setchapterstring() -nsect(LilyPond -- The GNU Project Music Typesetter) +nchapter(LilyPond -- The GNU Project Music Typesetter) includefile(../BLURB.in)(url(italiano)(DOEXPAND(docdir)/DOEXPAND(outdir)/COPERTINA.html))(url(nederlands)(DOEXPAND(docdir)/DOEXPAND(outdir)/FLAPTEKST.html)) nl() @@ -14,20 +18,17 @@ center(mudela(fragment)( \relative c'' { \key es; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } )) -nsubsect() + +nsect() Hmm, this is what it said yesterday too. I just want to know url(What's new)(DOEXPAND(docdir)/DOEXPAND(outdir)/NEWS.html) today and -then COMMENT( -url(Download)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz) -LilyPond. perhaps lily/VERSION, i.e. without my-patch-level would be -best... -)url(Download)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz) +then url(Download)(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz) LilyPond. +nl() Or get the latest url(patch)(DOEXPAND(depth)/DOEXPAND(outdir)/lilypond-@TOPLEVEL_VERSION@.diff.gz). -nsubsect(Introduction) - +nsubsect(Webmaster's Disclaimer) These pages were entirely created from the LilyPond package-sources. Sorry for poor look they have: we want to be hacking at LilyPond, and @@ -37,44 +38,61 @@ Note: These pages are created from the latest bf(development snapshots) of LilyPond, specifically, this page was made from LilyPond @TOPLEVEL_VERSION@.tar.gz -nsect(Sites) -description( -dit(lurl(http://www.cs.uu.nl/people/hanwen/lilypond/))Han-Wen's site. -dit(lurl(http://www.xs4all.nl/~jantien/lilypond/))Jan's site. -dit(lurl(http://www.realtime.net/~daboys/lilypond/))Jeff's Windows NT Distribution site. +nsect(Preview) + +itemize( +beginbold() +it()url(Examples)(DOEXPAND(depth)/input/DOEXPAND(outdir)/index.html): +endbold() + simple pieces, tests and bugs. MIDI, PNG (gif replacement), PostScript, and Source. +beginbold() +it()url(Music in Mutopia)(DOEXPAND(depth)/mutopia/DOEXPAND(outdir)/index.html): +endbold() + LilyPond handling real music. MIDI, view PNG (gif replacement), PostScript, and Source. ) +nsect(Documentation) -nsubsubsect(Mirrors) -description( -dit(lurl(http://sca.uwaterloo.ca/lilypond/)) - Eric Praetzel was kind enough to provide a mirror of both the website - and the ftp site. +itemize( +it()url(Tutorial)(DOEXPAND(docdir)/tex/DOEXPAND(outdir)/tutorial.html) +it()url(FAQ)(DOEXPAND(docdir)/DOEXPAND(outdir)/faq.html) +it()url(Reference Manual)(DOEXPAND(docdir)/tex/DOEXPAND(outdir)/refman.html) +it()url(Mailing Lists)(DOEXPAND(docdir)/DOEXPAND(outdir)/mail.html) +it()url(All of the LilyPond documentation)(DOEXPAND(docdir)/DOEXPAND(outdir)/index.html) +it()url(The DOC++ documentation of the C++ sources.)(DOEXPAND(depth)/docxx/index.html) ) -nsubsect(Examples) +nsect(Sites) itemize( -it()url(short examples of what LilyPond can do: MIDI, PS, .png and input.) -(DOEXPAND(depth)/input/DOEXPAND(outdir)/index.html) -it()url(examples of what LilyPond can do with real music: MIDI, PS, .png and input)(DOEXPAND(depth)/mutopia/DOEXPAND(outdir)/index.html) +it()lurl(http://www.cs.uu.nl/people/hanwen/lilypond/) Han-Wen's site +it()lurl(http://www.xs4all.nl/~jantien/lilypond/) Jan's site +it()lurl(http://www.realtime.net/~daboys/lilypond/) Jeff's Windows NT Distribution site ) -nsubsect(NEWS) +nsubsect(Mirrors) +description( +dit(lurl(http://sca.uwaterloo.ca/lilypond/)) + Eric Praetzel was kind enough to provide a mirror of both the website + and the ftp site. +) + +nsect(NEWS) This is what the latest version brings: verb( top_of_NEWS ) -Go get it at lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/) - -nsubsect(Documentation) - +beginbold() +Go get it at itemize( -it()url(All of the LilyPond documentation.)(DOEXPAND(docdir)/DOEXPAND(outdir)/index.html) -it()url(The DOC++ documentation of the C++ sources.)(DOEXPAND(depth)/docxx/index.html) +it()lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/) +endbold() +it()lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/) RedHat binary +it()lurl(ftp://ftp.debian.org/pub/debian/dists/unstable/main/binary-i386/tex) Debian binary +it()lurl(http://www.realtime.net/~daboys/lilypond/) Windows NT binary ) @COUNTER_REF@ diff --git a/NEWS b/NEWS index 98a312d98a..9b9189af5f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl5.jcn3 + - website fixes + pl5.jcn2 - extender-*, see input/test/extender.ly - bf: half-beam length (urg) diff --git a/VERSION b/VERSION index 95a012f617..8d9330e3fa 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=5 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/init/engraver.ly b/init/engraver.ly index 91db39ae70..79ad9d2385 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -220,7 +220,8 @@ HaraKiriStaffContext = \translator { % huh, Score should do HaraKiri, not Part yes? OrchestralPartStaffContext = \translator { - \HaraKiriStaffContext +% \HaraKiriStaffContext + \StaffContext barColumnPriority = "0"; marginBreakPriority = "-4"; \consists "Mark_engraver"; @@ -228,6 +229,7 @@ OrchestralPartStaffContext = \translator { \consists "Bar_number_engraver"; }; +% where to put HaraKiri here? OrchestralScoreContext= \translator { \type Score_engraver; \name Score; diff --git a/init/part-paper.ly b/init/part-paper.ly index 94e0351107..162984e5b3 100644 --- a/init/part-paper.ly +++ b/init/part-paper.ly @@ -1,27 +1,9 @@ %part-paper.ly \paper { + \translator { \OrchestralPartStaffContext } + \translator { \ScoreContext skipBars = 1; } % for simple testing only! % castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn -Score = \translator { - \type Score_engraver; - - \consists "Timing_engraver"; - \consists "Bar_column_engraver"; - \consists "Bar_number_engraver"; - \consists "Mark_engraver"; - \consists "Span_score_bar_engraver"; - \consists "Score_priority_engraver"; - \consists "Priority_horizontal_align_engraver"; - \consists "Vertical_align_engraver"; - - \accepts "StaffGroup"; - \accepts "Staff"; - \accepts "RhythmicStaff"; - \accepts "Lyrics"; - \accepts "GrandStaff"; - SkipBars = "1"; -} - \include "bar-numbering.ly"; } diff --git a/input/GNUmakefile b/input/GNUmakefile index 16b785ec2d..716a611a01 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -4,7 +4,7 @@ depth = .. SUBDIRS=test bugs -examples=example-3 twinkle-pop praeludium-fuga-E twinkle +examples=example-3 twinkle-pop praeludium-fuga-E twinkle star-spangled-banner flexamples=example-1 example-2 LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly new file mode 100644 index 0000000000..54fed0b456 --- /dev/null +++ b/input/star-spangled-banner.ly @@ -0,0 +1,118 @@ +%{ +Converted from star.mup with the aid of mup-to-ly.py +http://www.Arkkra.com/doc/star.html +http://www.Arkkra.com/doc/star.ps +%} +\header{ +title="The Star Spangled Banner"; +subtitle="(United States of America's National Anthem)"; +poet="Text by Francis Scott Key"; +composer="J. S. Smith"; +arranger="Arranged by William J. Krauss"; +enteredby="jcn"; +copyright="public domain"; +} + +$staff1_voice_1 = \notes { + [a8.()fis16] d4 fis4 a4 d'2 [fis'8. e'16] d'4 fis4 gis4 a2 [a8 a8] + fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 d'4 a4 fis4 d4 [a8. fis16] + fis4 d4 [fis'8. fis'16] fis'4 g'4 a'4 a'2 [g'8 fis'8] e'4 fis'4 + g'4 g'2 g'4 fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 fis4 gis4 a2 a4 + d'4 d'4 [d'8()cis'8] b4 b4 b4 e'4 [g'8 ()fis'8] [e'8()d'8] + d'4~cis'4 [a8. a16] d'4.~e'8 [fis'8 g'8] a'2 [d'8 e'8] fis'4. g'8 + e'4 d'2 s4 +} + +$staff1_voice_2 = \notes { + [a8.()fis16] a,4 d4 e4 d4~fis4 [fis8. fis16] fis4 d4 d4 cis2 [e8 + e8] a4. a8 a4 a2 [a8. a16] a4 a4 a4 fis4 d4 [a8. fis16] fis4 d4 r4 + a4 a4 d'4 d'2 [a8 a8] cis'4 cis'4 cis'4 cis'2 a4 a4. a8 a4 a2 [a8. + a16] d4 d4 d4 cis2 e4 fis4 e4 d4 d4 d4 dis4 g4 [g8()dis8] e4 e2 + [e8. e16] d4.~a8 [a8 a8] a2 [g8 g8] a4. a8 g4 fis2 s4 +} + +$staff2_voice_1 = \notes { + r4 fis4 a4 a4 b2 [cis'8. cis'16] b4 b4 b4 a2 [cis'8 cis'8] d'4. + cis'8 d'4 e'2 [e'8. e'16] d'4 d'4 a4 fis4 d4 r4 fis4 d4 r4 d4 e4 + fis4 fis'2 [e'8 d'8] e'4 e'4 e'4 e'2 cis'4 d'4. cis'8 d'4 e'2 + [e'8. e'16] a4 a4 e4 e2 cis'4 a4 a4 a4 g4 g4 b4 b4 b4 b4 a2 + [cis'8. cis'16] a4.~cis'8 [d'8 d'8] d'2 [d'8 d'8] d'4. d'8 cis'4 + a2 s4 +} + +$staff2_voice_2 = \notes { + r4 d4 d4 cis4 b,2 [ais,8. ais,16] b,4 b,4 e4 a,2 [a8 a8] d4. e8 + [fis8 g8] a2 [g8. g16] fis4 fis4 a4 fis4 d4 r4 fis4 d4 r4 d4 d4 d4 + d2 [d8 d8] a4 a4 a4 a2 a,4 d4. e8 [fis8 g8] a2 [g8. g16] fis4 d4 + e4 a,2 a4 d4 e4 fis4 g4 g4 fis4 e4 [e8()fis8] [g8()gis8] a2 [g8. + g16] fis4.~a,8 [d8 e8] fis2 [b8 b8] a4. a8 a,4 d2 s4 +} + +$text1 = \lyrics{ + Oh4 __ say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 + so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- + ing. Whose8. broad16 +} + +$text2 = \lyrics{ + _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2 + O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly + _ _ _ +} + +$text3 = \lyrics{ + stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 + burst-4 ing in air,2 gave4 proof4. through8 the4 night2 that8. + our16 flag4 was still there,2 Oh4 say, does that star- span- + gled ban- ner yet wave,2 __ O'er8. the16 land2 __ of8 the8 free2 + and8 the8 home4. of8 the4 brave.2 +} + +global = \notes { + \time 3/4; + \key D; + \partial 4; + \skip 4; + \bar "|:"; + \skip 2.*8; + \bar ":|"; + \skip 2.*16; + \skip 2.; + \bar "|."; + } + +\include "paper16.ly"; + +\score{ + \type GrandStaff < + \type Staff=staffA < + \global + \notes \transpose c'' {\voiceone \$staff1_voice_1 } + \notes \transpose c'' {\voicetwo \$staff1_voice_2 } + > + \type Lyrics = one \lyrics < +% urg, too much distance between two texts; fixme first +% \$text1 +% { \$text2 \$text3 } + { \$text1 \$text3 } + > + \type Staff=staffB < + \global + \clef bass; + {\voiceone \$staff2_voice_1 } + {\voicetwo \$staff2_voice_2 } + > + > + \paper{ + \paper_sixteen; + textheight = 230.\mm; + linewidth= 180.\mm; + \translator { + \GrandStaffContext + \accepts "Lyrics"; + } + \translator { + \BarNumberingStaffContext + } + } +} diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index 5af2ecfc95..9d0326d15f 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -1,7 +1,7 @@ # input/test/Makefile depth = ../.. -examples=font20 hara-kiri grace mark denneboom stars-and-stripes +examples=font20 hara-kiri grace mark denneboom slurs LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 89b6cb0682..8d38bc7271 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -62,8 +62,6 @@ zoger = \type Staff = zoger \notes \relative c { \skip 1*1; } - \include "score-paper.ly"; - zagers = \type GrandStaff < \zager \zoger @@ -83,7 +81,6 @@ zagers = \type GrandStaff < %uh? % \translator { \OrchestralScoreContext } % \translator { \OrchestralPartStaffContext } - } linewidth = 40.0\mm; } } diff --git a/input/test/mark.ly b/input/test/mark.ly index f5e9deb060..7b2f99823c 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -20,6 +20,6 @@ two = \notes\relative c{ \score{ < \global \one \two > \paper { - \include "score-bar-numbering.ly"; + \translator { \BarNumberingStaffContext } } } diff --git a/input/test/stars-and-stripes.ly b/input/test/stars-and-stripes.ly index 9dbecdeb71..e69de29bb2 100644 --- a/input/test/stars-and-stripes.ly +++ b/input/test/stars-and-stripes.ly @@ -1,118 +0,0 @@ -%{ -Converted from star.mup with the aid of mup-to-ly.py -http://www.Arkkra.com/doc/star.html -http://www.Arkkra.com/doc/star.ps -%} -\header{ -title="The Star Spangled Banner"; -subtitle="(The United States National Anthem)"; -poet="Text by Francis Scott Key"; -composer="J. S. Smith"; -arranger="Arranged by William J. Krauss"; -enteredby="jcn"; -copyright="public domain"; -} - -$staff1_voice_1 = \notes { - [a8.()fis16] d4 fis4 a4 d'2 [fis'8. e'16] d'4 fis4 gis4 a2 [a8 a8] - fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 d'4 a4 fis4 d4 [a8. fis16] - fis4 d4 [fis'8. fis'16] fis'4 g'4 a'4 a'2 [g'8 fis'8] e'4 fis'4 - g'4 g'2 g'4 fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 fis4 gis4 a2 a4 - d'4 d'4 [d'8()cis'8] b4 b4 b4 e'4 [g'8 ()fis'8] [e'8()d'8] - d'4~cis'4 [a8. a16] d'4.~e'8 [fis'8 g'8] a'2 [d'8 e'8] fis'4. g'8 - e'4 d'2 s4 -} - -$staff1_voice_2 = \notes { - [a8.()fis16] a,4 d4 e4 d4~fis4 [fis8. fis16] fis4 d4 d4 cis2 [e8 - e8] a4. a8 a4 a2 [a8. a16] a4 a4 a4 fis4 d4 [a8. fis16] fis4 d4 r4 - a4 a4 d'4 d'2 [a8 a8] cis'4 cis'4 cis'4 cis'2 a4 a4. a8 a4 a2 [a8. - a16] d4 d4 d4 cis2 e4 fis4 e4 d4 d4 d4 dis4 g4 [g8()dis8] e4 e2 - [e8. e16] d4.~a8 [a8 a8] a2 [g8 g8] a4. a8 g4 fis2 s4 -} - -$staff2_voice_1 = \notes { - r4 fis4 a4 a4 b2 [cis'8. cis'16] b4 b4 b4 a2 [cis'8 cis'8] d'4. - cis'8 d'4 e'2 [e'8. e'16] d'4 d'4 a4 fis4 d4 r4 fis4 d4 r4 d4 e4 - fis4 fis'2 [e'8 d'8] e'4 e'4 e'4 e'2 cis'4 d'4. cis'8 d'4 e'2 - [e'8. e'16] a4 a4 e4 e2 cis'4 a4 a4 a4 g4 g4 b4 b4 b4 b4 a2 - [cis'8. cis'16] a4.~cis'8 [d'8 d'8] d'2 [d'8 d'8] d'4. d'8 cis'4 - a2 s4 -} - -$staff2_voice_2 = \notes { - r4 d4 d4 cis4 b,2 [ais,8. ais,16] b,4 b,4 e4 a,2 [a8 a8] d4. e8 - [fis8 g8] a2 [g8. g16] fis4 fis4 a4 fis4 d4 r4 fis4 d4 r4 d4 d4 d4 - d2 [d8 d8] a4 a4 a4 a2 a,4 d4. e8 [fis8 g8] a2 [g8. g16] fis4 d4 - e4 a,2 a4 d4 e4 fis4 g4 g4 fis4 e4 [e8()fis8] [g8()gis8] a2 [g8. - g16] fis4.~a,8 [d8 e8] fis2 [b8 b8] a4. a8 a,4 d2 s4 -} - -$text1 = \lyrics{ - Oh4 __ say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 - so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- - ing. Whose8. broad16 -} - -$text2 = \lyrics{ - _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2 - O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly - _ _ _ -} - -$text3 = \lyrics{ - stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 - burst-4 ing in air,2 gave4 proof4. through8 the4 night2 that8. - our16 flag4 was still there,2 Oh4 say, does that star- span- - gled ban- ner yet wave,2 __ O'er8. the16 land2 __ of8 the8 free2 - and8 the8 home4. of8 the4 brave.2 -} - -global = \notes { - \time 3/4; - \key D; - \partial 4; - \skip 4; - \bar "|:"; - \skip 2.*8; - \bar ":|"; - \skip 2.*16; - \skip 2.; - \bar "|."; - } - -\include "paper16.ly"; - -\score{ - \type GrandStaff < - \type Staff=staffA < - \global - \notes \transpose c'' {\voiceone \$staff1_voice_1 } - \notes \transpose c'' {\voicetwo \$staff1_voice_2 } - > - \type Lyrics = one \lyrics < -% urg, too much distance between two texts; fixme first -% \$text1 -% { \$text2 \$text3 } - { \$text1 \$text3 } - > - \type Staff=staffB < - \global - \clef bass; - {\voiceone \$staff2_voice_1 } - {\voicetwo \$staff2_voice_2 } - > - > - \paper{ - \paper_sixteen; - textheight = 230.\mm; - linewidth= 180.\mm; - \translator { - \GrandStaffContext - \accepts "Lyrics"; - } - \translator { - \BarNumberingStaffContext - } - } -} diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index 40c4ce7d3c..3499e9627c 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -1,9 +1,4 @@ - -\paper { \translator { - \OrchestralPartStaffContext - - } - \translator { \ScoreContext - skipBars = 1; - } +\paper { + \translator { \OrchestralPartStaffContext } + \translator { \ScoreContext skipBars = 1; } } diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index eeb3e58ee7..0f2537d2f5 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -75,6 +75,7 @@ strijkers = \type StaffGroup = strijkers_group < > \paper{ % Give hara-kiri something to do... + % URG fixme Score+HaraKiri! linewidth = 130.0\mm; \translator { \OrchestralScoreContext } }