X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=3120233fd8699cd5bdfb3d6bbd99bad9b468de09;hb=94e7421a0a408bf60077bffe5d6f70142c5dad3f;hp=0c753df6cc4223930af6bd9aa072aa2c86a846e9;hpb=6ca8238cb8a034b18d0cf7f9d6d05a4e3bc41909;p=features.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 0c753df6cc..3120233fd8 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -19,9 +19,12 @@
 #	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
 #	  <some arbitrary LaTeX code to be issued in the preamble>
@@ -64,12 +67,19 @@
 #   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
 #   loading command.
 #
@@ -112,6 +122,7 @@ Font ccfonts
 	GuiName          "Concrete Roman"
 	Family           rm
 	Package          ccfonts
+	MoreOptions      1
 EndFont
 
 Font chancery
@@ -132,6 +143,7 @@ Font cochineal
 	OsfOption        "proportional,osf"
 	Package          cochineal
 	AltFonts         crimson
+	MoreOptions      1
 EndFont
 
 AltFont crimson
@@ -148,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
@@ -155,7 +211,7 @@ Font DejaVuSerif
 EndFont
 
 Font DejaVuSerifCondensed
-	GuiName          "DejaVu Serif Condensed"
+	GuiName          "DejaVu Serif (Condensed)"
 	Family           rm
 	Package          DejaVuSerifCondensed
 EndFont
@@ -169,40 +225,39 @@ Font IBMPlexSerif
 	GuiName          "IBM Plex Serif"
 	Family           rm
 	Package          plex-serif
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSerifThin
-	GuiName          "IBM Plex Serif Thin"
+	GuiName          "IBM Plex Serif (Thin)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    thin
+	PackageOptions   thin
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSerifExtraLight
-	GuiName          "IBM Plex Serif Extra Light"
+	GuiName          "IBM Plex Serif (Extra Light)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    extralight
+	PackageOptions   extralight
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSerifLight
-	GuiName          "IBM Plex Serif Light"
-	Family           rm
-	Package          plex-serif
-	PackageOption    light
-EndFont
-
-Font IBMPlexSerifSemibold
-	GuiName          "IBM Plex Serif Semibold"
+	GuiName          "IBM Plex Serif (Light)"
 	Family           rm
 	Package          plex-serif
-	PackageOption    semibold
+	PackageOptions   light
+	MoreOptions      1
 EndFont
 
 Font ADOBESourceSerifPro
-	GuiName		"Adobe Source Serif Pro"
-	Family		rm
-	Package		sourceserifpro
+	GuiName		 "Source Serif Pro"
+	Family		 rm
+	Package		 sourceserifpro
+	OsfOption        osf
+	MoreOptions      1
 EndFont
 
 Font garamondx
@@ -212,6 +267,7 @@ Font garamondx
 	Package          garamondx
 	Requires         garamondx-fonts
 	AltFonts         ugm
+	MoreOptions      1
 EndFont
 
 AltFont ugm
@@ -228,6 +284,7 @@ Font libertine
 	Package          libertineRoman
 	CompleteFont     libertine-full
 	AltFonts         libertine-type1,libertine-2012,libertine-legacy
+	MoreOptions      1
 EndFont
 
 AltFont libertine-full
@@ -235,6 +292,7 @@ AltFont libertine-full
 	Family           rm
 	Package          libertine
 	Requires         libertineRoman
+	MoreOptions      1
 EndFont
 
 AltFont libertine-type1
@@ -260,11 +318,31 @@ 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
 	Package          lmodern
 	NoMathFont       lmr
+	MoreOptions      1
 EndFont
 
 AltFont lmr
@@ -281,7 +359,7 @@ Font md-charter
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    charter
+	PackageOptions   charter
 	Requires         mdbch
 	Provides         amssymb,amsfonts
 	NoMathFont       mdbch
@@ -301,7 +379,7 @@ Font md-utopia
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    utopia
+	PackageOptions   utopia
 	Requires         mdput
 	Provides         amssymb,amsfonts
 	NoMathFont       mdput
@@ -321,7 +399,7 @@ Font md-garamond
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    garamond
+	PackageOptions   garamond
 	Requires         mdugm
 	Provides         amssymb,amsfonts
 	NoMathFont       mdugm
@@ -342,6 +420,7 @@ Font minionpro
 	Package          MinionPro
 	Provides         amssymb,amsfonts
 	NoMathFont       minionpro-nomath
+	MoreOptions      1
 EndFont
 
 AltFont minionpro-nomath
@@ -350,7 +429,7 @@ AltFont minionpro-nomath
 	OsfOption        lf
 	OsfDefault       1
 	Package          MinionPro
-	PackageOption    onlytext
+	PackageOptions   onlytext
 EndFont
 
 Font newcent
