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

diff --git a/lib/latexfonts b/lib/latexfonts
index 281b3f891f..3120233fd8 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>
@@ -18,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>
@@ -33,6 +37,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
@@ -62,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.
 #
@@ -110,6 +122,7 @@ Font ccfonts
 	GuiName          "Concrete Roman"
 	Family           rm
 	Package          ccfonts
+	MoreOptions      1
 EndFont
 
 Font chancery
@@ -124,18 +137,129 @@ Font charter
 	Package          charter
 EndFont
 
+Font cochineal
+	GuiName          "Crimson (Cochineal)"
+	Family           rm
+	OsfOption        "proportional,osf"
+	Package          cochineal
+	AltFonts         crimson
+	MoreOptions      1
+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
 
+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
+	Package          DejaVuSerif
+EndFont
+
+Font DejaVuSerifCondensed
+	GuiName          "DejaVu Serif (Condensed)"
+	Family           rm
+	Package          DejaVuSerifCondensed
+EndFont
+
 AltFont eco
 	Family           rm
 	Package          eco
 EndFont
 
+Font IBMPlexSerif
+	GuiName          "IBM Plex Serif"
+	Family           rm
+	Package          plex-serif
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSerifThin
+	GuiName          "IBM Plex Serif (Thin)"
+	Family           rm
+	Package          plex-serif
+	PackageOptions   thin
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSerifExtraLight
+	GuiName          "IBM Plex Serif (Extra Light)"
+	Family           rm
+	Package          plex-serif
+	PackageOptions   extralight
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSerifLight
+	GuiName          "IBM Plex Serif (Light)"
+	Family           rm
+	Package          plex-serif
+	PackageOptions   light
+	MoreOptions      1
+EndFont
+
+Font ADOBESourceSerifPro
+	GuiName		 "Source Serif Pro"
+	Family		 rm
+	Package		 sourceserifpro
+	OsfOption        osf
+	MoreOptions      1
+EndFont
+
 Font garamondx
 	GuiName          "URW Garamond"
 	Family           rm
@@ -143,21 +267,48 @@ Font garamondx
 	Package          garamondx
 	Requires         garamondx-fonts
 	AltFonts         ugm
+	MoreOptions      1
 EndFont
 
 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
+	MoreOptions      1
+EndFont
+
+AltFont libertine-full
+	GuiName          "Libertine"
+	Family           rm
+	Package          libertine
+	Requires         libertineRoman
+	MoreOptions      1
+EndFont
+
+AltFont libertine-type1
+	GuiName          "Libertine"
+	Family           rm
+	OsfOption        osf
+	Package          libertine-type1
+	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
@@ -167,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
@@ -188,7 +359,7 @@ Font md-charter
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    charter
+	PackageOptions   charter
 	Requires         mdbch
 	Provides         amssymb,amsfonts
 	NoMathFont       mdbch
@@ -208,7 +379,7 @@ Font md-utopia
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    utopia
+	PackageOptions   utopia
 	Requires         mdput
 	Provides         amssymb,amsfonts
 	NoMathFont       mdput
@@ -228,7 +399,7 @@ Font md-garamond
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    garamond
+	PackageOptions   garamond
 	Requires         mdugm
 	Provides         amssymb,amsfonts
 	NoMathFont       mdugm
@@ -249,6 +420,7 @@ Font minionpro
 	Package          MinionPro
 	Provides         amssymb,amsfonts
 	NoMathFont       minionpro-nomath
+	MoreOptions      1
 EndFont
 
 AltFont minionpro-nomath
@@ -257,7 +429,7 @@ AltFont minionpro-nomath
 	OsfOption        lf
 	OsfDefault       1
 	Package          MinionPro
-	PackageOption    onlytext
+	PackageOptions   onlytext
 EndFont
 
 Font newcent
@@ -266,6 +438,63 @@ Font newcent
 	Package          newcent
 EndFont
 
