From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 25 Oct 2000 19:33:46 +0000 (+0200)
Subject: patch::: 1.3.99.jcn1
X-Git-Tag: release/1.3.100~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c4e3d87936d6696bed2d9120428d1c1e7ddc429;p=lilypond.git

patch::: 1.3.99.jcn1

1.3.99.jcn1
===========

* Made several font size and initialisation fixes.
---

diff --git a/CHANGES b/CHANGES
index e575161253..4392a298dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.99.jcn1
+===========
+
+* Made several font size and initialisation fixes.
+
 1.3.98.jcn2
 ===========
 
diff --git a/VERSION b/VERSION
index 1a504215d7..3303cdd964 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=99
-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/mf/feta-braces23.mf b/mf/feta-braces23.mf
index c14215dd7c..6e4ca0c712 100644
--- a/mf/feta-braces23.mf
+++ b/mf/feta-braces23.mf
@@ -8,10 +8,10 @@
 % 
 
 font_identifier:="feta-braces23";
-font_size 23;
+font_size 22.5;  %% feta23 = 22.5pt  ...
 mode_setup;
 
-staffsize#:=23pt#;
+staffsize#:=22.5pt#;
 input feta-beugel;
 end.
 
diff --git a/mf/feta-din10.mf b/mf/feta-din10.mf
index 749c181cbb..55a476a584 100644
--- a/mf/feta-din10.mf
+++ b/mf/feta-din10.mf
@@ -1,8 +1,7 @@
-
 % feta-din10.mf
 % part of LilyPond's pretty-but-neat music font
 
-design_size:=10;
+design_size:=10; % feta20 = 20pt
 
 input feta-din;
 
diff --git a/mf/feta-din11.mf b/mf/feta-din11.mf
new file mode 100644
index 0000000000..5fb32da8ac
--- /dev/null
+++ b/mf/feta-din11.mf
@@ -0,0 +1,9 @@
+% feta-din11.mf
+% part of LilyPond's pretty-but-neat music font
+
+design_size:=11.25; % feta23 = 22.5pt
+
+input feta-din;
+
+end.
+
diff --git a/mf/feta-din12.mf b/mf/feta-din12.mf
index 9ffb1b51d3..e69de29bb2 100644
--- a/mf/feta-din12.mf
+++ b/mf/feta-din12.mf
@@ -1,9 +0,0 @@
-% feta-din10.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=12;
-
-input feta-din;
-
-end.
-
diff --git a/mf/feta-din13.mf b/mf/feta-din13.mf
new file mode 100644
index 0000000000..762539aa92
--- /dev/null
+++ b/mf/feta-din13.mf
@@ -0,0 +1,9 @@
+% feta-din13.mf
+% part of LilyPond's pretty-but-neat music font
+
+design_size:=13; % feta26 = 26pt
+
+input feta-din;
+
+end.
+
diff --git a/mf/feta-din14.mf b/mf/feta-din14.mf
index 3c435f8d8e..e69de29bb2 100644
--- a/mf/feta-din14.mf
+++ b/mf/feta-din14.mf
@@ -1,2 +0,0 @@
-design_size := 14.4;
-input feta-din;
diff --git a/mf/feta-din16.mf b/mf/feta-din16.mf
new file mode 100644
index 0000000000..451de0882d
--- /dev/null
+++ b/mf/feta-din16.mf
@@ -0,0 +1,9 @@
+% feta-din16.mf
+% part of LilyPond's pretty-but-neat music font
+
+design_size:=16;
+
+input feta-din;
+
+end.
+
diff --git a/mf/feta-din3.mf b/mf/feta-din3.mf
index 63c89cbd60..e69de29bb2 100644
--- a/mf/feta-din3.mf
+++ b/mf/feta-din3.mf
@@ -1,10 +0,0 @@
-% feta-din4.mf
-% part of LilyPond's pretty-but-neat music font
-
-% size:=4;
-design_size:=16*3/15;
-
-input feta-din.mf;
-
-end.
-
diff --git a/mf/feta-din4.mf b/mf/feta-din4.mf
index 8aabec40e0..a8e25a1da6 100644
--- a/mf/feta-din4.mf
+++ b/mf/feta-din4.mf
@@ -1,8 +1,7 @@
 % feta-din4.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=4;
-design_size:=16*4/15;
+design_size:=3.82; % 6.5/1.2/1.2  din5 = 6.5/1.2 :  din7 = 6.5pt
 
 input feta-din.mf;
 
