From 731d3cb1ef66145c13864a4cfc762e8245d60fab Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Fri, 14 Aug 2009 19:25:19 -0700 Subject: [PATCH] Web examples: simplify build, split sesto into 3 files. --- Documentation/general/examples/GNUmakefile | 13 +- Documentation/general/examples/sesto-full.ly | 72 ++++++++++ Documentation/general/examples/sesto-piano.ly | 46 ++++++ .../general/examples/sesto-violin.ly | 27 ++++ .../general/examples/{sesto.ly => sesto.ily} | 131 ++---------------- Documentation/general/introduction.itexi | 9 +- 6 files changed, 166 insertions(+), 132 deletions(-) create mode 100644 Documentation/general/examples/sesto-full.ly create mode 100644 Documentation/general/examples/sesto-piano.ly create mode 100644 Documentation/general/examples/sesto-violin.ly rename Documentation/general/examples/{sesto.ly => sesto.ily} (70%) diff --git a/Documentation/general/examples/GNUmakefile b/Documentation/general/examples/GNUmakefile index 2414c63f28..473d16b967 100644 --- a/Documentation/general/examples/GNUmakefile +++ b/Documentation/general/examples/GNUmakefile @@ -2,14 +2,10 @@ depth=../../.. LOCALSTEPMAKE_TEMPLATES=lilypond ly include $(depth)/make/stepmake.make -LILYPOND_PREVIEW = $(LILYPOND_BINARY) --png -dpreview -dresolution=150 +LILYPOND_PREVIEW = $(LILYPOND_BINARY) -dpreview -dresolution=150 -FINE_LY_FILES = $(LY_FILES) -PNG_PAGES = sesto-1 sesto-2 - -OUT_PNG_FILES = $(FINE_LY_FILES:%.ly=$(outdir)/%.png) +OUT_PNG_FILES = $(LY_FILES:%.ly=$(outdir)/%.png) OUT_PNG_PAGES = $(PNG_PAGES:%=$(outdir)/%.png) -OUT_PNG_FILES += $(OUT_PNG_PAGES) OUT_SMALL_PNG_FILES = $(OUT_PNG_FILES:%.png=%-small.png) @@ -24,8 +20,3 @@ $(outdir)/%.png: %.ly $(outdir)/%-small.png: $(outdir)/%.png pngtopnm $< | pnmscale -w=600 | pnmtopng > $@ -$(outdir)/%-1.png: $(outdir)/%.png - mv $(outdir)/$*-1.preview.png $@ - -$(outdir)/%-2.png: $(outdir)/%.png - mv $(outdir)/$*-2.preview.png $@ diff --git a/Documentation/general/examples/sesto-full.ly b/Documentation/general/examples/sesto-full.ly new file mode 100644 index 0000000000..e94aa9fd08 --- /dev/null +++ b/Documentation/general/examples/sesto-full.ly @@ -0,0 +1,72 @@ +%%% G.F Haendel, Giulio Cesare in Egitto +%%% Act I, scene IV +%%% Sesto: Svegliatevi nel core, furie d'un alma offesa (excerpt) +%%% +%%% Nicolas Sceaux + +\version "2.12.2" +\include "sesto.ily" + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% +%%% Lead sheet +%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\book { + \paper { + #(layout-set-staff-size 14) + } + \score { + \new StaffGroupNoBar << + \new StaffGroupNoBracket << + \new Staff << + \set Staff.instrumentName = "Violino I." + \global \clef treble \keepWithTag #'violin \violinoI + >> + \new Staff << + \set Staff.instrumentName = "Violino II." + \global \clef treble \keepWithTag #'violin \violinoII + >> + >> + \new Staff << + \new Voice = "sesto" \with { autoBeaming = ##f } << + \set Staff.instrumentName = \markup \smallCaps Sesto. + \global \clef treble \sesto + >> + \lyricsto "sesto" \new Lyrics \sestoLyrics + >> + \new Staff << + \set Staff.instrumentName = "Bassi." + \global \clef bass \bassi + >> + >> + \layout { + indent = 20\mm + \context { + \Score + \name Score +%% FIXME: vertical engine changed! +%% \override VerticalAlignment #'max-stretch = #ly:align-interface::calc-max-stretch + \accepts "StaffGroupNoBar" + skipBars = ##t + } + \context { + \StaffGroup + \name StaffGroupNoBar + \description "Like StaffGroup, but without spanbar" + \remove "Span_bar_engraver" + \accepts "StaffGroupNoBracket" + } + \context { + \StaffGroup + \name StaffGroupNoBracket + \description "Like StaffGroup, but without brackets" + \remove "System_start_delimiter_engraver" + } + } +% \midi { } + } +} + + diff --git a/Documentation/general/examples/sesto-piano.ly b/Documentation/general/examples/sesto-piano.ly new file mode 100644 index 0000000000..de74cd0f8d --- /dev/null +++ b/Documentation/general/examples/sesto-piano.ly @@ -0,0 +1,46 @@ +%%% G.F Haendel, Giulio Cesare in Egitto +%%% Act I, scene IV +%%% Sesto: Svegliatevi nel core, furie d'un alma offesa (excerpt) +%%% +%%% Nicolas Sceaux + +\version "2.12.2" +\include "sesto.ily" + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% +%%% Reduction +%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\book { + \header { instrument = "Vocal part and keyboard reduction" } + \paper { + #(layout-set-staff-size 16) + } + \score { + << + \new Staff << + \new Voice = "sesto" \with { autoBeaming = ##f } << + \set Staff.instrumentName = \markup \smallCaps Sesto. + \global \clef treble \sesto + >> + \lyricsto "sesto" \new Lyrics \sestoLyrics + >> + \new PianoStaff << + \new Staff << + \global \clef treble + \partcombine \keepWithTag #'reduction \violinoI \keepWithTag #'reduction \violinoII + >> + \new Staff << + \global \clef bass \bassi + >> + >> + >> + \layout { + indent = 20\mm + \context { \Voice printPartCombineTexts = ##f } + } + } +} + diff --git a/Documentation/general/examples/sesto-violin.ly b/Documentation/general/examples/sesto-violin.ly new file mode 100644 index 0000000000..038889b81f --- /dev/null +++ b/Documentation/general/examples/sesto-violin.ly @@ -0,0 +1,27 @@ +%%% G.F Haendel, Giulio Cesare in Egitto +%%% Act I, scene IV +%%% Sesto: Svegliatevi nel core, furie d'un alma offesa (excerpt) +%%% +%%% Nicolas Sceaux + +\version "2.12.2" +\include "sesto.ily" + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% +%%% Violino I +%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\book { + \header { instrument = "Violino I" } + \paper { + #(layout-set-staff-size 18) + } + \score { + \new Staff << + \global \clef treble \keepWithTag #'violin \violinoI + >> + \layout { indent = 5\mm } + } +} diff --git a/Documentation/general/examples/sesto.ly b/Documentation/general/examples/sesto.ily similarity index 70% rename from Documentation/general/examples/sesto.ly rename to Documentation/general/examples/sesto.ily index f027590ab2..899d3cc0c7 100644 --- a/Documentation/general/examples/sesto.ly +++ b/Documentation/general/examples/sesto.ily @@ -21,6 +21,8 @@ sesto = { r4 r8 g' c'' ees''16[ d''] c''8 c'' | c'' g' ees''4 ~ ees''8 d''16 ees'' f''8 aes' | aes' g' r c'' c'' b'16[ c''] d''8 g' | + +%{ %%10 f'4 r8 d'' ees'' d''16[ c''] b'4 | c'' r8 c'' c''8. c'16 c'4 | @@ -47,11 +49,13 @@ sesto = { c''2 r | %%30 R1*5 | +%} } sestoLyrics = \lyricmode { Sve -- glia -- te -- vi nel co -- re, fu -- rie "d'un" al -- "ma of" -- fe -- sa, +%{ a far "d'un" tra -- di -- tor a -- spra ven -- det -- ta! sve -- glia -- te -- vi, sve -- glia te -- vi nel co -- re, @@ -68,6 +72,7 @@ sestoLyrics = \lyricmode { a far d'un tra -- di -- tor, a far d'un tra -- di -- tor, __ d'un tra -- di -- tor as -- pra ven -- det -- ta! +%} } violinoI = { @@ -81,6 +86,7 @@ violinoI = { ees'' r8 g'_\p c'' ees''16 d'' c''8 c'' | c'' g' ees''4 ~ ees''8 d''16 ees'' f''8 aes' | aes' g' r c'' c'' b'16 c'' d''8 g' | +%{ %%10 f'4 r8 d'' ees'' d''16 c'' b'4 | c''16 g'' f'' g'' ees'' g'' f'' g'' ees'' g'' f'' g'' ees'' g'' f'' g'' | @@ -111,6 +117,7 @@ violinoI = { f''2 ~ f''8 d'' b' g' | c''16 g'' f'' g'' ees'' g'' f'' g'' c'' g'' f'' g'' ees'' g'' f'' g'' | b'8 c''16 d'' ees''8 d'' c''4^\fermata r +%} } violinoII = { @@ -124,6 +131,7 @@ violinoII = { ees''4 r8 g' c'' ees''16 d'' c''8 c'' | c'' g' ees''4 ~ ees''8 d''16 ees'' f''8 aes' | aes' g' r c'' c'' b'16 c'' d''8 g' | +%{ %%10 f'4 r8 d'' ees'' d''16 c'' b'4 | c''16 ees'' d'' ees'' c'' ees'' d'' ees'' c'' ees'' d'' ees'' c'' ees'' d'' ees'' | @@ -154,6 +162,7 @@ violinoII = { f''2 ~ f''8 d'' b' g' | c''16 ees'' d'' ees'' c'' ees'' d'' ees'' c'' ees'' d'' ees'' c'' ees'' d'' ees'' | d'8 ees'16 f' g'8 b' c''4^\fermata r +%} } bassi = { @@ -167,6 +176,7 @@ bassi = { ees4 r r r8 c_\p | c' ees'16 d' c'8 bes aes f bes bes, | ees ees, r c ees c g ees | +%{ %%10 aes f d' b c' f g g, | c4 r r r8 c' | @@ -197,128 +207,13 @@ bassi = { aes, f, d b, aes f d' b | c' c bes bes, aes aes, g g, | f c g g, c4^\fermata r +%} } global = { \key c \minor \set Score . tempoWholesPerMinute = #(ly:make-moment (/ 80 4) 1 0 1) - \time 4/4 s1*34 \bar "|." + \time 4/4 +%s1*34 \bar "|." } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% -%%% Lead sheet -%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\book { - \paper { - #(layout-set-staff-size 14) - } - \score { - \new StaffGroupNoBar << - \new StaffGroupNoBracket << - \new Staff << - \set Staff.instrumentName = "Violino I." - \global \clef treble \keepWithTag #'violin \violinoI - >> - \new Staff << - \set Staff.instrumentName = "Violino II." - \global \clef treble \keepWithTag #'violin \violinoII - >> - >> - \new Staff << - \new Voice = "sesto" \with { autoBeaming = ##f } << - \set Staff.instrumentName = \markup \smallCaps Sesto. - \global \clef treble \sesto - >> - \lyricsto "sesto" \new Lyrics \sestoLyrics - >> - \new Staff << - \set Staff.instrumentName = "Bassi." - \global \clef bass \bassi - >> - >> - \layout { - indent = 20\mm - \context { - \Score - \name Score -%% FIXME: vertical engine changed! -%% \override VerticalAlignment #'max-stretch = #ly:align-interface::calc-max-stretch - \accepts "StaffGroupNoBar" - skipBars = ##t - } - \context { - \StaffGroup - \name StaffGroupNoBar - \description "Like StaffGroup, but without spanbar" - \remove "Span_bar_engraver" - \accepts "StaffGroupNoBracket" - } - \context { - \StaffGroup - \name StaffGroupNoBracket - \description "Like StaffGroup, but without brackets" - \remove "System_start_delimiter_engraver" - } - } -% \midi { } - } -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% -%%% Reduction -%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\book { - \header { instrument = "Vocal part and keyboard reduction" } - \paper { - #(layout-set-staff-size 16) - } - \score { - << - \new Staff << - \new Voice = "sesto" \with { autoBeaming = ##f } << - \set Staff.instrumentName = \markup \smallCaps Sesto. - \global \clef treble \sesto - >> - \lyricsto "sesto" \new Lyrics \sestoLyrics - >> - \new PianoStaff << - \new Staff << - \global \clef treble - \partcombine \keepWithTag #'reduction \violinoI \keepWithTag #'reduction \violinoII - >> - \new Staff << - \global \clef bass \bassi - >> - >> - >> - \layout { - indent = 20\mm - \context { \Voice printPartCombineTexts = ##f } - } - } -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% -%%% Violino I -%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\book { - \header { instrument = "Violino I" } - \paper { - #(layout-set-staff-size 18) - } - \score { - \new Staff << - \global \clef treble \keepWithTag #'violin \violinoI - >> - \layout { indent = 5\mm } - } -} diff --git a/Documentation/general/introduction.itexi b/Documentation/general/introduction.itexi index 27d5924fa8..54a756d4ac 100644 --- a/Documentation/general/introduction.itexi +++ b/Documentation/general/introduction.itexi @@ -242,11 +242,14 @@ code. This is an excerpt of @uref{http://nicolas.sceaux.free.fr/, Nicolas Sceaux's} engraving of Handel's @emph{Giulio Cesare}, in full score, piano-vocal reduction, and a violin part. -@imageClickable{examples/sesto-small.png, (click to enlarge), examples/sesto.png, center} +@imageClickable{examples/sesto-full-small.png, (click to enlarge), +examples/sesto-full.png, center} -@imageClickable{examples/sesto-1-small.png, (click to enlarge), examples/sesto-1.png, center} +@imageClickable{examples/sesto-piano-small.png, (click to enlarge), +examples/sesto-piano.png, center} -@imageClickable{examples/sesto-2-small.png, (click to enlarge), examples/sesto-2.png, center} +@imageClickable{examples/sesto-violin-small.png, (click to enlarge), +examples/sesto-violin.png, center} @newsEnd -- 2.39.5