From adec8fe46d639a0e0f8ade1d572dd5d510cecfd9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Sun, 15 Aug 2004 21:52:13 +0000 Subject: [PATCH] Change \papersize Default|Custom to lower letter for consistency. Fix comment. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8948 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/lyx2lyx/ChangeLog | 6 ++++++ lib/lyx2lyx/lyx_1_4.py | 28 ++++++++++++++++++++++++++++ src/ChangeLog | 8 ++++++++ src/lyxlex.C | 2 +- src/tex-strings.C | 2 +- 5 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog index b688d93dcc..7193f4946f 100644 --- a/lib/lyx2lyx/ChangeLog +++ b/lib/lyx2lyx/ChangeLog @@ -1,3 +1,9 @@ +2004-08-15 José Matos + + * lyx_1_4.py (normalize_papersize, denormalize_papersize): + \papersize Default -> \papersize default + \papersize Custom -> \papersize custom + 2004-08-15 José Matos * LyX.py: new file that gathers all the knowleadge of the LyX file diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py index f2265dd678..947915f357 100644 --- a/lib/lyx2lyx/lyx_1_4.py +++ b/lib/lyx2lyx/lyx_1_4.py @@ -1444,6 +1444,32 @@ def remove_begin_body(body, opt): del body[i] +## +# \papersize +# +def normalize_papersize(header): + i = find_token(header, '\\papersize', 0) + if i == -1: + return + + tmp = split(header[i]) + if tmp[1] == "Default": + header[i] = '\\papersize default' + return + if tmp[1] == "Custom": + header[i] = '\\papersize custom' + + +def denormalize_papersize(header): + i = find_token(header, '\\papersize', 0) + if i == -1: + return + + tmp = split(header[i]) + if tmp[1] == "custom": + header[i] = '\\papersize Custom' + + ## # Convertion hub # @@ -1529,10 +1555,12 @@ def convert(file): convert_bullets(file.header, file) add_begin_header(file.header, file) add_begin_body(file.body, file) + normalize_papersize(file.header) file.format = 236 def revert(file): if file.format > 235: + denormalize_papersize(file.header) remove_begin_body(file.body, file) remove_begin_header(file.header, file) revert_bullets(file.header, file) diff --git a/src/ChangeLog b/src/ChangeLog index 51f5b48806..b6fa72604a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2004-08-15 José Matos + + * lyxlex.C (getString): fix comment, buffer::readBody is now + buffer:readDocument. + + * tex-strings.C (string_papersize): Default -> default, + Custom -> custom, for consistency with other options. + 2004-08-15 Lars Gullik Bjonnes * pch.h: new file diff --git a/src/lyxlex.C b/src/lyxlex.C index 32c4ace873..3e4f0d70dc 100644 --- a/src/lyxlex.C +++ b/src/lyxlex.C @@ -147,7 +147,7 @@ string const LyXLex::getString() const // I would prefer to give a tag number instead of an explicit token -// here, but it is not possible because Buffer::readBody uses +// here, but it is not possible because Buffer::readDocument uses // explicit tokens (JMarc) string const LyXLex::getLongString(string const & endtoken) { diff --git a/src/tex-strings.C b/src/tex-strings.C index b5f68fa0c3..042533fa41 100644 --- a/src/tex-strings.C +++ b/src/tex-strings.C @@ -27,7 +27,7 @@ char const * const string_quotes_language[] = { char const * const string_papersize[] = { - "Default", "Custom", "letterpaper", "executivepaper", "legalpaper", + "default", "custom", "letterpaper", "executivepaper", "legalpaper", "a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", "" }; -- 2.39.2