anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend e9c0d48d

Browse Source 
Forgotten to commit lyx_2_4.py
This commit is contained in:
Kornel Benko 2019-07-17 18:03:31 +02:00
parent e9c0d48d58
commit a45759cdb4
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/lyx2lyx/lyx_2_4.py
View File

@ -179,6 +179,10 @@ def createFontMapping(fontlist):
elif font == 'Cantarell': elif font == 'Cantarell':
fm.expandFontMapping(['cantarell,defaultsans'], fm.expandFontMapping(['cantarell,defaultsans'],
"sans", "sf", "cantarell", "scaled", "oldstyle") "sans", "sf", "cantarell", "scaled", "oldstyle")
elif font == 'Chivo':
fm.expandFontMapping(['ChivoThin,thin', 'ChivoLight,light',
'Chivo,regular', 'ChivoMedium,medium'],
"sans", "sf", "Chivo", "scale", "oldstyle")
elif font == 'Fira': elif font == 'Fira':
fm.expandFontMapping(['FiraSans', 'FiraSansBook,book', fm.expandFontMapping(['FiraSans', 'FiraSansBook,book',
'FiraSansThin,thin', 'FiraSansLight,light', 'FiraSansThin,thin', 'FiraSansLight,light',
@ -2918,6 +2922,22 @@ def revert_CantarellFont(document):
if revert_fonts(document, fm, fontmap, False, True): if revert_fonts(document, fm, fontmap, False, True):
add_preamble_fonts(document, fontmap) add_preamble_fonts(document, fontmap)
def convert_ChivoFont(document):
" Handle Chivo font definition to LaTeX "
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
fm = createFontMapping(['Chivo'])
convert_fonts(document, fm, "oldstyle")
def revert_ChivoFont(document):
" Revert native Chivo font definition to LaTeX "
if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1:
fontmap = dict()
fm = createFontMapping(['Chivo'])
if revert_fonts(document, fm, fontmap, False, True):
add_preamble_fonts(document, fontmap)
def convert_FiraFont(document): def convert_FiraFont(document):
" Handle Fira font definition to LaTeX " " Handle Fira font definition to LaTeX "
@ -2980,9 +3000,11 @@ convert = [
[580, []], [580, []],
[581, [convert_osf]], [581, [convert_osf]],
[582, [convert_AdobeFonts,convert_latexFonts,convert_notoFonts,convert_CantarellFont,convert_FiraFont]],# old font re-converterted due to extra options [582, [convert_AdobeFonts,convert_latexFonts,convert_notoFonts,convert_CantarellFont,convert_FiraFont]],# old font re-converterted due to extra options
[583, [convert_ChivoFont]],
] ]
revert = [[581, [revert_CantarellFont,revert_FiraFont]], revert = [[582, [revert_ChivoFont]],
[581, [revert_CantarellFont,revert_FiraFont]],
[580, [revert_texfontopts,revert_osf]], [580, [revert_texfontopts,revert_osf]],
[579, [revert_minionpro, revert_plainNotoFonts_xopts, revert_notoFonts_xopts, revert_IBMFonts_xopts, revert_AdobeFonts_xopts, revert_font_opts]], # keep revert_font_opts last! [579, [revert_minionpro, revert_plainNotoFonts_xopts, revert_notoFonts_xopts, revert_IBMFonts_xopts, revert_AdobeFonts_xopts, revert_font_opts]], # keep revert_font_opts last!
[578, [revert_babelfont]], [578, [revert_babelfont]],