lilypond-1.3.101

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index 32b03ca22a6752f550b0d98723f0f11c1b4252e6..c1fa0154915995fc9737e31df3fdcad3323bc906 100644 (file)
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -68,9 +68,10 @@ list is alphabetically ordered.
     minor bug fixes, lyric-phrasing.
 @item @email{Roy.Rankin@@alcatel.com.au, Roy R. Rankin},
     major extension, fixes to abc2ly, lilypond bug fixes
+@item @email{reuterj@@ira.uka.de, Juergen Reuter}
+        Custos support.
 @item @email{daboys@@austin.rr.com, Jeffrey B. Reed},
     Windows-NT support.
-
 @item Shay Rojanski
     Some mudela source.
 @item @email{august@@infran.ru, August S.Sigov}

diff --git a/input/scarlatti-paper.ly b/input/scarlatti-paper.ly
index 983c51bfdb5d9ef6eb6ff1f818cff42b2dcb4d7d..1675adfd8c721afd92977f795f969507424eef80 100644 (file)
--- a/input/scarlatti-paper.ly
+++ b/input/scarlatti-paper.ly
@@ -1,7 +1,12 @@
 \paper{
        %my standard paper block
-       0=\font "feta19"
-       -1=\font "feta16"
+
+       % figure out a way to do this cleanly.
+
+%      0=\font "feta19"
+%      -1=\font "feta16"
+%      \stylesheet #(make-style-sheet 'paper19)
+
        arithmetic_multiplier=7.\pt;
        indent=0.;
        linewidth=188.\mm;
@@ -15,7 +20,8 @@
                minVerticalAlign=8.4;
        }
        \translator{\StaffContext
-       timeSignatureStyle="C";}
+               TimeSignature \push #'style = #"C"
+       }
        \translator{\VoiceContext
                noStemExtend = ##t
                tupletVisibility = ##f

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 6eb97a0c01c027c1a5996f27bdac4f0f68bddd6f..88213329851f2459787ebca7ab84d681a5d50ba1 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -115,7 +115,8 @@ IMPLEMENT_TYPE_P (Font_metric, "font-metric?");
 Molecule
 Font_metric::find_by_name (String) const
 {
-  assert (false);
+  Molecule m ;
+  return m;
 }
 
 

diff --git a/ly/engraver.ly b/ly/engraver.ly
index acfd960192c73fe48857f5acfebb287819c60134..c66da4a8312112acbbcbfc992a04b710653ca30b 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -372,7 +372,7 @@ ScoreContext = \translator {
 
        barAuto = ##t
        voltaVisibility = ##t
-       %  name, glyph id, c0 position
+       %  name, glyph id, clef position 
        supportedClefTypes = #'(
          ("treble" . ("clefs-G" -2))
          ("violin" . ("clefs-G" -2))
@@ -431,6 +431,7 @@ ScoreContext = \translator {
          Key_item
          Staff_bar
          Time_signature
+         Custos
          Stanza_number
        )
 

diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 160993ac285ac7843870cfce30c6665082bd9937..b7ec74559c4e512b48126bc82f90b46fa3f557b1 100644 (file)
--- a/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -34,7 +34,7 @@ global = \notes {
   \bar "||";
   \time 2/4;
   s2*18
-  \bar ".|";
+  \bar "|.";
 }
   
 i = \context Staff \notes\relative c''{

diff --git a/scm/font.scm b/scm/font.scm
index deebd5e4c26035145a7e0a251c90c4bff36d259e..fc59fcdfad72a6e39de5320c70c62a01d46f366f 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -67,12 +67,16 @@
     ((-3 medium upright roman cmr 6) . "cmr6" )
     ((-4 medium upright roman cmr 5) . "cmr5" )
     ((-5 medium upright roman cmr 4) . "cmr4" )
+    ((-3 medium italic roman cmti 5) . "cmti6")    
+    ((-2 medium italic roman cmti 6) . "cmti7")
     ((-1 medium italic roman cmti 8) . "cmti8")    
     ((0 medium italic roman cmti 10) . "cmti10")
     ((1 medium italic roman cmti 12) . "cmti12")
-    ((2 bold upright roman cmbx 10) . "cmbx10")
-    ((1 bold upright roman cmbx 12) . "cmbx12")
     ((2 bold upright roman cmbx 14) . "cmbx14")
+    ((1 bold upright roman cmbx 12) . "cmbx12")
+    ((0 bold upright roman cmbx 10) . "cmbx10")
+    ((-1 bold upright roman cmbx 8) . "cmbx8")
+    ((-2 bold upright roman cmbx 7) . "cmbx7")
     ((-3 medium upright math msam 10) . "msam10")
     ((-2 medium upright math msam 10) . "msam10")
     ((-1 medium upright math msam 10) . "msam10")
@@ -92,13 +96,14 @@
     ((-3 bold italic dynamic feta 10) . "feta-din6")
     ((-4 bold italic dynamic feta 10) . "feta-din5")
     ((-5 bold italic dynamic feta 10) . "feta-din4")
+    ((2 medium upright music feta 26) . "feta26")
+    ((1 medium upright music feta 23) . "feta23")
     ((0 medium upright music feta 20) . "feta20")
+    ((-0.5 medium upright music feta 20) . "feta19")    
     ((-1 medium upright music feta 16) . "feta16")
     ((-2 medium upright music feta 13) . "feta13")
     ((-3 medium upright music feta 13) . "feta11")
     ((-4 medium upright music feta 13) . "feta11")
-    ((1 medium upright music feta 23) . "feta23")
-    ((2 medium upright music feta 26) . "feta26")
     ((-1 medium upright math msam 10) . "msam10")
     ((-2 medium upright math msam 10) . "msam10")
     ((-3 medium upright math msam 10) . "msam10")
@@ -133,9 +138,10 @@
 (define font-list-alist
   (map-alist-vals (lambda (x) (change-style-sheet-relative-size
                               paper20-style-sheet-alist x))
-                 '((paper11 . -3)
-                   (paper13 . -2)
-                   (paper16 . -1)
+                 '((paper11 . -4)
+                   (paper13 . -3)
+                   (paper16 . -2)
+                   (paper19 . -1)                  
                    (paper20 . 0)
                    (paper23 . 1)
                    (paper26 . 2)
@@ -168,11 +174,12 @@
     ;; FIXME: this is a not-so-cool idea to use ALIGN
     ;; RAISE, LOOKUP, since they are not proper elt-properties,
     ;; and might interfere with them.
-    (markup-abbrev-to-properties-alist
+    (markup-to-properties . ,markup-to-properties)
+    (abbreviation-alist
      . ((rows . ((align . 0)))
        (lines . ((align . 1)))
        (roman . ((font-family . roman)))
-       (music . ((font-family . music)))
+       (music . ((font-family . music) (font-shape . upright)))
        (finger . ((font-style . finger)))
        (bold . ((font-series . bold)))
        (italic . ((font-shape . italic)))
@@ -186,17 +193,6 @@
     )
   )
 
-
-
-(define (font-regexp-to-font-name paper regexp)
-  (let ((style-sheet (cdr (assoc paper style-sheet-alist))))
-    (let loop ((fonts style-sheet))
-      (if (string-match regexp (caar fonts))
-         (cdar fonts)
-         (if (pair? (cdr fonts))
-             (loop (cdr fonts))
-             '())))))
-
 ;; reduce the font list by successively applying a font-qualifier.
 (define (qualifiers-to-fontnames  qualifiers font-descr-alist)
   (if (null? qualifiers)
@@ -292,19 +288,18 @@
        selected)       ; return the topmost.
     ))
 
-(define markup-abbrev-to-properties-alist
-  (append
-    (map (lambda (x) (cons (car x) (cons 'font-style (car x))))
-       style-to-font-alist)))
-
-(define (markup-to-properties markup)
+(define (markup-to-properties sheet markup)
   ;;(display "markup: `")
-  ;;(display markup)
+  ;;(write markup)
   ;;(display "'\n")
   (if (pair? markup)
       (list markup)
-      (let ((entry (assoc markup markup-abbrev-to-properties-alist)))
-       (if entry (cdr entry)
+      (let ((entry (assoc markup
+                         ;; assoc-chain?
+                         (append (cdr (assoc 'abbreviation-alist sheet))
+                                 (cdr (assoc 'style-alist sheet))))))
+       (if entry
+           (cdr entry)
            (list (cons markup #t))))))
 
 ; fixme, how's this supposed to work?