X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=446e83a563e03f6703981b94d9bac7e14407ae82;hb=a02af82b82d87a9b632cc7181423634f2e18dd31;hp=f7c73b38d9602dc49dfa821135cc246e53ca64b5;hpb=ecbed31e805018b573e59170c65fddde7da32f75;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index f7c73b38d9..446e83a563 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -22,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
 #
 #
@@ -53,8 +56,8 @@
 #   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
@@ -65,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
 #
@@ -130,17 +136,31 @@ 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
+EndFont
+
 Font libertine
 	GuiName          "Libertine"
 	Family           rm
-	OsfOption        lining
-	OsfDefault       1
-	Package          libertine
-	PackageOption    rm
-	AltFonts         libertine-type1,libertine-legacy
+	OsfOption        osf
+	Package          libertine-type1
+	AltFonts         libertine-2012,libertine-legacy
+	Requires         libertineMono-type1
 EndFont
 
-AltFont libertine-type1
+AltFont libertine-2012
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        lining
@@ -210,7 +230,7 @@ AltFont mdput
 EndFont
 
 Font md-garamond
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -223,7 +243,7 @@ Font md-garamond
 EndFont
 
 AltFont mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	SwitchDefault    1
 	Requires         mdugm
@@ -404,14 +424,14 @@ EndFont
 Font biolinum
 	GuiName          "Biolinum"
 	Family           sf
-	OsfOption        lining
-	OsfDefault       1
-	Package          libertine
-	PackageOption    sf
-	AltFonts         biolinum-type1
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum-type1
+	Requires         libertineMono-type1
+	AltFonts         biolinum-2012
 EndFont
 
-Font biolinum-type1
+AltFont biolinum-2012
 	GuiName          "Biolinum"
 	Family           sf
 	OsfOption        lining
@@ -440,6 +460,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
@@ -499,6 +575,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
@@ -537,6 +620,40 @@ Font eulervm
 	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