CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/30 14:18:22
Modified files:
input : twinkle-pop.ly simple-song.ly sakura-sakura.ly
example-3.ly example-2.ly example-1.ly
. : ChangeLog
Added files:
input : xiao-hai-zi-guai-guai.ly
Removed files:
input : xiao-haizi-guai-guai.ly
Log message:
Rename from
xiao-haizi-guai-guai.ly.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/xiao-hai-zi-guai-guai.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/twinkle-pop.ly.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/simple-song.ly.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/sakura-sakura.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/example-3.ly.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/example-2.ly.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/example-1.ly.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3679&tr2=1.3680&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3679 lilypond/ChangeLog:1.3680
--- lilypond/ChangeLog:1.3679 Mon May 30 10:56:39 2005
+++ lilypond/ChangeLog Mon May 30 14:18:22 2005
@@ -1,5 +1,10 @@
2005-05-30 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/input/example-1.ly
diff -u lilypond/input/example-1.ly:1.25 lilypond/input/example-1.ly:1.26
--- lilypond/input/example-1.ly:1.25 Fri Nov 19 23:02:24 2004
+++ lilypond/input/example-1.ly Mon May 30 14:18:22 2005
@@ -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"
Index: lilypond/input/example-2.ly
diff -u lilypond/input/example-2.ly:1.25 lilypond/input/example-2.ly:1.26
--- lilypond/input/example-2.ly:1.25 Sun Nov 21 00:18:05 2004
+++ lilypond/input/example-2.ly Mon May 30 14:18:22 2005
@@ -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"
+
Index: lilypond/input/example-3.ly
diff -u lilypond/input/example-3.ly:1.46 lilypond/input/example-3.ly:1.47
--- lilypond/input/example-3.ly:1.46 Fri Nov 19 23:02:24 2004
+++ lilypond/input/example-3.ly Mon May 30 14:18:22 2005
@@ -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 @@
\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, included in the
-%% user-manual.
-%%
+For learning LilyPond, please read the tutorial
+
+ http://lilypond.org/tutorial
+
+also included in the user-manual.
+%}
+
+%% Optional version number
+\version "2.4.0"
Index: lilypond/input/sakura-sakura.ly
diff -u lilypond/input/sakura-sakura.ly:1.1 lilypond/input/sakura-sakura.ly:1.2
--- lilypond/input/sakura-sakura.ly:1.1 Sat Mar 12 21:19:33 2005
+++ lilypond/input/sakura-sakura.ly Mon May 30 14:18:22 2005
@@ -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:
Index: lilypond/input/simple-song.ly
diff -u lilypond/input/simple-song.ly:1.13 lilypond/input/simple-song.ly:1.14
--- lilypond/input/simple-song.ly:1.13 Sun Feb 27 17:25:20 2005
+++ lilypond/input/simple-song.ly Mon May 30 14:18:22 2005
@@ -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.
Index: lilypond/input/twinkle-pop.ly
diff -u lilypond/input/twinkle-pop.ly:1.66 lilypond/input/twinkle-pop.ly:1.67
--- lilypond/input/twinkle-pop.ly:1.66 Thu Jan 27 22:55:06 2005
+++ lilypond/input/twinkle-pop.ly Mon May 30 14:18:22 2005
@@ -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 { }
}
-
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
