anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warning in lyx2lyx 2.0<->2.1 round trip

Browse Source 
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.
(cherry picked from commit e754d00faa)

Conflicts:
	status.21x
This commit is contained in:
Georg Baum 2014-04-27 18:04:40 +02:00 committed by Richard Heck
parent 774ffef941
commit a87c56b5ad
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/lyx2lyx/lyx_2_1.py
View File

@ -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):
@ -4432,7 +4441,7 @@ convert = [
[415, [convert_undertilde]],
[416, []],
[417, [convert_japanese_encodings]],
[418, []],
[418, [convert_justification]],
[419, []],
[420, [convert_biblio_style]],
[421, [convert_longtable_captions]],