X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=3120233fd8699cd5bdfb3d6bbd99bad9b468de09;hb=07625d55be6d966713bd025e1103d5534e099457;hp=72322f26ae420d9499022a827b12e691d7165c71;hpb=b6dc8c8a4aa87084645f14fed90e007f2f4d9a7e;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 72322f26ae..3120233fd8 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -19,9 +19,11 @@
 #	OsfOption          <option for oldstyle figure support>
 #	OsfFont            <extra font for oldstyle figures>
 #	OsfDefault         <0|1>
+#	OsfFontOnly        <0|1>
 #	ScOption           <option for true smallcaps support>
 #	OsfScOption        <option for combined osf and true smallcaps support>
 #	ScaleOption        <option for font scaling>
+#	ScaleCommand       <command sequence to set scale value of the font>
 #       MoreOptions        <0|1>
 #	Provides           <features provided by the font packages (comma-separated)>
 #	Preamble
@@ -65,13 +67,17 @@
 #   tags.
 # * OsfFont is a font that is loaded additionally in and that provides
 #   Old Style Figures for a given font (e.g. eco).
+# * If OsfFontOnly is true, then the OsfFont will replace the non-OsF
+#   one (only OsfFont is loaded if osf is true). Otherwise it will
+#   complement the non-osf font.
 # * OsfScOption overrides any OsfOption and ScOption if both features
 #   are selected.
 # * ScOption and OsfScOption are currently only supported for rm fonts.
 # * Set OsfDefault to true for fonts which have Old Style Figures by
 #   default and provide an option for lining figures. Pass this option
 #   to OsfOption.
-# * ScaleOption supports the placeholder $$val for the scale value.
+# * ScaleOption and ScaleCommand support the placeholder $$val for the
+#   scale value.
 # * If MoreOptions is true, then the user can insert additional options to
 #   the font package via the Document Settings.
 # * The Preamble code is output immediately after the respective font
@@ -154,6 +160,50 @@ Font cmr
 	OsfFont          eco
 EndFont
 
+Font CrimsonPro
+	GuiName          "Crimson Pro"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          CrimsonPro
+	AltFonts         crimson
+	MoreOptions      1
+	FontEncoding     OT1,T1,LY1,TS1
+EndFont
+
+Font CrimsonProMedium
+	GuiName          "Crimson Pro (Medium)"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          CrimsonPro
+	PackageOptions   medium
+	MoreOptions      1
+	FontEncoding     OT1,T1,LY1,TS1
+EndFont
+
+Font CrimsonProLight
+	GuiName          "Crimson Pro (Light)"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          CrimsonPro
+	PackageOptions   light
+	MoreOptions      1
+	FontEncoding     OT1,T1,LY1,TS1
+EndFont
+
+Font CrimsonProExtraLight
+	GuiName          "Crimson Pro (Extralight)"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          CrimsonPro
+	PackageOptions   extralight
+	MoreOptions      1
+	FontEncoding     OT1,T1,LY1,TS1
+EndFont
+
 Font DejaVuSerif
 	GuiName          "DejaVu Serif"
 	Family           rm
@@ -182,7 +232,7 @@ Font IBMPlexSerifThin
 	GuiName          "IBM Plex Serif (Thin)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    thin
+	PackageOptions   thin
 	MoreOptions      1
 EndFont
 
@@ -190,7 +240,7 @@ Font IBMPlexSerifExtraLight
 	GuiName          "IBM Plex Serif (Extra Light)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    extralight
+	PackageOptions   extralight
 	MoreOptions      1
 EndFont
 
@@ -198,20 +248,12 @@ Font IBMPlexSerifLight
 	GuiName          "IBM Plex Serif (Light)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    light
-	MoreOptions      1
-EndFont
-
-Font IBMPlexSerifSemibold
-	GuiName          "IBM Plex Serif (Semibold)"
-	Family           rm
-	Package          plex-serif
-	PackageOption    semibold
+	PackageOptions   light
 	MoreOptions      1
 EndFont
 
 Font ADOBESourceSerifPro