diff --git a/mf/feta-din5.mf b/mf/feta-din5.mf
index 790a8087ab..7b6e1fcadd 100644
--- a/mf/feta-din5.mf
+++ b/mf/feta-din5.mf
@@ -1,8 +1,7 @@
 % feta-din5.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=5;
-design_size:=20*4/15;
+design_size:=4.58; % 6.5/1.2 :  din7 = 6.5pt
 
 input feta-din.mf;
 
diff --git a/mf/feta-din6.mf b/mf/feta-din6.mf
index 854e524f00..e69de29bb2 100644
--- a/mf/feta-din6.mf
+++ b/mf/feta-din6.mf
@@ -1,10 +0,0 @@
-% feta-din5.mf
-% part of LilyPond's pretty-but-neat music font
-
-% size:=5;
-design_size:=20*6/15;
-
-input feta-din.mf;
-
-end.
-
diff --git a/mf/feta-din7.mf b/mf/feta-din7.mf
index c9854d3e5d..81aeffe2f2 100644
--- a/mf/feta-din7.mf
+++ b/mf/feta-din7.mf
@@ -1,8 +1,7 @@
-% feta-din5.mf
+% feta-din7.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=5;
-design_size:=26*4/15;
+design_size:=6.5; % feta13 = 13pt
 
 input feta-din.mf;
 
diff --git a/mf/feta-din8.mf b/mf/feta-din8.mf
index 745fc6c252..32767f685b 100644
--- a/mf/feta-din8.mf
+++ b/mf/feta-din8.mf
@@ -1,7 +1,7 @@
 % feta-din8.mf
 % part of LilyPond's pretty-but-neat music font
 
-design_size:=8;
+design_size:=8; % feta16 = 16pt
 
 input feta-din.mf;
 
diff --git a/mf/feta-nummer10.mf b/mf/feta-nummer10.mf
index 1a802df0dd..884ca5c30a 100644
--- a/mf/feta-nummer10.mf
+++ b/mf/feta-nummer10.mf
@@ -1,8 +1,7 @@
-
 % feta-nummer10.mf
 % part of LilyPond's pretty-but-neat music font
 
-design_size:=10;
+design_size:=10; % feta20 = 20pt
 
 input feta-nummer;
 
diff --git a/mf/feta-nummer11.mf b/mf/feta-nummer11.mf
new file mode 100644
index 0000000000..9bebc84f90
--- /dev/null
+++ b/mf/feta-nummer11.mf
@@ -0,0 +1,9 @@
+% feta-nummer11.mf
+% part of LilyPond's pretty-but-neat music font
+
+design_size:=11.25; % feta23 = 22.5pt
+
+input feta-nummer;
+
+end.
+
diff --git a/mf/feta-nummer12.mf b/mf/feta-nummer12.mf
index 315caebb43..e69de29bb2 100644
--- a/mf/feta-nummer12.mf
+++ b/mf/feta-nummer12.mf
@@ -1,9 +0,0 @@
-% feta-nummer10.mf
-% part of LilyPond's pretty-but-neat music font
-
-design_size:=12;
-
-input feta-nummer;
-
-end.
-
diff --git a/mf/feta-nummer13.mf b/mf/feta-nummer13.mf
new file mode 100644
index 0000000000..e87025b6ba
--- /dev/null
+++ b/mf/feta-nummer13.mf
@@ -0,0 +1,9 @@
+% feta-nummer13.mf
+% part of LilyPond's pretty-but-neat music font
+
+design_size:=13; % feta26 = 26pt
+
+input feta-nummer;
+
+end.
+
diff --git a/mf/feta-nummer14.mf b/mf/feta-nummer14.mf
index dc966e6be4..e69de29bb2 100644
--- a/mf/feta-nummer14.mf
+++ b/mf/feta-nummer14.mf
@@ -1,2 +0,0 @@
-design_size := 14.4;
-input feta-nummer;
diff --git a/mf/feta-nummer3.mf b/mf/feta-nummer3.mf
index 8ac70299c6..e69de29bb2 100644
--- a/mf/feta-nummer3.mf
+++ b/mf/feta-nummer3.mf
@@ -1,10 +0,0 @@
-% feta-nummer4.mf
-% part of LilyPond's pretty-but-neat music font
-
-% size:=4;
-design_size:=16*3/15;
-
-input feta-nummer.mf;
-
-end.
-
diff --git a/mf/feta-nummer4.mf b/mf/feta-nummer4.mf
index 97b59333d3..bb9a0768be 100644
--- a/mf/feta-nummer4.mf
+++ b/mf/feta-nummer4.mf
@@ -1,8 +1,7 @@
 % feta-nummer4.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=4;
