From eca0c649beb0155064924559c65e553dcd1ef88d Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 18 Aug 2018 17:10:43 +0200 Subject: [PATCH] Amend 24050bf, DejaVu adm IBM-Plex fonts need different scale options --- lib/lyx2lyx/lyx_2_4.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py index b68c2202c0..f2f1fe1c92 100644 --- a/lib/lyx2lyx/lyx_2_4.py +++ b/lib/lyx2lyx/lyx_2_4.py @@ -60,7 +60,7 @@ def convert_fonts(document, font_list, font_type, scale_type, pkg): " Handle font definition to LaTeX " def createkey(pkg, options): - sort(options) + options.sort() return pkg + ':' + "-".join(options) def getfontname(pkg, options, pkg2fontmap, font2pkgmap): @@ -200,7 +200,12 @@ def revert_fonts(document, font_list, fontmap, package=None): # cutoff " 100" xval = xval[:-4] 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: fontmap[val].extend(optmap[font]) -- 2.39.5