20151126

yk700101 · Nov 25, 2015 · 8627c44 · 8627c44
1 parent 7aaa7b5
commit 8627c44
Show file tree

Hide file tree

Showing 48 changed files with 124 additions and 128 deletions.
diff --git a/001-utaga-hajimaru/kitakazeno-uta/altoLyrics.ly b/001-utaga-hajimaru/kitakazeno-uta/altoLyrics.ly
@@ -20,8 +20,8 @@ altoLyrics = \lyricmode
 
   き16 た16 か16 ぜ16 は4 \skip4 きょ16 う16 も16 う16 たっ16 \skip16 て16 い16 る2 \skip4 |
 
-  も4 う4 __ \skip4 も8*2/3 ど8*2/3 ら8*2/3 ない4*2/3 の8*2/3 か？2 \skip4 |
+  も4 う4 __ \skip4 も8*2/3 ど8*2/3 ら8*2/3 ない4*2/3 の8*2/3 か2 \skip4 |
 
-  わ16 た16 し16 の16 う8*2/3 た8*2/3 は8*2/3 \skip16 ど16 こ16 へ16 いっ16 \skip16 た16 の16 か？2 __ \skip4 \skip4 |
+  わ16 た16 し16 の16 う8*2/3 た8*2/3 は8*2/3 \skip16 ど16 こ16 へ16 いっ16 \skip16 た16 の16 か2 __ \skip4 \skip4 |
 }
 
diff --git a/001-utaga-hajimaru/kitakazeno-uta/kitakazeno-uta.ly b/001-utaga-hajimaru/kitakazeno-uta/kitakazeno-uta.ly
@@ -51,11 +51,16 @@
       {
         \line
         {
-          %move right
-          \hspace #3.0
           きたかぜの歌
         }
+      }
+    }
 
