X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=3120233fd8699cd5bdfb3d6bbd99bad9b468de09;hb=83e65161a8a12be72aa6ba5b5037e378b2730051;hp=5fd5a2ed5579d9389a5ff1de4b278cec23eb37a0;hpb=54c41ce26e5f87c34653d0ebe24d067fdfebf480;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index 5fd5a2ed55..3120233fd8 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -6,18 +6,29 @@
 #
 # Font <name>
 #	GuiName            "<Gui Name>"
-#	Family             <rm|sf|tt>
+#	Family             <rm|sf|tt|math>
+#	FontEncoding       <font encoding>
 #	SwitchDefault      <0|1>
 #	Package            <LaTeX package to be loaded>
 #	Requires           <LaTeX package to test for>
-#	AltPackages        <alternative packages (comma-separated)>
-#	OT1Package         <alternative package specifically for OT1 encoding>
-#	CompletePackage    <alternative package for the complete family>
+#	AltFonts           <alternative fonts (comma-separated)>
+#	OT1Font            <alternative font specifically for OT1 encoding>
+#	CompleteFont       <alternative package for the complete family>
+#	NoMathFont         <alternative font that does not change math>
 #	PackageOptions     <general options to be passed to the package>
 #	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>
+#	EndPreamble
 # EndFont
 #
 #
@@ -26,34 +37,55 @@
 # * 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
 #   options is used per font (SwitchDefault takes precendende). Note that
 #   SwitchDefault uses the font name.
-# * If AltPackages are defined, LyX will try to load them in the defined
+# * In addition to normal fonts, you can also define alternative fonts
+#   using the AltFont...EndFont tags. These alternative fonts will not
+#   be added to the GUI, but LyX will fall back on them under specific
+#   circumstances (e.g. if the main font is not available; see below).
+# * If AltFonts are defined, LyX will try to load them in the defined
 #   order if the main package is not available. So
 #       Package          mathptmx
-#       AltPackages      mathptm,times
+#       AltFonts         mathptm,times
 #   will try to load mathptm if mathptmx is not available and then times
 #   if mathptm is not available either.
-#   No options will be passed to alternative packages!
+#   AltFonts need to be defined separately using AltFont ... EndFont tags.
 # * If Requires is set, LyX will check for this. If not, it will check
-#   for Package and AltPackages.
-# * OT1Package will load the defined package instead of the default
-#   package if the font encoding is OT1. This is necessary since some
-#   newer packages for a font do not support this encoding.
-#   The value "none" tells LyX not to load a package in OT1 encoding.
-#   No options will be passed to OT1 packages!
-# * CompletePackage is a package that is loaded if the current font is
-#   selected as rm and both sf and tt are set to "default" (this allows
-#   f. ex. to load "bera" as opposed to "beraserif").
+#   for Package and AltFonts.
+# * OT1Font will load the defined font if the font encoding is OT1. This is
+#   necessary since some newer font packages do not support this encoding.
+#   The value "none" tells LyX not to load any font in OT1 encoding.
+#   OT1Fonts need to be defined separately using AltFont ... EndFont tags.
+# * The CompleteFont is loaded if the current font is selected as rm and
+#   both sf and tt are set to "default" (this allows for instance to load
+#   "bera" as opposed to "beraserif").
+#   CompleteFonts need to be defined separately using AltFont ... EndFont
+#   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.
-# * ScaleOption supports the placeholder $$val for the scale value.
+# * 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 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.
 #
 ##########################################################################
 
+
 #
 # ROMAN FONTS
 #
@@ -62,7 +94,7 @@ Font ae
 	GuiName          "AE (Almost European)"
 	Family           rm
 	Package          "ae,aecompl"
-	OT1Package       none
+	OT1Font          none
 	Requires         ae
 EndFont
 
@@ -70,10 +102,16 @@ Font beraserif
 	GuiName          "Bera Serif"
 	Family           rm
 	Package          beraserif
-	CompletePackage  bera
+	CompleteFont     bera
 	Requires         bera
 EndFont
 
+AltFont bera
+	GuiName          "Bera Serif"
+	Family           rm
+	Package          bera
+EndFont
+
 Font bookman
 	GuiName          "Bookman"
 	Family           rm
@@ -84,6 +122,7 @@ Font ccfonts
 	GuiName          "Concrete Roman"
 	Family           rm
 	Package          ccfonts
+	MoreOptions      1
 EndFont
 
 Font chancery
@@ -98,57 +137,299 @@ 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
-	OsfPackage       eco
+	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
+	OsfOption        osfI
+	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
+EndFont
+
+AltFont libertine-legacy
 	GuiName          "Libertine"
 	Family           rm
 	OsfOption        osf
 	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
+	GuiName          "Latin Modern Roman"
+	Family           rm
+	SwitchDefault    1
+	Requires         lmodern
 EndFont
 
-Font mdbch
+Font md-charter
 	GuiName          "Bitstream Charter (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    charter
+	PackageOptions   charter
 	Requires         mdbch
+	Provides         amssymb,amsfonts
+	NoMathFont       mdbch
 EndFont
 
-Font mdput
+AltFont mdbch
+	GuiName          "Bitstream Charter (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdbch
+EndFont
+
+Font md-utopia
 	GuiName          "Utopia (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    utopia
+	PackageOptions   utopia
+	Requires         mdput
+	Provides         amssymb,amsfonts
+	NoMathFont       mdput
+EndFont
+
+AltFont mdput
+	GuiName          "Utopia (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
 	Requires         mdput
 EndFont
 
-Font mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+Font md-garamond
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
 	OsfScOption      expert
 	Package          mathdesign
-	PackageOption    garamond
+	PackageOptions   garamond
 	Requires         mdugm
