From: hanwen <hanwen>
Date: Thu, 25 Jul 2002 22:19:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.5.71~69
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=167dad6cd8d837fbb9068736392b18e5ced47189;p=lilypond.git

*** empty log message ***
---

diff --git a/input/template/README b/input/template/README
index 7964ec496d..6f39e7f8af 100644
--- a/input/template/README
+++ b/input/template/README
@@ -1,9 +1,4 @@
 
-* Mention this somewhere in documentation (Tutorial)
-
-* Better comment-out most header entries, or
-  move to template/title.ly altogether?
-
 * Naming conventions for voices/staves
   (think: \autochange, \partcombine)?
 
@@ -46,7 +41,6 @@ TODO (Choral templates, anyone?)
   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
diff --git a/input/template/header.ly b/input/template/header.ly
new file mode 100644
index 0000000000..aea4b0b2b5
--- /dev/null
+++ b/input/template/header.ly
@@ -0,0 +1,26 @@
+\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"
+  source =  "urtext "
+  enteredby = "your name here"
+  maintainerEmail = "your email here"
+  texidoc = "The standard header that ought to be above a file."
+
+}
+
+% insert a score otherwise lilypond-book gets confused. 
+\score {
+  \notes {
+  c4
+  }
+} 
diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 73ce6ba33b..5326f8598a 100644
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc = "popsong format: chords, melody and lyrics."
 }
 
 melody = \notes \relative c' {
@@ -26,7 +13,7 @@ text = \lyrics {
 }
 
 accompaniment = \chords {
-  a2: c2
+  a2 c2
 }
 
 \score {
diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index 6fd13892de..2ded1de5e4 100644
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc = "Melody and lyrics."
 }
 
 melody = \notes \relative c'' {
@@ -30,7 +17,6 @@ text = \lyrics {
     \addlyrics
       \context Staff = one {
         \property Staff.autoBeaming = ##f
-        \property Staff.automaticMelismata = ##t
         \melody
       }
       \context Lyrics \text
diff --git a/input/template/melody.ly b/input/template/melody.ly
index fecd79b6e6..6883109698 100644
--- a/input/template/melody.ly
+++ b/input/template/melody.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc = "Only a melody."
 }
 
 melody = \notes \relative c' {
diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly
index c5d1336c91..a5db5e37e0 100644
--- a/input/template/piano-4-voices.ly
+++ b/input/template/piano-4-voices.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc ="Polyphonic piano music"
 }
 
 upperOne = \notes\relative c'' {
@@ -52,4 +39,4 @@ lowerTwo = \notes\relative c {
   >
   \paper { }  
   \midi { }  
-}
\ No newline at end of file
+}
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index 99b4ad7e39..acf0512e40 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -1,28 +1,9 @@
-%{
-  argh. DOCME
-
-
-  template that puts dynamics on a separate line, so it is neatly
-centered between staffs.
-%}
-
 \version "1.5.68"
-
 \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"
+texidoc ="
+  template that puts dynamics on a separate line, so it is neatly
+centered between staffs.
+"
 }
 
 upper = \notes\relative c'' {
diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 20f24f4300..1f2af8030c 100644
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc ="Lyrics between two staffs."
 }
 
 upper = \notes\relative c'' {
@@ -51,4 +38,4 @@ text = \lyrics {
     }
   }  
   \midi { }  
-}
\ No newline at end of file
+}
diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index d47ca5e7e8..88af92d181 100644
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,20 +1,8 @@
 \version "1.5.68"
 
 \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"
+  texidoc ="Classical song format: one staff with melody and lyrics, and piano accompaniment."
+  
 }
 
 melody = \notes \relative c'' {
@@ -55,4 +43,4 @@ lower = \notes\relative c {
     \translator { \HaraKiriStaffContext }
   }  
   \midi { }  
-}
\ No newline at end of file
+}
diff --git a/input/template/piano.ly b/input/template/piano.ly
index f523ad5c16..2d07a0fa1d 100644
--- a/input/template/piano.ly
+++ b/input/template/piano.ly
@@ -1,20 +1,7 @@
 \version "1.5.68"
 
 \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"
+  texidoc = "simple piano music" 
 }
 
 upper = \notes\relative c'' {
@@ -36,4 +23,4 @@ lower = \notes\relative c {
   >
   \paper { }  
   \midi { }  
-}
\ No newline at end of file
+}
diff --git a/input/template/satb.ly b/input/template/satb.ly
index 3c2369616f..49b1bad896 100644
--- a/input/template/satb.ly
+++ b/input/template/satb.ly
@@ -1,9 +1,9 @@
+\header {
 
-%{
-
+    texidoc = "
  Example template for a SATB vocal  score.
- 
-%}
+" 
+}
 
 sopMusic = \notes  \relative c'' { c4 c [c8( )b] c4 }
 sopWords = \lyrics { hi4 hi hi hi  }