@@ -360,72 +439,60 @@ 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
-EndFont
-
-Font NotoSerifExtralight
-	GuiName         "Noto Serif Extralight"
-	Family          rm
-	Package         noto-serif
-	PackageOption   extralight
-	OsfDefault	0
-	OsfOption	osf
-EndFont
-
-Font NotoSerif-TLF
-	GuiName          "Noto Serif"
+	GuiName          "Noto Serif (Light)"
 	Family           rm
-	SwitchDefault    1
-	Requires         noto
-	CompleteFont     noto
+	Package          noto-serif
+	PackageOptions   light
+	OsfDefault	 0
+	OsfOption	 osf
+	MoreOptions      1
 EndFont
 
-AltFont noto
-	GuiName          "Noto Serif"
+Font NotoSerifExtralight
+	GuiName          "Noto Serif (Extralight)"
 	Family           rm
-	Package          noto
+	Package          noto-serif
+	PackageOptions   extralight
+	OsfDefault	 0
+	OsfOption	 osf
+	MoreOptions      1
 EndFont
 
 Font palatino
@@ -438,6 +505,7 @@ Font palatino
 	AltFonts         mathpple,palatino-sty
 	NoMathFont       ppl
 	Requires         psnfss
+	MoreOptions      1
 EndFont
 
 AltFont mathpple
@@ -457,6 +525,7 @@ AltFont ppl
 	GuiName          "Palatino"
 	Family           rm
 	OsfFont          pplj
+	OsfFontOnly      1
 	SwitchDefault    1
 EndFont
 
@@ -467,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
@@ -487,6 +549,7 @@ Font times
 	AltFonts         mathptm,times-sty
 	NoMathFont       ptm
 	Requires         psnfss
+	MoreOptions      1
 EndFont
 
 AltFont mathptm
@@ -549,6 +612,7 @@ Font utopia
 	AltFonts         utopia-sty
 	OT1Font          utopia-sty
 	NoMathFont       futs
+	MoreOptions      1
 EndFont
 
 AltFont utopia-sty
@@ -562,6 +626,7 @@ AltFont futs
 	Family           rm
 	SwitchDefault    1
 	OsfFont          futj
+	OsfFontOnly      1
 EndFont
 
 AltFont futj
@@ -575,6 +640,7 @@ Font xcharter
 	Family          rm
 	Package         XCharter
 	OsfOption       osf
+	MoreOptions      1
 EndFont
 
 #
@@ -602,6 +668,7 @@ Font biolinum
 	ScaleOption      scaled=$$val
 	Package          biolinum
 	AltFonts         biolinum-type1,biolinum-2012
+	MoreOptions      1
 EndFont
 
 AltFont biolinum-type1
@@ -611,6 +678,7 @@ AltFont biolinum-type1
 	ScaleOption      scaled=$$val
 	Package          biolinum-type1
 	Requires         libertineMono-type1
+	MoreOptions      1
 EndFont
 
 AltFont biolinum-2012
@@ -619,6 +687,61 @@ AltFont biolinum-2012
 	OsfOption        lining
 	OsfDefault       1
 	Package          biolinum-type1
+	MoreOptions      1
+EndFont
+
+Font cantarell
+	GuiName		"Cantarell"
+	Family		sf
+	OsfOption	oldstyle
+	Package		cantarell
+	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
@@ -643,65 +766,134 @@ 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
 	Package          plex-sans
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSansCondensed
-	GuiName          "IBM Plex Sans Condensed"
+	GuiName          "IBM Plex Sans (Condensed)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    condensed
+	PackageOptions   condensed
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSansThin
-	GuiName          "IBM Plex Sans Thin"
+	GuiName          "IBM Plex Sans (Thin)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    thin
+	PackageOptions   thin
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSansExtraLight
-	GuiName          "IBM Plex Sans Extra Light"
+	GuiName          "IBM Plex Sans (Extra Light)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    extralight
+	PackageOptions   extralight
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
 Font IBMPlexSansLight
-	GuiName          "IBM Plex Sans Light"
+	GuiName          "IBM Plex Sans (Light)"
 	Family           sf
 	Package          plex-sans
-	PackageOption    light
+	PackageOptions   light
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
-Font IBMPlexSansSemibold
-	GuiName          "IBM Plex Sans Semibold"
-	Family           sf
-	Package          plex-sans
-	PackageOption    semibold
-	ScaleOption      scale=$$val
-EndFont
-
-Font	ADOBESourceSansPro
-	GuiName		"Adobe Source Sans Pro"
-	Family		sf
-	Package		sourcesanspro
-	PackageOption	osf
-	ScaleOption	scaled=$$val
+Font ADOBESourceSansPro
+	GuiName		 "Source Sans Pro"
+	Family		 sf
+	Package		 sourcesanspro
+	ScaleOption	 scaled=$$val
+	OsfOption        osf
+	MoreOptions      1
 EndFont
 
 Font helvet
