]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.5.1.jcn4: Re: .ly templates?
authorJan Nieuwenhuizen <janneke@gnu.org>
Wed, 11 Jul 2001 20:57:41 +0000 (22:57 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Wed, 11 Jul 2001 20:57:41 +0000 (22:57 +0200)
1.5.1.jcn3

14 files changed:
CHANGES
VERSION
input/GNUmakefile
input/ascii-art/GNUmakefile
input/template/GNUmakefile [new file with mode: 0644]
input/template/README [new file with mode: 0644]
input/template/melody-lyrics-chords.ly [new file with mode: 0644]
input/template/melody-lyrics.ly [new file with mode: 0644]
input/template/melody.ly [new file with mode: 0644]
input/template/piano-4-voices.ly [new file with mode: 0644]
input/template/piano-lyrics.ly [new file with mode: 0644]
input/template/piano-melody-lyrics.ly [new file with mode: 0644]
input/template/piano.ly [new file with mode: 0644]
input/test/title.ly

diff --git a/CHANGES b/CHANGES
index 640d803673a7412a8b249a46d365bd9758d7216e..ef2cfe9c85b72eb84cc38410debae6f8599ae37b 100644 (file)
--- 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 f091b0882cfb7cbee52a641db2ca1b577215d591..8fd02b1f0c1218813d304c49144940540420bcfa 100644 (file)
--- 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.
index 3f3951d288085b9e7df790bc397c19526b2b130a..9cf5f1fd688588ad6a9bda0fc3d81d6d4ee7b575 100644 (file)
@@ -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
index 9c2b9f48fe6809a4c3508352db43adcc6be54aa7..516974621f73dd8a4ed41e47b7653ff07c6bacd5 100644 (file)
@@ -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 (file)
index 0000000..cba7839
--- /dev/null
@@ -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 (file)
index 0000000..b3c24f9
--- /dev/null
@@ -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 (file)
index 0000000..80dcd6c
--- /dev/null
@@ -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 (file)
index 0000000..613fa72
--- /dev/null
@@ -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 (file)
index 0000000..8073941
--- /dev/null
@@ -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 (file)
index 0000000..a5bfe1e
--- /dev/null
@@ -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 (file)
index 0000000..1d519ed
--- /dev/null
@@ -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 (file)
index 0000000..a1c2c3e
--- /dev/null
@@ -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 (file)
index 0000000..497c8c2
--- /dev/null
@@ -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
index 176829a4c5dc31aa25cce0cdbab0589d077d1698..9ef39c0dc5fff35d907768d93158c5ffb29db3f4 100644 (file)
@@ -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 {