X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=b390efe27d7c0e74ab29fe2c1be9f44eb6ab1434;hb=98883304e2d5f68f5be8124423295aecb43e3463;hp=4294aa7395461bad32d4835736e5b70641118f8d;hpb=036a4be387c9890c9fb59bdf3f117be5b3627865;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 4294aa7395..b390efe27d 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -149,15 +149,24 @@ 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-2012,libertine-legacy
+	Requires         libertineMono-type1
+EndFont
+
+AltFont libertine-2012
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        lining
 	OsfDefault       1
 	Package          libertine-type1
-	AltFonts         libertine-legacy
 EndFont
 
 AltFont libertine-legacy
@@ -414,6 +423,16 @@ Font berasans
 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
@@ -442,44 +461,60 @@ 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
-	Preamble
-	\renewcommand{\bfdefault}{b}
-	EndPreamble
 EndFont
 
 Font kurierl
 	GuiName         "Kurier (Light)"
 	Family          sf
-	SwitchDefault 1
-	Preamble
-	\renewcommand{\bfdefault}{b}
-	EndPreamble
+	Requires        kurier
+	SwitchDefault   1
 EndFont
 
-Font kurier-condensed
+Font kurierc
 	GuiName         "Kurier (Condensed)"
 	Family          sf
 	Requires        kurier
-	Preamble
-	\renewcommand{\sfdefault}{kurier}
-	\edef\sfdefault{\sfdefault c}
-	\renewcommand{\bfdefault}{b}
-	EndPreamble
+	SwitchDefault   1
 EndFont
 
-Font kurier-light-condensed
+Font kurierlc
 	GuiName         "Kurier (Light Condensed)"
 	Family          sf
 	Requires        kurier
-	Preamble
-	\renewcommand{\sfdefault}{kurierl}
-	\edef\sfdefault{\sfdefault c}
-	\renewcommand{\bfdefault}{b}
-	EndPreamble
+	SwitchDefault   1
 EndFont
 
 Font lmss
@@ -541,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
@@ -587,14 +629,29 @@ Font garamondx-ntxm
 	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
-	\let\Myrmdefault\rmdefault
+	% store roman font
+	\let\origrmdefault\rmdefault
 	\usepackage[math]{kurier}
-	\renewcommand{\rmdefault}{\Myrmdefault}
+	% reset stored roman font
+	\renewcommand{\rmdefault}{\origrmdefault}
 	EndPreamble
 EndFont