+	Provides         amssymb,amsfonts
+	NoMathFont       mdugm
+EndFont
+
+AltFont mdugm
+	GuiName          "URW Garamond (Mathdesign)"
+	Family           rm
+	SwitchDefault    1
+	Requires         mdugm
+EndFont
+
+Font minionpro
+	GuiName          "Minion Pro"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          MinionPro
+	Provides         amssymb,amsfonts
+	NoMathFont       minionpro-nomath
+	MoreOptions      1
+EndFont
+
+AltFont minionpro-nomath
+	GuiName          "Minion Pro"
+	Family           rm
+	OsfOption        lf
+	OsfDefault       1
+	Package          MinionPro
+	PackageOptions   onlytext
 EndFont
 
 Font newcent
@@ -157,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
@@ -164,16 +502,73 @@ Font palatino
 	ScOption         sc
 	OsfScOption      osf
 	Package          mathpazo
-	AltPackages      "mathpple,palatino"
+	AltFonts         mathpple,palatino-sty
+	NoMathFont       ppl
 	Requires         psnfss
+	MoreOptions      1
+EndFont
+
+AltFont mathpple
+	GuiName          "Palatino"
+	Family           rm
+	Package          mathpple
+	NoMathFont       ppl
+EndFont
+
+AltFont palatino-sty
+	GuiName          "Palatino"
+	Family           rm
+	Package          palatino
+EndFont
+
+AltFont ppl
+	GuiName          "Palatino"
+	Family           rm
+	OsfFont          pplj
+	OsfFontOnly      1
+	SwitchDefault    1
+EndFont
+
+AltFont pplj
+	GuiName          "Palatino"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
+Font PTSerif-TLF
+	GuiName         "PT Serif"
+	Family          rm
+	Requires        paratype
+	Package         PTSerif
 EndFont
 
 Font times
 	GuiName          "Times Roman"
 	Family           rm
 	Package          mathptmx
-	AltPackages      "mathptm,times"
+	AltFonts         mathptm,times-sty
+	NoMathFont       ptm
 	Requires         psnfss
+	MoreOptions      1
+EndFont
+
+AltFont mathptm
+	GuiName          "Times Roman"
+	Family           rm
+	Package          mathptm
+	NoMathFont       ptm
+EndFont
+
+AltFont times-sty
+	GuiName          "Times Roman"
+	Family           rm
+	Package          times
+EndFont
+
+AltFont ptm
+	GuiName          "Times Roman"
+	Family           rm
+	SwitchDefault    1
 EndFont
 
 Font tgbonum
@@ -214,10 +609,39 @@ Font utopia
 	OsfOption        oldstyle
 	ScOption         expert
 	Package          fourier
-	AltPackages      utopia
-	OT1Package       utopia
+	AltFonts         utopia-sty
+	OT1Font          utopia-sty
+	NoMathFont       futs
+	MoreOptions      1
+EndFont
+
+AltFont utopia-sty
+	GuiName          "Utopia (Fourier)"
+	Family           rm
+	Package          utopia
+EndFont
+
+AltFont futs
+	GuiName          "Utopia (Fourier)"
+	Family           rm
+	SwitchDefault    1
+	OsfFont          futj
+	OsfFontOnly      1
 EndFont
 
+AltFont futj
+	GuiName          "Utopia (Fourier)"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
+Font xcharter
+	GuiName         "Bitstream Charter (XCharter)"
+	Family          rm
+	Package         XCharter
+	OsfOption       osf
+	MoreOptions      1
+EndFont
 
 #
 # SANS SERIF FONTS
@@ -237,6 +661,89 @@ Font berasans
 	Requires         bera
 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
 	GuiName          "CM Bright"
 	Family           sf
@@ -247,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
@@ -258,6 +904,80 @@ 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
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+Font kurierl
+	GuiName         "Kurier (Light)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+Font kurierc
+	GuiName         "Kurier (Condensed)"
+	Family          sf
+	Requires        kurier
+	SwitchDefault   1
+EndFont
+
+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
 	GuiName          "Latin Modern Sans"
 	Family           sf
@@ -265,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
@@ -277,6 +1059,12 @@ Font tgheros
 	Package          tgheros
 EndFont
 
+Font uop
+	GuiName          "URW Classico (Optima)"
+	Family           sf
+	SwitchDefault    1
+	Requires         urwclassico
+EndFont
 
 #
 # MONOSPACED FONTS
@@ -300,6 +1088,7 @@ EndFont
 Font cmtt
 	GuiName          "Computer Modern Typewriter"
 	Family           tt
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
@@ -310,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
@@ -324,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
@@ -336,3 +1227,87 @@ Font txtt
 	SwitchDefault    1
 	Requires         txfonts
 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
+	Package          eulervm
+EndFont
+
+Font garamondx-ntxm
+	GuiName          "URW Garamond (New TX)"
+	Family           math
+	Package          newtxmath
+	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
+	Preamble
+	% store roman font
+	\let\origrmdefault\rmdefault
+	\usepackage[math]{kurier}
+	% reset stored roman font
+	\renewcommand{\rmdefault}{\origrmdefault}
+	EndPreamble
+EndFont
+
+Font libertine-ntxm
+	GuiName          "Libertine (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOptions   libertine
+	Provides         amssymb,amsfonts
+EndFont
+
+Font libertinusmath
+	GuiName          "Libertinus Math"
+	Family           math
+	Package          libertinust1math
+	Provides         amssymb,amsfonts
+EndFont
+
+Font minion-ntxm
+	GuiName          "Minion Pro (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOptions   minion
+	Requires         minion2newtx
+	Provides         amssymb,amsfonts
+EndFont
+
+Font newtxmath
+	GuiName          "Times Roman (New TX)"
+	Family           math
+	Package          newtxmath
+	Provides         amssymb,amsfonts
+EndFont