From b38f39fe5ac9005b915a8ab26113a977992a5160 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 11 Jul 2001 22:57:41 +0200 Subject: [PATCH] patch::: 1.5.1.jcn4: Re: .ly templates? 1.5.1.jcn3 --- CHANGES | 4 +- VERSION | 2 +- input/GNUmakefile | 2 +- input/ascii-art/GNUmakefile | 3 -- input/template/GNUmakefile | 7 ++++ input/template/README | 57 +++++++++++++++++++++++++ input/template/melody-lyrics-chords.ly | 45 ++++++++++++++++++++ input/template/melody-lyrics.ly | 40 ++++++++++++++++++ input/template/melody.ly | 28 +++++++++++++ input/template/piano-4-voices.ly | 55 ++++++++++++++++++++++++ input/template/piano-lyrics.ly | 54 ++++++++++++++++++++++++ input/template/piano-melody-lyrics.ly | 58 ++++++++++++++++++++++++++ input/template/piano.ly | 39 +++++++++++++++++ input/test/title.ly | 2 +- 14 files changed, 389 insertions(+), 7 deletions(-) create mode 100644 input/template/GNUmakefile create mode 100644 input/template/README create mode 100644 input/template/melody-lyrics-chords.ly create mode 100644 input/template/melody-lyrics.ly create mode 100644 input/template/melody.ly create mode 100644 input/template/piano-4-voices.ly create mode 100644 input/template/piano-lyrics.ly create mode 100644 input/template/piano-melody-lyrics.ly create mode 100644 input/template/piano.ly diff --git a/CHANGES b/CHANGES index 640d803673..ef2cfe9c85 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,11 @@ *** WARNING(reminder): all output via TeX (ie: using ly2dvi or plain *** lilypond) still yields broken stems, bars and staff lines. -1.5.1.jcn2 +1.5.1.jcn3 ========== +* Added some template .ly's for evaluation. + * Make blot work without -fps too. * Use blot diameter for postscript beams and boxes. diff --git a/VERSION b/VERSION index f091b0882c..8fd02b1f0c 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=1 -MY_PATCH_LEVEL=jcn3 +MY_PATCH_LEVEL=jcn4 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/GNUmakefile b/input/GNUmakefile index 3f3951d288..9cf5f1fd68 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=bugs test regression tutorial no-notation ascii-art +SUBDIRS=bugs test regression tutorial no-notation ascii-art template # nereides is tweaked a lot, can't do (read webpage) examples=trip star-spangled-banner paddy twinkle #nereides diff --git a/input/ascii-art/GNUmakefile b/input/ascii-art/GNUmakefile index 9c2b9f48fe..516974621f 100644 --- a/input/ascii-art/GNUmakefile +++ b/input/ascii-art/GNUmakefile @@ -1,8 +1,5 @@ -# input/bugs/Makefile - depth = ../.. LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make - diff --git a/input/template/GNUmakefile b/input/template/GNUmakefile new file mode 100644 index 0000000000..cba7839f6d --- /dev/null +++ b/input/template/GNUmakefile @@ -0,0 +1,7 @@ +depth = ../.. + +LOCALSTEPMAKE_TEMPLATES=ly mutopia +EXTRA_DIST_FILES=README + +include $(depth)/make/stepmake.make + diff --git a/input/template/README b/input/template/README new file mode 100644 index 0000000000..b3c24f9b3f --- /dev/null +++ b/input/template/README @@ -0,0 +1,57 @@ + +* Mention this somewhere in documentation (Tutorial) + +* Better comment-out most header entries, or + move to template/title.ly altogether? + +* Naming conventions for voices/staffs + (think: \autochange, \partcombine)? + +* Add (commented-out) stuff like \time 3/4 + \property Staff.TimeSignature \set #'style = #xxx? + +* Handy emacs shortcuts to (these) templates? + +* Mutopia headers? + +* Another approach would be to not include any music in the templates, + and standardise the naming of the music, so that you'd do: + + title = 'Piano piece' + upper = \notes { ... } + lower = \notes { ... } + + \include "template/piano.ly" + + In this case, we'd also need one simple music example file per + template. This approach can be even easier to use, but is not very + flexible, it only works for simple and uniform pieces. + +* Possibly some of you already have created something like this? I was + thinking of having templates for: + + single melody = melody.ly + melody with lyrics = melody-lyrics.ly + melody with lyrics and chords = melody-lyrics-chords.ly + piano = piano.ly + piano with several voices = piano-4-voices.ly + piano with lyrics (between staffs) = piano-lyrics.ly + piano with melody and lyrics = piano-melody-lyrics.ly + +TODO (Choral templates, anyone?) + piano with lyrics and chords + (string) duet + (string) duet parts + string quartet + string quintet parts + orchestral score + orchestral parts + choral score + choral score with piano reduction (i.e., the piano staves have the + same notes as the choral parts) + choral score with piano accompaniment + choral parts + + + + diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly new file mode 100644 index 0000000000..80dcd6c70d --- /dev/null +++ b/input/template/melody-lyrics-chords.ly @@ -0,0 +1,45 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +melody = \notes \relative c' { + a b c d +} + +text = \lyrics { + Aaa Bee Cee Dee +} + +accompaniment = \chords { + a2: c2 +} + +\score { + < + \context ChordNames \accompaniment + \addlyrics + \context Staff = one { + \property Staff.noAutoBeaming = ##t + \property Staff.automaticMelismata = ##t + \melody + } + \context Lyrics \text + > + \paper { } + \midi { } +} diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly new file mode 100644 index 0000000000..613fa72474 --- /dev/null +++ b/input/template/melody-lyrics.ly @@ -0,0 +1,40 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +melody = \notes \relative c'' { + a b c d +} + +text = \lyrics { + Aaa Bee Cee Dee +} + +\score { + < + \addlyrics + \context Staff = one { + \property Staff.noAutoBeaming = ##t + \property Staff.automaticMelismata = ##t + \melody + } + \context Lyrics \text + > + \paper { } + \midi { } +} diff --git a/input/template/melody.ly b/input/template/melody.ly new file mode 100644 index 0000000000..80739411c6 --- /dev/null +++ b/input/template/melody.ly @@ -0,0 +1,28 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +melody = \notes \relative c' { + a b c d +} + +\score { + \context Staff \melody + \paper { } + \midi { } +} diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly new file mode 100644 index 0000000000..a5bfe1ee6c --- /dev/null +++ b/input/template/piano-4-voices.ly @@ -0,0 +1,55 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +upperOne = \notes\relative c'' { + \voiceOne + a b c d +} + +upperTwo = \notes\relative c' { + \voiceTwo + a2 c +} + +lowerOne = \notes\relative c { + \voiceOne + a2 c +} + +lowerTwo = \notes\relative c { + \voiceTwo + a1 +} + +\score { + \context PianoStaff < + %\time 4/4 + \context Staff = upper < + \context Voice = one \upperOne + \context Voice = two \upperTwo + > + \context Staff = lower < + \clef bass + \context Voice = one \lowerOne + \context Voice = two \lowerTwo + > + > + \paper { } + \midi { } +} \ No newline at end of file diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly new file mode 100644 index 0000000000..1d519ed4dd --- /dev/null +++ b/input/template/piano-lyrics.ly @@ -0,0 +1,54 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +upper = \notes\relative c'' { + a b c d +} + +lower = \notes\relative c { + a2 c +} + +text = \lyrics { + Aaa Bee Cee Dee +} + +\score { + \context GrandStaff < + \addlyrics + \context Staff = upper \upper + \context Lyrics \text + \context Staff = lower < + \clef bass + \lower + > + > + \paper { + \translator { + \GrandStaffContext + \accepts "Lyrics" + } + \translator { + %\LyricsVoiceContext + \LyricsContext + \consists "Bar_engraver" + } + } + \midi { } +} \ No newline at end of file diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly new file mode 100644 index 0000000000..a1c2c3ecc9 --- /dev/null +++ b/input/template/piano-melody-lyrics.ly @@ -0,0 +1,58 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +melody = \notes \relative c'' { + a b c d +} + +text = \lyrics { + Aaa Bee Cee Dee +} + +upper = \notes\relative c'' { + a b c d +} + +lower = \notes\relative c { + a2 c +} + +\score { + < + \addlyrics + \context Staff = mel { + \property Staff.noAutoBeaming = ##t + \property Staff.automaticMelismata = ##t + \melody + } + \context Lyrics \text + + \context PianoStaff < + \context Staff = upper \upper + \context Staff = lower < + \clef bass + \lower + > + > + > + \paper { + \translator { \HaraKiriStaffContext } + } + \midi { } +} \ No newline at end of file diff --git a/input/template/piano.ly b/input/template/piano.ly new file mode 100644 index 0000000000..497c8c2e4e --- /dev/null +++ b/input/template/piano.ly @@ -0,0 +1,39 @@ +\version "1.5.1" + +\header { + dedication = "dedication" + title = "Title" + subtitle = "Subtitle" + subsubtitle = "Subsubtitle" + composer = "Composer (xxxx-yyyy)" + opus = "Opus 0" + piece = "Piece I" + instrument = "Instrument" + arranger = "Arranger" + poet = "Poet" + texttranslator = "Translator" + copyright = "public domain" + enteredby = "jcn" + source = "urtext" +} + +upper = \notes\relative c'' { + a b c d +} + +lower = \notes\relative c { + a2 c +} + +\score { + \context PianoStaff < + %\time 4/4 + \context Staff = upper \upper + \context Staff = lower < + \clef bass + \lower + > + > + \paper { } + \midi { } +} \ No newline at end of file diff --git a/input/test/title.ly b/input/test/title.ly index 176829a4c5..9ef39c0dc5 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -6,6 +6,7 @@ subtitle = "Subtitle" subsubtitle = "Subsubtitle" composer = "Composer (xxxx-yyyy)" + instrument = "Instrument" arranger = "Arranger" poet = "Poet" % ugr: warning: Identifier name is a keyword: `translator' @@ -14,7 +15,6 @@ copyright = "public domain" enteredby = "jcn" source = "urtext" - instrument = "Instrument" } \score { -- 2.39.5