+Font NotoSerifRegular
+	GuiName          "Noto Serif"
+	Family           rm
+	Package          noto-serif
+	OsfOption	 osf
+	MoreOptions      1
+	CompleteFont     noto
+EndFont
+
+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
+	PackageOptions   medium
+	OsfDefault	 0
+	OsfOption	 osf
+	MoreOptions      1
+EndFont
+
+Font NotoSerifThin
+	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
+	PackageOptions   light
+	OsfDefault	 0
+	OsfOption	 osf
+	MoreOptions      1
+EndFont
+
+Font NotoSerifExtralight
+	GuiName          "Noto Serif (Extralight)"
+	Family           rm
+	Package          noto-serif
+	PackageOptions   extralight
+	OsfDefault	 0
+	OsfOption	 osf
+	MoreOptions      1
+EndFont
+
 Font palatino
 	GuiName          "Palatino"
 	Family           rm
@@ -276,6 +505,7 @@ Font palatino
 	AltFonts         mathpple,palatino-sty
 	NoMathFont       ppl
 	Requires         psnfss
+	MoreOptions      1
 EndFont
 
 AltFont mathpple
@@ -295,6 +525,7 @@ AltFont ppl
 	GuiName          "Palatino"
 	Family           rm
 	OsfFont          pplj
+	OsfFontOnly      1
 	SwitchDefault    1
 EndFont
 
@@ -304,6 +535,13 @@ AltFont pplj
 	SwitchDefault    1
 EndFont
 
+Font PTSerif-TLF
+	GuiName         "PT Serif"
+	Family          rm
+	Requires        paratype
+	Package         PTSerif
+EndFont
+
 Font times
 	GuiName          "Times Roman"
 	Family           rm
@@ -311,6 +549,7 @@ Font times
 	AltFonts         mathptm,times-sty
 	NoMathFont       ptm
 	Requires         psnfss
+	MoreOptions      1
 EndFont
 
 AltFont mathptm
@@ -373,6 +612,7 @@ Font utopia
 	AltFonts         utopia-sty
 	OT1Font          utopia-sty
 	NoMathFont       futs
+	MoreOptions      1
 EndFont
 
 AltFont utopia-sty
@@ -386,6 +626,7 @@ AltFont futs
 	Family           rm
 	SwitchDefault    1
 	OsfFont          futj
+	OsfFontOnly      1
 EndFont
 
 AltFont futj
@@ -394,6 +635,13 @@ AltFont futj
 	SwitchDefault    1
 EndFont
 
+Font xcharter
+	GuiName         "Bitstream Charter (XCharter)"
+	Family          rm
+	Package         XCharter
+	OsfOption       osf
+	MoreOptions      1
+EndFont
 
 #
 # SANS SERIF FONTS
@@ -414,11 +662,86 @@ Font berasans
 EndFont
 
 Font biolinum
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum
+	AltFonts         biolinum-type1,biolinum-2012
+	MoreOptions      1
+EndFont
+
+AltFont biolinum-type1
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum-type1
+	Requires         libertineMono-type1
+	MoreOptions      1
+EndFont
+
+AltFont biolinum-2012
 	GuiName          "Biolinum"
 	Family           sf
 	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
@@ -431,9 +754,148 @@ EndFont
 Font cmss
 	GuiName          "Computer Modern Sans"
 	Family           sf
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
+Font DejaVuSans
+	GuiName          "DejaVu Sans"
+	Family           sf
+	Package          DejaVuSans
+	ScaleOption      scaled=$$val
+EndFont
+
+Font DejaVuSansCondensed
+	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)"
+	Family           sf
+	Package          plex-sans
+	PackageOptions   condensed
+	ScaleOption      scale=$$val
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSansThin
+	GuiName          "IBM Plex Sans (Thin)"
+	Family           sf
+	Package          plex-sans
+	PackageOptions   thin
+	ScaleOption      scale=$$val
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSansExtraLight
+	GuiName          "IBM Plex Sans (Extra Light)"
+	Family           sf
+	Package          plex-sans
+	PackageOptions   extralight
+	ScaleOption      scale=$$val
+	MoreOptions      1
+EndFont
+
+Font IBMPlexSansLight
+	GuiName          "IBM Plex Sans (Light)"
+	Family           sf
+	Package          plex-sans
+	PackageOptions   light
+	ScaleOption      scale=$$val
+	MoreOptions      1
+EndFont
+
+Font ADOBESourceSansPro
+	GuiName		 "Source Sans Pro"
+	Family		 sf
+	Package		 sourcesanspro
+	ScaleOption	 scaled=$$val
+	OsfOption        osf
+	MoreOptions      1
+EndFont
+
 Font helvet
 	GuiName          "Helvetica"
 	Family           sf
