anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-05 17:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/configure.py: use \nonstopmode instead of -interaction=nonstopmode, from JMarc and Enrico

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14317 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-07-03 15:34:02 +00:00
parent fa8db4c6a9
commit f7c2372ec4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ChangeLog
View File

@ -1,3 +1,6 @@
2006-07-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org> and Enrico Forestieri <forenr@tlc.unipr.it>
* configure.py: use \nonstopmode instead of -interaction=nonstopmode
2006-07-02 Bo Peng <ben.bob@gmail.com> 2006-07-02 Bo Peng <ben.bob@gmail.com>
* configure.py: add nonstopmode to cygwin latex check * configure.py: add nonstopmode to cygwin latex check

14
lib/configure.py
View File

@ -85,17 +85,16 @@ def checkTeXPaths():
from tempfile import mkstemp from tempfile import mkstemp
fd, tmpfname = mkstemp(suffix='.ltx', dir='/tmp') fd, tmpfname = mkstemp(suffix='.ltx', dir='/tmp')
os.write(fd, r''' os.write(fd, r'''
\documentstyle{article} \relax
\begin{document}\end{document}
''') ''')
os.close(fd) os.close(fd)
inpname = cmdOutput('cygpath -m ' + tmpfname) inpname = cmdOutput('cygpath -m ' + tmpfname)
# a wrapper file # a wrapper file
wfd, wtmpfname = mkstemp(suffix='.ltx', dir='/tmp') wfd, wtmpfname = mkstemp(suffix='.ltx', dir='/tmp')
wtmpfname = cmdOutput('cygpath -m ' + wtmpfname) wtmpfname = cmdOutput('cygpath -m ' + wtmpfname)
os.write(wfd, r'\input{' + inpname + '}' ) os.write(wfd, r'\nonstopmode\input{' + inpname + '}' )
os.close(wfd) os.close(wfd)
if cmdOutput('latex -interaction=nonstopmode %s' % wtmpfname).find('Error') != -1: if cmdOutput('latex %s' % wtmpfname).find('Error') != -1:
print "configure: TeX engine needs posix-style paths in latex files" print "configure: TeX engine needs posix-style paths in latex files"
windows_style_tex_paths = 'false' windows_style_tex_paths = 'false'
else: else:
@ -637,11 +636,8 @@ def checkTeXAllowSpaces():
tex_allows_spaces = 'false' tex_allows_spaces = 'false'
if lyx_check_config: if lyx_check_config:
print "Checking whether TeX allows spaces in file names... ", print "Checking whether TeX allows spaces in file names... ",
writeToFile('a b.tex', r'\message{working^^J}' ) writeToFile('a b.tex', r'\nonstopmode\message{working^^J}' )
# FIXME: the bsh version uses < /dev/null which is not portable. if ''.join(cmdOutput(LATEX + ' "a b"')).find('working') != -1:
# Can anyone confirm if this option (-interaction) is available
# at other flavor of latex as well? (MikTex/win, Web2C/linux are fine.)
if ''.join(cmdOutput(LATEX + ' -interaction=nonstopmode "a b"')).find('working') != -1:
print 'yes' print 'yes'
tex_allows_spaces = 'true' tex_allows_spaces = 'true'
else: else: