X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=b390efe27d7c0e74ab29fe2c1be9f44eb6ab1434;hb=935da758f4a287541d78d353b66fe72b96d72db1;hp=273da4b2d484dd11505f688e95922a7fc1225523;hpb=d37b5723c1767f1cecdb89fc99b3896e1711351f;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 273da4b2d4..b390efe27d 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -6,13 +6,14 @@
 #
 # Font <name>
 #	GuiName            "<Gui Name>"
-#	Family             <rm|sf|tt>
+#	Family             <rm|sf|tt|math>
 #	SwitchDefault      <0|1>
 #	Package            <LaTeX package to be loaded>
 #	Requires           <LaTeX package to test for>
 #	AltFonts           <alternative fonts (comma-separated)>
 #	OT1Font            <alternative font specifically for OT1 encoding>
 #	CompleteFont       <alternative package for the complete family>
+#	NoMathFont         <alternative font that does not change math>
 #	PackageOptions     <general options to be passed to the package>
 #	OsfOption          <option for oldstyle figure support>
 #	OsfFont            <extra font for oldstyle figures>
@@ -21,6 +22,9 @@
 #	OsfScOption        <option for combined osf and true smallcaps support>
 #	ScaleOption        <option for font scaling>
 #	Provides           <features provided by the font packages (comma-separated)>
+#	Preamble
+#	  <some arbitrary LaTeX code to be issued in the preamble>
+#	EndPreamble
 # EndFont
 #
 #
@@ -49,11 +53,11 @@
 #   for Package and AltFonts.
 # * OT1Font will load the defined font if the font encoding is OT1. This is
 #   necessary since some newer font packages do not support this encoding.
-#   The value "none" tells LyX not to load a package in OT1 encoding.
+#   The value "none" tells LyX not to load any font in OT1 encoding.
 #   OT1Fonts need to be defined separately using AltFont ... EndFont tags.
 # * The CompleteFont 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").
+#   both sf and tt are set to "default" (this allows for instance to load
+#   "bera" as opposed to "beraserif").
 #   CompleteFonts need to be defined separately using AltFont ... EndFont
 #   tags.
 # * OsfFont is a font that is loaded additionally in and that provides
@@ -64,9 +68,12 @@
 #   default and provide an option for lining figures. Pass this option
 #   to OsfOption.
 # * ScaleOption supports the placeholder $$val for the scale value.
+# * The Preamble code is output immediately after the respective font
+#   loading command.
 #
 ##########################################################################
 
+
 #
 # ROMAN FONTS
 #
@@ -129,12 +136,37 @@ AltFont eco
 	Package          eco
 EndFont
 
+Font garamondx
+	GuiName          "URW Garamond"
+	Family           rm
+	OsfOption        osfI
+	Package          garamondx
+	Requires         garamondx-fonts
+	AltFonts         ugm
+EndFont
+
+AltFont ugm
+	GuiName          "URW Garamond"
+	Family           rm
+	SwitchDefault    1
+	Requires         ugm
+EndFont
+
 Font libertine
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        osf
 	Package          libertine-type1
-	AltFonts         libertine-legacy
+	AltFonts         libertine-2012,libertine-legacy
+	Requires         libertineMono-type1
+EndFont
+
+AltFont libertine-2012
+	GuiName          "Libertine"
+	Family           rm
+	OsfOption        lining
+	OsfDefault       1
+	Package          libertine-type1
 EndFont
 
 AltFont libertine-legacy
@@ -148,9 +180,17 @@ Font lmodern
 	GuiName          "Latin Modern Roman"
 	Family           rm
 	Package          lmodern
+	NoMathFont       lmr
+EndFont
+
+AltFont lmr
+	GuiName          "Latin Modern Roman"
+	Family           rm
+	SwitchDefault    1
+	Requires         lmodern
 EndFont
 
-Font mdbch
+Font md-charter
 	GuiName          "Bitstream Charter (Mathdesign)"
 	Family           rm
 	OsfOption        expert
@@ -160,9 +200,17 @@ Font mdbch
 	PackageOption    charter
 	Requires         mdbch
 	Provides         amssymb,amsfonts
+	NoMathFont       mdbch
 EndFont
 
-Font mdput
+AltFont mdbch
+	GuiName          "Bitstream Charter (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdbch
+EndFont
+
+Font md-utopia
 	GuiName          "Utopia (Mathdesign)"
 	Family           rm
 	OsfOption        expert
@@ -172,10 +220,18 @@ Font mdput
 	PackageOption    utopia
 	Requires         mdput
 	Provides         amssymb,amsfonts
+	NoMathFont       mdput
+EndFont
+
+AltFont mdput
+	GuiName          "Utopia (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdput
 EndFont
 
-Font mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+Font md-garamond
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -184,6 +240,14 @@ Font mdugm
 	PackageOption    garamond
 	Requires         mdugm
 	Provides         amssymb,amsfonts
+	NoMathFont       mdugm
+EndFont
+
+AltFont mdugm
+	GuiName          "URW Garamond (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdugm
 EndFont
 
 Font minionpro
@@ -193,6 +257,16 @@ Font minionpro
 	OsfDefault       1
 	Package          MinionPro
 	Provides         amssymb,amsfonts
+	NoMathFont       minionpro-nomath
+EndFont
+
+AltFont minionpro-nomath
+	GuiName          "Minion Pro"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          MinionPro
+	PackageOption    onlytext
 EndFont
 
 Font newcent
@@ -209,6 +283,7 @@ Font palatino
 	OsfScOption      osf
 	Package          mathpazo
 	AltFonts         mathpple,palatino-sty
+	NoMathFont       ppl
 	Requires         psnfss
 EndFont
 
