forgotten fixes for bug 2027

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10494 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/ChangeLog b/lib/doc/ChangeLog
index 78f0594843cb1b86adc4b36f90bf9bdfc556478e..5a07644f90331b2cb1fc3cd5fd53db35bd806af9 100644 (file)
--- a/lib/doc/ChangeLog
+++ b/lib/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * doc_toc.py: make it work again with builddir == srcdir
+
 2005-09-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * 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 c50ad1e7c6194d365f78f148394047dae9628009..8fa2eedc47ccce989098d8ec675b058a3982bbda 100755 (executable)
--- 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 3975d9cfcc11cdfd395cc45866fad1323fe3a0a1..1783652f5cdd111af058eb2fe48d1ac73f7baafb 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-28  José Matos  <jamatos@lyx.org>
+
+       * LyX.py: fix relation_format reversion
+
 2005-09-28  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * LyX.py: enlarge range to current format (244).

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 3bf90bca5e0b57f86875bb6fc2a7be45df82ee59..12f99b3b662fe04b322a90ea97744427759e7dfd 100644 (file)
--- 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