Jean-Marc Lasgouttes wrote:
>>>>>> "Georg" == Georg Baum
>>>>>> <[EMAIL PROTECTED]>
>>>>>> writes:
> Georg> Here is the next step (with ChangeLog entries instead of a log
> Georg> message because the svn merge gave them): Actually use
> Georg> configure.py. Jean-Marc, is this OK to go in? The plan is to
> Georg> apply the other pending configure fixes afterwards.
>
> Yes, this is good.
OK, next step: The path with spaces fix from Angus. OK?
Georg
Log:
>From Angus:
Enable lib/configure.py to find tex2lyx if the path to it contains spaces.
Index: status.14x
===================================================================
--- status.14x (Revision 13740)
+++ status.14x (Arbeitskopie)
@@ -76,3 +76,5 @@ What's new
- Replace the old sh version of lib/configure with the new python version
lib/configure.py
+
+- Enable lib/configure.py to find tex2lyx if the path to it contains spaces.
Index: lib/configure.py
===================================================================
--- lib/configure.py (Revision 13739)
+++ lib/configure.py (Arbeitskopie)
@@ -268,10 +268,22 @@ def checkConverterEntries():
''' Check all converters (\converter entries) '''
checkProg('the pdflatex program', ['pdflatex $$i'],
rc_entry = [ r'\converter latex pdf2 "%%" "latex"' ])
- #
- checkProg('a LaTeX -> LyX converter', [os.path.join('..','src','tex2lyx','tex2lyx') + ' -f $$i $$o', \
+
+ ''' If we're running LyX in-place then tex2lyx will be found in
+ ../src/tex2lyx. Add this directory to the PATH temporarily and
+ search for tex2lyx.
+ Use PATH to avoid any problems with paths-with-spaces.
+ '''
+ path_orig = os.environ["PATH"]
+ os.environ["PATH"] = os.path.join('..','src','tex2lyx') + \
+ os.pathsep + path_orig
+
+ checkProg('a LaTeX -> LyX converter', ['tex2lyx -f $$i $$o', \
'tex2lyx' + version_suffix + ' -f $$i $$o' ],
rc_entry = [ r'\converter latex lyx "%%" ""' ])
+
+ os.environ["PATH"] = path_orig
+
#
checkProg('a Noweb -> LyX converter', ['noweb2lyx' + version_suffix + ' $$i $$o'], path = ['./reLyX'],
rc_entry = [ r'\converter literate lyx "%%" ""' ])
