Use booleans True and False and fix a typo in configure.py

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15932 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2006-11-15 01:20:31 +00:00
parent c72b361fc9
commit 35be7672f4

View File

@ -189,15 +189,15 @@ def checkDTLtools():
if ((os.name == 'nt' or sys.platform == 'cygwin') and if ((os.name == 'nt' or sys.platform == 'cygwin') and
checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and checkProg('DVI to DTL converter', ['dv2dt']) != ['', ''] and
checkProg('DTL to DVI converter', ['dt2dv']) != ['', '']): checkProg('DTL to DVI converter', ['dt2dv']) != ['', '']):
dtl_tools = 'true' dtl_tools = True
else: else:
dtl_tools = 'false' dtl_tools = False
return dtl_tools return dtl_tools
def checkLatex(dtl_tools): def checkLatex(dtl_tools):
''' Check latex, return lyx_check_config ''' ''' Check latex, return lyx_check_config '''
if (dtl_tools == 'true'): if dtl_tools:
# Windows only: DraftDVI # Windows only: DraftDVI
converter_entry = r'''\converter latex dvi2 "%%" "latex" converter_entry = r'''\converter latex dvi2 "%%" "latex"
\converter dvi2 dvi "python -tt $$s/scripts/clean_dvi.py $$i $$o" ""''' \converter dvi2 dvi "python -tt $$s/scripts/clean_dvi.py $$i $$o" ""'''
@ -287,7 +287,7 @@ def checkFormatEntries(dtl_tools):
# #
checkViewer('a DVI previewer', ['xdvi', 'kdvi'], checkViewer('a DVI previewer', ['xdvi', 'kdvi'],
rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"']) rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"'])
if (dtl_tools == 'true'): if dtl_tools:
# Windows only: DraftDVI # Windows only: DraftDVI
addToRC(r'\Format dvi2 dvi DraftDVI "" "" "document,vector"') addToRC(r'\Format dvi2 dvi DraftDVI "" "" "document,vector"')
# #
@ -416,7 +416,7 @@ def checkConverterEntries():
'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea -s $$i'], 'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea -s $$i'],
rc_entry = [ r'\converter latex html "%%" "originaldir,needaux"' ]) rc_entry = [ r'\converter latex html "%%" "originaldir,needaux"' ])
# #
path, lilypond = checkProg('a LilyPond -> ESP/PDF/PNG converter', ['lilypond']) path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond'])
if (lilypond != ''): if (lilypond != ''):
version_string = cmdOutput("lilypond --version") version_string = cmdOutput("lilypond --version")
match = re.match('GNU LilyPond (\S+)', version_string) match = re.match('GNU LilyPond (\S+)', version_string)