Simplify support for kurier fonts

This commit is contained in:
Juergen Spitzmueller 2013-02-12 20:33:42 +01:00
parent 0ea6654228
commit 557e2f5ef9
2 changed files with 13 additions and 46 deletions

View File

@ -445,41 +445,29 @@ EndFont
Font kurier
GuiName "Kurier"
Family sf
Requires kurier
SwitchDefault 1
Preamble
\renewcommand{\bfdefault}{b}
EndPreamble
EndFont
Font kurierl
GuiName "Kurier (Light)"
Family sf
SwitchDefault 1
Preamble
\renewcommand{\bfdefault}{b}
EndPreamble
Requires kurier
SwitchDefault 1
EndFont
Font kurier-condensed
Font kurierc
GuiName "Kurier (Condensed)"
Family sf
Requires kurier
Preamble
\renewcommand{\sfdefault}{kurier}
\edef\sfdefault{\sfdefault c}
\renewcommand{\bfdefault}{b}
EndPreamble
SwitchDefault 1
EndFont
Font kurier-light-condensed
Font kurierlc
GuiName "Kurier (Light Condensed)"
Family sf
Requires kurier
Preamble
\renewcommand{\sfdefault}{kurierl}
\edef\sfdefault{\sfdefault c}
\renewcommand{\bfdefault}{b}
EndPreamble
SwitchDefault 1
EndFont
Font lmss

View File

@ -3542,34 +3542,13 @@ def revert_kurier_fonts(document):
document.header[i] = "\\font_math auto"
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
k = find_token(document.header, "\\font_sans kurierl", 0)
kurier_fonts = ["kurier", "kurierc", "kurierl", "kurierlc"]
k = find_token(document.header, "\\font_sans kurier", 0)
if k != -1:
add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurierl}\n" \
"\\renewcommand{\\bfdefault}{b}")
document.header[k] = "\\font_sans default"
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
l = find_token(document.header, "\\font_sans kurier-condensed", 0)
if l != -1:
add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurier}\n" \
"\\edef\\sfdefault{\\sfdefault c}\n" \
"\\renewcommand{\\bfdefault}{b}")
document.header[l] = "\\font_sans default"
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
m = find_token(document.header, "\\font_sans kurier-light-condensed", 0)
if m != -1:
add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurierl}\n" \
"\\edef\\sfdefault{\\sfdefault c}\n" \
"\\renewcommand{\\bfdefault}{b}")
document.header[m] = "\\font_sans default"
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
j = find_token(document.header, "\\font_sans kurier", 0)
if j != -1:
add_to_preamble(document, "\\renewcommand{\\sfdefault}{kurier}\n" \
"\\renewcommand{\\bfdefault}{b}")
document.header[j] = "\\font_sans default"
sf = get_value(document.header, "\\font_sans", k)
if sf in kurier_fonts:
add_to_preamble(document, "\\renewcommand{\\sfdefault}{%s}" % sf)
document.header[k] = "\\font_sans default"
##