From c2091becd2c2bd638a1917779132b59662bfc025 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Tue, 29 Jan 2019 13:21:05 +0100 Subject: [PATCH] Amend a25b9702, lyx2lyx: Corrected handling of system-font-specs In the lines specifying the font, e.g. \font_typewriter "DejaVuSansMono" "DejaVu Sans Mono" the system font specs may contain words separated by spaces --- lib/lyx2lyx/lyx_2_4.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py index 85f7314eae..a74cc237bd 100644 --- a/lib/lyx2lyx/lyx_2_4.py +++ b/lib/lyx2lyx/lyx_2_4.py @@ -220,7 +220,8 @@ def convert_fonts(document, fm): if j != -1: val = get_value(document.header, ft, j) vals = val.split() - document.header[j] = ft + ' "' + fn + '" ' + vals[1] + vals[0] = '"' + fn + '"' + document.header[j] = ft + ' ' + ' '.join(vals) def revert_fonts(document, fm, fontmap): " Revert native font definition to LaTeX " @@ -251,7 +252,8 @@ def revert_fonts(document, fm, fontmap): val = fontinfo.package if not val in fontmap: fontmap[val] = [] - document.header[i] = ft + ' "default" ' + words[1] + words[0] = '"default"' + document.header[i] = ft + ' ' + ' '.join(words) if fontinfo.scaleopt != None: xval = get_value(document.header, "\\font_" + fontinfo.scaletype + "_scale", 0) mo = rscales.search(xval) -- 2.39.2