X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=4898c18e93f24a3313947453ccd6a10d6d5c109c;hb=870121fc22a2225896e5fb9a23f1d09b5c286f5f;hp=25ca2e13a298e102c35d15e2b6edc2a6ed871609;hpb=8f9898994d93d8f215f041bf42df0e06d028bbee;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 25ca2e13a2..4898c18e93 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -130,10 +130,26 @@ 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        osf
+	OsfOption        lining
+	OsfDefault       1
 	Package          libertine-type1
 	AltFonts         libertine-legacy
 EndFont
@@ -159,7 +175,7 @@ AltFont lmr
 	Requires         lmodern
 EndFont
 
-Font mdbch
+Font md-charter
 	GuiName          "Bitstream Charter (Mathdesign)"
 	Family           rm
 	OsfOption        expert
@@ -169,9 +185,17 @@ Font mdbch
 	PackageOption    charter
 	Requires         mdbch
 	Provides         amssymb,amsfonts
+	NoMathFont       mdbch
+EndFont
+
+AltFont mdbch
+	GuiName          "Bitstream Charter (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdbch
 EndFont
 
-Font mdput
+Font md-utopia
 	GuiName          "Utopia (Mathdesign)"
 	Family           rm
 	OsfOption        expert
@@ -181,10 +205,18 @@ Font mdput
 	PackageOption    utopia
 	Requires         mdput
 	Provides         amssymb,amsfonts
+	NoMathFont       mdput
 EndFont
 
-Font mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+AltFont mdput
+	GuiName          "Utopia (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdput
+EndFont
+
+Font md-garamond
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -193,6 +225,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
@@ -326,6 +366,7 @@ Font utopia
 	Package          fourier
 	AltFonts         utopia-sty
 	OT1Font          utopia-sty
+	NoMathFont       futs
 EndFont
 
 AltFont utopia-sty
@@ -334,6 +375,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
@@ -353,6 +407,14 @@ Font berasans
 	Requires         bera
 EndFont
 
+Font biolinum
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        lining
+	OsfDefault       1
+	Package          biolinum-type1
+EndFont
+
 Font cmbr
 	GuiName          "CM Bright"
 	Family           sf
@@ -393,6 +455,13 @@ Font tgheros
 	Package          tgheros
 EndFont
 
+Font uop
+	GuiName          "URW Classico (Optima)"
+	Family           sf
+	SwitchDefault    1
+	Requires         urwclassico
+EndFont
+
 
 #
 # MONOSPACED FONTS
@@ -462,4 +531,36 @@ Font eulervm
 	GuiName          "Euler VM"
 	Family           math
 	Package          eulervm
-EndFont
\ No newline at end of file
+EndFont
+
+Font garamondx-ntxm
+	GuiName          "URW Garamond (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    garamondx
+	Provides         amssymb,amsfonts
+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