-	GuiName		 "Adobe Source Serif Pro"
+	GuiName		 "Source Serif Pro"
 	Family		 rm
 	Package		 sourceserifpro
 	OsfOption        osf
@@ -276,6 +318,25 @@ AltFont libertine-legacy
 	Package          libertine
 EndFont
 
+Font libertinus
+	GuiName          "Libertinus"
+	Family           rm
+	OsfOption        osf
+	Package          libertinus
+	PackageOptions   serif
+	CompleteFont     libertinus-full
+	MoreOptions      1
+
+EndFont
+
+AltFont libertinus-full
+	GuiName          "Libertinus"
+	Family           rm
+	OsfOption        osf
+	Package          libertinus
+	MoreOptions      1
+EndFont
+
 Font lmodern
 	GuiName          "Latin Modern Roman"
 	Family           rm
@@ -298,7 +359,7 @@ Font md-charter
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    charter
+	PackageOptions   charter
 	Requires         mdbch
 	Provides         amssymb,amsfonts
 	NoMathFont       mdbch
@@ -318,7 +379,7 @@ Font md-utopia
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    utopia
+	PackageOptions   utopia
 	Requires         mdput
 	Provides         amssymb,amsfonts
 	NoMathFont       mdput
@@ -338,7 +399,7 @@ Font md-garamond
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    garamond
+	PackageOptions   garamond
 	Requires         mdugm
 	Provides         amssymb,amsfonts
 	NoMathFont       mdugm
@@ -368,7 +429,7 @@ AltFont minionpro-nomath
 	OsfOption        lf
 	OsfDefault       1
 	Package          MinionPro
-	PackageOption    onlytext
+	PackageOptions   onlytext
 EndFont
 
 Font newcent
@@ -378,78 +439,58 @@ Font newcent
 EndFont
 
 Font NotoSerifRegular
-	GuiName         "Noto Serif Regular"
-	Family          rm
-	Package         noto-serif
-	PackageOption   regular
-	OsfDefault	0
-	OsfOption	osf
-	AltFonts	NotoSerifRegular1
+	GuiName          "Noto Serif"
+	Family           rm
+	Package          noto-serif
+	OsfOption	 osf
 	MoreOptions      1
+	CompleteFont     noto
 EndFont
 
-AltFont NotoSerifRegular1
-	GuiName         "Noto Serif Regular"
-	Family          rm
-	Package         noto-serif
-	PackageOption   regular
-	OsfDefault	1
-	OsfOption	osf
+AltFont noto
+	GuiName          "Noto Serif"
+	Family           rm
+	Package          noto
+	OsfOption	 osf
 	MoreOptions      1
 EndFont
 
 Font NotoSerifMedium
-	GuiName         "Noto Serif (Medium)"
-	Family          rm
-	Package         noto-serif
-	PackageOption   medium
-	OsfDefault	0
-	OsfOption	osf
+	GuiName          "Noto Serif (Medium)"
+	Family           rm
+	Package          noto-serif
+	PackageOptions   medium
+	OsfDefault	 0
+	OsfOption	 osf
 	MoreOptions      1
 EndFont
 
 Font NotoSerifThin
-	GuiName         "Noto Serif (Thin)"
-	Family          rm
-	Package         noto-serif
-	PackageOption   thin
-	OsfDefault	0
-	OsfOption	osf
+	GuiName          "Noto Serif (Thin)"
+	Family           rm
+	Package          noto-serif
+	PackageOptions   thin
+	OsfDefault	 0
+	OsfOption	 osf
 	MoreOptions      1
 EndFont
 
 Font NotoSerifLight
-	GuiName         "Noto Serif (Light)"
-	Family          rm
-	Package         noto-serif
-	PackageOption   light
-	OsfDefault	0
-	OsfOption	osf
+	GuiName          "Noto Serif (Light)"
+	Family           rm
+	Package          noto-serif
+	PackageOptions   light
+	OsfDefault	 0
+	OsfOption	 osf
 	MoreOptions      1
 EndFont
 
 Font NotoSerifExtralight
