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

diff --git a/lib/latexfonts b/lib/latexfonts
index 446e83a563..f3a438a557 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -7,6 +7,7 @@
 # Font <name>
 #	GuiName            "<Gui Name>"
 #	Family             <rm|sf|tt|math>
+#	FontEncoding       <font encoding>
 #	SwitchDefault      <0|1>
 #	Package            <LaTeX package to be loaded>
 #	Requires           <LaTeX package to test for>
@@ -33,6 +34,7 @@
 # * Adding a new font results in a FILE FORMAT CHANGE. So if a new font
 #   is added for the LyX distribution, the according changes need to be
 #   done.
+# * If FontEncoding is not specified, T1 is assumed.
 # * "SwitchDefault 1" makes the font to be loaded by switching the default
 #   family to <name> (e.g., \renewcommand{\rmdefault}{cmr}), whereas
 #   Package <package> loads it via \usepackage{package}. Only one of these
@@ -124,9 +126,24 @@ 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
+	FontEncoding     OT1
 	SwitchDefault    1
 	OsfFont          eco
 EndFont
@@ -149,14 +166,30 @@ AltFont ugm
 	GuiName          "URW Garamond"
 	Family           rm
 	SwitchDefault    1
+	Requires         ugm
 EndFont
 
 Font libertine
+	GuiName          "Libertine"
+	Family           rm
+	OsfOption        osf
+	Package          libertineRoman
+	CompleteFont     libertine-full
+	AltFonts         libertine-type1,libertine-2012,libertine-legacy
+EndFont
+
+AltFont libertine-full
+	GuiName          "Libertine"
+	Family           rm
+	Package          libertine
+	Requires         libertineRoman
+EndFont
+
+AltFont libertine-type1
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        osf
 	Package          libertine-type1
-	AltFonts         libertine-2012,libertine-legacy
 	Requires         libertineMono-type1
 EndFont
 
@@ -274,6 +307,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
@@ -312,6 +359,20 @@ AltFont pplj
 	SwitchDefault    1
 EndFont
 
+Font PTSerif-TLF
+	GuiName         "ParaType Serif"
+	Family          rm
+	Requires        paratype
+	Package         PTSerif
+	CompleteFont    paratype
+EndFont
+
+AltFont paratype
+	GuiName          "ParaType Serif"
+	Family           rm
+	Package          paratype
+EndFont
+
 Font times
 	GuiName          "Times Roman"
 	Family           rm
@@ -402,6 +463,12 @@ AltFont futj
 	SwitchDefault    1
 EndFont
 
+Font xcharter
+	GuiName         "Bitstream Charter (XCharter)"
+	Family          rm
+	Package         XCharter
+	OsfOption       osf
+EndFont
 
 #
 # SANS SERIF FONTS
@@ -422,13 +489,21 @@ Font berasans
 EndFont
 
 Font biolinum
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum
+	AltFonts         biolinum-type1,biolinum-2012
+EndFont
+
+AltFont biolinum-type1
 	GuiName          "Biolinum"
 	Family           sf
 	OsfOption        osf
 	ScaleOption      scaled=$$val
 	Package          biolinum-type1
 	Requires         libertineMono-type1
-	AltFonts         biolinum-2012
 EndFont
 
 AltFont biolinum-2012
@@ -449,6 +524,7 @@ EndFont
 Font cmss
 	GuiName          "Computer Modern Sans"
 	Family           sf
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
@@ -523,6 +599,21 @@ Font lmss
 	Requires         lmodern
 EndFont
 
+Font NotoSans-TLF
+	GuiName          "Noto Sans"
+	Family           sf
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
+Font PTSans-TLF
+	GuiName         "ParaType Sans"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTSans
+EndFont
+
 Font tgadventor
 	GuiName          "TeX Gyre Adventor"
 	Family           sf
@@ -565,6 +656,7 @@ EndFont
 Font cmtt
 	GuiName          "Computer Modern Typewriter"
 	Family           tt
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
@@ -576,6 +668,14 @@ Font courier
 EndFont
 
 Font libertine-mono
+	GuiName          "Libertine Mono"
+	Family           tt
+	ScaleOption      scaled=$$val
+	Package          libertineMono
+	AltFonts	 libertine-mono-type1
+EndFont
+
+AltFont libertine-mono-type1
 	GuiName          "Libertine Mono"
 	Family           tt
 	ScaleOption      scaled=$$val
@@ -596,6 +696,21 @@ Font luximono
 	Package          luximono
 EndFont
 
+Font NotoMono-TLF
+	GuiName          "Noto Mono"
+	Family           tt
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
+Font PTMono-TLF
+	GuiName         "ParaType Mono"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTMono
+EndFont
+
 Font tgcursor
 	GuiName          "TeX Gyre Cursor"
 	Family           tt
@@ -614,6 +729,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