LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File cedilla-config.lisp.patch of Package cedilla (Project openSUSE:Factory)

diff -ru cedilla-0.6.orig/cedilla-config.lisp cedilla-0.6/cedilla-config.lisp
--- cedilla-0.6.orig/cedilla-config.lisp	2006-02-15 21:52:09.000000000 +0100
+++ cedilla-0.6/cedilla-config.lisp	2006-07-20 15:56:10.000000000 +0200
@@ -18,38 +18,38 @@
 ;;; Font sets using standard PS fonts.
 
 (define-fontset "courier"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/adobe/courier/pcrr8a.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/adobe/courier/pcrr8a.afm"
      :omit ,*greek-glyph-names*)
     (:built-in :width 600 :cap-height 562 :x-height 426)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "times"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/adobe/times/ptmr8a.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/adobe/times/ptmr8a.afm"
      :omit ,*greek-glyph-names*)
     (:built-in :width 667 :figure-width 500 :cap-height 662 :x-height 450)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "helvetica"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/adobe/helvetic/phvr8a.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/adobe/helvetic/phvr8a.afm"
      :omit ,*greek-glyph-names*)
     (:built-in :width 722 :figure-width 556 :cap-height 718 :x-height 523)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; Just like Courier, but with narrower spaces.
 
 (define-fontset "courier-space"
   `((:space :width 300)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/courier/pcrr8a.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/courier/pcrr8a.afm"
      :omit ,*greek-glyph-names*)
     (:built-in :width 600 :cap-height 562 :x-height 426)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; Random free fonts.
@@ -59,52 +59,67 @@
 ;;; compatibility with the IBM-PC character set.
    
 (define-fontset "ibm-courier"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/cour.afm"
+  `((:afm "/usr/share/fonts/Type1/cour.afm"
+     :resources ("/usr/share/fonts/Type1/cour.pfa")
+     :omit ,*greek-glyph-names*)
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/cour.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/cour.pfa")
      :omit ,*greek-glyph-names*)
     (:built-in :width 600 :cap-height 562 :x-height 426)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; An Adobe font that found its way into X11R5.
 
 (define-fontset "utopia"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/UTRG____.afm"
+  `((:afm "/usr/share/fonts/Type1/UTRG____.afm"
+     :resources ("/usr/share/fonts/Type1/UTRG____.pfa")
+     :omit ,*greek-glyph-names*)
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/UTRG____.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/UTRG____.pfa")
      :omit ,*greek-glyph-names*)
     (:built-in :width 684 :figure-width 530 :cap-height 692 :x-height 509)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; The Luxi fonts, included with XFree86 4.2.0.
 
 (define-fontset "luxi-mono"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/l047013t.afm"
+  `((:afm "/usr/share/fonts/Type1/l047013t.afm"
+     :resources ("/usr/share/fonts/Type1/l047013t.pfa")
+     :omit ,*greek-glyph-names*)
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/l047013t.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/l047013t.pfa")
      :omit ,*greek-glyph-names*)
     (:built-in :width 600 :cap-height 692 :x-height 509)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "luxi-sans"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/l048013t.afm"
+  `((:afm "/usr/share/fonts/Type1/l048013t.afm"
+     :resources ("/usr/share/fonts/Type1/l048013t.pfa")
+     :omit ,*greek-glyph-names*)
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/l048013t.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/l048013t.pfa")
      :omit ,*greek-glyph-names*)
     (:built-in :width 722 :figure-width 556 :cap-height 723 :x-height 530)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "luxi-serif"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/l049013t.afm"
+  `((:afm "/usr/share/fonts/Type1/l049013t.afm"
+     :resources ("/usr/share/fonts/Type1/l049013t.pfa")
+     :omit ,*greek-glyph-names*)
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/l049013t.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/l049013t.pfa")
      :omit ,*greek-glyph-names*)
     (:built-in :width 667 :figure-width 500 :cap-height 723 :x-height 530)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; The Omega Serif fonts, a set of international fonts provided with
@@ -119,48 +134,48 @@
 (defparameter *omega-serif-fonts*
   `(
     ;; Omega Serif Common
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omseco.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omseco.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omseco.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omseco.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Latin
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omsela.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omsela.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omsela.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omsela.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Greek
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omsegr.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omsegr.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omsegr.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omsegr.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Cyrillic and Cyrillic Extended
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omsecy.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omsecy.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omsecy.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omsecy.pfb")
      :encoding ,#'omega-encoding)
     #+ignore
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omsecx.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omsecx.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omsecx.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omsecx.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Armenian
     #+ignore
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omseha.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omseha.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omseha.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omseha.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Hebrew
     #+ignore
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omsehe.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omsehe.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omsehe.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omsehe.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif Tifinagh
     #+ignore
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omseti.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omseti.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omseti.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omseti.pfb")
      :encoding ,#'omega-encoding)
     ;; Omega Serif IPA
     #+ignore
-    (:afm "/usr/share/texmf-tetex/fonts/afm/public/omega/omseip.afm"
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/omega/omseip.pfb")
+    (:afm "/usr/share/texmf/fonts/afm/public/omega/omseip.afm"
+     :resources ("/usr/share/texmf/fonts/type1/public/omega/omseip.pfb")
      :encoding ,#'omega-encoding)
     (:built-in :width 667 :figure-width 500 :cap-height 662 :x-height 450)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 )
 
@@ -173,30 +188,30 @@
 ;;; The alternative is to use them with the Times-Roman font, with
 ;;; which they blend well
 (define-fontset "times-omega-serif"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/adobe/times/ptmr8a.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/adobe/times/ptmr8a.afm"
      :omit ,*greek-glyph-names*)
     ,@*omega-serif-fonts*))
 
 ;;; Antykwa Poltawskiego.
 
 (define-fontset "antp"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/public/antp/antpr.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/public/antp/antpr.afm"
      :omit ,*greek-glyph-names*
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/antp/antpr.pfb"))
+     :resources ("/usr/share/texmf/fonts/type1/public/antp/antpr.pfb"))
     (:built-in :width 656 :figure-width 480 :cap-height 700 :x-height 440)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; Antykwa Torunska.
 
 (define-fontset "antt"
-  `((:afm "/usr/share/texmf-tetex/fonts/afm/public/antt/anttr.afm"
+  `((:afm "/usr/share/texmf/fonts/afm/public/antt/anttr.afm"
      :omit ,*greek-glyph-names*
-     :resources ("/usr/share/texmf-tetex/fonts/type1/public/antt/anttr.pfb"))
+     :resources ("/usr/share/texmf/fonts/type1/public/antt/anttr.pfb"))
     (:built-in :width 763 :figure-width 520 :cap-height 714 :x-height 504)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; The URW++ fonts included with Ghostscript.  Older versions cover
@@ -204,78 +219,78 @@
 ;;; languages.  Recent add Cyrillic glyphs.
 
 (define-fontset "urw-gothic"
-  `((:afm "/usr/share/fonts/type1/gsfonts/a010013l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/a010013l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/a010013l.afm"
+     :resources ("/usr/share/ghostscript/fonts/a010013l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 813 :figure-width 554 :cap-height 739 :x-height 547)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
     
 (define-fontset "bookman"
-  `((:afm "/usr/share/fonts/type1/gsfonts/b018012l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/b018012l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/b018012l.afm"
+     :resources ("/usr/share/ghostscript/fonts/b018012l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 740 :figure-width 620 :cap-height 681 :x-height 485)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
     
 (define-fontset "century-schoolbook"
-  `((:afm "/usr/share/fonts/type1/gsfonts/c059013l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/c059013l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/c059013l.afm"
+     :resources ("/usr/share/ghostscript/fonts/c059013l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 722 :figure-width 556 :cap-height 722 :x-height 466)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "nimbus-sans"
-  `((:afm "/usr/share/fonts/type1/gsfonts/n019003l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/n019003l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/n019003l.afm"
+     :resources ("/usr/share/ghostscript/fonts/n019003l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 667 :figure-width 556 :cap-height 729 :x-height 524)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "nimbus-roman"
-  `((:afm "/usr/share/fonts/type1/gsfonts/n021003l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/n021003l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/n021003l.afm"
+     :resources ("/usr/share/ghostscript/fonts/n021003l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 667 :figure-width 500 :cap-height 662 :x-height 450)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "nimbus-mono"
-  `((:afm "/usr/share/fonts/type1/gsfonts/n022003l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/n022003l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/n022003l.afm"
+     :resources ("/usr/share/ghostscript/fonts/n022003l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 600 :figure-width 600 :cap-height 563 :x-height 417)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 (define-fontset "palladio"
-  `((:afm "/usr/share/fonts/type1/gsfonts/p052003l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/p052003l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/p052003l.afm"
+     :resources ("/usr/share/ghostscript/fonts/p052003l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 709 :figure-width 500 :cap-height 692 :x-height 469)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; Cedilla really should compensate for the font's ItalicAngle when
 ;;; positioning diacritics.
 
 (define-fontset "chancery"
-  `((:afm "/usr/share/fonts/type1/gsfonts/z003034l.afm"
-     :resources ("/usr/share/fonts/type1/gsfonts/z003034l.pfb")
+  `((:afm "/usr/share/ghostscript/fonts/z003034l.afm"
+     :resources ("/usr/share/ghostscript/fonts/z003034l.pfb")
      :omit ,*greek-glyph-names*)
     (:built-in :width 520 :figure-width 440 :cap-height 678 :x-height 411)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; This is a Cyrillic font that uses standard glyph names -- no
@@ -286,12 +301,15 @@
 ;;; uni0259 (schwa), so we omit that.
 
 (define-fontset "cyrillic-courier"
-  `((:afm "/usr/X11R6/lib/X11/fonts/Type1/n022003d.afm"
+  `((:afm "/usr/share/fontsType1/n022003d.afm"
+     :resources ("/usr/share/fonts/Type1/n022003d.pfb")
+     :omit ("uni0259" ,@*greek-glyph-names*))
+    (:afm "/usr/X11R6/lib/X11/fonts/Type1/n022003d.afm"
      :resources ("/usr/X11R6/lib/X11/fonts/Type1/n022003d.pfb")
      :omit ("uni0259" ,@*greek-glyph-names*))
     (:built-in :width 600 :cap-height 562 :x-height 426)
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/symbol/psyr.afm")
-    (:afm "/usr/share/texmf-tetex/fonts/afm/adobe/zapfding/pzdr.afm"
+    (:afm "/usr/share/texmf/fonts/afm/adobe/symbol/psyr.afm")
+    (:afm "/usr/share/texmf/fonts/afm/adobe/zapfding/pzdr.afm"
      :encoding ,#'zapf-dingbats-encoding)))
 
 ;;; Paper sizes.  See macros.lisp for additional keyword arguments.