* scripts/lilypond.py (run_dvips): Use lm.map.

* scm/font.scm (add-cmr-fonts): Use lm fonts.

diff --git a/ChangeLog b/ChangeLog
index 7b55b619a831346877c356587dd32a2ac512d3fd..bbacd54492ee87c94cee667218fb63caff3b345d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * flower/parse-afm.cc [METATYPE1_BUG]: Grok Metatype1's global
+       `Generated' tag.
+
+       * scm/font.scm (add-cmr-fonts): Use super-cm/lmodern fonts.  NOT.
+       Severely broken (the Debian package, at least).
+
 2004-04-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/context.cc (find_create_context): assign to lvalue.

diff --git a/flower/parse-afm.cc b/flower/parse-afm.cc
index 2634ab1e20c5393cec7417550c52deacb38613b5..874371a42bd8c7f5e50a35cf0972657df25d4765 100644 (file)
--- a/flower/parse-afm.cc
+++ b/flower/parse-afm.cc
@@ -77,6 +77,9 @@ Morten Welinder <terra@diku.dk> September 1999.
 #include "parse-afm.hh"
 #include "warn.hh"
 
+#define METATYPE1_BUG   /* Parse Metatype1's (version unknown)
+                          'Generated' global tag as comment. */
+
 #define lineterm EOL   /* line terminating character */
 #define lineterm_alt '\r' /* alternative line terminating character */
 #define normalEOF 1    /* return code from parsing routines used only */
@@ -114,7 +117,11 @@ enum parseKey {
   ASCENDER, CHARBBOX, CODE, COMPCHAR, CAPHEIGHT, COMMENT, 
   DESCENDER, ENCODINGSCHEME, ENDCHARMETRICS, ENDCOMPOSITES, 
   ENDFONTMETRICS, ENDKERNDATA, ENDKERNPAIRS, ENDTRACKKERN, 
-  FAMILYNAME, FONTBBOX, FONTNAME, FULLNAME, ISFIXEDPITCH, 
+  FAMILYNAME, FONTBBOX, FONTNAME, FULLNAME,
+#ifdef METATYPE1_BUG 
+  GENERATED,
+#endif
+  ISFIXEDPITCH, 
   ITALICANGLE, KERNPAIR, KERNPAIRXAMT, LIGATURE, CHARNAME, 
   NOTICE, COMPCHARPIECE, STARTCHARMETRICS, STARTCOMPOSITES, 
   STARTFONTMETRICS, STARTKERNDATA, STARTKERNPAIRS, 
@@ -139,7 +146,11 @@ static char *keyStrings[] = {
   "Ascender", "B", "C", "CC", "CapHeight", "Comment",
   "Descender", "EncodingScheme", "EndCharMetrics", "EndComposites", 
   "EndFontMetrics", "EndKernData", "EndKernPairs", "EndTrackKern", 
-  "FamilyName", "FontBBox", "FontName", "FullName", "IsFixedPitch", 
+  "FamilyName", "FontBBox", "FontName", "FullName",
+#ifdef METATYPE1_BUG
+  "Generated",
+#endif  
+  "IsFixedPitch", 
   "ItalicAngle", "KP", "KPX", "L", "N", 
   "Notice", "PCC", "StartCharMetrics", "StartComposites", 
   "StartFontMetrics", "StartKernData", "StartKernPairs", 
@@ -157,7 +168,8 @@ static char *keyStrings[] = {
  *  reads all tokens until the next end-of-line.
  */
  
-static char *token (FILE *stream)
+static char*
+token (FILE *stream)
 {
   int ch, idx;
 
@@ -192,7 +204,8 @@ static char *token (FILE *stream)
  *  more than one word (like Comment lines and FullName).
  */
 
-static char *linetoken (FILE *stream)
+static char*
+linetoken (FILE *stream)
 {
   int ch, idx;
 
@@ -224,7 +237,8 @@ static char *linetoken (FILE *stream)
  *  The algorithm is a standard Knuth binary search.
  */
 
-static enum parseKey recognize (  register char *ident)
+static enum parseKey
+recognize (register char *ident)
 {
   int lower = 0,
     upper = (int) NOPE,
@@ -235,17 +249,23 @@ static enum parseKey recognize (  register char *ident)
   while ((upper >= lower) && !found)
     {
       midpoint = (lower + upper)/2;
-      if (keyStrings[midpoint] == NULL) break;
+      if (keyStrings[midpoint] == NULL)
+       break;
       cmpvalue = strncmp (ident, keyStrings[midpoint], MAX_NAME);
-      if (cmpvalue == 0) found = TRUE;
-      else if (cmpvalue < 0) upper = midpoint - 1;
-      else lower = midpoint + 1;
-    } /* while */
+      if (cmpvalue == 0)
+       found = TRUE;
+      else
+       if (cmpvalue < 0)
+         upper = midpoint - 1;
+      else
+       lower = midpoint + 1;
+    }
 
-  if (found) return (enum parseKey) midpoint;
-  else return NOPE;
-    
-} /* recognize */
+  if (found)
+    return (enum parseKey) midpoint;
+  else
+    return NOPE;
+}
 
 
 /************************* parseGlobals *****************************/
@@ -269,7 +289,8 @@ static enum parseKey recognize (  register char *ident)
  *  parseFile to determine if there is more file to parse.
  */
  
-static BOOL parseGlobals (FILE *fp, register AFM_GlobalFontInfo *gfi)
+static BOOL
+parseGlobals (FILE *fp, register AFM_GlobalFontInfo *gfi)
 {  
   BOOL cont = TRUE, save = (gfi != NULL);
   int error = AFM_ok;
@@ -312,6 +333,9 @@ static BOOL parseGlobals (FILE *fp, register AFM_GlobalFontInfo *gfi)
            strcpy (gfi->afmVersion, keyword);
            break;
          case COMMENT:
+#ifdef METATYPE1_BUG       
+         case GENERATED:
+#endif     
            keyword = linetoken (fp);
            break;
          case FONTNAME:
@@ -415,7 +439,7 @@ static BOOL parseGlobals (FILE *fp, register AFM_GlobalFontInfo *gfi)
 } /* parseGlobals */    
 
 
-
+#if 0
 /************************* initializeArray ************************/
 
 /*  Unmapped character codes are (at Adobe Systems) assigned the
@@ -434,7 +458,8 @@ static BOOL parseGlobals (FILE *fp, register AFM_GlobalFontInfo *gfi)
  *  file is reset to be where it was upon entering this function.
  */
  
-static int initializeArray (FILE *fp, register int *cwi)
+static int
+initializeArray (FILE *fp, register int *cwi)
 {  
   BOOL cont = TRUE, found = FALSE;
   long opos = ftell (fp);
@@ -493,7 +518,7 @@ static int initializeArray (FILE *fp, register int *cwi)
   return (error);
         
 } /* initializeArray */    
-
+#endif 
 
 /************************* parseCharWidths **************************/
 
@@ -515,7 +540,8 @@ static int initializeArray (FILE *fp, register int *cwi)
  *  parseFile to determine if there is more file to parse.
  */
  
-static int parseCharWidths (FILE *fp, register int *cwi)
+static int
+parseCharWidths (FILE *fp, register int *cwi)
 {  
   BOOL cont = TRUE, save = (cwi != NULL);
   int pos = 0, error = AFM_ok;
@@ -614,7 +640,8 @@ static int parseCharWidths (FILE *fp, register int *cwi)
  *  parseFile to determine if there is more file to parse.
  */
  
-static int parseCharMetrics (FILE *fp, register AFM_Font_info *fi)
+static int
+parseCharMetrics (FILE *fp, register AFM_Font_info *fi)
 {  
   BOOL cont = TRUE, firstTime = TRUE;
   int error = AFM_ok, count = 0;
@@ -733,7 +760,8 @@ static int parseCharMetrics (FILE *fp, register AFM_Font_info *fi)
  *  parseFile to determine if there is more file to parse.
  */
  
-static int parseAFM_TrackKernData (FILE *fp, register AFM_Font_info *fi)
+static int
+parseAFM_TrackKernData (FILE *fp, register AFM_Font_info *fi)
 {  
   BOOL cont = TRUE, save = (fi->tkd != NULL);
   int pos = 0, error = AFM_ok, tcount = 0;
@@ -770,6 +798,9 @@ static int parseAFM_TrackKernData (FILE *fp, register AFM_Font_info *fi)
        switch (recognize (keyword))
          {
          case COMMENT:
+#ifdef METATYPE1_BUG       
+         case GENERATED:
+#endif     
            keyword = linetoken (fp);
            break;
          case TRACKKERN:
@@ -835,7 +866,8 @@ static int parseAFM_TrackKernData (FILE *fp, register AFM_Font_info *fi)
  *  parseFile to determine if there is more file to parse.
  */
  
-static int parseAFM_PairKernData (FILE *fp, register AFM_Font_info *fi)
+static int
+parseAFM_PairKernData (FILE *fp, register AFM_Font_info *fi)
 {  
   BOOL cont = TRUE, save = (fi->pkd != NULL);
   int pos = 0, error = AFM_ok, pcount = 0;
@@ -959,7 +991,8 @@ static int parseAFM_PairKernData (FILE *fp, register AFM_Font_info *fi)
  *  parseFile to determine if there is more file to parse.
  */
  
-static int parseAFM_CompCharData (FILE *fp, register AFM_Font_info *fi)
+static int
+parseAFM_CompCharData (FILE *fp, register AFM_Font_info *fi)
 {  
   BOOL cont = TRUE, firstTime = TRUE, save = (fi->ccd != NULL);
   int pos = 0, j = 0, error = AFM_ok, ccount = 0, pcount = 0;
@@ -1153,7 +1186,8 @@ AFM_free (AFM_Font_info *fi)
  *  pointer upon return of this function is undefined.
  */
 
-extern int AFM_parseFile (FILE *fp, AFM_Font_info **fi, int flags)
+int
+AFM_parseFile (FILE *fp, AFM_Font_info **fi, int flags)
 {
     
   int code = AFM_ok;   /* return code from each of the parsing routines */
@@ -1165,15 +1199,28 @@ extern int AFM_parseFile (FILE *fp, AFM_Font_info **fi, int flags)
   /* storage data for the global variable ident */                           
   if (!ident)
     ident = (char *) calloc (MAX_NAME, sizeof (char)); 
-  if (ident == NULL) {error = AFM_storageProblem; return (error);}      
-  
+  if (ident == NULL)
+    {
+      error = AFM_storageProblem;
+      return error;
+    }
+
   (*fi) = (AFM_Font_info *) calloc (1, sizeof (AFM_Font_info));
-  if ((*fi) == NULL) {error = AFM_storageProblem; return (error);}      
+  if ((*fi) == NULL)
+    {
+      error = AFM_storageProblem;
+      return error;
+    }      
   
   if (flags & P_G) 
     {
-      (*fi)->gfi = (AFM_GlobalFontInfo *) calloc (1, sizeof (AFM_GlobalFontInfo));
-      if ((*fi)->gfi == NULL) {error = AFM_storageProblem; return (error);}      
+      (*fi)->gfi = (AFM_GlobalFontInfo *) calloc (1,
+                                                 sizeof (AFM_GlobalFontInfo));
+      if ((*fi)->gfi == NULL)
+       {
+         error = AFM_storageProblem;
+         return error;
+       }      
     }
     
   /* The AFM File begins with Global Font Information. This section */
@@ -1198,11 +1245,11 @@ extern int AFM_parseFile (FILE *fp, AFM_Font_info **fi, int flags)
         {
          (*fi)->cmi = (AFM_CharMetricInfo *) 
            calloc ((*fi)->numOfChars, sizeof (AFM_CharMetricInfo));
-         if ((*fi)->cmi == NULL) {
-           error = AFM_storageProblem;
-           return (error);
-
-         }
+         if ((*fi)->cmi == NULL)
+           {
+             error = AFM_storageProblem;
+             return error;
+           }
          code = parseCharMetrics (fp, *fi);             
         }
       else

diff --git a/scm/font.scm b/scm/font.scm
index 8491cd3b422e2ed93632b357e924cd04143dd6da..360e4deccd74283c160ecb026be6224e9cc1c84e 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -259,6 +259,10 @@
                ,(delay (ly:font-load "cmtt12"))
                )))))
 
+  ;; lmodern: super-cm using metapost
+  ;; lm.map: Reencoding, at fontlevel for TeX ?:
+  ;; cork-lmb10 LMRomanDemi10-Regular "enccorklm ReEncodeFont" <cork-lm.enc <lmb10.pf
+  
   (for-each
    (lambda (x)
      (add-font
@@ -270,53 +274,90 @@
       (cons (* factor (cadr x))
            (cddr x))
       ))
+
+;;; super-cm, aka lmodern (on Debian) seems rather broken:
+;;; * no usable TFM files  (no lmr10.tfm, only cork-lmr10.tfm)
+;;; * broken AFM files:
+;;;    - invalid keyword 'Generated'
+;;;    - lists FontEncoding Fontspecific  -- duh
+;;; revert to ec-fonts-mftraced for now
+;;; make this easily switchable?
+   
+;;;    `((#(roman upright medium) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmr6"))
+;;;            ,(delay (ly:font-load "lmr8")) 
+;;;            ,(delay (ly:font-load "lmr10"))
+;;;            ,(delay (ly:font-load "lmr17")))))
+
+;;;      (#(roman upright bold) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmbx6"))
+;;;            ,(delay (ly:font-load "lmbx8"))
+;;;            ,(delay (ly:font-load "lmbx10"))
+;;;            ,(delay (ly:font-load "lmbx12")))))
+     
+;;;      (#(roman italic medium) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmri7"))
+;;;            ,(delay (ly:font-load "lmri10"))
+;;;            ,(delay (ly:font-load "lmri12")))))
+;;;      (#(roman italic bold) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmbi8"))
+;;;            ,(delay (ly:font-load "lmbi10"))
+;;;            ,(delay (ly:font-load "lmbi14")))))
+     
+;;;      (#(roman caps medium) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmcs10")))))
+
+;;;      (#(roman upright bold-narrow ) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmb10")))))
+     
+;;;      (#(sans upright medium) .
+;;;       (10.0  . #(,(delay (ly:font-load "lmss8"))
+;;;             ,(delay (ly:font-load "lmss10"))
+;;;             ,(delay (ly:font-load "lmss12"))
+;;;             ,(delay (ly:font-load "lmss17")))))
+;;;      (#(sans upright bold) .
+;;;       (10.0  . #(,(delay (ly:font-load "lmssbx10")))))
+     
+;;;      (#(typewriter upright medium) .
+;;;       (10.0 . #(,(delay (ly:font-load "lmtt8"))
+;;;            ,(delay (ly:font-load "lmtt10"))
+;;;            ,(delay (ly:font-load "lmtt12"))))))))
    `((#(roman upright medium) .
       (10.0 . #(,(delay (ly:font-load "ecrm6"))
                ,(delay (ly:font-load "ecrm8")) 
                ,(delay (ly:font-load "ecrm10"))
-               ,(delay (ly:font-load "ecrm17"))
-               )))
-
+               ,(delay (ly:font-load "ecrm17"))))) 
      (#(roman upright bold) .
       (10.0 . #(,(delay (ly:font-load "ecbx6"))
                ,(delay (ly:font-load "ecbx8"))
                ,(delay (ly:font-load "ecbx10"))
-               ,(delay (ly:font-load "ecbx12"))
-               )))
-     
+               ,(delay (ly:font-load "ecbx12"))))) 
      (#(roman italic medium) .
       (10.0 . #(,(delay (ly:font-load "ecti7"))
                ,(delay (ly:font-load "ecti10"))
-               ,(delay (ly:font-load "ecti12"))
-               )))
+               ,(delay (ly:font-load "ecti12")))))
      (#(roman italic bold) .
       (10.0 . #(,(delay (ly:font-load "ecbi8"))
                ,(delay (ly:font-load "ecbi10"))
-               ,(delay (ly:font-load "ecbi14"))
-               )))
-     
-     (#(roman caps medium) .
-      (10.0 . #(,(delay (ly:font-load "eccc10")))))
-
+               ,(delay (ly:font-load "ecbi14")))))
+     ;; duplicate entry?
+     ;;(#(roman caps medium) .
+     ;; (10.0 . #(,(delay (ly:font-load "eccc10")))))
      (#(roman caps medium) .
       (10.0 . #(,(delay (ly:font-load "ecsc10")))))
-
      (#(roman upright bold-narrow ) .
-      (10.0 . #(,(delay (ly:font-load "ecb10"))
-               )))
-     
+      (10.0 . #(,(delay (ly:font-load "ecb10")))))
      (#(sans upright medium) .
       (10.0  . #(,(delay (ly:font-load "ecss8"))
                 ,(delay (ly:font-load "ecss10"))
                 ,(delay (ly:font-load "ecss12"))
-                ,(delay (ly:font-load "ecss17"))
-                )))
+                ,(delay (ly:font-load "ecss17")))))
      (#(typewriter upright medium) .
       (10.0 . #(,(delay (ly:font-load "ectt8"))
                ,(delay (ly:font-load "ectt10"))
-               ,(delay (ly:font-load "ectt12"))
-               )))
-     )))
+               ,(delay (ly:font-load "ectt12"))))))))
+
+
   
 
 ;; (display (make-font-tree 1.0))

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index b8ebb636ccf60d7b4669c2bb5c1c01edfaa8007d..e9e98492014a3c18a78403dc86726d4a05d6b634 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -501,6 +501,7 @@ leaving a PS file in OUTBASE.ps
                                pass
 
                if pfa_file:
+                       #opts = opts + ' -Ppdf -G0 -u +lm.map -u +lilypond.map'
                        opts = opts + ' -Ppdf -G0 -u +ec-mftrace.map -u +lilypond.map'
                else:
                        ly.warning (_ ('''Trying create PDF, but no PFA fonts found.