release commit

diff --git a/ChangeLog b/ChangeLog
index c961e02ec2e42ed4d3417eca77e780d0362e9955..aa3187552841cdc87a9c9138a30bb718d0b59401 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,10 @@
-2004-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-       * input/regression/span-bar.ly: Fix typos.  Set indent-level:2,
-       run indent-region.
-
 2004-03-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * VERSION: 2.1.35 released
+       
+       * scripts/convert-ly.py (FatalConversionError.sub_abs): convert
+       context argument too.
+
        * make/ly-rules.make ($(outdir)/%.texi): use variable for outdir.
 
        * input/mutopia/W.A.Mozart/mozart-hrn-3.ly: Mozart died in 1791
@@ -16,9 +16,12 @@
        .png case separately.
 
        * python/lilylib.py (system): typo.
-
+       
 2004-03-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/regression/span-bar.ly: Fix typos.  Set indent-level:2,
+       run indent-region.
+
        * Documentation/user/preface.itely: Run texinfo-all-menus-update.
        Fixes compile.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 9c45fff780fd3254b2317b118e5b64ea157e7811..8b2453b8308e947a2c5519f9d766bb54367ab0b4 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -9,6 +9,9 @@
 
 @itemize @bullet
 
+@item Setting @code{raggedlast = ##t} in the @code{\paper} block
+causes the last line to be set flush-left instead of justified. 
+
 @item The @code{Timing_engraver} now sets the @code{Timing} alias on
 its containing context automatically.
 

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index ea788668eafa05cdb38cb3dd8e9559e08721b15f..1fd26c2fb2a5ad3f9f0e43fefc0bd3cfea946a64 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -1,79 +1,8 @@
 @comment @c -*-texinfo-*-
 
-
 @node Preface
 @unnumbered Preface
 
-@menu
-* Preface to version 2.2::      
-* Preface to version 2.0::      
-* Preface to version 1.8::      
-* Preface to version 1.6::      
-@end menu
-
-
-@node Preface to version 2.2
-@unnumberedsec Preface to version 2.2
-
-During the 2.1 development cycle, the cleanup of the existing features
-has continued unabated. Major areas of change are orchestral
-notation, lyrics formatting and font size handling.
-
-Han-Wen and Jan
-
-Utrecht/Eindhoven, The Netherlands, March 2004. 
-
-
-@node Preface to version 2.0
-@unnumberedsec Preface to version 2.0
-
-
-Due to personal circumstances, Han-Wen was able to do a lot more on
-LilyPond during the past months. A testament to that is the quick
-release of version 2.0, less than two months after 1.8. We have taken
-the opportunity to make a few radical changes to the syntax: note
-attributes, like articulation, dynamics and fingerings are now
-post-fix exclusively. This makes entering scores easier: you never
-have to think about the order of the attributes.  With version 2.0, we
-have a new and improved platform for working on notation and
-typography features for coming versions,
- 
-Due to other personal circumstances, Jan was not able to do more than
-packaging for Cygwin.  The good news is that we now have a nearly
-fool-proof installation for Windows.  He will be back for serious
-hacking in 2.1.
-
-
-Han-Wen and Jan
-
-Utrecht/Eindhoven, The Netherlands, September 2003.
-
-@node Preface to version 1.8
-@unnumberedsec Preface to version 1.8
-
-If you are familiar with LilyPond version 1.6, then version 1.8 will
-no offer no big surprises. The only conspicuous change is in the way
-that formatted text is entered. There is now a new syntax that is more
-friendly, more versatile and extensible. We hope you like it.  In
-general, development on version 1.8 has been focused on improving the
-design of various internal mechanisms.  This includes chord name
-formatting and entry code, music expression storage, and integration
-between LilyPond and Scheme.  These changes may not be evident
-directly, but they make the program more robust and more flexible,
-which translates into fewer bugs and more adjustment options.
-
-Special thanks for version 1.8 go out to Juergen Reuter for lots of
-work on the ancient notation engine, and to Amy Zapf for pushing us to
-rewrite the chord name support.
-
-@c TODO [wie meer?]  
-
-Han-Wen and Jan, 
-
-Utrecht/Eindhoven, The Netherlands, April/May 2003.
-
-@node Preface to version 1.6
-@unnumberedsec Preface to version 1.6
 
 It must have been during a rehearsal of the EJE (Eindhoven Youth
 Orchestra), somewhere in 1995 that Jan, one of the cranked violists
@@ -103,21 +32,13 @@ bugs. Nevertheless, it has become a part of our life, and we keep
 doing it. Probably the most important motivation is that our program
 actually does something useful for people. When we browse around the
 net we find many people that use LilyPond, and produce impressive
-pieces of sheet music.  Seeing that still feels unreal, but in a very
+pieces of sheet music.  Seeing that feels unreal, but in a very
 pleasant way.
 
 Our users not only give us good vibes by using our program, many of
-them also help us by giving suggestions and sending bug reports. So
-first and foremost, we would like to thank all users that sent us
-bug reports, gave suggestions or contributed in any other way to
-LilyPond.
-
-We would also like to thank the following people: Mats Bengtsson for
-the uncountable number of questions he answered on the mailing list,
-and Rune Zedeler for his energy in finding and fixing bugs.  Nicola
-Bernardini for inviting us to his workshop on music publishing, which
-was truly a masterclass, and Heinz Stolba and James Ingram for
-teaching us there. 
+them also help us by giving suggestions and sending bug reports, so we
+would like to thank all users that sent us bug reports, gave
+suggestions or contributed in any other way to LilyPond.
 
 Playing and printing music is more than nice analogy. Programming
 together is a lot of fun, and helping people is deeply satisfying, but
@@ -129,3 +50,13 @@ Han-Wen and Jan
 Utrecht/Eindhoven, The Netherlands, July 2002.
 
 
+@unnumberedsec Notes to version 2.2
+
+During the 2.1 development cycle, the cleanup of the existing features
+has continued unabated. Major areas of improvement are orchestral
+notation, lyrics formatting and font size handling.
+
+Han-Wen and Jan
+
+Utrecht/Eindhoven, The Netherlands, March 2004. 
+

diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 6460a9c98123f9f6b5e53e8a77be7d022ba1a93a..7e2072aeb8afb3145c3e649de9ceefed4f8e1730 100644 (file)
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -18,9 +18,9 @@ between systems.
       \override Score.SpanBar #'transparent = ##t
       a1 a1
     }