@@ -216,6 +291,7 @@ AltFont mathpple
 	GuiName          "Palatino"
 	Family           rm
 	Package          mathpple
+	NoMathFont       ppl
 EndFont
 
 AltFont palatino-sty
@@ -224,11 +300,25 @@ AltFont palatino-sty
 	Package          palatino
 EndFont
 
+AltFont ppl
+	GuiName          "Palatino"
+	Family           rm
+	OsfFont          pplj
+	SwitchDefault    1
+EndFont
+
+AltFont pplj
+	GuiName          "Palatino"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
 Font times
 	GuiName          "Times Roman"
 	Family           rm
 	Package          mathptmx
 	AltFonts         mathptm,times-sty
+	NoMathFont       ptm
 	Requires         psnfss
 EndFont
 
@@ -236,6 +326,7 @@ AltFont mathptm
 	GuiName          "Times Roman"
 	Family           rm
 	Package          mathptm
+	NoMathFont       ptm
 EndFont
 
 AltFont times-sty
@@ -244,6 +335,12 @@ AltFont times-sty
 	Package          times
 EndFont
 
+AltFont ptm
+	GuiName          "Times Roman"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
 Font tgbonum
 	GuiName          "TeX Gyre Bonum"
 	Family           rm
@@ -284,6 +381,7 @@ Font utopia
 	Package          fourier
 	AltFonts         utopia-sty
 	OT1Font          utopia-sty
+	NoMathFont       futs
 EndFont
 
 AltFont utopia-sty
@@ -292,6 +390,19 @@ AltFont utopia-sty
 	Package          utopia
 EndFont
 
+AltFont futs
+	GuiName          "Utopia (Fourier)"
+	Family           rm
+	SwitchDefault    1
+	OsfFont          futj
+EndFont
+
+AltFont futj
+	GuiName          "Utopia (Fourier)"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
 
 #
 # SANS SERIF FONTS
@@ -311,6 +422,24 @@ Font berasans
 	Requires         bera
 EndFont
 
+Font biolinum
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum-type1
+	Requires         libertineMono-type1
+	AltFonts         biolinum-2012
+EndFont
+
+AltFont biolinum-2012
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        lining
+	OsfDefault       1
+	Package          biolinum-type1
+EndFont
+
 Font cmbr
 	GuiName          "CM Bright"
 	Family           sf
@@ -332,6 +461,62 @@ Font helvet
 	Requires         psnfss
 EndFont
 
+Font iwona
+	GuiName         "Iwona"
+	Family          sf
+	Requires        iwona
+	SwitchDefault   1
+EndFont
+
+Font iwonal
+	GuiName         "Iwona (Light)"
+	Family          sf
+	Requires        iwona
+	SwitchDefault   1
+EndFont
+
+Font iwonac
+	GuiName         "Iwona (Condensed)"
+	Family          sf
+	Requires        iwona
+	SwitchDefault   1
+EndFont
+
+Font iwonalc
+	GuiName         "Iwona (Light Condensed)"
+	Family          sf
+	Requires        iwona
+	SwitchDefault   1
+EndFont
+
+Font kurier
+	GuiName         "Kurier"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+Font kurierl
+	GuiName         "Kurier (Light)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+Font kurierc
+	GuiName         "Kurier (Condensed)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+Font kurierlc
+	GuiName         "Kurier (Light Condensed)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
 Font lmss
 	GuiName          "Latin Modern Sans"
 	Family           sf
@@ -351,6 +536,13 @@ Font tgheros
 	Package          tgheros
 EndFont
 
+Font uop
+	GuiName          "URW Classico (Optima)"
+	Family           sf
+	SwitchDefault    1
+	Requires         urwclassico
+EndFont
+
 
 #
 # MONOSPACED FONTS
@@ -384,6 +576,13 @@ Font courier
 	Requires         psnfss
 EndFont
 
+Font libertine-mono
+	GuiName          "Libertine Mono"
+	Family           tt
+	ScaleOption      scaled=$$val
+	Package          libertineMono-type1
+EndFont
+
 Font lmtt
 	GuiName          "Latin Modern Typewriter"
 	Family           tt
@@ -410,3 +609,72 @@ Font txtt
 	SwitchDefault    1
 	Requires         txfonts
 EndFont
+
+
+#
+# MATH FONTS
+#
+
+Font eulervm
+	GuiName          "Euler VM"
+	Family           math
+	Package          eulervm
+EndFont
+
+Font garamondx-ntxm
+	GuiName          "URW Garamond (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    garamondx
+	Provides         amssymb,amsfonts
+EndFont
+
+Font iwona-math
+	GuiName         "Iwona (Math)"
+	Family          math
+	Requires        iwona
+	Preamble
+	% store roman font
+	\let\origrmdefault\rmdefault
+	\usepackage[math]{iwona}
+	% reset stored roman font
+	\renewcommand{\rmdefault}{\origrmdefault}
+	EndPreamble
+EndFont
+
+Font kurier-math
+	GuiName         "Kurier (Math)"
+	Family          math
+	Requires        kurier
+	Preamble
+	% store roman font
+	\let\origrmdefault\rmdefault
+	\usepackage[math]{kurier}
+	% reset stored roman font
+	\renewcommand{\rmdefault}{\origrmdefault}
+	EndPreamble
+EndFont
+
+Font libertine-ntxm
+	GuiName          "Libertine (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    libertine
+	Provides         amssymb,amsfonts
+EndFont
+
+Font minion-ntxm
+	GuiName          "Minion Pro (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    minion
+	Requires         minion2newtx
+	Provides         amssymb,amsfonts
+EndFont
+
+Font newtxmath
+	GuiName          "Times Roman (New TX)"
+	Family           math
+	Package          newtxmath
+	Provides         amssymb,amsfonts
+EndFont