Jean-Marc Lasgouttes wrote:
>>>>>> "Georg" == Georg Baum
>>>>>> <[EMAIL PROTECTED]>
>>>>>> writes:
>
> Georg> - remove *TOC.lyx from CVS - add Makefile.depend to CVS (not
> Georg> needed for GNU make, but might be needed for other flavours of
> Georg> make) - apply the patch
>
> Georg> Is this OK?
>
> Yes.
Ok, it is in. I forgot however to include the fix from Jose', and it turned
out that my testing was fooled by still existing TOc files, and we have a
problem with srcdir == bulddir now.
Both issues are fixed with the attached patch, which is going in right now.
Georg
Index: lib/doc/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/ChangeLog,v
retrieving revision 1.36
diff -u -p -r1.36 ChangeLog
--- lib/doc/ChangeLog 28 Sep 2005 13:47:02 -0000 1.36
+++ lib/doc/ChangeLog 28 Sep 2005 14:20:48 -0000
@@ -1,5 +1,9 @@
2005-09-28 Georg Baum <[EMAIL PROTECTED]>
+ * doc_toc.py: make it work again with builddir == srcdir
+
+2005-09-28 Georg Baum <[EMAIL PROTECTED]>
+
* de_UserGuide.lyx, it_UserGuide.lyx: repair invalid syntax, maybe
caused by a lyx2lyx bug
* Makefile.am: generate TOC files automatically
Index: lib/doc/doc_toc.py
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/doc/doc_toc.py,v
retrieving revision 1.3
diff -u -p -r1.3 doc_toc.py
--- lib/doc/doc_toc.py 28 Sep 2005 13:47:03 -0000 1.3
+++ lib/doc/doc_toc.py 28 Sep 2005 14:24:17 -0000
@@ -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
@@ -104,8 +108,6 @@ def main(argv):
# fallback
if lang not in info:
lang = 'en'
-
- srcdir = os.path.dirname(sys.argv[0])
# Determine existing translated documents for that language.
toc_general = []
Index: lib/lyx2lyx/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/lyx2lyx/ChangeLog,v
retrieving revision 1.101
diff -u -p -r1.101 ChangeLog
--- lib/lyx2lyx/ChangeLog 28 Sep 2005 09:40:48 -0000 1.101
+++ lib/lyx2lyx/ChangeLog 28 Sep 2005 14:20:55 -0000
@@ -1,3 +1,7 @@
+2005-09-28 José Matos <[EMAIL PROTECTED]>
+
+ * LyX.py: fix relation_format reversion
+
2005-09-28 Jürgen Spitzmüller <[EMAIL PROTECTED]>
* LyX.py: enlarge range to current format (244).
Index: lib/lyx2lyx/LyX.py
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/lyx2lyx/LyX.py,v
retrieving revision 1.25
diff -u -p -r1.25 LyX.py
--- lib/lyx2lyx/LyX.py 28 Sep 2005 09:40:48 -0000 1.25
+++ lib/lyx2lyx/LyX.py 28 Sep 2005 14:20:55 -0000
@@ -284,7 +300,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 +391,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
