From 19da7392346397fd250b99c821571c1c4e56cf35 Mon Sep 17 00:00:00 2001 From: janneke Date: Mon, 30 May 2005 14:18:22 +0000 Subject: [PATCH] Rename from xiao-haizi-guai-guai.ly. --- ChangeLog | 5 ++ input/example-1.ly | 31 ++++++----- input/example-2.ly | 32 +++++++----- input/example-3.ly | 36 ++++++++----- input/sakura-sakura.ly | 48 ++++++++--------- input/simple-song.ly | 18 +++---- input/twinkle-pop.ly | 95 ++++++++++++++++------------------ input/xiao-hai-zi-guai-guai.ly | 38 ++++++++++++++ input/xiao-haizi-guai-guai.ly | 38 -------------- 9 files changed, 179 insertions(+), 162 deletions(-) create mode 100644 input/xiao-hai-zi-guai-guai.ly delete mode 100644 input/xiao-haizi-guai-guai.ly diff --git a/ChangeLog b/ChangeLog index 565c2caa2c..f04b1bec7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-05-30 Jan Nieuwenhuizen + * input/xiao-hai-zi-guai-guai.ly: Rename from + xiao-haizi-guai-guai.ly. + + * input/*: Reindent, do not use TAB. + * Documentation/pictures/ly.xpm: Bugfix: do not anti-alias against white background. diff --git a/input/example-1.ly b/input/example-1.ly index c990518a64..ddb719c404 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,18 +1,21 @@ -\version "2.4.0" - -% A simple scale in LilyPond -% -% Type: -% -% lilypond example-1 -% xpdf example-1 # or your PDF viewer here -% - -%% -%% For learning LilyPond, please read the tutorial, included in the -%% user-manual. -%% +%%% A simple scale in LilyPond \relative { c d e f g a b c } + +%{ +Type + + lilypond example-1 + xpdf example-1 # or your PDF viewer here + +For learning LilyPond, please read the tutorial + + http://lilypond.org/tutorial + +also included in the user-manual. +%} + +%% Optional version number +\version "2.4.0" diff --git a/input/example-2.ly b/input/example-2.ly index b2ebafb909..f4a0339902 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,17 +1,21 @@ -\version "2.4.0" -% Some beamed and slurred notes of different taste in LilyPond -% -% Type: -% -% lilypond example-2 -% xpdf example-2 # or your PDF viewer here -% - -%% -%% For learning LilyPond, please read the tutorial, included in the -%% user-manual. -%% - +%%% Some tied, slurred and beamed notes of different taste in LilyPond \relative { a'2 ~ a4( e8[) e] a,16[ a a a] } + +%{ +Type + + lilypond example-2 + xpdf example-2 # or your PDF viewer here + +For learning LilyPond, please read the tutorial + + http://lilypond.org/tutorial + +also included in the user-manual. +%} + +%% Optional version number +\version "2.4.0" + diff --git a/input/example-3.ly b/input/example-3.ly index 6e1c6b3172..09e7944721 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,12 +1,17 @@ -\version "2.4.0" +%%% A full example with two staves + +\header { + title = "And now, example 3" + copyright = "public domain" +} one = \relative { - c' d e f + c' d e f } two = \relative { - \clef "bass" - c2 g2 + \clef "bass" + c2 g2 } << @@ -14,15 +19,18 @@ two = \relative { \new Staff \two >> +%{ +Type + + lilypond example-3 + xpdf example-3 # or your PDF viewer here -% A full example with two staves -% -% Type: -% -% lilypond example-3 -% xpdf example-3 # or your PDF viewer here +For learning LilyPond, please read the tutorial -%% -%% For learning LilyPond, please read the tutorial, included in the -%% user-manual. -%% + http://lilypond.org/tutorial + +also included in the user-manual. +%} + +%% Optional version number +\version "2.4.0" diff --git a/input/sakura-sakura.ly b/input/sakura-sakura.ly index 91aa4af023..c3b0ea6ff3 100644 --- a/input/sakura-sakura.ly +++ b/input/sakura-sakura.ly @@ -8,29 +8,29 @@ } << - \relative c'' { - %% Beams are melismata, no autobeams. - \set Staff.autoBeaming = ##f + \relative c'' { + %% Beams are melismata, no autobeams. + \set Staff.autoBeaming = ##f - | a4 a b2 | a4 a b2 - | a4 b c b | a4 b8[ a] f2 - | e4 c e f | e4 e8[ c] b2 - | a'4 b c b | a4 b8[ a] f2 - | e4 c e f | e4 e8[ c] b2 - | a'4 a b2 | a4 a b2 - | d,4 e b'8[ a] f4 | e1 \bar "|." - } - \addlyrics { - さ く ら さ く ら - の や ま も さ と も - み わ た す か ぎ り - か す み か く も か - あ さ ひ に に を う - さ く ら さ く ら - は な ざ か り - } + | a4 a b2 | a4 a b2 + | a4 b c b | a4 b8[ a] f2 + | e4 c e f | e4 e8[ c] b2 + | a'4 b c b | a4 b8[ a] f2 + | e4 c e f | e4 e8[ c] b2 + | a'4 a b2 | a4 a b2 + | d,4 e b'8[ a] f4 | e1 \bar "|." + } + \addlyrics { + さ く ら さ く ら + の や ま も さ と も + み わ た す か ぎ り + か す み か く も か + あ さ ひ に に を う + さ く ら さ く ら + は な ざ か り + } >> - -% Local Variables: -% coding: utf-8 -% End: + +%%% Local Variables: +%%% coding: utf-8 +%%% End: diff --git a/input/simple-song.ly b/input/simple-song.ly index 344c8b8aed..bc4379c45f 100644 --- a/input/simple-song.ly +++ b/input/simple-song.ly @@ -1,15 +1,15 @@ %% A simple song in LilyPond << - \relative { - \clef bass - d,2 d c4 bes a2 \break - c2 c d4 f g2 - } - \addlyrics { - My first Li -- ly song, - Not much can go wrong! - } + \relative { + \clef bass + d,2 d c4 bes a2 \break + c2 c d4 f g2 + } + \addlyrics { + My first Li -- ly song, + Not much can go wrong! + } >> %% Optional helper for automatic updating by convert-ly. May be omitted. diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index ef8c568b46..17a54f08ae 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,70 +1,67 @@ \version "2.4.0" \header{ -filename = "twinkle-pop.ly" -xtitle = "Ah, vous dirais-je, maman " -composer = "traditional" -enteredby = "HWN, chords by Johan Vromans" -copyright = "public domain" + filename = "twinkle-pop.ly" + composer = "traditional" + enteredby = "HWN, chords by Johan Vromans" + copyright = "public domain" } melodie = \relative c'' { - \clef "violin" - \time 2/4 + \clef "violin" + \time 2/4 - c4 c | g' g | a a | g2 | - f4 f | e e | d d | c2 | - g'4 g | f f | e e | d d | - g g | f f | e e | d d | - % copy 1-8 - c4 c | g' g | a a | g2 | - f4 f | e e | d d | c2 \bar "|." + | c4 c | g' g | a a | g2 + | f4 f | e e | d d | c2 + | g'4 g | f f | e e | d d + | g g | f f | e e | d d + %% copy 1-8 + | c4 c | g' g | a a | g2 + | f4 f | e e | d d | c2 \bar "|." } acc = \chordmode { - % why don't \skip, s4 work? - c2 c f c - f c g:7 c - g f c g:7 % urg, bug! - g f c g:7 - % copy 1-8 - c2 c f c - f c g:7 c + c2 c f c + f c g:7 c + g f c g:7 + g f c g:7 + %% copy 1-8 + c2 c f c + f c g:7 c } text = \lyricmode{ - \override LyricText #'font-shape = #'italic + \override LyricText #'font-shape = #'italic - Ah!4 vous dir -- ai -- je ma man2 - Ce4 qui cau -- se mon tour -- ment2 - Pa4 -- pa veut que je rai -- so -- nne - Comme4 un -- e grand -- e per -- so -- nne - Moi4 je dis que les bon -- bons2 - Val4 -- ent mieux que la rai -- son2 - + Ah!4 vous dir -- ai -- je ma man2 + Ce4 qui cau -- se mon tour -- ment2 + Pa4 -- pa veut que je rai -- so -- nne + Comme4 un -- e grand -- e per -- so -- nne + Moi4 je dis que les bon -- bons2 + Val4 -- ent mieux que la rai -- son2 + } \score { - << - \context ChordNames \acc - \context Staff = "melody" \melodie - \context Lyrics \text - >> - \header{ - title = "Ah, vous dirais-je, maman " - } - \layout { } + << + \context ChordNames \acc + \context Staff = "melody" \melodie + \context Lyrics \text + >> + \header{ + title = "Ah, vous dirais-je, maman " + } + \layout { } } \score { - << - \context ChordNames \transpose c d\acc - \context Staff = "melody" \transpose c d\melodie - \context Lyrics \text - >> - \header{ - piece = \markup { "clarinet in B" \flat } - } - \layout { } + << + \context ChordNames \transpose c d\acc + \context Staff = "melody" \transpose c d\melodie + \context Lyrics \text + >> + \header{ + piece = \markup { "clarinet in B" \flat } + } + \layout { } } - diff --git a/input/xiao-hai-zi-guai-guai.ly b/input/xiao-hai-zi-guai-guai.ly new file mode 100644 index 0000000000..c0adf6c608 --- /dev/null +++ b/input/xiao-hai-zi-guai-guai.ly @@ -0,0 +1,38 @@ +%% xiao-hai-zi-guai-guai.ly + +\version "2.5.14" + +\header { + title = "小孩子乖乖" + subtitle = "(Xiao3 hai2 zi5 guai1 guai1)" +} + +<< + \relative c'' { + %% Beams are melismata, no autobeams. + \set Staff.autoBeaming = ##f + + | g4 c8 a g4 g + | e4 g8 a g4 g + | a4 g8 e d4 d + | e4 g8[ e] d[ e] c4 + + | a'8 g a g e a g4 + | e8 g e d c4 r + | a8 c d e c4 r \bar "|." + } + \addlyrics { + 小 孩 子 乖 乖 + 把 門 兒 開 開 + 快 點 兒 開 開 + 我 要 進 來 + + 不 開 不 開 不 能 開 + 你 是 大 野 狼 + 不 讓 你 進 來 + } +>> + +%%% Local Variables: +%%% coding: utf-8 +%%% End: diff --git a/input/xiao-haizi-guai-guai.ly b/input/xiao-haizi-guai-guai.ly deleted file mode 100644 index 128577d106..0000000000 --- a/input/xiao-haizi-guai-guai.ly +++ /dev/null @@ -1,38 +0,0 @@ -%% xiao-haizi-guai-guai.ly - -\version "2.5.14" - -\header { - title = "小孩子乖乖" - subtitle = "(Xiao3 hai2 zi5 guai1 guai1)" -} - -<< - \relative c'' { - %% Beams are melismata, no autobeams. - \set Staff.autoBeaming = ##f - - | g4 c8 a g4 g - | e4 g8 a g4 g - | a4 g8 e d4 d - | e4 g8[ e] d[ e] c4 - - | a'8 g a g e a g4 - | e8 g e d c4 r - | a8 c d e c4 r \bar "|." - } - \addlyrics { - 小 孩 子 乖 乖 - 把 門 兒 開 開 - 快 點 兒 開 開 - 我 要 進 來 - - 不 開 不 開 不 能 開 - 你 是 大 野 狼 - 不 讓 你 進 來 - } ->> - -% Local Variables: -% coding: utf-8 -% End: -- 2.39.5