X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=b3d1712f3a299bd63ee81da3d6c73ab29895be18;hb=0984e113171297e402c88ce048e9ccf1fb3d3619;hp=281b3f891f3e4ca1db56e3874f129a6799175ad7;hpb=487d3bffab0320deac76dc842696b397496317ee;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 281b3f891f..b3d1712f3a 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -124,6 +124,20 @@ Font charter
 	Package          charter
 EndFont
 
+Font cochineal
+	GuiName          "Crimson (Cochineal)"
+	Family           rm
+	OsfOption        "proportional,osf"
+	Package          cochineal
+	AltFonts         crimson
+EndFont
+
+AltFont crimson
+	GuiName          "Crimson"
+	Family           rm
+	Package          crimson
+EndFont
+
 Font cmr
 	GuiName          "Computer Modern Roman"
 	Family           rm
@@ -149,15 +163,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
@@ -266,6 +289,20 @@ Font newcent
 	Package          newcent
 EndFont
 
+Font NotoSerif-TLF
+	GuiName          "Noto Serif"
+	Family           rm
+	SwitchDefault    1
+	Requires         noto
+	CompleteFont     noto
+EndFont
+
+AltFont noto
+	GuiName          "Noto Serif"
+	Family           rm
+	Package          noto
+EndFont
+
 Font palatino
 	GuiName          "Palatino"
 	Family           rm
@@ -414,6 +451,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 +489,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
-	SwitchDefault	1
-	Preamble
-		\renewcommand{\bfdefault}{b}
-	EndPreamble
+	GuiName         "Kurier"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
 EndFont
 
 Font kurierl
-	GuiName		"Kurier (light)"
-	Family		sf
-	SwitchDefault	1
-	Preamble
-		\renewcommand{\bfdefault}{b}
-	EndPreamble
+	GuiName         "Kurier (Light)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
 EndFont
 
-Font kurier-condensed
-	GuiName		"Kurier (condensed)"
-	Family		sf
-	Requires	kurier
-	Preamble
-		\renewcommand{\sfdefault}{kurier}
-		\edef\sfdefault{\sfdefault c}
-		\renewcommand{\bfdefault}{b}
-	EndPreamble
+Font kurierc
+	GuiName         "Kurier (Condensed)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
 EndFont
 
-Font kurier-light-condensed
-	GuiName		"Kurier (light condensed)"
-	Family		sf
-	Requires	kurier
-	Preamble
-		\renewcommand{\sfdefault}{kurierl}
-		\edef\sfdefault{\sfdefault c}
-		\renewcommand{\bfdefault}{b}
-	EndPreamble
+Font kurierlc
+	GuiName         "Kurier (Light Condensed)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
 EndFont
 
 Font lmss
@@ -489,6 +552,13 @@ Font lmss
 	Requires         lmodern
 EndFont
 
+Font NotoSans-TLF
+	GuiName          "Noto Sans"
+	Family           sf
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
 Font tgadventor
 	GuiName          "TeX Gyre Adventor"
 	Family           sf
@@ -541,6 +611,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
@@ -555,6 +632,13 @@ Font luximono
 	Package          luximono
 EndFont
 
+Font NotoMono-TLF
+	GuiName          "Noto Mono"
+	Family           tt
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
 Font tgcursor
 	GuiName          "TeX Gyre Cursor"
 	Family           tt
@@ -573,6 +657,14 @@ EndFont
 # MATH FONTS
 #
 
+Font cochineal-ntxm
+	GuiName          "Crimson (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    cochineal
+	Provides         amssymb,amsfonts
+EndFont
+
 Font eulervm
 	GuiName          "Euler VM"
 	Family           math
@@ -587,14 +679,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
+	GuiName         "Kurier (Math)"
+	Family          math
+	Requires        kurier
 	Preamble
-		\let\Myrmdefault\rmdefault
-		\usepackage[math]{kurier}
-		\renewcommand{\rmdefault}{\Myrmdefault}
+	% store roman font
+	\let\origrmdefault\rmdefault
+	\usepackage[math]{kurier}
+	% reset stored roman font
+	\renewcommand{\rmdefault}{\origrmdefault}
 	EndPreamble
 EndFont