-    \new Lyrics \lyrics <<
-      { bla1 die bla }
-      { foo bar foo }
+    \lyrics <<
+      \new Lyrics { bla1 die bla }
+      \new Lyrics { foo bar foo }
     >>
     \new Staff {
       f1 f1 f1 f1
@@ -34,6 +34,7 @@ between systems.
   }
 }
 
+
 %% Local variables:
 %% LilyPond-indent-level:2
 %% End:

diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index e23799f21bf1d52c16f0f36c7403d463b3f3f5a3..e3be1fe7ea4c7199f9462942a8b7a20e986c9579 100644 (file)
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -5,6 +5,7 @@
 
       }
 
+\version "2.1.35"
 \paper {
    indent = 0.0\mm
    raggedright = ##t

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 1e15c69683521a7e547e78b780f1f7da0d61462e..be45079d32b51e6a42f084ef7197f6df791b692b 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -100,10 +100,11 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
 Stencil
 Time_signature::numbered_time_signature (Grob*me,int num, int den)
 {
-  SCM number_def = scm_list_1 (gh_cons (ly_symbol2scm ("font-encoding"),
-                                       ly_symbol2scm ("number")));
-                                       
-  SCM chain = me->get_property_alist_chain (number_def);
+  SCM chain = me->get_property_alist_chain (Font_interface::text_font_alist_chain (me));
+  chain = scm_cons (scm_list_1 (gh_cons (ly_symbol2scm ("font-encoding"),
+                                        ly_symbol2scm ("number"))),
+                   chain);
+                               
   SCM sn = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
                                 scm_makfrom0str (to_string (num).to_str0 ()));
   SCM sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 5f31dc5b62ea58b847841bffb0af85fc77df7e30..f649d0bb5c425d2ca2927823b79ebc0b0ffa6808 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1886,10 +1886,23 @@ def conv (str):
                              r' \\revert \1', s)
                return s
        str = re.sub (r'\\(translator|with)\s*{[^}]+}',  subst_in_trans, str)
-       str = re.sub (r"""\\override\s*([a-zA-Z]+\s*\.\s*)?autoBeamSettings"""
-                     +r"""\s*#([^=]+)\s*=\s*#\(ly:make-moment\s+(\d+)\s+(\d)\s*\)""",
-                     r"""#(override-auto-beam-setting \2 \3 \4)""",
-                     str)
+
+       def sub_abs (m):
+               
+               context = m.group ('context')
+               d = m.groupdict ()
+               if context:
+                       context = " '%s" % context[:-1] # -1: remove . 
+               else:
+                       context = ''
+
+               d['context'] = context
+               
+               return r"""#(override-auto-beam-setting %(prop)s %(num)s %(den)s%(context)s)""" % d
+
+       str = re.sub (r"""\\override\s*(?P<context>[a-zA-Z]+\s*\.\s*)?autoBeamSettings"""
+                     +r"""\s*#(?P<prop>[^=]+)\s*=\s*#\(ly:make-moment\s+(?P<num>\d+)\s+(?P<den>\d)\s*\)""",
+                     sub_abs, str)
        
        return str