* scm/define-markup-commands.scm (upright): New markup command.

* lily/parser.yy (markup): Add STRING_IDENTIFIER.

* scm/font.scm (paper20-font-vector): cmcsc klugdge.

diff --git a/ChangeLog b/ChangeLog
index d7a05dee435f71fd480919be970890d133362011..80291d0b7cb0916be5e0a2681a1b306efb13a0bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/define-markup-commands.scm (upright): New markup command.
+
+       * lily/parser.yy (markup): Add STRING_IDENTIFIER.
+
        * scm/font.scm (paper20-font-vector): cmcsc klugdge.
 
        * scm/output-ps.scm (output-stencil): New function.
@@ -22,7 +26,7 @@
        * mf/GNUmakefile (Fontmap, Fontmap.lily): Add Fontmap for GS.
        (SAUTER_FONTS): Reinstate.
 
-       * scm/define-markup-commands.scm (smallcaps): New markup command.
+       * scm/define-markup-commands.scm (caps): New markup command.
 
        * scm/output-ps.scm (output-scopes): Experimental markup output.
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 1af8d751382bacc33c93aac83b74d1e8a5f53fe8..8b376f692ed53f2b918e42c8f4ae9d20f7566167 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2331,7 +2331,9 @@ markup:
        | MARKUP_IDENTIFIER {
                $$ = $1;
        }
-       
+       | STRING_IDENTIFIER {
+               $$ = $1;
+       }
        ;
 
 markup_list:

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 6c34795996f9089ac9fd3039b5becd38d38e9c59..b99802c0ee48cc1848dcf6c1d6f19658e291d431 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -31,15 +31,13 @@ FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
 
-SAUTER_FONTS = cmr10 \
-       cmbxti6 cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
-        cmcsc7 cmcsc8 cmcsc10 cmcsc12 \
-       cmcsc12 cmbx14 cmbx17 \
-       cmtt5 cmtt6 cmtt7 cmtt17 \
-        cmti5 cmti6 \
-       cmss5 cmss6 cmss7 cmss8
-# in tetex: cmbx5 cmbx6
-# not used: cmxbti14
+SAUTER_FONTS = cmbx14 cmbx17 \
+        cmbxti12 cmbxti14 \
+        cmbxti6 cmbxti7 cmbxti8 \
+        cmcsc12 cmcsc7 cmcsc8 \
+        cmss5 cmss6 cmss7 \
+        cmti5 cmti6 \
+        cmtt17 cmtt5 cmtt6 cmtt7
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 1c24c49ceb5dbef65ca61dc986a18b3a1da71783..c0ceebe06cdabadc8737c5e166794313868cf7c8 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -141,6 +141,11 @@ this is bold and italic
   (interpret-markup
    paper (prepend-alist-chain 'font-family 'typewriter props) arg))
 
+(def-markup-command (upright paper props arg) (markup?)
+  "Set font shape to @code{upright}."
+  (interpret-markup
+   paper (prepend-alist-chain 'font-shape 'upright props) arg))
+
 (def-markup-command (doublesharp paper props) ()
   (interpret-markup paper props (markup #:musicglyph "accidentals-4")))
 (def-markup-command (threeqsharp paper props) ()

diff --git a/scm/font.scm b/scm/font.scm
index f62aaaa0aadd268b003ef26922b20ee2af0b82d8..b1c707fdec2d0e46f5eb7191186839a5e055abfd 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -81,8 +81,7 @@ or
      (10.0 . #((10.0 . "cmb10")
               )))
     (#(medium caps roman) .
-     ;; FIXME? ps-header output
-     (20.0 . #((10.0 . "cmcsc10")
+     (10.0 . #((10.0 . "cmcsc10")
               (12.0 . "cmcsc12"))))
     (#(* * dynamic) .
      (14.0 .  #((6.0 . "feta-din6")

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 07db7a7d130fbe45a8e28db878d18b089acd4b76..ba477c005533890d3c8a9a8acbfafc63d9b89130 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -99,15 +99,23 @@
         cmbx17
         cmbxti12
         cmbxti14
+        cmbxti6
         cmbxti7
         cmbxti8
         cmcsc12
         cmcsc7
+        cmcsc8
+        cmss5
+        cmss6
+        cmss7
+        cmti5
+        cmti6
         cmtt17
-        
-        ;;; FIXME: added
-        cmbx8)))
-  
+        cmtt5
+        cmtt6
+        cmtt7)))
+
+
 (define (define-fonts internal-external-name-mag-pairs)
 
   (define (font-load-command name-mag command)
@@ -117,7 +125,12 @@
       (cond
        ((and (equal? (substring name 0 2) "cm")
             (not (member name lily-traced-cm-fonts)))
-       (string-upcase name))
+       
+       ;; huh, how is this supposed to work?
+       ;;(string-upcase name)
+       
+       (string-append name ".pfb"))
+       
        ((equal? (substring name 0 4) "feta")
        (regexp-substitute/global #f "feta([a-z-]*)([0-9]+)" name 'pre "GNU-LilyPond-feta" 1 "-" 2 'post))
        (else name)))
@@ -294,7 +307,7 @@
    (if (pair? header-stencils)
        (let ((s (output-stencils header-stencils)))
         (set! header-stencils '())
-        s)
+        (string-append s (stop-system) (start-system width height)))
        "")))
 
 (define (stem breapth width depth height) 
@@ -354,9 +367,12 @@
 (define (output-scopes paper scopes fields basename)
 
   ;; FIXME: customise/generate these
-  (let ((props '(((font-family . roman)
+  (let ((props '((;;(linewidth . 120)
+                 (font-family . roman)
                  (word-space . 1)
                  (baseline-skip . 2)
+                 (font-series . medium)
+                 (font-style . roman)
                  (font-shape . upright)
                  (font-size . 0)))))
   
@@ -404,7 +420,7 @@
 (define header-stencils '())
 
 (define (output-stencils lst)
-  (apply string-append (map (lambda (x) (output-stencil x '(0 . 0))) lst)))
+  (apply string-append (map (lambda (x) (output-stencil x '(10 . -10))) lst)))
 
 ;; TODO:
 ;; de-urg me