anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-04 22:32:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync lyx2lyx with 1.4 (fix bug 2131)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10614 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-11-21 17:14:44 +00:00
parent 3a981e0e95
commit c3ff9d4d4b
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2005-11-21 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* lyx2lyx: sync with 1.4
2005-10-12 Hartmut Haase <hha4491@atomstromfrei.de>
* examples/de_splash.lyx: update.

3
lib/lyx2lyx/LyX.py
View File

@ -46,7 +46,7 @@ format_relation = [("0_10", [210], ["0.10.7","0.10"]),
("1_1_6fix3", [218], ["1.1.6fix3","1.1.6fix4","1.1"]),
("1_2", [220], ["1.2.0","1.2.1","1.2.3","1.2.4","1.2"]),
("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3"]),
("1_4", range(222,245), ["1.4.0cvs","1.4"])]
("1_4", range(222,246), ["1.4.0cvs","1.4"])]
def formats_list():
@ -481,7 +481,6 @@ class NewFile(LyX_Base):
"\\paragraph_separation indent",
"\\defskip medskip",
"\\quotes_language english",
"\\quotes_times 2",
"\\papercolumns 1",
"\\papersides 1",
"\\paperpagestyle default",

21
lib/lyx2lyx/lyx_1_4.py
View File

@ -1557,7 +1557,7 @@ def convert_frameless_box(file):
ert = ert + '\\let\\endminipage\\endlyxtolyxminipage%\n'
old_i = i
i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
j = j + i - old_i - 1
file.body[i:i] = ['\\begin_inset Minipage',
@ -1578,7 +1578,7 @@ def convert_frameless_box(file):
ert = '\\let\\minipage\\lyxtolyxrealminipage%\n'
ert = ert + '\\let\\endminipage\\lyxtolyxrealendminipage%'
old_i = i
i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
j = j + i - old_i - 1
# Redefine the minipage end before the inset end.
@ -1586,7 +1586,7 @@ def convert_frameless_box(file):
file.body[j:j] = ['\\layout Standard', '', '']
j = j + 2
ert = '\\let\\endminipage\\endlyxtolyxminipage'
j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
j = j + 1
file.body.insert(j, '')
j = j + 1
@ -1597,7 +1597,7 @@ def convert_frameless_box(file):
ert = '}%\n'
else:
ert = '\\end{lyxtolyxrealminipage}%\n'
j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
# We don't need to restore the original minipage after the inset
# end because the scope of the redefinition is the original box.
@ -2258,6 +2258,13 @@ def remove_paperpackage(file):
file.header[i] = "\\papersize default"
def remove_quotestimes(file):
i = find_token(file.header, '\\quotes_times', 0)
if i == -1:
return
del file.header[i]
##
# Convertion hub
#
@ -2286,9 +2293,11 @@ convert = [[222, [insert_tracking_changes, add_end_header]],
[241, [convert_ert_paragraphs]],
[242, [convert_french]],
[243, [remove_paperpackage]],
[244, [rename_spaces]]]
[244, [rename_spaces]],
[245, [remove_quotestimes]]]
revert = [[243, [revert_space_names]],
revert = [[244, []],
[243, [revert_space_names]],
[242, []],
[241, []],
[240, [revert_ert_paragraphs]],