CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/15 21:11:12
Modified files:
. : ChangeLog
input/mutopia/J.S.Bach: wtk1-fugue2.ly
lily : percent-repeat-engraver.cc
Log message:
(bassdux): text formatting
fixes. Remove tweaks.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4011&tr2=1.4012&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/percent-repeat-engraver.cc.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4011 lilypond/ChangeLog:1.4012
--- lilypond/ChangeLog:1.4011 Mon Aug 15 19:23:02 2005
+++ lilypond/ChangeLog Mon Aug 15 21:11:12 2005
@@ -1,5 +1,8 @@
2005-08-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): text formatting
+ fixes. Remove tweaks.
+
* input/regression/tuplet-slope.ly: add a test case.
* lily/tuplet-bracket.cc (calc_position_and_height): revert
Index: lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly
diff -u lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly:1.34
lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly:1.35
--- lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly:1.34 Sun Jun 26 22:39:13 2005
+++ lilypond/input/mutopia/J.S.Bach/wtk1-fugue2.ly Mon Aug 15 21:11:12 2005
@@ -16,32 +16,29 @@
%% TODO: handle \footer, \head[er] properly
footer = "Mutopia-2002/08/19-6"
- tagline = \markup { \smaller
- \column {
- \fill-line { \footer "" }
- \fill-line { { "This music is part of the Mutopia
project, "
- \typewriter {
"http://sca.uwaterloo.ca/Mutopia/"; }
- "." } }
- \fill-line { { "It has been typeset and placed in
the public "
- "domain by " \maintainer "." } }
- \fill-line { { "Unrestricted modification and
redistribution "
- "is permitted and encouraged---copy
this music "
- "and share it!" } }
- }
- }
+ tagline = \markup {
+ \smaller
+ \column {
+ \line { \footer }
+ \line {
+ "This music is part of the Mutopia project, "
+ \typewriter { "http://sca.uwaterloo.ca/Mutopia/"; }
+ }
+ \line {
+ #(ly:export (string-append
+ "It has been typeset and placed in the public "
+ "domain by " maintainer "." ))
+ }
+ \justify {
+ Unrestricted modification and redistribution
+ is permitted and encouraged. Copy this music
+ and share it!
+ }
+ }
+ }
lastupdated = "2002/August/19"
-}
-
-
-%{
-We really want this piece on 2 pages.
-
-tweaks: we use 19 iso. 20 pt staff space, and squeeze up the spacing a bit.
-
-the few forced linebreaks were an earlier attempt to get the spacing
-to match up.
+ }
-%}
\version "2.6.0"
@@ -55,11 +52,11 @@
r8 c16 b c8 g as c16 b c8 d |
g, c16 b c8 d f,16 g as4 g16 f |
- es c' b a g f! es d c8 es' d c | \break
+ es c' b a g f! es d c8 es' d c |
bes a bes c fis, g a fis |
%%5
g4 r16 c, d es f g as8~ as16 d, es f |
- g a bes8 ~ bes16 es, f g as g f es d8 c'16 b! | \break
+ g a bes8 ~ bes16 es, f g as g f es d8 c'16 b! |
% forced accident!
c4 r4 r8 f es d |
r8 as g f g f16 es f8 d |
@@ -84,7 +81,6 @@
d, g16 fis g8 a! c,16 d es4 d16 c | % forced accident!
bes8 r8 r16 d e fis g a bes8 ~ bes16 e, f g |
a bes c8 ~ c16 fis,16 g a bes8 es,!16 d es8 g, |
- \break
as f'16 es f8 a,8 bes g'16 f g8 b, |
%%20
c16 f es d
@@ -179,7 +175,6 @@
f d'16 c d8 fis, g4 r16 g, a b |
c16 d es8~ es16 a, bes c d es f8~ f16 b, c d |
%%20
- % es8 r r e f f, es! d | % ->
\classic_accidentals
es8 r r e \stemNeutral \stemDown f f, es! d \stemNeutral |
r as' g f g f16 es f8 g |
c16 d es d c bes as g f bes' as g f es d c |
@@ -229,5 +224,6 @@
}
\paper {
linewidth = 18.0 \cm
+ raggedlastbottom = ##f
}
}
Index: lilypond/lily/percent-repeat-engraver.cc
diff -u lilypond/lily/percent-repeat-engraver.cc:1.45
lilypond/lily/percent-repeat-engraver.cc:1.46
--- lilypond/lily/percent-repeat-engraver.cc:1.45 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/percent-repeat-engraver.cc Mon Aug 15 21:11:12 2005
@@ -57,6 +57,7 @@
protected:
virtual void finalize ();
virtual bool try_music (Music *);
+
void stop_translation_timestep ();
void start_translation_timestep ();
void process_music ();
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
