commit cacd2a041d2c78904d43f0918515695a972781b9
Author: Georg Baum <[email protected]>
Date: Thu Apr 24 21:52:32 2014 +0200
Fix warning in lyx2lyx 2.0<->2.1 round trip
revert_justification() issues a warning if the \justification parameter does
not exist, and LyX itself always writes it unconditionally as well, so add
it
also in lyx2lyx when converting old documents.
Currently this does not have any user visible effect, but it decouples the
default value of BufferParams::justification from the conversion of old
documents: Now it is possible to set the default to false in LyX, and old
documents will still be converted correctly.
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index c7768b1..2a5360e 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -387,6 +387,15 @@ def revert_japanese_encodings(document):
document.header[i] = "\\inputencoding %s" % jap_enc_dict[val]
+def convert_justification(document):
+ " Add the \\justification buffer param"
+ i = find_token(document.header, "\\use_indices" , 0)
+ if i == -1:
+ document.warning("Malformed LyX document: Missing \\use_indices.")
+ return
+ document.header.insert(i + 1, "\\justification true")
+
+
def revert_justification(document):
" Revert the \\justification buffer param"
if not del_token(document.header, '\\justification', 0):
@@ -4423,7 +4432,7 @@ convert = [
[415, [convert_undertilde]],
[416, []],
[417, [convert_japanese_encodings]],
- [418, []],
+ [418, [convert_justification]],
[419, []],
[420, [convert_biblio_style]],
[421, [convert_longtable_captions]],
