anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 24050bf, DejaVu adm IBM-Plex fonts need different scale options

Browse Source
This commit is contained in:
Kornel Benko 2018-08-18 17:10:43 +02:00
parent 8a7c10958e
commit 66a33930f5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/lyx2lyx/lyx_2_4.py
View File

@ -60,7 +60,7 @@ def convert_fonts(document, font_list, font_type, scale_type, pkg):
" Handle font definition to LaTeX " " Handle font definition to LaTeX "
def createkey(pkg, options): def createkey(pkg, options):
sort(options) options.sort()
return pkg + ':' + "-".join(options) return pkg + ':' + "-".join(options)
def getfontname(pkg, options, pkg2fontmap, font2pkgmap): def getfontname(pkg, options, pkg2fontmap, font2pkgmap):
@ -200,7 +200,12 @@ def revert_fonts(document, font_list, fontmap, package=None):
# cutoff " 100" # cutoff " 100"
xval = xval[:-4] xval = xval[:-4]
if xval != "100": if xval != "100":
fontmap[val].extend(["scale=" + format(float(xval) / 100, '.2f')]) # set correct scale option
if re.match('Deja.*', val):
scale_par = "scaled"
else:
scale_par = "scale"
fontmap[val].extend([scale_par + "=" + format(float(xval) / 100, '.2f')])
if len(optmap[font]) > 0: if len(optmap[font]) > 0:
fontmap[val].extend(optmap[font]) fontmap[val].extend(optmap[font])