@@ -768,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
@@ -776,64 +986,61 @@ 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
 EndFont
 
 Font NotoSansMedium
-	GuiName         "Noto Sans Medium"
+	GuiName         "Noto Sans (Medium)"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-        PackageOption   medium
+        PackageOptions  medium
 	OsfDefault	0
 	OsfOption	osf
+	MoreOptions	1
 EndFont
 
 Font NotoSansThin
-	GuiName         "Noto Sans Thin"
+	GuiName         "Noto Sans (Thin)"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   thin
+	PackageOptions  thin
 	OsfDefault	0
 	OsfOption	osf
+	MoreOptions	1
 EndFont
 
 Font NotoSansLight
-	GuiName         "Noto Sans Light"
+	GuiName         "Noto Sans (Light)"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   light
+	PackageOptions  light
 	OsfDefault	0
 	OsfOption	osf
+	MoreOptions	1
 EndFont
 
 Font NotoSansExtralight
-	GuiName         "Noto Sans Extralight"
+	GuiName         "Noto Sans (Extralight)"
 	Family          sf
 	ScaleOption     scaled=$$val
 	Package         noto-sans
-	PackageOption   extralight
+	PackageOptions  extralight
 	OsfDefault	0
 	OsfOption	osf
-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
@@ -871,17 +1078,6 @@ Font beramono
 	Requires         bera
 EndFont
 
-Font cantarellMS
-	GuiName		"Cantarell Monospace"
-	Family		tt
-	OsfOption	oldstyle
-	OsfDefault	0
-	Package		cantarell
-	PackageOption	"defaultsans,tabular"
-	FontEncoding	T2A,T1,OT1
-	ScaleOption	scale=$$val
-EndFont
-
 Font cmtl
 	GuiName          "CM Typewriter Light"
 	Family           tt
@@ -910,50 +1106,59 @@ 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
 	Package          plex-mono
 	ScaleOption      scale=$$val
+	MoreOptions      1
 EndFont
 
 Font IBMPlexMonoThin
-	GuiName          "IBM Plex Mono Thin"
+	GuiName          "IBM Plex Mono (Thin)"
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    thin
+	PackageOptions   thin
+	MoreOptions      1
 EndFont
 
 Font IBMPlexMonoExtraLight
-	GuiName          "IBM Plex Mono Extra Light"
+	GuiName          "IBM Plex Mono (Extra Light)"
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    extralight
+	PackageOptions   extralight
+	MoreOptions      1
 EndFont
 
 Font IBMPlexMonoLight
-	GuiName          "IBM Plex Mono Light"
+	GuiName          "IBM Plex Mono (Light)"
 	Family           tt
 	Package          plex-mono
 	ScaleOption      scale=$$val
-	PackageOption    light
+	PackageOptions   light
+	MoreOptions      1
 EndFont
 
-Font IBMPlexMonoSemibold
-	GuiName          "IBM Plex Mono Semibold"
-	Family           tt
-	Package          plex-mono
-	ScaleOption      scale=$$val
-	PackageOption    semibold
-EndFont
-
-Font	ADOBESourceCodePro
-	GuiName		"Adobe Source Code Pro"
-	Family		tt
-	Package		sourcecodepro
-	ScaleOption	scaled=$$val
+Font ADOBESourceCodePro
+	GuiName		 "Source Code Pro"
+	Family		 tt
+	Package		 sourcecodepro
+	ScaleOption	 scaled=$$val
+	OsfOption        osf
+	MoreOptions      1
 EndFont
 
 Font libertine-mono
@@ -971,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
@@ -986,23 +1199,16 @@ Font luximono
 EndFont
 
 Font NotoMonoRegular
-	GuiName         "Noto Mono Regular"
+	GuiName         "Noto Mono"
 	Family          tt
 	ScaleOption     scaled=$$val
 	Package         noto-mono
-	OsfOption	osf
-	PackageOption	regular
-EndFont
-
-Font NotoMono-TLF
-	GuiName          "Noto Mono"
-	Family           tt
-	SwitchDefault    1
-	Requires         noto
+	OsfOption       osf
+	MoreOptions     1
 EndFont
 
 Font PTMono-TLF
-	GuiName         "ParaType Mono"
+	GuiName         "PT Mono"
 	Family          tt
 	ScaleOption     scaled=$$val
 	Requires        paratype
@@ -1031,7 +1237,7 @@ Font cochineal-ntxm
 	GuiName          "Crimson (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    cochineal
+	PackageOptions   cochineal
 	Provides         amssymb,amsfonts
 EndFont
 
@@ -1045,7 +1251,7 @@ Font garamondx-ntxm
 	GuiName          "URW Garamond (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    garamondx
+	PackageOptions   garamondx
 	Provides         amssymb,amsfonts
 EndFont
 
@@ -1079,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
 
@@ -1087,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