X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=12f5a2c05ed899f40baea78b342461b49f405e43;hb=b501845b2c3012b99fd7778f9aab8d7b5351eb92;hp=cf5940546fa4e712197e39e9a8e38c5cde512fe0;hpb=869b84aef9dbec9c90ba4483db0b28a3fb92b947;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index cf5940546f..12f5a2c05e 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -13,6 +13,7 @@
 #	AltPackages        <alternative packages (comma-separated)>
 #	OT1Package         <alternative package specifically for OT1 encoding>
 #	CompletePackage    <alternative package for the complete family>
+#	PackageOptions     <general options to be passed to the package>
 #	OsfOption          <option for oldstyle figure support>
 #	ScOption           <option for true smallcaps support>
 #	OsfScOption        <option for combined osf and true smallcaps support>
@@ -27,20 +28,23 @@
 #   done.
 # * "SwitchDefault 1" makes the font to be loaded by switching the default
 #   family to <name> (e.g., \renewcommand{\rmdefault}{cmr}), whereas
-#   Package <package> loads it via \usepackage{package}. Normally, only
-#   one of these options is used per font.
+#   Package <package> loads it via \usepackage{package}. Only one of these
+#   options is used per font (SwitchDefault takes precendende). Note that
+#   SwitchDefault uses the font name.
 # * If AltPackages are defined, LyX will try to load them in the defined
 #   order if the main package is not available. So
 #       Package          mathptmx
 #       AltPackages      mathptm,times
 #   will try to load mathptm if mathptmx is not available and then times
 #   if mathptm is not available either.
+#   No options will be passed to alternative packages!
 # * If Requires is set, LyX will check for this. If not, it will check
 #   for Package and AltPackages.
 # * OT1Package will load the defined package instead of the default
 #   package if the font encoding is OT1. This is necessary since some
 #   newer packages for a font do not support this encoding.
 #   The value "none" tells LyX not to load a package in OT1 encoding.
+#   No options will be passed to OT1 packages!
 # * CompletePackage is a package that is loaded if the current font is
 #   selected as rm and both sf and tt are set to "default" (this allows
 #   f. ex. to load "bera" as opposed to "beraserif").
@@ -51,9 +55,49 @@
 ##########################################################################
 
 #
-# Roman fonts
+# ROMAN FONTS
 #
 
+Font ae
+	GuiName          "AE (Almost European)"
+	Family           rm
+	Package          "ae,aecompl"
+	OT1Package       none
+	Requires         ae
+EndFont
+
+Font beraserif
+	GuiName          "Bera Serif"
+	Family           rm
+	Package          beraserif
+	CompletePackage  bera
+	Requires         bera
+EndFont
+
+Font bookman
+	GuiName          "Bookman"
+	Family           rm
+	Package          bookman
+EndFont
+
+Font ccfonts
+	GuiName          "Concrete Roman"
+	Family           rm
+	Package          ccfonts
+EndFont
+
+Font chancery
+	GuiName          "Zapf Chancery"
+	Family           rm
+	Package          chancery
+EndFont
+
+Font charter
+	GuiName          "Bitstream Charter (PSNFSS)"
+	Family           rm
+	Package          charter
+EndFont
+
 Font cmr
 	GuiName          "Computer Modern Roman"
 	Family           rm
@@ -61,26 +105,56 @@ Font cmr
 	OsfPackage       eco
 EndFont
 
+Font libertine
+	GuiName          "Libertine"
+	Family           rm
+	OsfOption        osf
+	Package          libertine
+EndFont
+
 Font lmodern
 	GuiName          "Latin Modern Roman"
 	Family           rm
 	Package          lmodern
 EndFont
 
-Font ae
-	GuiName          "AE (Almost European)"
+Font mdbch
+	GuiName          "Bitstream Charter (Mathdesign)"
 	Family           rm
-	Package          "ae,aecompl"
-	OT1Package       none
-	Requires         ae
+	OsfOption        expert
+	ScOption         expert
+	OsfScOption      expert
+	Package          mathdesign
+	PackageOption    charter
+	Requires         mdbch
 EndFont
 
-Font times
-	GuiName          "Times Roman"
+Font mdput
+	GuiName          "Utopia (Mathdesign)"
 	Family           rm
-	Package          mathptmx
-	AltPackages      "mathptm,times"
-	Requires         psnfss
+	OsfOption        expert
+	ScOption         expert
+	OsfScOption      expert
+	Package          mathdesign
+	PackageOption    utopia
+	Requires         mdput
+EndFont
+
+Font mdugm
+	GuiName          "Adobe Garamond (Mathdesign)"
+	Family           rm
+	OsfOption        expert
+	ScOption         expert
+	OsfScOption      expert
+	Package          mathdesign
+	PackageOption    garamond
+	Requires         mdugm
+EndFont
+
+Font newcent
+	GuiName          "New Century Schoolbook"
+	Family           rm
+	Package          newcent
 EndFont
 
 Font palatino