@@ -442,44 +904,78 @@ 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 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
@@ -489,6 +985,68 @@ Font lmss
 	Requires         lmodern
 EndFont
 
+Font NotoSansRegular
+	GuiName         "Noto Sans"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	OsfDefault	0
+	OsfOption	osf
+	MoreOptions	1
+EndFont
+
+Font NotoSansMedium
+	GuiName         "Noto Sans (Medium)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+        PackageOptions  medium
+	OsfDefault	0
+	OsfOption	osf
+	MoreOptions	1
+EndFont
+
+Font NotoSansThin
+	GuiName         "Noto Sans (Thin)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOptions  thin
+	OsfDefault	0
+	OsfOption	osf
+	MoreOptions	1
+EndFont
+
+Font NotoSansLight
+	GuiName         "Noto Sans (Light)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOptions  light
+	OsfDefault	0
+	OsfOption	osf
+	MoreOptions	1
+EndFont
+
+Font NotoSansExtralight
+	GuiName         "Noto Sans (Extralight)"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOptions  extralight
+	OsfDefault	0
+	OsfOption	osf
+	MoreOptions	1
+EndFont
+
+Font PTSans-TLF
+	GuiName         "PT Sans"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTSans
+EndFont
+
 Font tgadventor
 	GuiName          "TeX Gyre Adventor"
 	Family           sf
@@ -508,7 +1066,6 @@ Font uop
 	Requires         urwclassico
 EndFont
 
-
 #
 # MONOSPACED FONTS
 #
@@ -531,6 +1088,7 @@ EndFont
 Font cmtt
 	GuiName          "Computer Modern Typewriter"
 	Family           tt
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
@@ -541,6 +1099,91 @@ Font courier
 	Requires         psnfss
 EndFont
 
+Font DejaVuSansMono
+	GuiName          "DejaVu Sans Mono"
+	Family           tt
+	Package          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)"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOptions   thin
+	MoreOptions      1
+EndFont
+
+Font IBMPlexMonoExtraLight
+	GuiName          "IBM Plex Mono (Extra Light)"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOptions   extralight
+	MoreOptions      1
+EndFont
+
+Font IBMPlexMonoLight
+	GuiName          "IBM Plex Mono (Light)"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOptions   light
+	MoreOptions      1
+EndFont
+
+Font ADOBESourceCodePro
+	GuiName		 "Source Code Pro"
+	Family		 tt
+	Package		 sourcecodepro
+	ScaleOption	 scaled=$$val
+	OsfOption        osf
+	MoreOptions      1
+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
+	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
@@ -555,6 +1198,23 @@ Font luximono
 	Package          luximono
 EndFont
 
+Font NotoMonoRegular
+	GuiName         "Noto Mono"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Package         noto-mono
+	OsfOption       osf
+	MoreOptions     1
+EndFont
+
+Font PTMono-TLF
+	GuiName         "PT Mono"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTMono
+EndFont
+
 Font tgcursor
 	GuiName          "TeX Gyre Cursor"
 	Family           tt
@@ -573,6 +1233,14 @@ EndFont
 # MATH FONTS
 #
 
+Font cochineal-ntxm
+	GuiName          "Crimson (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOptions   cochineal
+	Provides         amssymb,amsfonts
+EndFont
+
 Font eulervm
 	GuiName          "Euler VM"
 	Family           math
@@ -583,18 +1251,33 @@ Font garamondx-ntxm
 	GuiName          "URW Garamond (New TX)"
 	Family           math
 	Package          newtxmath
-	PackageOption    garamondx
+	PackageOptions   garamondx
 	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
 
@@ -602,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
 
@@ -610,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