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

Update format to 340.

Browse Source 
Move

\begin_layout

to

\begin_layout Plain Layout

for consistency.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26020 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2008-08-01 17:57:01 +00:00
parent 04ab3867c4
commit 94b2838bec
3 changed files with 77 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
development/FORMAT
View File

@ -1,6 +1,9 @@
LyX file-format changes LyX file-format changes
----------------------- -----------------------
2008-08-01 José Matos <jamatos@fc.up.pt>
* Format incremented to 340: move empty layouts to "Plain Layout".
2008-07-28 Richard Heck <rgheck@brown.edu> 2008-07-28 Richard Heck <rgheck@brown.edu>
* Format incremented to 339: removal of default modules. * Format incremented to 339: removal of default modules.

17
lib/lyx2lyx/lyx_1_6.py
View File

@ -1315,7 +1315,8 @@ def convert_ams_classes(document):
return return
m = r.match(document.body[i]) m = r.match(document.body[i])
if m == None: if m == None:
document.warning("Weirdly formed \\begin_layout at line %d of body!" % i) # This is an empty layout
# document.warning("Weirdly formed \\begin_layout at line %d of body!" % i)
i += 1 i += 1
continue continue
m = m.group(1) m = m.group(1)
@ -2873,6 +2874,16 @@ def revert_removed_modules(document):
document.header[i : j + 1] = [] document.header[i : j + 1] = []
def add_plain_layout(document):
i = 0
while True:
i = find_token(document.body, "\\begin_layout", i)
if i == -1:
return
if len(document.body[i].split()) == 1:
document.body[i] = "\\begin_layout Plain Layout"
i += 1
## ##
# Conversion hub # Conversion hub
# #
@ -2941,9 +2952,11 @@ convert = [[277, [fix_wrong_tables]],
[337, [convert_display_enum]], [337, [convert_display_enum]],
[338, []], [338, []],
[339, []], [339, []],
[340, [add_plain_layout]]
] ]
revert = [[338, [revert_removed_modules]], revert = [[339, []],
[338, [revert_removed_modules]],
[337, [revert_polytonicgreek]], [337, [revert_polytonicgreek]],
[336, [revert_display_enum]], [336, [revert_display_enum]],
[335, [remove_fontsCJK]], [335, [remove_fontsCJK]],

2
src/Buffer.cpp
View File

@ -115,7 +115,7 @@ namespace os = support::os;
namespace { namespace {
int const LYX_FORMAT = 339; //rgh: removed modules int const LYX_FORMAT = 340; //jamatos: add plain layout
typedef map<string, bool> DepClean; typedef map<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache; typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;