diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog index 53f486b1e4..a8b5c34f5f 100644 --- a/lib/lyx2lyx/ChangeLog +++ b/lib/lyx2lyx/ChangeLog @@ -1,3 +1,8 @@ +2005-07-29 José Matos + + * lyx_1_4.py: + * LyX.py: do not ignore format 222. + 2005-07-22 José Matos * lyx_1_4.py (convert_paperpackage, revert_paperpackage): diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 102618d5b5..83a8c6f062 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -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(223,244), ["1.4.0cvs","1.4"])] + ("1_4", range(222,244), ["1.4.0cvs","1.4"])] def formats_list(): diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py index 423f68e6f5..f0b7131348 100644 --- a/lib/lyx2lyx/lyx_1_4.py +++ b/lib/lyx2lyx/lyx_1_4.py @@ -1896,7 +1896,8 @@ def remove_paperpackage(file): # Convertion hub # -convert = [[223, [insert_tracking_changes, add_end_header, remove_color_default, +convert = [[222, [insert_tracking_changes]], + [223, [add_end_header, remove_color_default, convert_spaces, convert_bibtex, remove_insetparent]], [224, [convert_external, convert_comment]], [225, [add_end_layout, layout2begin_layout, convert_end_document, @@ -1943,8 +1944,8 @@ revert = [[242, []], [224, [rm_end_layout, begin_layout2layout, revert_end_document, revert_valignment_middle, convert_vspace, convert_frameless_box]], [223, [revert_external_2, revert_comment, revert_eqref]], - [221, [rm_end_header, revert_spaces, revert_bibtex, - rm_tracking_changes, rm_body_changes]]] + [222, [rm_end_header, revert_spaces, revert_bibtex]], + [221, [rm_tracking_changes, rm_body_changes]]] if __name__ == "__main__":