patch::: 1.3.116.mb1

1.3.116.mb1
===========

* Bugfix: convert-ly.py: Correct syntax for inserted \version,
  \push -> override happened in 1.3.111

* Bugfix: corrected documentation of timeSignatureStyle, removed all
  `unknown type' in the property documentation.

* Added font family typewriter (cmtt).

* Bugfix: some examples updated

diff --git a/CHANGES b/CHANGES
index 6fa1f14d6c2266b682d93c0a37531dab0d3e4120..277d51ff11bdae9c6e83c621b4613547655543cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+1.3.116.mb1
+===========
+
+* Bugfix: convert-ly.py: Correct syntax for inserted \version, 
+  \push -> override happened in 1.3.111
+
+* Bugfix: corrected documentation of timeSignatureStyle, removed all
+  `unknown type' in the property documentation.
+
+* Added font family typewriter (cmtt).
+
+* Bugfix: some examples updated
+
 1.3.115.jcn2
 ============
 

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 035c187b9bcef00be2c4074811b68e0836e04ead..e00b8889c13dd392acf2c06b9dd4a8ac26f49ecd 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -63,7 +63,7 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
     The default value is @code{#f}.  Can be set to @code{#t} with
     @code{\specialkey} or reset with @code{\normalkey}. [BROKEN]
 
-  @item @code{timeSignatureStyle}@indexcode{timeSignatureStyle} @propertytype{string}
+  @item @code{timeSignatureStyle}@indexcode{timeSignatureStyle} @propertytype{symbol}
     Changes the default two-digit layout for time signatures.  The
     following values are recognized:
 
@@ -77,14 +77,16 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
         typeset with old-style mensuration marks.  All other time
         signatures are written with two digits.
 
-      @item @code{1}@indexcode{1}  
+      @item @code{1xxx}@indexcode{1xxx}  
         All time signatures are typeset with a single
-        digit, e.g. 3/2 is written as 3.
+        digit, e.g. 3/2 is written as 3. (Any symbol starting
+       with the digit @code{1} will do.)
 
       @item @indexcode{CM/N}@code{C}@var{M}@code{/}@var{N}, 
       @indexcode{oldM/N}@code{old}@var{M}@code{/}@var{N} or
       @code{old6/8alt}@indexcode{old6/8alt}  
-        Tells LilyPond to use a specific symbol as time signature.
+        Tells LilyPond to use a specific symbol as time signature, 
+       regardless of the actual time signature.
     @end table
 
     The different time signature characters are shown below with its
@@ -92,38 +94,39 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
 
 @lilypond[center,verbatim]
 
-      \score {
-        \notes\relative c'' {
-          \property Voice.textStyle = typewriter
-          \property Staff.timeSignatureStyle = "C2/2"
-          \time 2/2; a2^"C2/2" a2 
-          \property Staff.timeSignatureStyle = "C4/4"
-          \time 2/2; a2^"C4/4" a2 
-          \property Staff.timeSignatureStyle = "old2/2"
-          \time 2/2; a2^"old2/2" a2 
-          \property Staff.timeSignatureStyle = "old3/2"
-          \time 2/2; a2^"old3/2" a2 
-          \property Staff.timeSignatureStyle = "old2/4"
-          \time 2/2; a2^"old2/4" a2 
-          \property Staff.timeSignatureStyle = "old4/4"
-          \time 2/2; a2^"old4/4" a2 
-          \property Staff.timeSignatureStyle = "old6/4"
-          \time 2/2; a2^"old6/4" a2 
-          \property Staff.timeSignatureStyle = "old9/4"
-          \time 2/2; a2^"old9/4" a2 
-          \property Staff.timeSignatureStyle = "old4/8"
-          \time 2/2; a2^"old4/8" a2 
-          \property Staff.timeSignatureStyle = "old6/8"
-          \time 2/2; a2^"old6/8" a2 
-          \property Staff.timeSignatureStyle = "old6/8alt"
-          \time 2/2; a2^"old6/8alt" a2 
-          \property Staff.timeSignatureStyle = "old9/8"
-          \time 2/2; a2^"old9/8" a2 
-        }
-        \paper {
-          linewidth = 4.5 \in;
-        }
-      }
+ \score {
+   \notes\relative c'' {
+     \property Voice.TextScript \set #'font-shape = #'upright
+     \property Voice.TextScript \set #'font-family = #'typewriter
+     \property Staff.TimeSignature \set #'style = #'C2/2
+     \time 2/2; a2^"C2/2" a2 
+     \property Staff.TimeSignature \set #'style = #'C4/4
+     \time 2/2; a2^"C4/4" a2 
+     \property Staff.TimeSignature \set #'style = #'old2/2
+     \time 2/2; a2^"old2/2" a2 
+     \property Staff.TimeSignature \set #'style = #'old3/2
+     \time 2/2; a2^"old3/2" a2 
+     \property Staff.TimeSignature \set #'style = #'old2/4
+     \time 2/2; a2^"old2/4" a2 
+     \property Staff.TimeSignature \set #'style = #'old4/4
+     \time 2/2; a2^"old4/4" a2 
+     \property Staff.TimeSignature \set #'style = #'old6/4
+     \time 2/2; a2^"old6/4" a2 
+     \property Staff.TimeSignature \set #'style = #'old9/4
+     \time 2/2; a2^"old9/4" a2 
+     \property Staff.TimeSignature \set #'style = #'old4/8
+     \time 2/2; a2^"old4/8" a2 
+     \property Staff.TimeSignature \set #'style = #'old6/8
+     \time 2/2; a2^"old6/8" a2 
+     \property Staff.TimeSignature \set #'style = #'old6/8alt
+     \time 2/2; a2^"old6/8alt" a2 
+     \property Staff.TimeSignature \set #'style = #'old9/8
+     \time 2/2; a2^"old9/8" a2 
+   }
+   \paper {
+     linewidth = 4.5 \in;
+   }
+ }
     
 @end lilypond
 

diff --git a/VERSION b/VERSION
index 07b942cf3e889f99afdc646d13635b93504c3495..8534d83a23897c57da107af1b63dfcc5db4286c5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=116
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly
index 4939630f78290b4021ca8d8f8e729f252a6fd090..7314754d73de1d837cf8b67f8b4d051b8f52fa89 100644 (file)
--- a/input/test/tuplet.ly
+++ b/input/test/tuplet.ly
@@ -15,10 +15,10 @@
 
 
   
-  \property Voice .tupletBracketVisibility = #'if-no-beam  
+  \property Voice.TupletBracket \set #'tuplet-bracket-visibility = #'if-no-beam  
   \times 2/3 { [c8 c c]  }
-  \property Voice .tupletDirection = #1
-  \property Voice .tupletNumberVisibility = ##f
+  \property Voice.TupletBracket \set #'direction = #1
+  \property Voice.TupletBracket \set #'tuplet-number-visibility = ##f
   \times 2/3 { c8 [c c]  }
     
 

diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly
index 6e1d8aed8bba20005aae3a835b4ec029aeb168fd..932e1688f7e745db8dde8868d98677da32538659 100644 (file)
--- a/input/test/vertical-align.ly
+++ b/input/test/vertical-align.ly
@@ -4,9 +4,6 @@
 \score {
 \notes <
        \context GrandStaff < {
-          \property GrandStaff . maxVerticalAlign = #12.0
-          \property GrandStaff . minVerticalAlign = #7.0
-
           c'1 \break  c'''''1 
        }
            { c'1 \break c,,,,1}
@@ -14,6 +11,10 @@
 
 >
 
-\paper{}
+\paper{
+  \translator{\StaffContext
+    VerticalAlignment \override #'threshold = #'(7 . 12)
+  }
+}
 
 }

diff --git a/scm/backend-property.scm b/scm/backend-property.scm
index c098361b9bb93bb157d3a33bc66d5fdd38b2bf4b..ebc85c4e2a62c300995203395048b58ad3d4f10b 100644 (file)
--- a/scm/backend-property.scm
+++ b/scm/backend-property.scm
@@ -189,7 +189,7 @@ length")
 (grob-property-description 'new-accidentals list? "list of (pitch, accidental) pairs")
 (grob-property-description 'no-spacing-rods boolean? "read from grobs: boolean that makes Separation_item ignore this item (MOVE ME TO ITEM)")
 (grob-property-description 'non-default boolean? "not set because of existence of a bar?")
-(grob-property-description 'note-width 'number? "unit for horizontal translation, measured in staff-space.")
+(grob-property-description 'note-width number? "unit for horizontal translation, measured in staff-space.")
 (grob-property-description 'number-gap number? "")
 (grob-property-description 'old-accidentals list? "list of (pitch, accidental) pairs")
 (grob-property-description 'origin ly-input-location? "location in input file of the definition")

diff --git a/scm/font.scm b/scm/font.scm
index 2682e600114001393d73f5cf581a892abe94c1b0..06ddc26b7fa745d083b46ec58be4830da65ade69 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -89,6 +89,17 @@
     ((-1 bold upright roman cmbx 8) . "cmbx8")
     ((-2 bold upright roman cmbx 7) . "cmbx7")
     
+    ((4 medium upright typewriter cmtt 20) . "cmtt20")
+    ((3 medium upright typewriter cmtt 16) . "cmtt16")
+    ((2 medium upright typewriter cmtt 14) . "cmtt14")
+    ((1 medium upright typewriter cmtt 12) . "cmtt12")
+    ((0 medium upright typewriter cmtt 10) . "cmtt10")
+    ((-1 medium upright typewriter cmtt 8) . "cmtt8" )
+    ((-2 medium upright typewriter cmtt 7) . "cmtt7" )
+    ((-3 medium upright typewriter cmtt 6) . "cmtt6" )
+    ((-4 medium upright typewriter cmtt 5) . "cmtt5" )
+    ((-5 medium upright typewriter cmtt 4) . "cmtt4" )
+
     ;; should use the same brace font every where and fix C++ code.
     ((2 medium upright braces feta-braces 26) . "feta-braces26")
     ((1 medium upright braces feta-braces 23) . "feta-braces23")

diff --git a/scm/lily.scm b/scm/lily.scm
index 060b82bb280755f6f6fe175f090cc0e6d84c3a0a..007e5045b8fb945d0546536d5d41c58f544c428b 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -27,7 +27,6 @@
   (and (pair? x) (number? (car x)) (number? (cdr x))))
 (define (boolean-or-symbol? x) (or boolean? x) (or symbol? x))
 (define (number-or-string? x) (or (number? x) (string? x)))
-(define (list-or-string? x) (or (list? x) (string? x)))
 (define markup?
   (lambda (x) (or (string? x) (list? x))))
 
@@ -53,6 +52,9 @@
    ((output-port? obj) "output port")   
    ((vector? obj) "vector")
    ((procedure? obj) "procedure") 
+   ((boolean-or-symbol? obj) "boolean or symbol")
+   ((number-or-string? obj) "number or string")
+   ((markup? obj) "markup (list or string)")
    (else "unknown type")
   ))
 
@@ -76,6 +78,9 @@
    ((eq? predicate output-port?) "output port")   
    ((eq? predicate vector?) "vector")
    ((eq? predicate procedure?) "procedure") 
+   ((eq? predicate boolean-or-symbol?) "boolean or symbol")
+   ((eq? predicate number-or-string?) "number or string")
+   ((eq? predicate markup?) "markup (list or string)")
    (else "unknown type")
   ))
 

diff --git a/scm/translator-properties.scm b/scm/translator-properties.scm
index d2513d0a37a242c70192186f04626c8a1d967a08..a620aa87281d05d41713a0f87c2a4794e974c946 100644 (file)
--- a/scm/translator-properties.scm
+++ b/scm/translator-properties.scm
@@ -135,8 +135,8 @@ remembered for the duration of a measure.
 ")
 (translator-property-description 'graceAccidentalSpace number? "amount space to alot for an accidental")
 (translator-property-description 'graceAlignPosition dir? "put the grace note before or after the main note?")
-(translator-property-description 'instr list-or-string? "see @code{instrument}")
-(translator-property-description 'instrument list-or-string? " If @code{Instrument_name_engraver}
+(translator-property-description 'instr markup? "see @code{instrument}")
+(translator-property-description 'instrument markup? " If @code{Instrument_name_engraver}
 @cindex Instrument_name_engraver
  is
     added to the Staff translator, then the @code{instrument} property

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 5a86f0ce617c8555ff7755f768c48aadeb0857e5..23eb571ca2ea1e526aa8995c101fc4a085f11be1 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -570,7 +570,7 @@ if 1:
 
                return str
        
-       conversions.append (((1,3,110), conv, '\\push -> \\override, \\pop -> \\revert'))
+       conversions.append (((1,3,111), conv, '\\push -> \\override, \\pop -> \\revert'))
 
 if 1:
        def conv (str):
@@ -611,9 +611,9 @@ def do_conversion (infile, from_version, outfile, to_version):
 
        if last_conversion:
                sys.stderr.write ('\n')
-               new_ver =  '\\\\version \"%s\"' % tup_to_str (last_conversion)
+               new_ver =  '\\version \"%s\"' % tup_to_str (last_conversion)
                if re.search (lilypond_version_re_str, str):
-                       str = re.sub (lilypond_version_re_str,new_ver , str)
+                       str = re.sub (lilypond_version_re_str,'\\'+new_ver , str)
                else:
                        str = new_ver + '\n' + str