-	GuiName         "Noto Serif (Extralight)"
-	Family          rm
-	Package         noto-serif
-	PackageOption   extralight
-	OsfDefault	0
-	OsfOption	osf
-	MoreOptions     1
-EndFont
-
-Font NotoSerif-TLF
-	GuiName          "Noto Serif"
-	Family           rm
-	SwitchDefault    1
-	Requires         noto
-	CompleteFont     noto
-EndFont
-
-AltFont noto
-	GuiName          "Noto Serif"
+	GuiName          "Noto Serif (Extralight)"
 	Family           rm
-	Package          noto
+	Package          noto-serif
+	PackageOptions   extralight
+	OsfDefault	 0
 	OsfOption	 osf
 	MoreOptions      1
 EndFont
@@ -484,6 +525,7 @@ AltFont ppl
 	GuiName          "Palatino"
 	Family           rm
 	OsfFont          pplj
+	OsfFontOnly      1
 	SwitchDefault    1
 EndFont
 
@@ -494,17 +536,10 @@ AltFont pplj
 EndFont
 
 Font PTSerif-TLF
-	GuiName         "ParaType Serif"
+	GuiName         "PT Serif"
 	Family          rm
 	Requires        paratype
 	Package         PTSerif
-	CompleteFont    paratype
-EndFont
-
-AltFont paratype
-	GuiName          "ParaType Serif"
-	Family           rm
-	Package          paratype
 EndFont
 
 Font times
@@ -591,6 +626,7 @@ AltFont futs
 	Family           rm
 	SwitchDefault    1
 	OsfFont          futj
+	OsfFontOnly      1
 EndFont
 
 AltFont futj
@@ -659,12 +695,55 @@ Font cantarell
 	Family		sf
 	OsfOption	oldstyle
 	Package		cantarell
-	PackageOption	"defaultsans"
+	PackageOptions	"defaultsans"
 	MoreOptions      1
 	FontEncoding	T2A,T1,OT1
 	ScaleOption	scale=$$val
 EndFont
 
+Font ChivoThin
+	GuiName          "Chivo (Thin)"
+	Family           sf
+	OsfOption       oldstyle
+	Package          Chivo
+	PackageOptions   "thin"
+	MoreOptions      1
+	FontEncoding     OT1,LY1,T1,TS1
+	ScaleOption      scale=$$val
+EndFont
+
+Font ChivoLight
+	GuiName          "Chivo (Light)"
+	Family           sf
+	OsfOption       oldstyle
+	Package          Chivo
+	PackageOptions   "light"
+	MoreOptions      1
+	FontEncoding     OT1,LY1,T1,TS1
+	ScaleOption      scale=$$val
+EndFont
+
+Font Chivo
+	GuiName          "Chivo"
+	Family           sf
+	OsfOption       oldstyle
+	Package          Chivo
+	MoreOptions      1
+	FontEncoding     OT1,LY1,T1,TS1
+	ScaleOption      scale=$$val
+EndFont
+
+Font ChivoMedium
+	GuiName          "Chivo (Medium)"
+	Family           sf
+	OsfOption       oldstyle
+	Package          Chivo
+	PackageOptions   "medium"
+	MoreOptions      1
+	FontEncoding     OT1,LY1,T1,TS1
+	ScaleOption      scale=$$val
+EndFont
+
 Font cmbr
 	GuiName          "CM Bright"
 	Family           sf
@@ -687,12 +766,83 @@ Font DejaVuSans
 EndFont
 
 Font DejaVuSansCondensed
-	GuiName          "DejaVu Sans Condensed"
+	GuiName          "DejaVu Sans (Condensed)"
 	Family           sf
 	Package          DejaVuSansCondensed
 	ScaleOption      scaled=$$val
 EndFont
 
+Font FiraSans
+	GuiName         "Fira Sans"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansBook
+	GuiName         "Fira Sans (Book)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+        PackageOptions  book
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansLight
+	GuiName         "Fira Sans (Light)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+	PackageOptions  light
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansExtralight
+	GuiName         "Fira Sans (Extralight)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+	PackageOptions  extralight
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansUltralight
+	GuiName         "Fira Sans (Ultralight)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+	PackageOptions  ultralight
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
+Font FiraSansThin
+	GuiName         "Fira Sans (Thin)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         FiraSans
+	PackageOptions  thin
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
 Font IBMPlexSans
 	GuiName          "IBM Plex Sans"
 	Family           sf