+  subtitle =
+    \markup
+    { 
+      \column
+      {
         \line
         {
           (Kitakaze no Uta)
@@ -66,7 +71,6 @@
   subsubtitle =
     \markup
     { 
-      \lower #3.0
       \column
       {
         \line
@@ -81,9 +85,6 @@
     { 
       \column
       {
-        %insert blank line
-        \hspace #0.1
-
         \line
         {
           Words and Music by YAMAMOTO Kenji (1970/1/1- )
@@ -98,7 +99,7 @@
       {
         \line
         {
-          Ver1.18 (2008/11/26-2010/09/07) / Edition may be freely distributed, duplicated, performed, or recorded.
+          Ver1.20 (2008/11/26-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded.
         }
 
         \line
@@ -183,15 +184,14 @@
   {
     \context 
     {
-      \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
       \override BarLine #'transparent = ##t
     }
 
     \context 
     {
-      \Voice
+      \Staff
       \consists "Ambitus_engraver"
     }
   }

diff --git a/001-utaga-hajimaru/kitakazeno-uta/make_pdf.sh b/001-utaga-hajimaru/kitakazeno-uta/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click kitakazeno-uta.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click kitakazeno-uta.ly && rm *.ps
diff --git a/001-utaga-hajimaru/kitakazeno-uta/tenorLyrics.ly b/001-utaga-hajimaru/kitakazeno-uta/tenorLyrics.ly
@@ -22,7 +22,7 @@ tenorLyrics = \lyricmode
 
   も4 う4 __ \skip4 も4 う2. \skip4 |
 
-  \skip4 \skip4 う4 __ \skip8 た8 は？2 __ \skip4 \skip4 |
+  \skip4 \skip4 う4 __ \skip8 た8 は2 __ \skip4 \skip4 |
 
 }
 
diff --git a/001-utaga-hajimaru/tabidachino-uta/make_pdf.sh b/001-utaga-hajimaru/tabidachino-uta/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click tabidachino-uta.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click tabidachino-uta.ly && rm *.ps
diff --git a/001-utaga-hajimaru/tabidachino-uta/tabidachino-uta.ly b/001-utaga-hajimaru/tabidachino-uta/tabidachino-uta.ly
@@ -51,11 +51,16 @@
       {
         \line
         {
-          %move right
-          \hspace #5.0
           たびだちの歌
         }
+      }
+    }
 
+  subtitle =
+    \markup
+    { 
+      \column
+      {
         \line
         {
           (Tabidachi no Uta)
@@ -66,7 +71,6 @@
   subsubtitle =
     \markup
     { 
-      \lower #3.0
       \column
       {
         \line
@@ -81,9 +85,6 @@
     { 
       \column
       {
-        %insert blank line
-        \hspace #0.1
-
         \line
         {
           Words and Music by YAMAMOTO Kenji (1970/1/1- )
@@ -98,7 +99,7 @@
       {
         \line
         {
-          Ver1.22 (2008/11/30-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded.
+          Ver1.23 (2008/11/30-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded.
         }
 
         \line
@@ -183,15 +184,14 @@
   {
     \context 
     {
-      \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
       \override BarLine #'transparent = ##t
     }
 
     \context 
     {
-      \Voice
+      \Staff
       \consists "Ambitus_engraver"
     }
   }

diff --git a/001-utaga-hajimaru/utaga-hajimaru/make_pdf.sh b/001-utaga-hajimaru/utaga-hajimaru/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click utaga-hajimaru.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click utaga-hajimaru.ly && rm *.ps
diff --git a/001-utaga-hajimaru/utaga-hajimaru/utaga-hajimaru.ly b/001-utaga-hajimaru/utaga-hajimaru/utaga-hajimaru.ly
@@ -51,11 +51,16 @@
       {
         \line
         {
-          %move right
-          \hspace #4.0
           歌が はじまる
         }
+      }
+    }
 
+  subtitle =
+    \markup
+    { 
+      \column
+      {
         \line
         {
           (Uta ga Hajimaru)
@@ -66,7 +71,6 @@
   subsubtitle =
     \markup
     { 
-      \lower #3.0
       \column
       {
         \line
@@ -81,9 +85,6 @@
     { 
       \column
       {
-        %insert blank line
-        \hspace #0.1
-
         \line
         {
           Words and Music by YAMAMOTO Kenji (1970/1/1- )
@@ -98,7 +99,7 @@
       {
         \line
         {
-          Ver1.16 (2008/12/03-2010/09/09) / Edition may be freely distributed, duplicated, performed, or recorded.
+          Ver1.17 (2008/12/03-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded.
         }
 
         \line
@@ -183,15 +184,14 @@
   {
     \context 
     {
-      \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
       \override BarLine #'transparent = ##t
     }
 
     \context 
     {
-      \Voice
+      \Staff
       \consists "Ambitus_engraver"
     }
   }

diff --git a/001-utaga-hajimaru/utano-kobako/make_pdf.sh b/001-utaga-hajimaru/utano-kobako/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click utano-kobako.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click utano-kobako.ly && rm *.ps
diff --git a/001-utaga-hajimaru/utano-kobako/utano-kobako.ly b/001-utaga-hajimaru/utano-kobako/utano-kobako.ly
@@ -51,11 +51,16 @@
       {
         \line
         {
-          %move right
-          \hspace #6.0
           歌の小箱
         }
+      }
+    }
 
+  subtitle =
+    \markup
+    { 
+      \column
+      {
         \line
         {
           (Uta no Kobako)
@@ -66,7 +71,6 @@
   subsubtitle =
     \markup
     { 
-      \lower #3.0
       \column
       {
         \line
@@ -81,9 +85,6 @@
     { 
       \column
       {
-        %insert blank line
-        \hspace #0.1
-
         \line
         {
           Words and Music by YAMAMOTO Kenji (1970/1/1- )
@@ -98,7 +99,7 @@
       {
         \line
         {
-          Ver1.15 (2008/12/23-2010/09/07) / Edition may be freely distributed, duplicated, performed, or recorded.
+          Ver1.16 (2008/12/23-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded.
         }
 
         \line
@@ -183,15 +184,14 @@
   {
     \context 
     {
-      \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
       \override BarLine #'transparent = ##t
     }
 
     \context 
     {
-      \Voice
+      \Staff
       \consists "Ambitus_engraver"
     }
   }

diff --git a/001-utaga-hajimaru/utawa-afurete/make_pdf.sh b/001-utaga-hajimaru/utawa-afurete/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click utawa-afurete.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click utawa-afurete.ly && rm *.ps
diff --git a/001-utaga-hajimaru/utawa-afurete/utawa-afurete.ly b/001-utaga-hajimaru/utawa-afurete/utawa-afurete.ly
@@ -51,11 +51,16 @@
       {
         \line
         {
-          %move right
-          \hspace #3.0
           歌はあふれて 
         }
+      }
+    }
 
+  subtitle =
+    \markup
+    { 
+      \column
+      {
         \line
         {
           (Uta wa Afurete)
@@ -66,7 +71,6 @@
   subsubtitle =
     \markup
     { 
-      \lower #3.0
       \column
       {
         \line
@@ -81,9 +85,6 @@
     { 
       \column
       {
-        %insert blank line
-        \hspace #0.1
-
         \line
         {
           Words and Music by YAMAMOTO Kenji (1970/1/1- )
@@ -98,7 +99,7 @@
       {
         \line
         {
-          Ver1.26 (2008/11/10-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded.
+          Ver1.27 (2008/11/10-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded.
         }
 
         \line
@@ -183,15 +184,14 @@
   {
     \context 
     {
-      \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
       \override BarLine #'transparent = ##t
     }
 
     \context 
     {
-      \Voice
+      \Staff
       \consists "Ambitus_engraver"
     }
   }

diff --git a/001-utaga-hajimaru/yukaina-uta/make_pdf.sh b/001-utaga-hajimaru/yukaina-uta/make_pdf.sh
@@ -1 +1 @@
-lilypond -dno-point-and-click yukaina-uta.ly && rm *.ps
+PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click yukaina-uta.ly && rm *.ps
diff --git a/001-utaga-hajimaru/yukaina-uta/tenorLyricsRoman.ly b/001-utaga-hajimaru/yukaina-uta/tenorLyricsRoman.ly
@@ -14,15 +14,15 @@ tenorLyricsRoman = \lyricmode
   % --------------------------------------------------
   % 1
   % --------------------------------------------------
-  Don4 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Don4 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
+  Dm4 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Dm4 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
 
-  Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
+  Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
 
-  Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
+  Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
 
-  Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
+  Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
 
-  Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Don8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
+  Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Dm8 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 |
 
   Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 Chi16 -- ki16 -- chi16 -- ki16 -- ton16 -- \skip16 shan16 \skip16 ton4 \skip4 |