Avoid processing multiple times the same paragraph when converting latex arguments.

[lyx.git] / lib / latexfonts

diff --git a/lib/latexfonts b/lib/latexfonts
index 281b3f891f3e4ca1db56e3874f129a6799175ad7..446e83a563e03f6703981b94d9bac7e14407ae82 100644 (file)
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -152,12 +152,20 @@ AltFont 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 +422,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,44 +460,60 @@ 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 lmss
@@ -541,6 +575,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
@@ -587,14 +628,29 @@ 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
+       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