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

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index b68c2202c08fc86ca8c7a6b5d44456e8da8e730d..f2f1fe1c92c4427a657684d381b3b599e65ba9f0 100644 (file)
--- 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])