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

diff --git a/lib/latexfonts b/lib/latexfonts
index f7c73b38d9..4898c18e93 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -130,22 +130,28 @@ AltFont eco
 	Package          eco
 EndFont
 
-Font libertine
-	GuiName          "Libertine"
+Font garamondx
+	GuiName          "URW Garamond"
 	Family           rm
-	OsfOption        lining
-	OsfDefault       1
-	Package          libertine
-	PackageOption    rm
-	AltFonts         libertine-type1,libertine-legacy
+	OsfOption        osfI
+	Package          garamondx
+	Requires         garamondx-fonts
+	AltFonts         ugm
 EndFont
 
-AltFont libertine-type1
+AltFont ugm
+	GuiName          "URW Garamond"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
+Font libertine
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        lining
 	OsfDefault       1
 	Package          libertine-type1
+	AltFonts         libertine-legacy
 EndFont
 
 AltFont libertine-legacy
@@ -210,7 +216,7 @@ AltFont mdput
 EndFont
 
 Font md-garamond
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -223,7 +229,7 @@ Font md-garamond
 EndFont
 
 AltFont mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	SwitchDefault    1
 	Requires         mdugm
@@ -402,16 +408,6 @@ Font berasans
 EndFont
 
 Font biolinum
-	GuiName          "Biolinum"
-	Family           sf
-	OsfOption        lining
-	OsfDefault       1
-	Package          libertine
-	PackageOption    sf
-	AltFonts         biolinum-type1
-EndFont
-
-Font biolinum-type1
 	GuiName          "Biolinum"
 	Family           sf
 	OsfOption        lining
@@ -537,6 +533,14 @@ Font eulervm
 	Package          eulervm
 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