@@ -94,28 +168,18 @@ Font palatino
 	Requires         psnfss
 EndFont
 
-Font charter
-	GuiName          "Bitstream Charter"
-	Family           rm
-	Package          charter
-EndFont
-
-Font newcent
-	GuiName          "New Century Schoolbook"
-	Family           rm
-	Package          newcent
-EndFont
-
-Font bookman
-	GuiName          "Bookman"
+Font times
+	GuiName          "Times Roman"
 	Family           rm
-	Package          bookman
+	Package          mathptmx
+	AltPackages      "mathptm,times"
+	Requires         psnfss
 EndFont
 
 # fourier supersedes utopia.sty, but does
 # not work with OT1 encoding.
 Font utopia
-	GuiName          "Utopia"
+	GuiName          "Utopia (Fourier)"
 	Family           rm
 	OsfOption        oldstyle
 	ScOption         expert
@@ -124,44 +188,36 @@ Font utopia
 	OT1Package       utopia
 EndFont
 
-Font beraserif
-	GuiName          "Bera Serif"
-	Family           rm
-	Package          beraserif
-	CompletePackage  bera
-	Requires         bera
-EndFont
-
-Font ccfonts
-	GuiName          "Concrete Roman"
-	Family           rm
-	Package          ccfonts
-EndFont
-
-Font chancery
-	GuiName          "Zapf Chancery"
-	Family           rm
-	Package          chancery
-EndFont
-
 
 #
-# SansSerif fonts
+# SANS SERIF FONTS
 #
 
+Font avant
+	GuiName          "Avant Garde"
+	Family           sf
+	Package          avant
+EndFont
 
-Font cmss
-	GuiName          "Computer Modern Sans"
+Font berasans
+	GuiName          "Bera Sans"
 	Family           sf
-	SwitchDefault    1
+	ScaleOption      scaled=$$val
+	Package          berasans
+	Requires         bera
 EndFont
 
+Font cmbr
+	GuiName          "CM Bright"
+	Family           sf
+	SwitchDefault    1
+	Requires         cmbright
+EndFont
 
-Font lmss
-	GuiName          "Latin Modern Sans"
+Font cmss
+	GuiName          "Computer Modern Sans"
 	Family           sf
 	SwitchDefault    1
-	Requires         lmodern
 EndFont
 
 Font helvet
@@ -172,45 +228,39 @@ Font helvet
 	Requires         psnfss
 EndFont
 
-Font avant
-	GuiName          "Avant Garde"
+Font lmss
+	GuiName          "Latin Modern Sans"
 	Family           sf
-	Package          avant
+	SwitchDefault    1
+	Requires         lmodern
 EndFont
 
-Font berasans
-	GuiName          "Bera Sans"
-	Family           sf
+
+#
+# MONOSPACED FONTS
+#
+
+Font beramono
+	GuiName          "Bera Mono"
+	Family           tt
 	ScaleOption      scaled=$$val
-	Package          berasans
+	Package          beramono
 	Requires         bera
 EndFont
 
-Font cmbr
-	GuiName          "CM Bright"
-	Family           sf
+Font cmtl
+	GuiName          "CM Typewriter Light"
+	Family           tt
 	SwitchDefault    1
 	Requires         cmbright
 EndFont
 
-
-#
-# Monospaced fonts
-#
-
 Font cmtt
 	GuiName          "Computer Modern Typewriter"
 	Family           tt
 	SwitchDefault    1
 EndFont
 
-Font lmtt
-	GuiName          "Latin Modern Typewriter"
-	Family           tt
-	SwitchDefault    1
-	Requires         lmodern
-EndFont
-
 Font courier
 	GuiName          "Courier"
 	Family           tt
@@ -218,12 +268,11 @@ Font courier
 	Requires         psnfss
 EndFont
 
-Font beramono
-	GuiName          "Bera Mono"
+Font lmtt
+	GuiName          "Latin Modern Typewriter"
 	Family           tt
-	ScaleOption      scaled=$$val
-	Package          beramono
-	Requires         bera
+	SwitchDefault    1
+	Requires         lmodern
 EndFont
 
 Font luximono
@@ -233,10 +282,9 @@ Font luximono
 	Package          luximono
 EndFont
 
-Font cmtl
-	GuiName          "CM Typewriter Light"
+Font txtt
+	GuiName          "TX Typewriter"
 	Family           tt
 	SwitchDefault    1
-	Requires         cmbright
+	Requires         txfonts
 EndFont
-