-design_size:=16*4/15;
+design_size:=3.82; % 6.5/1.2/1.2  nummer5 = 6.5/1.2 :  nummer7 = 6.5pt
 
 input feta-nummer.mf;
 
diff --git a/mf/feta-nummer5.mf b/mf/feta-nummer5.mf
index 21c474f1a7..596be271b3 100644
--- a/mf/feta-nummer5.mf
+++ b/mf/feta-nummer5.mf
@@ -1,8 +1,7 @@
 % feta-nummer5.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=5;
-design_size:=20*4/15;
+design_size:=4.58; % 6.5/1.2 :  nummer7 = 6.5pt
 
 input feta-nummer.mf;
 
diff --git a/mf/feta-nummer6.mf b/mf/feta-nummer6.mf
index fbda92971a..e69de29bb2 100644
--- a/mf/feta-nummer6.mf
+++ b/mf/feta-nummer6.mf
@@ -1,10 +0,0 @@
-% feta-nummer5.mf
-% part of LilyPond's pretty-but-neat music font
-
-% size:=5;
-design_size:=20*6/15;
-
-input feta-nummer.mf;
-
-end.
-
diff --git a/mf/feta-nummer7.mf b/mf/feta-nummer7.mf
index fcc15d6b8f..6a4bbacbde 100644
--- a/mf/feta-nummer7.mf
+++ b/mf/feta-nummer7.mf
@@ -1,8 +1,7 @@
-% feta-nummer5.mf
+% feta-nummer7.mf
 % part of LilyPond's pretty-but-neat music font
 
-% size:=5;
-design_size:=26*4/15;
+design_size:=6.5; % feta13 = 13pt
 
 input feta-nummer.mf;
 
diff --git a/mf/feta-nummer8.mf b/mf/feta-nummer8.mf
index d790057895..d23a9f31b3 100644
--- a/mf/feta-nummer8.mf
+++ b/mf/feta-nummer8.mf
@@ -1,7 +1,7 @@
 % feta-nummer8.mf
 % part of LilyPond's pretty-but-neat music font
 
-design_size:=8;
+design_size:=8; % feta16 = 16pt
 
 input feta-nummer.mf;
 
diff --git a/mf/feta23.mf b/mf/feta23.mf
index b4dcaea7ad..5ef48a8a0d 100644
--- a/mf/feta23.mf
+++ b/mf/feta23.mf
@@ -1,10 +1,8 @@
-% feta16.mf
+% feta23.mf
 % part of LilyPond's pretty-but-neat music font
 
-% font_identifier:="feta16";
-% font_size 16pt#;
-
 input feta-autometric;
+% why is this 22.5?
 fet_beginfont("feta", 22.5);
 staffsize#:=22.5pt#;
 test:=0;
diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index 4e88fcdf28..da872eb567 100644
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -251,6 +251,8 @@
 		(style-to-font-name . ,style-to-font-name)
 		(markup-to-properties . ,markup-to-properties)
 		(font-family . roman)
+		(font-shape . upright)
+		(font-relative-size . 0)
                 
 		(meta . ,(element-description "LyricText" lyric-syllable-interface text-interface))
 	))
@@ -302,11 +304,12 @@
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
 		(font-family . roman)
+		(font-shape . upright)
 		(font-relative-size . 0)
 		(meta . ,(element-description  "NoteName"
-			note-name-interface
-			general-element-interface))
-	))
+					       note-name-interface
+					       general-element-interface))
+		))
 
 	(OctavateEight . (
 		(self-alignment-X . 0)
@@ -499,6 +502,8 @@
                (style-to-font-name . ,style-to-font-name)
                (markup-to-properties . ,markup-to-properties)
                (font-family . roman)
+               (font-shape . italic)
+               (font-relative-size . 0)
 		(meta . ,(element-description "TextScript" text-script-interface text-interface side-position-interface ))
 	))
 	(TextSpanner . (
@@ -549,12 +554,12 @@
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-                (font-shape . italic)
+                (font-style . tuplet)
 		(meta .  ,(element-description "TupletBracket" text-interface
 			   tuplet-bracket-interface))
 	))
 
