From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 22 Sep 2003 12:46:06 +0000 (+0000)
Subject: * scm/font.scm (paper20-style-sheet-alist): add cmss entries.
X-Git-Tag: release/1.9.9~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=78f82bc5e0e509e0734d1dea28718d26fa1f8b2b;p=lilypond.git

* scm/font.scm (paper20-style-sheet-alist): add cmss entries.

* scm/define-grobs.scm (all-grob-descriptions): use sans family
for chord names.

* mf/GNUmakefile: always trace pfa fonts.
(SAUTER_FONTS): add cmss[567] too fonts
---

diff --git a/ChangeLog b/ChangeLog
index 57a6ca4fc1..2d68801a15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* scm/font.scm (paper20-style-sheet-alist): add cmss entries.
+
+	* scm/define-grobs.scm (all-grob-descriptions): use sans family
+	for chord names.
+
 	* mf/GNUmakefile: always trace pfa fonts.
+	(SAUTER_FONTS): add cmss[567] too fonts
 
 	* configure.in: require mftrace. 
 
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 88d89a4c8d..e141ba7ac7 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -52,7 +52,7 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
 SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
 	cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \
-	cmti6 cmti5 
+	cmti6 cmti5  cmss5 cmss6 cmss7
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 80ae2e3650..07e382a70b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -260,7 +260,7 @@
 	(molecule-callback . ,Text_item::brew_molecule)
 	(after-line-breaking-callback . ,Chord_name::after_line_breaking)
 	(word-space . 0.0)
-	(font-family . roman)
+	(font-family . sans)
 	(meta . ((interfaces . (font-interface 							rhythmic-grob-interface
 												text-interface chord-name-interface item-interface ))))
 	))
diff --git a/scm/font.scm b/scm/font.scm
index 78aac9913c..ba6f8feb16 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -67,6 +67,17 @@
     ((-4 medium upright roman 5) . "cmr5" )
     ((-5 medium upright roman 5) . "cmr5" )
 
+    ((4 medium upright sans 17) . "cmss17")
+    ((3 medium upright sans 17) . "cmss17")
+    ((2 medium upright sans 14) . "cmss14")
+    ((1 medium upright sans 12) . "cmss12")
+    ((0 medium upright sans 10) . "cmss10")
+    ((-1 medium upright sans 9) . "cmss9" )
+    ((-2 medium upright sans 8) . "cmss8" )
+    ((-3 medium upright sans 7) . "cmss7" )
+    ((-3 medium upright sans 6) . "cmss6" )
+    ((-4 medium upright sans 5) . "cmss5" )
+    
     ((3 medium italic roman 12) . "cmti12")
     ((2 medium italic roman 12) . "cmti12")
     ((1 medium italic roman 12) . "cmti12") ;;; ugh. Should add magnification here!