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

More osf (texfont) fixes

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-07-14 09:09:46 +02:00
parent e69a6661a5
commit 509551cae0
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/latexfonts
View File

@ -721,11 +721,12 @@ Font IBMPlexSansSemibold
MoreOptions 1
EndFont
Font ADOBESourceSansPro
GuiName "Adobe Source Sans Pro"
Family sf
Package sourcesanspro
ScaleOption scaled=$$val
Font ADOBESourceSansPro
GuiName "Adobe Source Sans Pro"
Family sf
Package sourcesanspro
ScaleOption scaled=$$val
OsfOption osf
MoreOptions 1
EndFont
@ -984,11 +985,12 @@ Font IBMPlexMonoSemibold
MoreOptions 1
EndFont
Font ADOBESourceCodePro
GuiName "Adobe Source Code Pro"
Family tt
Package sourcecodepro
ScaleOption scaled=$$val
Font ADOBESourceCodePro
GuiName "Adobe Source Code Pro"
Family tt
Package sourcecodepro
ScaleOption scaled=$$val
OsfOption osf
MoreOptions 1
EndFont

7
lib/lyx2lyx/lyx_2_4.py
View File

@ -161,8 +161,8 @@ def createFontMapping(fontlist):
"typewriter", "tt", "plex-mono", "scale")
elif font == 'Adobe':
fm.expandFontMapping(['ADOBESourceSerifPro'], "roman", None, "sourceserifpro", None, "osf")
fm.expandFontMapping(['ADOBESourceSansPro'], "sans", "sf", "sourcesanspro", "scaled")
fm.expandFontMapping(['ADOBESourceCodePro'], "typewriter", "tt", "sourcecodepro", "scaled")
fm.expandFontMapping(['ADOBESourceSansPro'], "sans", "sf", "sourcesanspro", "scaled", "osf")
fm.expandFontMapping(['ADOBESourceCodePro'], "typewriter", "tt", "sourcecodepro", "scaled", "osf")
elif font == 'Noto':
fm.expandFontMapping(['NotoSerifRegular,regular', 'NotoSerifMedium,medium',
'NotoSerifThin,thin', 'NotoSerifLight,light',
@ -305,10 +305,9 @@ def revert_fonts(document, fm, fontmap, OnlyWithXOpts = False):
if xval1 != "100":
# set correct scale option
fontmap[val].extend([fontinfo.scaleopt + "=" + format(float(xval1) / 100, '.2f')])
if fontinfo.osfopt != None and fontinfo.fonttype == "roman":
if fontinfo.osfopt != None:
osf = find_token(document.header, "\\font_osf true")
if osf != -1:
document.header[osf] = "\\font_osf false"
fontmap[val].extend([fontinfo.osfopt])
if len(fontinfo.options) > 0:
fontmap[val].extend(fontinfo.options)

8
src/tex2lyx/Preamble.cpp
View File

@ -1075,6 +1075,10 @@ void Preamble::handle_package(Parser &p, string const & name,
scale_as_percentage(opt, h_font_sf_scale[0]);
continue;
}
if (opt == "osf") {
h_font_osf = "true";
continue;
}
if (!xopts.empty())
xopts += ", ";
xopts += opt;
@ -1168,6 +1172,10 @@ void Preamble::handle_package(Parser &p, string const & name,
scale_as_percentage(opt, h_font_tt_scale[0]);
continue;
}
if (opt == "osf") {
h_font_osf = "true";
continue;
}
if (!xopts.empty())
xopts += ", ";
xopts += opt;