From aba9a83f22d9b4d49921a87538348d7f430f8e18 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Wed, 28 Sep 2005 14:29:23 +0000 Subject: [PATCH] forgotten fixes for bug 2027 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10494 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/ChangeLog | 4 ++++ lib/doc/doc_toc.py | 8 +++++--- lib/lyx2lyx/ChangeLog | 4 ++++ lib/lyx2lyx/LyX.py | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/doc/ChangeLog b/lib/doc/ChangeLog index 78f0594843..5a07644f90 100644 --- a/lib/doc/ChangeLog +++ b/lib/doc/ChangeLog @@ -1,3 +1,7 @@ +2005-09-28 Georg Baum + + * doc_toc.py: make it work again with builddir == srcdir + 2005-09-28 Georg Baum * de_UserGuide.lyx, it_UserGuide.lyx: repair invalid syntax, maybe diff --git a/lib/doc/doc_toc.py b/lib/doc/doc_toc.py index c50ad1e7c6..8fa2eedc47 100755 --- a/lib/doc/doc_toc.py +++ b/lib/doc/doc_toc.py @@ -25,7 +25,11 @@ import sys import os -sys.path.insert(0, os.path.dirname(sys.argv[0]) + "/../lyx2lyx") +srcdir = os.path.dirname(sys.argv[0]) +if srcdir == '': + srcdir = '.' +sys.path.insert(0, srcdir + "/../lyx2lyx") + import parser_tools import LyX import depend @@ -105,8 +109,6 @@ def main(argv): if lang not in info: lang = 'en' - srcdir = os.path.dirname(sys.argv[0]) - # Determine existing translated documents for that language. toc_general = [] for file in depend.documents(srcdir, pref): diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog index 3975d9cfcc..1783652f5c 100644 --- a/lib/lyx2lyx/ChangeLog +++ b/lib/lyx2lyx/ChangeLog @@ -1,3 +1,7 @@ +2005-09-28 José Matos + + * LyX.py: fix relation_format reversion + 2005-09-28 Jürgen Spitzmüller * LyX.py: enlarge range to current format (244). diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 3bf90bca5e..12f99b3b66 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -284,7 +284,7 @@ class LyX_Base: " Set the value of the header parameter." i = find_token(self.header, '\\' + param, 0) if i == -1: - self.warning(3, 'Parameter not found in the header: %s' % param) + self.warning('Parameter not found in the header: %s' % param, 3) return self.header[i] = '\\%s %s' % (param, str(value)) @@ -375,7 +375,7 @@ class LyX_Base: steps.append(step[0]) else: mode = "revert" - relation_format = format_relation + relation_format = format_relation[:] relation_format.reverse() last_step = None