@@ -705,7 +855,7 @@ Font IBMPlexSansCondensed
 	GuiName          "IBM Plex Sans (Condensed)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    condensed
+	PackageOptions   condensed
 	ScaleOption      scale=$$val
 	MoreOptions      1
 EndFont
@@ -714,7 +864,7 @@ Font IBMPlexSansThin
 	GuiName          "IBM Plex Sans (Thin)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    thin
+	PackageOptions   thin
 	ScaleOption      scale=$$val
 	MoreOptions      1
 EndFont
@@ -723,7 +873,7 @@ Font IBMPlexSansExtraLight
 	GuiName          "IBM Plex Sans (Extra Light)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    extralight
+	PackageOptions   extralight
 	ScaleOption      scale=$$val
 	MoreOptions      1
 EndFont
@@ -732,22 +882,13 @@ Font IBMPlexSansLight
 	GuiName          "IBM Plex Sans (Light)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    light
-	ScaleOption      scale=$$val
-	MoreOptions      1
-EndFont
-
-Font IBMPlexSansSemibold
-	GuiName          "IBM Plex Sans (Semibold)"
-	Family           sf
-	Package          plex-sans
-	PackageOption    semibold
+	PackageOptions   light
 	ScaleOption      scale=$$val
 	MoreOptions      1
 EndFont
 
 Font ADOBESourceSansPro
-	GuiName		 "Adobe Source Sans Pro"
+	GuiName		 "Source Sans Pro"
 	Family		 sf
 	Package		 sourcesanspro
 	ScaleOption	 scaled=$$val
@@ -819,6 +960,24 @@ Font kurierlc
 	SwitchDefault   1
 EndFont
 
+Font LibertinusSans-LF
+	GuiName          "Libertinus Sans"
+	Family           sf
+	Requires         libertinus
+	SwitchDefault    1
+	OsfFont          LibertinusSans-OsF
+	OsfFontOnly      1
+	ScaleCommand     \renewcommand*{\LibertinusSans@scale}{$$val}
+EndFont
+
+AltFont LibertinusSans-OsF
+	GuiName          "Libertinus Sans"
+	Family           sf
+	Requires         libertinus
+	SwitchDefault    1
+	ScaleCommand     \renewcommand*{\LibertinusSans@scale}{$$val}
+EndFont
+
 Font lmss
 	GuiName          "Latin Modern Sans"
 	Family           sf
@@ -827,14 +986,13 @@ Font lmss
 EndFont
 
 Font NotoSansRegular
-	GuiName         "Noto Sans (Regular)"
+	GuiName         "Noto Sans"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-        PackageOption   regular
 	OsfDefault	0
 	OsfOption	osf
-	MoreOptions      1
+	MoreOptions	1
 EndFont
 
 Font NotoSansMedium
@@ -842,10 +1000,10 @@ Font NotoSansMedium
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-        PackageOption   medium
+        PackageOptions  medium
 	OsfDefault	0
 	OsfOption	osf
-	MoreOptions      1
+	MoreOptions	1
 EndFont
 
 Font NotoSansThin
@@ -853,10 +1011,10 @@ Font NotoSansThin
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   thin
+	PackageOptions  thin
 	OsfDefault	0
 	OsfOption	osf
-	MoreOptions      1
+	MoreOptions	1
 EndFont
 
 Font NotoSansLight
@@ -864,10 +1022,10 @@ Font NotoSansLight
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   light
+	PackageOptions  light
 	OsfDefault	0
 	OsfOption	osf
-	MoreOptions      1
+	MoreOptions	1
 EndFont
 
 Font NotoSansExtralight
@@ -875,21 +1033,14 @@ Font NotoSansExtralight
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   extralight
+	PackageOptions  extralight
 	OsfDefault	0
 	OsfOption	osf
