X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flatexfonts;h=0a01194570038fe35a1c5093c2fac0e8c04fbbd3;hb=1df3151b6a3bd3e3a25b74fa8d1a918fee67d924;hp=ca484fd188c00825cbb42a17aaa5ef9d5dd16008;hpb=1d84423e76c68a626fbb9acbeed245f1859d40f3;p=lyx.git

diff --git a/lib/latexfonts b/lib/latexfonts
index ca484fd188..0a01194570 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>
@@ -22,6 +23,9 @@
 #	OsfScOption        <option for combined osf and true smallcaps support>
 #	ScaleOption        <option for font scaling>
 #	Provides           <features provided by the font packages (comma-separated)>
+#	Preamble
+#	  <some arbitrary LaTeX code to be issued in the preamble>
+#	EndPreamble
 # EndFont
 #
 #
@@ -30,6 +34,7 @@
 # * Adding a new font results in a FILE FORMAT CHANGE. So if a new font
 #   is added for the LyX distribution, the according changes need to be
 #   done.
+# * If FontEncoding is not specified, T1 is assumed.
 # * "SwitchDefault 1" makes the font to be loaded by switching the default
 #   family to <name> (e.g., \renewcommand{\rmdefault}{cmr}), whereas
 #   Package <package> loads it via \usepackage{package}. Only one of these
@@ -53,8 +58,8 @@
 #   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 f. ex. to load "bera"
-#   as opposed to "beraserif").
+#   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
@@ -65,9 +70,12 @@
 #   default and provide an option for lining figures. Pass this option
 #   to OsfOption.
 # * ScaleOption supports the placeholder $$val for the scale value.
+# * The Preamble code is output immediately after the respective font
+#   loading command.
 #
 ##########################################################################
 
+
 #
 # ROMAN FONTS
 #
@@ -118,25 +126,131 @@ Font charter
 	Package          charter
 EndFont
 
+Font cochineal
+	GuiName          "Crimson (Cochineal)"
+	Family           rm
+	OsfOption        "proportional,osf"
+	Package          cochineal
+	AltFonts         crimson
+EndFont
+
+AltFont crimson
+	GuiName          "Crimson"
+	Family           rm
+	Package          crimson
+EndFont
+
 Font cmr
 	GuiName          "Computer Modern Roman"
 	Family           rm
+	FontEncoding     OT1
 	SwitchDefault    1
 	OsfFont          eco
 EndFont
 
+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
+EndFont
+
+Font IBMPlexSerifThin
+	GuiName          "IBM Plex Serif Thin"
+	Family           rm
+	Package          plex-serif
+	PackageOption    thin
+EndFont
+
+Font IBMPlexSerifExtraLight
+	GuiName          "IBM Plex Serif Extra Light"
+	Family           rm
+	Package          plex-serif
+	PackageOption    extralight
+EndFont
+
+Font IBMPlexSerifLight
+	GuiName          "IBM Plex Serif Light"
+	Family           rm
+	Package          plex-serif
+	PackageOption    light
+EndFont
+
+Font IBMPlexSerifSemibold
+	GuiName          "IBM Plex Serif Semibold"
+	Family           rm
+	Package          plex-serif
+	PackageOption    semibold
+EndFont
+
+Font ADOBESourceSerifPro
+	GuiName		"Adobe Source Serif Pro"
+	Family		rm
+	Package		sourceserifpro
+EndFont
+
+Font garamondx
+	GuiName          "URW Garamond"
+	Family           rm
+	OsfOption        osfI
+	Package          garamondx
+	Requires         garamondx-fonts
+	AltFonts         ugm
+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
+EndFont
+
+AltFont libertine-full
+	GuiName          "Libertine"
+	Family           rm
+	Package          libertine
+	Requires         libertineRoman
+EndFont
+
+AltFont libertine-type1
+	GuiName          "Libertine"
+	Family           rm
+	OsfOption        osf
+	Package          libertine-type1
+	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
@@ -201,7 +315,7 @@ AltFont mdput
 EndFont
 
 Font md-garamond
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -214,7 +328,7 @@ Font md-garamond
 EndFont
 
 AltFont mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	SwitchDefault    1
 	Requires         mdugm
@@ -245,6 +359,65 @@ Font newcent
 	Package          newcent
 EndFont
 
+Font NotoSerifRegular
+	GuiName         "Noto Serif Regular"
+	Family          rm
+	Package         noto-serif
+	PackageOption   regular
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSerifMedium
+	GuiName         "Noto Serif Medium"
+	Family          rm
+	Package         noto-serif
+	PackageOption   medium
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSerifThin
+	GuiName         "Noto Serif Thin"
+	Family          rm
+	Package         noto-serif
+	PackageOption   thin
+	OsfDefault	0
+	OsfOption	osf
+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"
+	Family           rm
+	SwitchDefault    1
+	Requires         noto
+	CompleteFont     noto
+EndFont
+
+AltFont noto
+	GuiName          "Noto Serif"
+	Family           rm
+	Package          noto
+EndFont
+
 Font palatino
 	GuiName          "Palatino"
 	Family           rm
@@ -283,6 +456,20 @@ AltFont pplj
 	SwitchDefault    1
 EndFont
 
+Font PTSerif-TLF
+	GuiName         "ParaType Serif"
+	Family          rm
+	Requires        paratype
+	Package         PTSerif
+	CompleteFont    paratype
+EndFont
+
+AltFont paratype
+	GuiName          "ParaType Serif"
+	Family           rm
+	Package          paratype
+EndFont
+
 Font times
 	GuiName          "Times Roman"
 	Family           rm
@@ -373,6 +560,12 @@ AltFont futj
 	SwitchDefault    1
 EndFont
 
