patch::: 1.3.101.jcn1

1.3.101.jcn1
============

* Silly font initialisation fix for paper19 non-feature.

diff --git a/CHANGES b/CHANGES
index 0c45c08fa7f2beeab5046bd5de615fdda2934d3f..4abb3b88fb81633be22fcbf69d8f000e7e93474d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.3.101.jcn1
+============
+
+* Silly font initialisation fix for paper19 non-feature.
 
 1.3.101
 =======

diff --git a/VERSION b/VERSION
index f45f6ae0299b3195b3ca315d8d634efcce3b2a9a..86e18c9b98a7b4ee9d71bf4b802930533500ed9a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=101
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/font.scm b/scm/font.scm
index fc59fcdfad72a6e39de5320c70c62a01d46f366f..cde631b71d2c7bca4c7eeef28f2e98292eeedc41 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -60,8 +60,9 @@
     ((-2 medium upright number feta-nummer 6) . "feta-nummer6")
     ((-3 medium upright number feta-nummer 5) . "feta-nummer5")
     ((-4 medium upright number feta-nummer 4) . "feta-nummer4")
-    ((0 medium upright roman cmr 10) . "cmr10")
+    ((2 medium upright roman cmr 14) . "cmr14")
     ((1 medium upright roman cmr 12) . "cmr12")
+    ((0 medium upright roman cmr 10) . "cmr10")
     ((-1 medium upright roman cmr 8) . "cmr8" )
     ((-2 medium upright roman cmr 7) . "cmr7" )
     ((-3 medium upright roman cmr 6) . "cmr6" )
@@ -91,11 +92,11 @@
     ((2 bold italic dynamic feta 10) . "feta-din13")
     ((1 bold italic dynamic feta 10) . "feta-din12")
     ((0 bold italic dynamic feta 10) . "feta-din10")
-    ((-1 bold italic dynamic feta 10) . "feta-din8")
-    ((-2 bold italic dynamic feta 10) . "feta-din7")
-    ((-3 bold italic dynamic feta 10) . "feta-din6")
-    ((-4 bold italic dynamic feta 10) . "feta-din5")
-    ((-5 bold italic dynamic feta 10) . "feta-din4")
+    ((-1 bold italic dynamic feta 8) . "feta-din8")
+    ((-2 bold italic dynamic feta 7) . "feta-din7")
+    ((-3 bold italic dynamic feta 6) . "feta-din6")
+    ((-4 bold italic dynamic feta 5) . "feta-din5")
+    ((-5 bold italic dynamic feta 4) . "feta-din4")
     ((2 medium upright music feta 26) . "feta26")
     ((1 medium upright music feta 23) . "feta23")
     ((0 medium upright music feta 20) . "feta20")
@@ -138,10 +139,10 @@
 (define font-list-alist
   (map-alist-vals (lambda (x) (change-style-sheet-relative-size
                               paper20-style-sheet-alist x))
-                 '((paper11 . -4)
-                   (paper13 . -3)
-                   (paper16 . -2)
-                   (paper19 . -1)                  
+                 '((paper11 . -3)
+                   (paper13 . -2)
+                   (paper16 . -1)
+                   (paper19 . -0.5)    
                    (paper20 . 0)
                    (paper23 . 1)
                    (paper26 . 2)