-	MoreOptions      1
-EndFont
-
-Font NotoSans-TLF
-	GuiName          "Noto Sans"
-	Family           sf
-	SwitchDefault    1
-	Requires         noto
+	MoreOptions	1
 EndFont
 
 Font PTSans-TLF
-	GuiName         "ParaType Sans"
+	GuiName         "PT Sans"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Requires        paratype
@@ -955,6 +1106,17 @@ Font DejaVuSansMono
 	ScaleOption      scaled=$$val
 EndFont
 
+Font FiraMono
+	GuiName         "Fira Mono"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Package         FiraMono
+	OsfDefault	1
+	OsfOption	lf
+	MoreOptions     1
+	FontEncoding    OT1,T1,TS1,LY1,LGR
+EndFont
+
 Font IBMPlexMono
 	GuiName          "IBM Plex Mono"
 	Family           tt
@@ -968,7 +1130,7 @@ Font IBMPlexMonoThin
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    thin
+	PackageOptions   thin
 	MoreOptions      1
 EndFont
 
@@ -977,7 +1139,7 @@ Font IBMPlexMonoExtraLight
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    extralight
+	PackageOptions   extralight
 	MoreOptions      1
 EndFont
 
@@ -986,21 +1148,12 @@ Font IBMPlexMonoLight
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    light
-	MoreOptions      1
-EndFont
-
-Font IBMPlexMonoSemibold
-	GuiName          "IBM Plex Mono (Semibold)"
-	Family           tt
-	Package          plex-mono
-	ScaleOption      scale=$$val
-	PackageOption    semibold
+	PackageOptions   light
 	MoreOptions      1
 EndFont
 
 Font ADOBESourceCodePro
-	GuiName		 "Adobe Source Code Pro"
+	GuiName		 "Source Code Pro"
 	Family		 tt
 	Package		 sourcecodepro
 	ScaleOption	 scaled=$$val
@@ -1023,6 +1176,14 @@ AltFont libertine-mono-type1
 	Package          libertineMono-type1
 EndFont
 
+Font LibertinusMono-TLF
+	GuiName          "Libertinus Mono"
+	Family           tt
+	Requires         libertinus
+	SwitchDefault    1
+	ScaleCommand     \renewcommand*{\LibertinusMono@scale}{$$val}
+EndFont
+
 Font lmtt
 	GuiName          "Latin Modern Typewriter"
 	Family           tt
@@ -1038,24 +1199,16 @@ Font luximono
 EndFont
 
 Font NotoMonoRegular
-	GuiName         "Noto Mono Regular"
+	GuiName         "Noto Mono"
 	Family          tt
 	ScaleOption     scaled=$$val
 	Package         noto-mono
-	PackageOption	regular
 	OsfOption       osf
 	MoreOptions     1
 EndFont
 
-Font NotoMono-TLF
-	GuiName          "Noto Mono"
-	Family           tt
-	SwitchDefault    1
-	Requires         noto
-EndFont
-
 Font PTMono-TLF
-	GuiName         "ParaType Mono"
+	GuiName         "PT Mono"
 	Family          tt
 	ScaleOption     scaled=$$val
 	Requires        paratype
@@ -1084,7 +1237,7 @@ Font cochineal-ntxm
 	GuiName          "Crimson (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    cochineal
+	PackageOptions   cochineal
 	Provides         amssymb,amsfonts
 EndFont
 
@@ -1098,7 +1251,7 @@ Font garamondx-ntxm
 	GuiName          "URW Garamond (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    garamondx
+	PackageOptions   garamondx
 	Provides         amssymb,amsfonts
 EndFont
 
@@ -1132,7 +1285,14 @@ Font libertine-ntxm
 	GuiName          "Libertine (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    libertine
+	PackageOptions   libertine
+	Provides         amssymb,amsfonts
+EndFont
+
+Font libertinusmath
+	GuiName          "Libertinus Math"
+	Family           math
+	Package          libertinust1math
 	Provides         amssymb,amsfonts
 EndFont
 
@@ -1140,7 +1300,7 @@ Font minion-ntxm
 	GuiName          "Minion Pro (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    minion
+	PackageOptions   minion
 	Requires         minion2newtx
 	Provides         amssymb,amsfonts
 EndFont