+Font xcharter
+	GuiName         "Bitstream Charter (XCharter)"
+	Family          rm
+	Package         XCharter
+	OsfOption       osf
+EndFont
 
 #
 # SANS SERIF FONTS
@@ -393,6 +586,24 @@ Font berasans
 EndFont
 
 Font biolinum
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum
+	AltFonts         biolinum-type1,biolinum-2012
+EndFont
+
+AltFont biolinum-type1
+	GuiName          "Biolinum"
+	Family           sf
+	OsfOption        osf
+	ScaleOption      scaled=$$val
+	Package          biolinum-type1
+	Requires         libertineMono-type1
+EndFont
+
+AltFont biolinum-2012
 	GuiName          "Biolinum"
 	Family           sf
 	OsfOption        lining
@@ -410,9 +621,79 @@ 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 IBMPlexSans
+	GuiName          "IBM Plex Sans"
+	Family           sf
+	Package          plex-sans
+	ScaleOption      scale=$$val
+EndFont
+
+Font IBMPlexSansCondensed
+	GuiName          "IBM Plex Sans Condensed"
+	Family           sf
+	Package          plex-sans
+	PackageOption    condensed
+	ScaleOption      scale=$$val
+EndFont
+
+Font IBMPlexSansThin
+	GuiName          "IBM Plex Sans Thin"
+	Family           sf
+	Package          plex-sans
+	PackageOption    thin
+	ScaleOption      scale=$$val
+EndFont
+
+Font IBMPlexSansExtraLight
+	GuiName          "IBM Plex Sans Extra Light"
+	Family           sf
+	Package          plex-sans
+	PackageOption    extralight
+	ScaleOption      scale=$$val
+EndFont
+
+Font IBMPlexSansLight
+	GuiName          "IBM Plex Sans Light"
+	Family           sf
+	Package          plex-sans
+	PackageOption    light
+	ScaleOption      scale=$$val
+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
+EndFont
+
 Font helvet
 	GuiName          "Helvetica"
 	Family           sf
@@ -421,6 +702,62 @@ 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 lmss
 	GuiName          "Latin Modern Sans"
 	Family           sf
@@ -428,6 +765,71 @@ Font lmss
 	Requires         lmodern
 EndFont
 
+Font NotoSansRegular
+	GuiName         "Noto Sans Regular"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+        PackageOption   regular
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSansMedium
+	GuiName         "Noto Sans Medium"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+        PackageOption   medium
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSansThin
+	GuiName         "Noto Sans Thin"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOption   thin
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSansLight
+	GuiName         "Noto Sans Light"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOption   light
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSansExtralight
+	GuiName         "Noto Sans Extralight"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Package         noto-sans
+	PackageOption   extralight
+	OsfDefault	0
+	OsfOption	osf
+EndFont
+
+Font NotoSans-TLF
+	GuiName          "Noto Sans"
+	Family           sf
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
+Font PTSans-TLF
+	GuiName         "ParaType Sans"
+	Family          sf
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTSans
+EndFont
+
 Font tgadventor
 	GuiName          "TeX Gyre Adventor"
 	Family           sf
@@ -440,6 +842,12 @@ Font tgheros
 	Package          tgheros
 EndFont
 
+Font uop
+	GuiName          "URW Classico (Optima)"
+	Family           sf
+	SwitchDefault    1
+	Requires         urwclassico
+EndFont
 
 #
 # MONOSPACED FONTS
@@ -463,6 +871,7 @@ EndFont
 Font cmtt
 	GuiName          "Computer Modern Typewriter"
 	Family           tt
+	FontEncoding     OT1
 	SwitchDefault    1
 EndFont
 
@@ -473,6 +882,74 @@ Font courier
 	Requires         psnfss
 EndFont
 
+Font DejaVuSansMono
+	GuiName          "DejaVu Sans Mono"
+	Family           tt
+	Package          DejaVuSansMono
+	ScaleOption      scaled=$$val
+EndFont
+
+Font IBMPlexMono
+	GuiName          "IBM Plex Mono"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+EndFont
+
+Font IBMPlexMonoThin
+	GuiName          "IBM Plex Mono Thin"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOption    thin
+EndFont
+
+Font IBMPlexMonoExtraLight
+	GuiName          "IBM Plex Mono Extra Light"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOption    extralight
+EndFont
+
+Font IBMPlexMonoLight
+	GuiName          "IBM Plex Mono Light"
+	Family           tt
+	Package          plex-mono
+	ScaleOption      scale=$$val
+	PackageOption    light
+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
+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 lmtt
 	GuiName          "Latin Modern Typewriter"
 	Family           tt
@@ -487,6 +964,29 @@ Font luximono
 	Package          luximono
 EndFont
 
+Font NotoMonoRegular
+	GuiName         "Noto Mono Regular"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Package         noto-mono
+	PackageOption	regular
+EndFont
+
+Font NotoMono-TLF
+	GuiName          "Noto Mono"
+	Family           tt
+	SwitchDefault    1
+	Requires         noto
+EndFont
+
+Font PTMono-TLF
+	GuiName         "ParaType Mono"
+	Family          tt
+	ScaleOption     scaled=$$val
+	Requires        paratype
+	Package         PTMono
+EndFont
+
 Font tgcursor
 	GuiName          "TeX Gyre Cursor"
 	Family           tt
@@ -505,12 +1005,54 @@ EndFont
 # MATH FONTS
 #
 
+Font cochineal-ntxm
+	GuiName          "Crimson (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    cochineal
+	Provides         amssymb,amsfonts
+EndFont
+
 Font eulervm
 	GuiName          "Euler VM"
 	Family           math
 	Package          eulervm
 EndFont
 
+Font garamondx-ntxm
+	GuiName          "URW Garamond (New TX)"
+	Family           math
+	Package          newtxmath
+	PackageOption    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