Merge branch 'master' into biblatex2

[lyx.git] / lib / latexfonts

diff --git a/lib/latexfonts b/lib/latexfonts
index b840784861984289caafd06cab599c2ba4a5db01..bf6152ac388237078e7a0523578278f760da36a4 100644 (file)
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -124,6 +124,20 @@ 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
@@ -149,15 +163,24 @@ AltFont ugm
        GuiName          "URW Garamond"
        Family           rm
        SwitchDefault    1
+       Requires         ugm
 EndFont
 
 Font libertine
+       GuiName          "Libertine"
+       Family           rm
+       OsfOption        osf
+       Package          libertine-type1
+       AltFonts         libertine-2012,libertine-legacy
+       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
@@ -414,6 +437,16 @@ Font berasans
 EndFont
 
 Font biolinum
+       GuiName          "Biolinum"
+       Family           sf
+       OsfOption        osf
+       ScaleOption      scaled=$$val
+       Package          biolinum-type1
+       Requires         libertineMono-type1
+       AltFonts         biolinum-2012
+EndFont
+
+AltFont biolinum-2012
        GuiName          "Biolinum"
        Family           sf
        OsfOption        lining
@@ -442,6 +475,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
@@ -501,6 +590,13 @@ Font courier
        Requires         psnfss
 EndFont
 
+Font libertine-mono
+       GuiName          "Libertine Mono"
+       Family           tt
+       ScaleOption      scaled=$$val
+       Package          libertineMono-type1
+EndFont
+
 Font lmtt
        GuiName          "Latin Modern Typewriter"
        Family           tt
@@ -533,6 +629,14 @@ 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
@@ -547,6 +651,32 @@ Font garamondx-ntxm
        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