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

Handle Michael's changes to InsetCollapsable.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8255 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-12-15 22:04:31 +00:00
parent 3833192776
commit faaea50708
8 changed files with 127 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/ChangeLog
View File

@ -1,3 +1,7 @@
2003-12-15 Angus Leeming <leeming@lyx.org>
* FORMAT: document change to format 228.
2003-12-10 Angus Leeming <leeming@lyx.org>
* FORMAT: document the addition of a 'draft' option to InsetExternal.

8
development/FORMAT
View File

@ -1,6 +1,14 @@
LyX file-format changes
-----------------------
2003-12-15 Angus Leeming <leeming@lyx.org>
* format incremented to 228.
* Change the output of all insets derived from InsetCollapsable
except for InsetERT (which has this output already), changing lines
"collapsed true" -> "status collapsed"
"collapsed false" -> "status open".
2003-12-10 Angus Leeming <leeming@lyx.org>
* format NOT incremented.

7
lib/lyx2lyx/ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-15 Angus Leeming <leeming@lyx.org>
* lyx2lyx:
* lyxconvert_227.py:
* lyxrevert_228.py: convert the InsetCollapsable format between
formats 227 and 228.
2003-12-10 Angus Leeming <leeming@lyx.org>
* lyxrevert_227.py: InsetExternal gains a 'draft' option, so remove

2
lib/lyx2lyx/lyx2lyx
View File

@ -40,7 +40,7 @@ opt.quiet = 0
format = re.compile(r"(\d)[\.,]?(\d\d)")
fileformat = re.compile(r"\\lyxformat\s*(\S*)")
lst_ft = [210, 215, 216, 217, 218, 220, 221, 223, 224, 225, 226, 227]
lst_ft = [210, 215, 216, 217, 218, 220, 221, 223, 224, 225, 226, 227, 228]
def usage():
print """Usage: lyx2lyx [options] [file]

50
lib/lyx2lyx/lyxconvert_227.py Normal file
View File

@ -0,0 +1,50 @@
# This file is part of lyx2lyx
# Copyright (C) 2003 José Matos <jamatos@fep.up.pt>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from parser_tools import find_tokens
def convert_collapsable(lines):
i = 0
while 1:
i = find_tokens(lines, ["\\begin_inset Box",
"\\begin_inset Branch",
"\\begin_inset CharStyle",
"\\begin_inset Float",
"\\begin_inset Foot",
"\\begin_inset Marginal",
"\\begin_inset Note",
"\\begin_inset OptArg",
"\\begin_inset Wrap"], i)
if i == -1:
break
# We are interested in the next line
i = i + 1
if (lines[i] == "collapsed false"):
lines[i] = "status open"
elif (lines[i] == "collapsed true"):
lines[i] = "status collapsed"
else:
sys.stderr.write("Malformed lyx file\n")
i = i + 1
def convert(header, body):
convert_collapsable(body)
if __name__ == "__main__":
pass

51
lib/lyx2lyx/lyxrevert_228.py Normal file
View File

@ -0,0 +1,51 @@
# This file is part of lyx2lyx
# Copyright (C) 2003 Jos<6F>é Matos <jamatos@fep.up.pt>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from parser_tools import find_tokens
def convert_collapsable(lines):
i = 0
while 1:
i = find_tokens(lines, ["\\begin_inset Box",
"\\begin_inset Branch",
"\\begin_inset CharStyle",
"\\begin_inset Float",
"\\begin_inset Foot",
"\\begin_inset Marginal",
"\\begin_inset Note",
"\\begin_inset OptArg",
"\\begin_inset Wrap"], i)
if i == -1:
break
# We are interested in the next line
i = i + 1
if (lines[i] == "status open"):
lines[i] = "collapsed false"
elif (lines[i] == "status collapsed" or
lines[i] == "status inlined"):
lines[i] = "collapsed true"
else:
sys.stderr.write("Malformed lyx file\n")
i = i + 1
def convert(header, body):
convert_collapsable(body)
if __name__ == "__main__":
pass

6
src/ChangeLog
View File

@ -1,7 +1,11 @@
2003-12-15 Angus Leeming <leeming@lyx.org>
* buffer.C: up the format to 228.
2003-12-15 André Pönitz <poenitz@gmx.net>
* cursor_slice.[Ch]: new class to cover texted and mathed's cursor slices
* cursor_slice.[Ch]: new class to cover texted and mathed's cursor
slices
* Makefile.am:

2
src/buffer.C
View File

@ -132,7 +132,7 @@ extern BufferList bufferlist;
namespace {
const int LYX_FORMAT = 227;
const int LYX_FORMAT = 228;
} // namespace anon