From 8627c4491e02f4bfd6acd4eff449bb69b97a0e8e Mon Sep 17 00:00:00 2001 From: YAMAMOTO Kenji Date: Thu, 26 Nov 2015 00:25:12 +0900 Subject: [PATCH] 20151126 --- .../kitakazeno-uta/altoLyrics.ly | 4 ++-- .../kitakazeno-uta/kitakazeno-uta.ly | 18 +++++++-------- 001-utaga-hajimaru/kitakazeno-uta/make_pdf.sh | 2 +- .../kitakazeno-uta/tenorLyrics.ly | 2 +- .../tabidachino-uta/make_pdf.sh | 2 +- .../tabidachino-uta/tabidachino-uta.ly | 18 +++++++-------- 001-utaga-hajimaru/utaga-hajimaru/make_pdf.sh | 2 +- .../utaga-hajimaru/utaga-hajimaru.ly | 18 +++++++-------- 001-utaga-hajimaru/utano-kobako/make_pdf.sh | 2 +- .../utano-kobako/utano-kobako.ly | 18 +++++++-------- 001-utaga-hajimaru/utawa-afurete/make_pdf.sh | 2 +- .../utawa-afurete/utawa-afurete.ly | 18 +++++++-------- 001-utaga-hajimaru/yukaina-uta/make_pdf.sh | 2 +- .../yukaina-uta/tenorLyricsRoman.ly | 10 ++++----- 001-utaga-hajimaru/yukaina-uta/yukaina-uta.ly | 18 +++++++-------- 001-utaga-hajimaru/yuugureno-uta/make_pdf.sh | 2 +- .../yuugureno-uta/yuugureno-uta.ly | 22 ++++++++----------- .../hoshifuru-uta/hoshifuru-uta.ly | 15 +++++++------ 002-utano-fuukei/hoshifuru-uta/make_pdf.sh | 2 +- 002-utano-fuukei/tokiyo-tomare/make_pdf.sh | 2 +- .../tokiyo-tomare/tokiyo-tomare.ly | 15 +++++++------ 002-utano-fuukei/yukino-kakera/make_pdf.sh | 2 +- .../yukino-kakera/yukino-kakera.ly | 15 +++++++------ .../tanpopo-no-watage/allBreaks.ly | 0 .../tanpopo-no-watage/allMarks.ly | 0 .../tanpopo-no-watage/allTempos.ly | 0 .../tanpopo-no-watage/common.ly | 0 .../tanpopo-no-watage/make_pdf.sh | 1 + .../tanpopo-no-watage/sopranoLyrics.ly | 0 .../tanpopo-no-watage/sopranoLyricsRoman.ly | 0 .../tanpopo-no-watage/sopranoMarks.ly | 0 .../tanpopo-no-watage/sopranoMusic.ly | 0 .../tanpopo-no-watage/tanpopo-no-watage.ly | 10 ++++----- .../tanpopo-no-watage/tenorLyrics.ly | 0 .../tanpopo-no-watage/tenorLyricsRoman.ly | 0 .../tanpopo-no-watage/tenorMarks.ly | 0 .../tanpopo-no-watage/tenorMusic.ly | 0 .../tanpopo-no-watage/wholeLyrics.ly | 9 +++----- 007-kusabana/tanpopo-no-watage/make_pdf.sh | 1 - .../ave-maria_jacob-gallus.ly | 2 +- .../ave-maria_jacob-gallus/make_pdf.sh | 2 +- .../il-bianco-e-dolce-cigno.ly | 2 +- .../il-bianco-e-dolce-cigno/make_pdf.sh | 2 +- .../innsbruck-ich-muss/innsbruck-ich-muss.ly | 2 +- .../innsbruck-ich-muss/make_pdf.sh | 2 +- .../lady-those-eyes/lady-those-eyes.ly | 4 ++-- .../lady-those-eyes/make_pdf.sh | 2 +- .../lady-those-eyes/mezzoLyrics.ly | 2 +- 48 files changed, 124 insertions(+), 128 deletions(-) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/allBreaks.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/allMarks.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/allTempos.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/common.ly (100%) create mode 100644 007-hana-yo-midori-yo/tanpopo-no-watage/make_pdf.sh rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/sopranoLyrics.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/sopranoLyricsRoman.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/sopranoMarks.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/sopranoMusic.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/tanpopo-no-watage.ly (96%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/tenorLyrics.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/tenorLyricsRoman.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/tenorMarks.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/tenorMusic.ly (100%) rename {007-kusabana => 007-hana-yo-midori-yo}/tanpopo-no-watage/wholeLyrics.ly (93%) delete mode 100644 007-kusabana/tanpopo-no-watage/make_pdf.sh diff --git a/001-utaga-hajimaru/kitakazeno-uta/altoLyrics.ly b/001-utaga-hajimaru/kitakazeno-uta/altoLyrics.ly index 8ee5c57..5836f44 100644 --- 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 index ddeaa81..9b95428 100644 --- 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,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \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 index 9d57c43..389a38d 100644 --- 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 index dc72200..fdd153a 100644 --- 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 index 2f5a106..45d9739 100644 --- 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 index 2539cad..780b90b 100644 --- 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,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \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 index 217495c..20bd660 100644 --- 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 index c986df3..19a38ba 100644 --- 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,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \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 index 23ce3bc..88e3b8c 100644 --- 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 index 557678b..2779a56 100644 --- 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,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \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 index a787880..d939f53 100644 --- 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 index c995980..056da75 100644 --- 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,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \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 index 17c31e1..a27ba87 100644 --- 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 index fdaa26d..af3fa7d 100644 --- 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 | diff --git a/001-utaga-hajimaru/yukaina-uta/yukaina-uta.ly b/001-utaga-hajimaru/yukaina-uta/yukaina-uta.ly index 59795af..ba32841 100644 --- a/001-utaga-hajimaru/yukaina-uta/yukaina-uta.ly +++ b/001-utaga-hajimaru/yukaina-uta/yukaina-uta.ly @@ -51,11 +51,16 @@ { \line { - %move right - \hspace #3.0 ゆかいな歌 } + } + } + subtitle = + \markup + { + \column + { \line { (Yukaina 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.29 (2008/11/16-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.31 (2008/11/16-2012/03/01) / Edition may be freely distributed, duplicated, performed, or recorded. } \line @@ -183,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -191,7 +191,7 @@ \context { - \Voice + \Staff \consists "Ambitus_engraver" } } diff --git a/001-utaga-hajimaru/yuugureno-uta/make_pdf.sh b/001-utaga-hajimaru/yuugureno-uta/make_pdf.sh index ac9035f..3f3ec24 100644 --- a/001-utaga-hajimaru/yuugureno-uta/make_pdf.sh +++ b/001-utaga-hajimaru/yuugureno-uta/make_pdf.sh @@ -1 +1 @@ -lilypond -dno-point-and-click yuugureno-uta.ly && rm *.ps +PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click yuugureno-uta.ly && rm *.ps diff --git a/001-utaga-hajimaru/yuugureno-uta/yuugureno-uta.ly b/001-utaga-hajimaru/yuugureno-uta/yuugureno-uta.ly index c6db60e..355e936 100644 --- a/001-utaga-hajimaru/yuugureno-uta/yuugureno-uta.ly +++ b/001-utaga-hajimaru/yuugureno-uta/yuugureno-uta.ly @@ -51,12 +51,16 @@ { \line { - %move right - \hspace #4.0 - ゆうぐれの歌 } + } + } + subtitle = + \markup + { + \column + { \line { (Yuugure no Uta) @@ -67,7 +71,6 @@ subsubtitle = \markup { - \lower #3.0 \column { \line @@ -82,16 +85,10 @@ { \column { - %insert blank line - \hspace #0.1 - \line { Words and Music by YAMAMOTO Kenji (1970/1/1- ) } - - %insert blank line - \hspace #0.1 } } @@ -102,7 +99,7 @@ { \line { - Ver1.14 (2009/01/07-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.15 (2009/01/07-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded. } \line @@ -187,7 +184,6 @@ { \context { - \Lyrics \consists "Bar_engraver" \consists "Separating_line_group_engraver" \override BarLine #'transparent = ##t @@ -195,7 +191,7 @@ \context { - \Voice + \Staff \consists "Ambitus_engraver" } } diff --git a/002-utano-fuukei/hoshifuru-uta/hoshifuru-uta.ly b/002-utano-fuukei/hoshifuru-uta/hoshifuru-uta.ly index b8023e3..9a89ff1 100644 --- a/002-utano-fuukei/hoshifuru-uta/hoshifuru-uta.ly +++ b/002-utano-fuukei/hoshifuru-uta/hoshifuru-uta.ly @@ -51,11 +51,16 @@ { \line { - %move right - \hspace #6.0 星ふる歌 } + } + } + subtitle = + \markup + { + \column + { \line { (Hoshifuru 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.10 (2009/12/20-2010/09/09) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.11 (2009/12/20-2010/12/24) / Edition may be freely distributed, duplicated, performed, or recorded. } \line diff --git a/002-utano-fuukei/hoshifuru-uta/make_pdf.sh b/002-utano-fuukei/hoshifuru-uta/make_pdf.sh index 598e5a9..b1e15a6 100644 --- a/002-utano-fuukei/hoshifuru-uta/make_pdf.sh +++ b/002-utano-fuukei/hoshifuru-uta/make_pdf.sh @@ -1 +1 @@ -lilypond -dno-point-and-click hoshifuru-uta.ly && rm *.ps +PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click hoshifuru-uta.ly && rm *.ps diff --git a/002-utano-fuukei/tokiyo-tomare/make_pdf.sh b/002-utano-fuukei/tokiyo-tomare/make_pdf.sh index b7a725d..a8e7391 100644 --- a/002-utano-fuukei/tokiyo-tomare/make_pdf.sh +++ b/002-utano-fuukei/tokiyo-tomare/make_pdf.sh @@ -1 +1 @@ -lilypond -dno-point-and-click tokiyo-tomare.ly && rm *.ps +PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click tokiyo-tomare.ly && rm *.ps diff --git a/002-utano-fuukei/tokiyo-tomare/tokiyo-tomare.ly b/002-utano-fuukei/tokiyo-tomare/tokiyo-tomare.ly index 553272d..b02d0d3 100644 --- a/002-utano-fuukei/tokiyo-tomare/tokiyo-tomare.ly +++ b/002-utano-fuukei/tokiyo-tomare/tokiyo-tomare.ly @@ -51,11 +51,16 @@ { \line { - %move right - \hspace #5.0 "時よ とまれ" } + } + } + subtitle = + \markup + { + \column + { \line { (Toki yo Tomare) @@ -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.12 (2010/01/15-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.13 (2010/01/15-2010/12/24) / Edition may be freely distributed, duplicated, performed, or recorded. } \line diff --git a/002-utano-fuukei/yukino-kakera/make_pdf.sh b/002-utano-fuukei/yukino-kakera/make_pdf.sh index 7f4d8f4..6f6efb4 100644 --- a/002-utano-fuukei/yukino-kakera/make_pdf.sh +++ b/002-utano-fuukei/yukino-kakera/make_pdf.sh @@ -1 +1 @@ -lilypond -dno-point-and-click yukino-kakera.ly && rm *.ps +PATH=/home/yamamoto/lilypond-2.12.3-1/bin:${PATH} lilypond -dno-point-and-click yukino-kakera.ly && rm *.ps diff --git a/002-utano-fuukei/yukino-kakera/yukino-kakera.ly b/002-utano-fuukei/yukino-kakera/yukino-kakera.ly index d057d13..37cfae0 100644 --- a/002-utano-fuukei/yukino-kakera/yukino-kakera.ly +++ b/002-utano-fuukei/yukino-kakera/yukino-kakera.ly @@ -51,11 +51,16 @@ { \line { - %move right - \hspace #3.0 ゆきの かけら } + } + } + subtitle = + \markup + { + \column + { \line { (Yuki no Kakera) @@ -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.11 (2010/02/08-2010/09/08) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.12 (2010/02/08-2010/12/14) / Edition may be freely distributed, duplicated, performed, or recorded. } \line diff --git a/007-kusabana/tanpopo-no-watage/allBreaks.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/allBreaks.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/allBreaks.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/allBreaks.ly diff --git a/007-kusabana/tanpopo-no-watage/allMarks.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/allMarks.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/allMarks.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/allMarks.ly diff --git a/007-kusabana/tanpopo-no-watage/allTempos.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/allTempos.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/allTempos.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/allTempos.ly diff --git a/007-kusabana/tanpopo-no-watage/common.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/common.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/common.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/common.ly diff --git a/007-hana-yo-midori-yo/tanpopo-no-watage/make_pdf.sh b/007-hana-yo-midori-yo/tanpopo-no-watage/make_pdf.sh new file mode 100644 index 0000000..285ebeb --- /dev/null +++ b/007-hana-yo-midori-yo/tanpopo-no-watage/make_pdf.sh @@ -0,0 +1 @@ +PATH=/home/yamamoto/lilypond-2.16.2-1/bin/:${PATH} lilypond -dno-point-and-click tanpopo-no-watage.ly diff --git a/007-kusabana/tanpopo-no-watage/sopranoLyrics.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/sopranoLyrics.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/sopranoLyrics.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/sopranoLyrics.ly diff --git a/007-kusabana/tanpopo-no-watage/sopranoLyricsRoman.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/sopranoLyricsRoman.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/sopranoLyricsRoman.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/sopranoLyricsRoman.ly diff --git a/007-kusabana/tanpopo-no-watage/sopranoMarks.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/sopranoMarks.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/sopranoMarks.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/sopranoMarks.ly diff --git a/007-kusabana/tanpopo-no-watage/sopranoMusic.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/sopranoMusic.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/sopranoMusic.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/sopranoMusic.ly diff --git a/007-kusabana/tanpopo-no-watage/tanpopo-no-watage.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/tanpopo-no-watage.ly similarity index 96% rename from 007-kusabana/tanpopo-no-watage/tanpopo-no-watage.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/tanpopo-no-watage.ly index 1d92648..6d44b52 100644 --- a/007-kusabana/tanpopo-no-watage/tanpopo-no-watage.ly +++ b/007-hana-yo-midori-yo/tanpopo-no-watage/tanpopo-no-watage.ly @@ -9,7 +9,7 @@ % Suite 300, San Francisco, California, 94105, USA. % ********************************************************************** -\version "2.12.3" +\version "2.16.2" \include "common.ly" @@ -99,7 +99,7 @@ { \line { - Ver1.05 (2010/05/15-2010/12/24) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.06 (2010/05/15-2011/10/17) / Edition may be freely distributed, duplicated, performed, or recorded. } \line @@ -114,9 +114,9 @@ { \new ChoirStaff { - << - \commonScoreSetting + \commonScoreSetting + << \new Staff { << @@ -192,7 +192,7 @@ \context { - \Voice + \Staff \consists "Ambitus_engraver" } } diff --git a/007-kusabana/tanpopo-no-watage/tenorLyrics.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/tenorLyrics.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/tenorLyrics.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/tenorLyrics.ly diff --git a/007-kusabana/tanpopo-no-watage/tenorLyricsRoman.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/tenorLyricsRoman.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/tenorLyricsRoman.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/tenorLyricsRoman.ly diff --git a/007-kusabana/tanpopo-no-watage/tenorMarks.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/tenorMarks.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/tenorMarks.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/tenorMarks.ly diff --git a/007-kusabana/tanpopo-no-watage/tenorMusic.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/tenorMusic.ly similarity index 100% rename from 007-kusabana/tanpopo-no-watage/tenorMusic.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/tenorMusic.ly diff --git a/007-kusabana/tanpopo-no-watage/wholeLyrics.ly b/007-hana-yo-midori-yo/tanpopo-no-watage/wholeLyrics.ly similarity index 93% rename from 007-kusabana/tanpopo-no-watage/wholeLyrics.ly rename to 007-hana-yo-midori-yo/tanpopo-no-watage/wholeLyrics.ly index 5a27b44..c04c877 100644 --- a/007-kusabana/tanpopo-no-watage/wholeLyrics.ly +++ b/007-hana-yo-midori-yo/tanpopo-no-watage/wholeLyrics.ly @@ -22,16 +22,14 @@ wholeLyrics = [ たんぽぽの わたげ ] } - %insert blank line - \hspace #0.1 + \vspace #1 \line { たんぽぽの　わたげを　そっと　ふこう } - %insert blank line - \hspace #0.1 + \vspace #1 \line { @@ -77,8 +75,7 @@ wholeLyrics = Let's blow the fluff of a dandelion softly. } - %insert blank line - \hspace #0.1 + \vspace #1 \line { diff --git a/007-kusabana/tanpopo-no-watage/make_pdf.sh b/007-kusabana/tanpopo-no-watage/make_pdf.sh deleted file mode 100644 index 8d701d5..0000000 --- a/007-kusabana/tanpopo-no-watage/make_pdf.sh +++ /dev/null @@ -1 +0,0 @@ -lilypond -dno-point-and-click tanpopo-no-watage.ly && rm *.ps diff --git a/027-renaissance-satb/ave-maria_jacob-gallus/ave-maria_jacob-gallus.ly b/027-renaissance-satb/ave-maria_jacob-gallus/ave-maria_jacob-gallus.ly index 6591884..4c0421e 100644 --- a/027-renaissance-satb/ave-maria_jacob-gallus/ave-maria_jacob-gallus.ly +++ b/027-renaissance-satb/ave-maria_jacob-gallus/ave-maria_jacob-gallus.ly @@ -9,7 +9,7 @@ % Suite 300, San Francisco, California, 94105, USA. % ********************************************************************** -\version "2.16.0" +\version "2.16.2" \include "common.ly" diff --git a/027-renaissance-satb/ave-maria_jacob-gallus/make_pdf.sh b/027-renaissance-satb/ave-maria_jacob-gallus/make_pdf.sh index bb89584..5f0b45e 100644 --- a/027-renaissance-satb/ave-maria_jacob-gallus/make_pdf.sh +++ b/027-renaissance-satb/ave-maria_jacob-gallus/make_pdf.sh @@ -1 +1 @@ -/home/yamamoto/lilypond-2.16.0-1/bin/lilypond -dno-point-and-click ave-maria_jacob-gallus.ly +PATH=/home/yamamoto/lilypond-2.16.2-1/bin/:${PATH} lilypond -dno-point-and-click ave-maria_jacob-gallus.ly diff --git a/027-renaissance-satb/il-bianco-e-dolce-cigno/il-bianco-e-dolce-cigno.ly b/027-renaissance-satb/il-bianco-e-dolce-cigno/il-bianco-e-dolce-cigno.ly index 0bab232..3bcddea 100644 --- a/027-renaissance-satb/il-bianco-e-dolce-cigno/il-bianco-e-dolce-cigno.ly +++ b/027-renaissance-satb/il-bianco-e-dolce-cigno/il-bianco-e-dolce-cigno.ly @@ -9,7 +9,7 @@ % Suite 300, San Francisco, California, 94105, USA. % ********************************************************************** -\version "2.16.0" +\version "2.16.2" \include "common.ly" diff --git a/027-renaissance-satb/il-bianco-e-dolce-cigno/make_pdf.sh b/027-renaissance-satb/il-bianco-e-dolce-cigno/make_pdf.sh index 13b4350..75717cb 100644 --- a/027-renaissance-satb/il-bianco-e-dolce-cigno/make_pdf.sh +++ b/027-renaissance-satb/il-bianco-e-dolce-cigno/make_pdf.sh @@ -1 +1 @@ -/home/yamamoto/lilypond-2.16.0-1/bin/lilypond -dno-point-and-click il-bianco-e-dolce-cigno.ly +PATH=/home/yamamoto/lilypond-2.16.2-1/bin/:${PATH} lilypond -dno-point-and-click il-bianco-e-dolce-cigno.ly diff --git a/027-renaissance-satb/innsbruck-ich-muss/innsbruck-ich-muss.ly b/027-renaissance-satb/innsbruck-ich-muss/innsbruck-ich-muss.ly index 2e0a283..6c35e71 100644 --- a/027-renaissance-satb/innsbruck-ich-muss/innsbruck-ich-muss.ly +++ b/027-renaissance-satb/innsbruck-ich-muss/innsbruck-ich-muss.ly @@ -9,7 +9,7 @@ % Suite 300, San Francisco, California, 94105, USA. % ********************************************************************** -\version "2.16.0" +\version "2.16.2" \include "common.ly" diff --git a/027-renaissance-satb/innsbruck-ich-muss/make_pdf.sh b/027-renaissance-satb/innsbruck-ich-muss/make_pdf.sh index b39ee99..6198c8c 100644 --- a/027-renaissance-satb/innsbruck-ich-muss/make_pdf.sh +++ b/027-renaissance-satb/innsbruck-ich-muss/make_pdf.sh @@ -1 +1 @@ -/home/yamamoto/lilypond-2.16.0-1/bin/lilypond -dno-point-and-click innsbruck-ich-muss.ly +PATH=/home/yamamoto/lilypond-2.16.2-1/bin/:${PATH} lilypond -dno-point-and-click innsbruck-ich-muss.ly diff --git a/032-renaissance-sst/lady-those-eyes/lady-those-eyes.ly b/032-renaissance-sst/lady-those-eyes/lady-those-eyes.ly index 5891c2d..5d0f1f6 100644 --- a/032-renaissance-sst/lady-those-eyes/lady-those-eyes.ly +++ b/032-renaissance-sst/lady-those-eyes/lady-those-eyes.ly @@ -9,7 +9,7 @@ % Suite 300, San Francisco, California, 94105, USA. % ********************************************************************** -\version "2.16.0" +\version "2.16.2" \include "common.ly" @@ -93,7 +93,7 @@ \line { - Ver1.03 (2012/09/08-2012/09/17) / Edition may be freely distributed, duplicated, performed, or recorded. + Ver1.04 (2012/09/08-2013/02/05) / Edition may be freely distributed, duplicated, performed, or recorded. } \line diff --git a/032-renaissance-sst/lady-those-eyes/make_pdf.sh b/032-renaissance-sst/lady-those-eyes/make_pdf.sh index 7df212e..dbd03bf 100644 --- a/032-renaissance-sst/lady-those-eyes/make_pdf.sh +++ b/032-renaissance-sst/lady-those-eyes/make_pdf.sh @@ -1 +1 @@ -/home/yamamoto/lilypond-2.16.0-1/bin/lilypond -dno-point-and-click lady-those-eyes.ly +PATH=/home/yamamoto/lilypond-2.16.2-1/bin/:${PATH} lilypond -dno-point-and-click lady-those-eyes.ly diff --git a/032-renaissance-sst/lady-those-eyes/mezzoLyrics.ly b/032-renaissance-sst/lady-those-eyes/mezzoLyrics.ly index fb4a877..a5436a1 100644 --- a/032-renaissance-sst/lady-those-eyes/mezzoLyrics.ly +++ b/032-renaissance-sst/lady-those-eyes/mezzoLyrics.ly @@ -36,7 +36,7 @@ mezzoLyrics = \lyricmode journ8 -- eth,8 \skip8 less8 heat8 in8 me8 so8 -- | journ8 -- eth,8 Oh,8 no,4 Oh,4 no,8 | \skip8 no,4 Oh,8 no,8 no,8 no,8 then8 | - thou16 be16 -- guilest4 __ \skip8 thee.2 | + thou16 be16 -- \skip4 guilest8 thee.2 | % -------------------------------------------------- % 1-4