-	(UnaChordaPdeal . (
+	(UnaChordaPedal . (
 		(molecule-callback . ,Text_item::brew_molecule)
                 (font-shape . italic)
                 (properties-to-font-name . ,properties-to-font-name)
diff --git a/scm/font.scm b/scm/font.scm
index d11a23a3c8..955fe0dcf5 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -10,8 +10,9 @@
   `(
     (finger . ((font-family . number) (font-relative-size . -3)))
     (volta . ((font-family . number) (font-relative-size . -2)))
+    (tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))
     (timesig . ((font-family .  number) (font-relative-size . 0)))
-    (mmrest . ((font-family . number) (font-relative-size . -1)))
+    (mmrest . ((font-family . number) (font-relative-size . 1)))
     (mark . ((font-family . number) (font-relative-size . 1)))
     (script . ((font-family . roman) (font-relative-size . -1)))
     (large . ((font-family . roman) (font-relative-size . 1)))
@@ -60,52 +61,61 @@
 
 (define paper20-style-sheet-alist
   '(
+    ((2 medium upright music feta 26) . "feta26")
+    ((1 medium upright music feta 23) . "feta23")
     ((0 medium upright music feta 20) . "feta20")
     ((-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")
+    ((-3 medium upright music feta 11) . "feta11")
+    ((-4 medium upright music feta 11) . "feta11")
+    ((2 medium upright braces feta-braces 26) . "feta-braces26")
+    ((1 medium upright braces feta-braces 23) . "feta-braces23")
     ((0 medium upright braces feta-braces 20) . "feta-braces20")
-    ((0 medium italic roman cmti 10) . "cmti10")
+    ((-1 medium upright braces feta-braces 16) . "feta-braces16")
+    ((-2 medium upright braces feta-braces 13) . "feta-braces13")
+    ((-3 medium upright braces feta-braces 11) . "feta-braces11")
+    ((2 medium italic roman cmti 12) . "cmti14")
     ((1 medium italic roman cmti 12) . "cmti12")
-    ((3 bold italic dynamic feta 10) . "feta-din13")
-    ((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")
+    ((0 medium italic roman cmti 10) . "cmti10")
+    ((-1 medium italic roman cmti 10) . "cmti8")
+    ((-2 medium italic roman cmti 10) . "cmti7")
+    ((-3 medium italic roman cmti 10) . "cmti6")
+    ((3 bold italic dynamic feta 16) . "feta-din16")
+    ((2 bold italic dynamic feta 16) . "feta-din16")
+    ((1 bold italic dynamic feta 13) . "feta-din13")
+    ((0 bold italic dynamic feta 11) . "feta-din11")
+    ((-1 bold italic dynamic feta 10) . "feta-din10")
+    ((-2 bold italic dynamic feta 8) . "feta-din8")
+    ((-3 bold italic dynamic feta 7) . "feta-din7")
+    ((-4 bold italic dynamic feta 5) . "feta-din5")
+    ((-5 bold italic dynamic feta 4) . "feta-din4")
     ((3 medium upright number feta-nummer 13) . "feta-nummer13")
     ((2 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((1 medium upright number feta-nummer 12) . "feta-nummer12")
+    ((1 medium upright number feta-nummer 11) . "feta-nummer11")
     ((0 medium upright number feta-nummer 10) . "feta-nummer10")
     ((-1 medium upright number feta-nummer 8) . "feta-nummer8")
-    ((-2 medium upright number feta-nummer 6) . "feta-nummer6")
+    ((-2 medium upright number feta-nummer 7) . "feta-nummer7")
     ((-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 bold upright roman cmbx 14) . "cmbx14")
+    ((1 bold upright roman cmbx 12) . "cmbx12")
     ((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" )
     ((-4 medium upright roman cmr 5) . "cmr5" )
     ((-5 medium upright roman cmr 4) . "cmr4" )
-    ((2 bold upright roman cmbx 10) . "cmbx10")
-    ((1 bold upright roman cmbx 12) . "cmbx12")
-    ((-3 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-1 medium upright math msam 10) . "msam10")
     ((0 medium upright math msam 10) . "msam10")
+    ((-1 medium upright math msam 10) . "msam10")
+    ((-2 medium upright math msam 10) . "msam10")
+    ((-3 medium upright math msam 10) . "msam10")
     ))
 
 
-;; return a FONT-DESCR with relative size incremented by INCREMENT 
-(define (change-relative-size font-desc increment)
-  (cons (+ increment (car font-desc)) (cdr font-desc))
+;; return a FONT-DESCR with relative size decremented by DECREMENT
+(define (change-relative-size font-desc decrement)
+  (cons (- (car font-desc) decrement) (cdr font-desc))
   )
 
 ;; map a  function FUNC over the keys of an alist LIST, leaving the vals.