X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=d379f5b0eb9346ee92bf889f6cbb705987bac540;hb=c09fcc890feadcbdca4308a12c99d4f7092ff735;hp=84bbdaf70993983310278c4527c2ff47269f135b;hpb=441161daa23e5c9e6e64e178c538d9f05923525a;p=lyx.git diff --git a/lib/configure.py b/lib/configure.py index 84bbdaf709..d379f5b0eb 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -8,26 +8,21 @@ # \author Bo Peng # Full author contact details are available in file CREDITS. -import sys, os, re, shutil, glob - - -class Tee: - ''' Writing to a Tee object will write to all file objects it keeps. - That is to say, writing to Tee(sys.stdout, open(logfile, 'w')) will - write to sys.stdout as well as a log file. - ''' - def __init__(self, *args): - self.files = args - - def write(self, data): - for f in self.files: - result = f.write(data) - return result - - def writelines(self, seq): - for i in seq: - self.write(i) +import sys, os, re, shutil, glob, logging +# set up logging +logging.basicConfig(level = logging.DEBUG, + format = '%(levelname)s: %(message)s', # ignore application name + filename = 'configure.log', + filemode = 'w') +# +# Add a handler to log to console +console = logging.StreamHandler() +console.setLevel(logging.INFO) # the console only print out general information +formatter = logging.Formatter('%(message)s') # only print out the message itself +console.setFormatter(formatter) +logger = logging.getLogger('LyX') +logger.addHandler(console) def writeToFile(filename, lines, append = False): " utility function: write or append lines to filename " @@ -45,6 +40,7 @@ def addToRC(lines): ''' if lines.strip() != '': writeToFile(outfile, lines + '\n', append = True) + logger.debug('Add to RC:\n' + lines + '\n\n') def removeFiles(filenames): @@ -54,7 +50,9 @@ def removeFiles(filenames): for file in filenames: try: os.remove(file) + logger.debug('Removing file %s' % file) except: + logger.debug('Failed to remove file %s' % file) pass @@ -89,8 +87,9 @@ def createDirectories(): if not os.path.isdir( dir ): try: os.mkdir( dir) + logger.debug('Create directory %s.' % dir) except: - print "Failed to create directory ", dir + logger.error('Failed to create directory %s.' % dir) sys.exit(1) @@ -110,10 +109,10 @@ def checkTeXPaths(): os.close(fd) latex_out = cmdOutput(r'latex "\nonstopmode\input{%s}"' % inpname) if 'Error' in latex_out: - print "configure: TeX engine needs posix-style paths in latex files" + logger.warning("configure: TeX engine needs posix-style paths in latex files") windows_style_tex_paths = 'false' else: - print "configure: TeX engine needs windows-style paths in latex files" + logger.info("configure: TeX engine needs windows-style paths in latex files") windows_style_tex_paths = 'true' removeFiles([tmpfname, logname, 'texput.log']) return windows_style_tex_paths @@ -148,15 +147,15 @@ def checkProg(description, progs, rc_entry = [], path = [], not_found = ''): ''' # one rc entry for each progs plus not_found entry if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: - print "rc entry should have one item or item for each prog and not_found." + logger.error("rc entry should have one item or item for each prog and not_found.") sys.exit(2) - print 'checking for ' + description + '...' + logger.info('checking for ' + description + '...') ## print '(' + ','.join(progs) + ')', for idx in range(len(progs)): # ac_prog may have options, ac_word is the command name ac_prog = progs[idx] ac_word = ac_prog.split(' ')[0] - print '+checking for "' + ac_word + '"... ', + msg = '+checking for "' + ac_word + '"... ' path = os.environ["PATH"].split(os.pathsep) + path extlist = [''] if os.environ.has_key("PATHEXT"): @@ -164,7 +163,7 @@ def checkProg(description, progs, rc_entry = [], path = [], not_found = ''): for ac_dir in path: for ext in extlist: if os.path.isfile( os.path.join(ac_dir, ac_word + ext) ): - print ' yes' + logger.info(msg + ' yes') # write rc entries for this command if len(rc_entry) == 1: addToRC(rc_entry[0].replace('%%', ac_prog)) @@ -172,16 +171,197 @@ def checkProg(description, progs, rc_entry = [], path = [], not_found = ''): addToRC(rc_entry[idx].replace('%%', ac_prog)) return [ac_dir, ac_word] # if not successful - print ' no' + logger.info(msg + ' no') + # write rc entries for 'not found' + if len(rc_entry) > 0: # the last one. + addToRC(rc_entry[-1].replace('%%', not_found)) + return ['', not_found] + + +def checkProgAlternatives(description, progs, rc_entry = [], alt_rc_entry = [], path = [], not_found = ''): + ''' + The same as checkProg, but additionally, all found programs will be added + as alt_rc_entries + ''' + # one rc entry for each progs plus not_found entry + if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: + logger.error("rc entry should have one item or item for each prog and not_found.") + sys.exit(2) + logger.info('checking for ' + description + '...') + ## print '(' + ','.join(progs) + ')', + found_prime = False + real_ac_dir = '' + real_ac_word = not_found + for idx in range(len(progs)): + # ac_prog may have options, ac_word is the command name + ac_prog = progs[idx] + ac_word = ac_prog.split(' ')[0] + msg = '+checking for "' + ac_word + '"... ' + path = os.environ["PATH"].split(os.pathsep) + path + extlist = [''] + if os.environ.has_key("PATHEXT"): + extlist = extlist + os.environ["PATHEXT"].split(os.pathsep) + found_alt = False + for ac_dir in path: + for ext in extlist: + if os.path.isfile( os.path.join(ac_dir, ac_word + ext) ): + logger.info(msg + ' yes') + pr = re.compile(r'(\\\S+)(.*)$') + m = None + # write rc entries for this command + if found_prime == False: + if len(rc_entry) == 1: + addToRC(rc_entry[0].replace('%%', ac_prog)) + elif len(rc_entry) > 1: + addToRC(rc_entry[idx].replace('%%', ac_prog)) + real_ac_dir = ac_dir + real_ac_word = ac_word + found_prime = True + if len(alt_rc_entry) == 1: + alt_rc = alt_rc_entry[0] + if alt_rc == "": + # if no explicit alt_rc is given, construct one + m = pr.match(rc_entry[0]) + if m: + alt_rc = m.group(1) + "_alternatives" + m.group(2) + addToRC(alt_rc.replace('%%', ac_prog)) + elif len(alt_rc_entry) > 1: + alt_rc = alt_rc_entry[idx] + if alt_rc == "": + # if no explicit alt_rc is given, construct one + m = pr.match(rc_entry[idx]) + if m: + alt_rc = m.group(1) + "_alternatives" + m.group(2) + addToRC(alt_rc.replace('%%', ac_prog)) + found_alt = True + break + if found_alt: + break + if found_alt == False: + # if not successful + logger.info(msg + ' no') + if found_prime: + return [real_ac_dir, real_ac_word] # write rc entries for 'not found' if len(rc_entry) > 0: # the last one. addToRC(rc_entry[-1].replace('%%', not_found)) return ['', not_found] +def addViewerAlternatives(rcs): + r = re.compile(r'\\Format (\S+).*$') + m = None + alt = '' + for idxx in range(len(rcs)): + if len(rcs) == 1: + m = r.match(rcs[0]) + if m: + alt = r'\viewer_alternatives ' + m.group(1) + " %%" + elif len(rcs) > 1: + m = r.match(rcs[idxx]) + if m: + if idxx > 0: + alt += '\n' + alt += r'\viewer_alternatives ' + m.group(1) + " %%" + return alt + + +def addEditorAlternatives(rcs): + r = re.compile(r'\\Format (\S+).*$') + m = None + alt = '' + for idxx in range(len(rcs)): + if len(rcs) == 1: + m = r.match(rcs[0]) + if m: + alt = r'\editor_alternatives ' + m.group(1) + " %%" + elif len(rcs) > 1: + m = r.match(rcs[idxx]) + if m: + if idxx > 0: + alt += '\n' + alt += r'\editor_alternatives ' + m.group(1) + " %%" + return alt + + def checkViewer(description, progs, rc_entry = [], path = []): - ''' The same as checkProg, but for viewers and editors ''' - return checkProg(description, progs, rc_entry, path, not_found = 'auto') + ''' The same as checkProgAlternatives, but for viewers ''' + if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: + logger.error("rc entry should have one item or item for each prog and not_found.") + sys.exit(2) + alt_rc_entry = [] + for idx in range(len(progs)): + if len(rc_entry) == 1: + rcs = rc_entry[0].split('\n') + alt = addViewerAlternatives(rcs) + alt_rc_entry.insert(0, alt) + elif len(rc_entry) > 1: + rcs = rc_entry[idx].split('\n') + alt = addViewerAlternatives(rcs) + alt_rc_entry.insert(idx, alt) + return checkProgAlternatives(description, progs, rc_entry, alt_rc_entry, path, not_found = 'auto') + + +def checkEditor(description, progs, rc_entry = [], path = []): + ''' The same as checkProgAlternatives, but for editors ''' + if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: + logger.error("rc entry should have one item or item for each prog and not_found.") + sys.exit(2) + alt_rc_entry = [] + for idx in range(len(progs)): + if len(rc_entry) == 1: + rcs = rc_entry[0].split('\n') + alt = addEditorAlternatives(rcs) + alt_rc_entry.insert(0, alt) + elif len(rc_entry) > 1: + rcs = rc_entry[idx].split('\n') + alt = addEditorAlternatives(rcs) + alt_rc_entry.insert(idx, alt) + return checkProgAlternatives(description, progs, rc_entry, alt_rc_entry, path, not_found = 'auto') + + +def checkViewerNoRC(description, progs, rc_entry = [], path = []): + ''' The same as checkViewer, but do not add rc entry ''' + if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: + logger.error("rc entry should have one item or item for each prog and not_found.") + sys.exit(2) + alt_rc_entry = [] + for idx in range(len(progs)): + if len(rc_entry) == 1: + rcs = rc_entry[0].split('\n') + alt = addViewerAlternatives(rcs) + alt_rc_entry.insert(0, alt) + elif len(rc_entry) > 1: + rcs = rc_entry[idx].split('\n') + alt = addViewerAlternatives(rcs) + alt_rc_entry.insert(idx, alt) + rc_entry = [] + return checkProgAlternatives(description, progs, rc_entry, alt_rc_entry, path, not_found = 'auto') + + +def checkEditorNoRC(description, progs, rc_entry = [], path = []): + ''' The same as checkViewer, but do not add rc entry ''' + if len(rc_entry) > 1 and len(rc_entry) != len(progs) + 1: + logger.error("rc entry should have one item or item for each prog and not_found.") + sys.exit(2) + alt_rc_entry = [] + for idx in range(len(progs)): + if len(rc_entry) == 1: + rcs = rc_entry[0].split('\n') + alt = addEditorAlternatives(rcs) + alt_rc_entry.insert(0, alt) + elif len(rc_entry) > 1: + rcs = rc_entry[idx].split('\n') + alt = addEditorAlternatives(rcs) + alt_rc_entry.insert(idx, alt) + rc_entry = [] + return checkProgAlternatives(description, progs, rc_entry, alt_rc_entry, path, not_found = 'auto') + + +def checkViewerEditor(description, progs, rc_entry = [], path = []): + ''' The same as checkProgAlternatives, but for viewers and editors ''' + checkEditorNoRC(description, progs, rc_entry, path) + return checkViewer(description, progs, rc_entry, path) def checkDTLtools(): @@ -241,28 +421,66 @@ def checkLatex(dtl_tools): # valid latex2e return LATEX else: - print "Latex not usable (not LaTeX2e) " + logger.warning("Latex not usable (not LaTeX2e) ") # remove temporary files removeFiles(['chklatex.ltx', 'chklatex.log']) return '' +def checkModule(module): + ''' Check for a Python module, return the status ''' + msg = 'checking for "' + module + ' module"... ' + try: + __import__(module) + logger.info(msg + ' yes') + return True + except ImportError: + logger.info(msg + ' no') + return False + + def checkFormatEntries(dtl_tools): ''' Check all formats (\Format entries) ''' - checkViewer('a Tgif viewer and editor', ['tgif'], + checkViewerEditor('a Tgif viewer and editor', ['tgif'], rc_entry = [r'\Format tgif obj Tgif "" "%%" "%%" "vector"']) # - checkViewer('a FIG viewer and editor', ['xfig', 'jfig3-itext.jar', 'jfig3.jar'], + checkViewerEditor('a FIG viewer and editor', ['xfig', 'jfig3-itext.jar', 'jfig3.jar'], rc_entry = [r'\Format fig fig FIG "" "%%" "%%" "vector"']) # - checkViewer('a Grace viewer and editor', ['xmgrace'], + checkViewerEditor('a Dia viewer and editor', ['dia'], + rc_entry = [r'\Format dia dia DIA "" "%%" "%%" "vector"']) + # + checkViewerEditor('a Grace viewer and editor', ['xmgrace'], rc_entry = [r'\Format agr agr Grace "" "%%" "%%" "vector"']) # - checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], + checkViewerEditor('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], rc_entry = [r'\Format fen fen FEN "" "%%" "%%" ""']) # - path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp']) - path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp']) + checkViewerEditor('a SVG viewer and editor', ['inkscape'], + rc_entry = [r'\Format svg svg SVG "" "%%" "%%" "vector"']) + # + path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], + rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" "" +\Format gif gif GIF "" "%s" "%s" "" +\Format jpg jpg JPEG "" "%s" "%s" "" +\Format pbm pbm PBM "" "%s" "%s" "" +\Format pgm pgm PGM "" "%s" "%s" "" +\Format png png PNG "" "%s" "%s" "" +\Format ppm ppm PPM "" "%s" "%s" "" +\Format tiff tif TIFF "" "%s" "%s" "" +\Format xbm xbm XBM "" "%s" "%s" "" +\Format xpm xpm XPM "" "%s" "%s" ""''']) + path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'], + rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" "" +\Format gif gif GIF "" "%s" "%s" "" +\Format jpg jpg JPEG "" "%s" "%s" "" +\Format pbm pbm PBM "" "%s" "%s" "" +\Format pgm pgm PGM "" "%s" "%s" "" +\Format png png PNG "" "%s" "%s" "" +\Format ppm ppm PPM "" "%s" "%s" "" +\Format tiff tif TIFF "" "%s" "%s" "" +\Format xbm xbm XBM "" "%s" "%s" "" +\Format xpm xpm XPM "" "%s" "%s" ""''']) addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" "" \Format gif gif GIF "" "%s" "%s" "" \Format jpg jpg JPEG "" "%s" "%s" "" @@ -275,7 +493,7 @@ def checkFormatEntries(dtl_tools): \Format xpm xpm XPM "" "%s" "%s" ""''' % \ (iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) ) # - checkViewer('a text editor', ['sensible-editor', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \ + checkViewerEditor('a text editor', ['sensible-editor', 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \ 'nedit', 'gedit', 'notepad'], rc_entry = [r'''\Format asciichess asc "Plain text (chess output)" "" "" "%%" "" \Format asciiimage asc "Plain text (image)" "" "" "%%" "" @@ -286,16 +504,23 @@ def checkFormatEntries(dtl_tools): \Format dot dot "Graphviz Dot" "" "" "%%" "vector" \Format platex tex "LaTeX (pLaTeX)" "" "" "%%" "document" \Format literate nw NoWeb N "" "%%" "document" +\Format sweave Rnw "Sweave" S "" "%%" "document" \Format lilypond ly "LilyPond music" "" "" "%%" "vector" \Format latex tex "LaTeX (plain)" L "" "%%" "document" \Format pdflatex tex "LaTeX (pdflatex)" "" "" "%%" "document" +\Format xetex tex "LaTeX (XeTeX)" "" "" "%%" "document" \Format text txt "Plain text" a "" "%%" "document" \Format text2 txt "Plain text (pstotext)" "" "" "%%" "document" \Format text3 txt "Plain text (ps2ascii)" "" "" "%%" "document" \Format text4 txt "Plain text (catdvi)" "" "" "%%" "document" \Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "document"''' ]) # - checkViewer('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \ + path, xhtmlview = checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'], + rc_entry = [r'\Format xhtml xhtml "LyXHTML" X "%%" "" "document"']) + if xhtmlview == "": + addToRC(r'\Format xhtml xhtml "LyXHTML" X "" "" "document"') + # + checkEditor('a BibTeX editor', ['sensible-editor', 'jabref', 'JabRef', \ 'pybliographic', 'bibdesk', 'gbib', 'kbib', \ 'kbibtex', 'sixpack', 'bibedit', 'tkbibtex' \ 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \ @@ -304,17 +529,18 @@ def checkFormatEntries(dtl_tools): # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', ['kghostview', 'evince', 'gv', 'ghostview -swap'], + checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" \Format ps ps Postscript t "%%" "" "document,vector"''']) - # - checkViewer('a PDF previewer', ['kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ + # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html + checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ 'gv', 'ghostview'], rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector" \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector" -\Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "document,vector"''']) +\Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "document,vector" +\Format pdf4 pdf "PDF (XeTeX)" X "%%" "" "document,vector"''']) # - checkViewer('a DVI previewer', ['xdvi', 'kdvi'], + checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'], rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"']) if dtl_tools: # Windows only: DraftDVI @@ -323,11 +549,16 @@ def checkFormatEntries(dtl_tools): checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'], rc_entry = [r'\Format html html HTML H "%%" "" "document"']) # - checkViewer('Noteedit', ['noteedit'], + checkViewerEditor('Noteedit', ['noteedit'], rc_entry = [r'\Format noteedit not Noteedit "" "%%" "%%" "vector"']) # - checkViewer('an OpenDocument viewer', ['swriter', 'oowriter'], - rc_entry = [r'\Format odt odt OpenDocument "" "%%" "%%" "document,vector"']) + checkViewerEditor('an OpenDocument/OpenOffice viewer', ['swriter', 'oowriter', 'abiword'], + rc_entry = [r'''\Format odt odt OpenDocument "" "%%" "%%" "document,vector" +\Format sxw sxw "OpenOffice.Org (sxw)" "" "" "" "document,vector"''']) + # + checkViewerEditor('a Rich Text and Word viewer', ['swriter', 'oowriter', 'abiword'], + rc_entry = [r'''\Format rtf rtf "Rich Text Format" "" "" "" "document,vector" +\Format word doc "MS Word" W "" "" "document,vector"''']) # # entried that do not need checkProg addToRC(r'''\Format date "" "date command" "" "" "" "" @@ -346,12 +577,9 @@ def checkFormatEntries(dtl_tools): \Format pdftex pdftex_t PDFTEX "" "" "" "" \Format program "" Program "" "" "" "" \Format pstex pstex_t PSTEX "" "" "" "" -\Format rtf rtf "Rich Text Format" "" "" "" "document,vector" -\Format sxw sxw "OpenOffice.Org (sxw)" "" "" "" "document,vector" \Format wmf wmf "Windows Metafile" "" "" "" "vector" \Format emf emf "Enhanced Metafile" "" "" "" "vector" -\Format word doc "MS Word" W "" "" "document,vector" -\Format wordhtml html "HTML (MS Word)" "" "" "" "document" +\Format wordhtml html "HTML (MS Word)" "" "" "" "document" ''') @@ -359,6 +587,9 @@ def checkConverterEntries(): ''' Check all converters (\converter entries) ''' checkProg('the pdflatex program', ['pdflatex $$i'], rc_entry = [ r'\converter pdflatex pdf2 "%%" "latex"' ]) + + checkProg('XeTeX', ['xelatex $$i'], + rc_entry = [ r'\converter xetex pdf4 "%%" "latex"' ]) ''' If we're running LyX in-place then tex2lyx will be found in ../src/tex2lyx. Add this directory to the PATH temporarily and @@ -379,6 +610,10 @@ def checkConverterEntries(): checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'], rc_entry = [r'''\converter literate latex "%%" "" \converter literate pdflatex "%%" ""''']) + # + checkProg('a Sweave -> LaTeX converter', ['R CMD Sweave $$i'], + rc_entry = [r'''\converter sweave latex "%%" "" +\converter sweave pdflatex "%%" ""''']) # checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \ 'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'], @@ -386,20 +621,42 @@ def checkConverterEntries(): # checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], rc_entry = [ r'\converter word latex "%%" ""' ]) - # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ - path, htmlconv = checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 'htlatex.sh $$i', \ - '/usr/share/tex4ht/htlatex $$i', 'tth -t -e2 -L$$b < $$i > $$o', \ - 'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea -s $$i'], - rc_entry = [ r'\converter latex html "%%" "needaux"' ]) - if htmlconv.find('htlatex') >= 0 or htmlconv == 'latex2html': - addToRC(r'''\copier html "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''') + # eLyXer: search as a Python module and then as an executable (elyxer.py, elyxer) + elyxerfound = checkModule('elyxer') + if elyxerfound: + addToRC(r'''\converter lyx html "python -m elyxer --directory $$r $$i $$o" ""''') + else: + path, elyxer = checkProg('a LyX -> HTML converter', + ['elyxer.py --directory $$r $$i $$o', 'elyxer --directory $$r $$i $$o'], + rc_entry = [ r'\converter lyx html "%%" ""' ]) + if elyxer.find('elyxer') >= 0: + elyxerfound = True + + if elyxerfound: + addToRC(r'''\copier html "python -tt $$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''') else: - addToRC(r'''\copier html "python -tt $$s/scripts/ext_copy.py $$i $$o"''') + # search for other converters than eLyXer + # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ + path, htmlconv = checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 'htlatex.sh $$i', \ + '/usr/share/tex4ht/htlatex $$i', 'tth -t -e2 -L$$b < $$i > $$o', \ + 'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea -s $$i'], + rc_entry = [ r'\converter latex html "%%" "needaux"' ]) + if htmlconv.find('htlatex') >= 0 or htmlconv == 'latex2html': + addToRC(r'''\copier html "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''') + else: + addToRC(r'''\copier html "python -tt $$s/scripts/ext_copy.py $$i $$o"''') + + # Check if LyxBlogger is installed. + path, lyxblogger = checkProg('A LyX to WordPress Blog Publishing Tool', + ['lyxblogger $$i'], rc_entry = []) + if lyxblogger.find('lyxblogger') >= 0: + addToRC(r'\Format blog blog "LyxBlogger" "" "" "" "document"') + addToRC(r'\converter xhtml blog "lyxblogger $$i" ""') # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ path, htmlconv = checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'", \ "htlatex.sh $$i 'html,word' 'symbol/!' '-cvalidate'", \ - "/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"], + "/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"], rc_entry = [ r'\converter latex wordhtml "%%" "needaux"' ]) if htmlconv.find('htlatex') >= 0: addToRC(r'''\copier wordhtml "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''') @@ -459,7 +716,7 @@ def checkConverterEntries(): else: addToRC(r'\converter lyxpreview png "" ""') # - checkProg('a fax program', ['kdeprintfax $$i', 'ksendfax $$i'], + checkProg('a fax program', ['kdeprintfax $$i', 'ksendfax $$i', 'hylapex $$i'], rc_entry = [ r'\converter ps fax "%%" ""']) # checkProg('a FIG -> EPS/PPM converter', ['fig2dev'], @@ -500,9 +757,28 @@ def checkConverterEntries(): \converter agr ppm "gracebat -hardcopy -printfile $$o -hdevice PNM $$i 2>/dev/null" ""''', '']) # - checkProg('a Dot -> PDF converter', ['dot -Tpdf $$i -o $$o'], - rc_entry = [ r'\converter dot pdf "%%" ""']) + checkProg('a Dot -> Image converter', ['dot'], + rc_entry = [ + r'''\converter dot eps "dot -Teps $$i -o $$o" "" +\converter dot pdf "dot -Tpdf $$i -o $$o" "" +\converter dot png "dot -Tpng $$i -o $$o" ""''', + '']) + # + checkProg('a Dia -> PNG converter', ['dia -e $$o -t png $$i'], + rc_entry = [ r'\converter dia png "%%" ""']) # + checkProg('a Dia -> EPS converter', ['dia -e $$o -t eps $$i'], + rc_entry = [ r'\converter dia eps "%%" ""']) + # + checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', 'inkscape --file=$$p/$$i --export-area-drawing --without-gui --export-pdf=$$p/$$o'], + rc_entry = [ r'\converter svg pdf "%%" ""']) + # + checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', 'inkscape --file=$$p/$$i --export-area-drawing --without-gui --export-eps=$$p/$$o'], + rc_entry = [ r'\converter svg eps "%%" ""']) + # the PNG export via Inkscape must not have the full path ($$p) for the file + checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i', 'inkscape --without-gui --file=$$i --export-png=$$o'], + rc_entry = [ r'\converter svg png "%%" ""']) + # path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond']) if (lilypond != ''): @@ -511,16 +787,21 @@ def checkConverterEntries(): if match: version_number = match.groups()[0] version = version_number.split('.') - if int(version[0]) > 2 or (len(version) > 1 and int(version[0]) == 2 and int(version[1]) >= 6): + if int(version[0]) > 2 or (len(version) > 1 and int(version[0]) == 2 and int(version[1]) >= 11): + addToRC(r'''\converter lilypond eps "lilypond -dbackend=eps --ps $$i" "" +\converter lilypond png "lilypond -dbackend=eps --png $$i" ""''') + addToRC(r'\converter lilypond pdf "lilypond -dbackend=eps --pdf $$i" ""') + print '+ found LilyPond version %s.' % version_number + elif int(version[0]) > 2 or (len(version) > 1 and int(version[0]) == 2 and int(version[1]) >= 6): addToRC(r'''\converter lilypond eps "lilypond -b eps --ps $$i" "" \converter lilypond png "lilypond -b eps --png $$i" ""''') if int(version[0]) > 2 or (len(version) > 1 and int(version[0]) == 2 and int(version[1]) >= 9): addToRC(r'\converter lilypond pdf "lilypond -b eps --pdf $$i" ""') - print '+ found LilyPond version %s.' % version_number + logger.info('+ found LilyPond version %s.' % version_number) else: - print '+ found LilyPond, but version %s is too old.' % version_number + logger.info('+ found LilyPond, but version %s is too old.' % version_number) else: - print '+ found LilyPond, but could not extract version number.' + logger.info('+ found LilyPond, but could not extract version number.') # checkProg('a Noteedit -> LilyPond converter', ['noteedit --export-lilypond $$i'], rc_entry = [ r'\converter noteedit lilypond "%%" ""', '']) @@ -573,10 +854,21 @@ def checkOtherEntries(): ''' entries other than Format and Converter ''' checkProg('ChkTeX', ['chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38'], rc_entry = [ r'\chktex_command "%%"' ]) - checkProg('BibTeX', ['jbibtex', 'bibtex'], - rc_entry = [ r'\bibtex_command "%%"' ]) - checkProg('an index processor', ['texindy', 'makeindex -c -q'], - rc_entry = [ r'\index_command "%%"' ]) + checkProgAlternatives('BibTeX or alternative programs', ['bibtex', 'bibtex8', 'biber'], + rc_entry = [ r'\bibtex_command "%%"' ], + alt_rc_entry = [ r'\bibtex_alternatives "%%"' ]) + checkProg('JBibTeX, the Japanese BibTeX', ['jbibtex', 'bibtex'], + rc_entry = [ r'\jbibtex_command "%%"' ]) + checkProgAlternatives('available index processors', ['texindy', 'makeindex -c -q'], + rc_entry = [ r'\index_command "%%"' ], + alt_rc_entry = [ r'\index_alternatives "%%"' ]) + checkProg('an index processor appropriate to Japanese', ['mendex -c -q', 'jmakeindex -c -q', 'makeindex -c -q'], + rc_entry = [ r'\jindex_command "%%"' ]) + path, splitindex = checkProg('the splitindex processor', ['splitindex.pl', 'splitindex'], + rc_entry = [ r'\splitindex_command "%%"' ]) + if splitindex == '': + checkProg('the splitindex processor (java version)', ['splitindex.class'], + rc_entry = [ r'\splitindex_command "java splitindex"' ]) checkProg('a nomenclature processor', ['makeindex'], rc_entry = [ r'\nomencl_command "makeindex -s nomencl.ist"' ]) ## FIXME: OCTAVE is not used anywhere @@ -609,10 +901,17 @@ def processLayoutFile(file, bool_docbook): we expect output: - "article" "article" "article" "false" - "scrbook" "scrbook" "book (koma-script)" "false" - "svjog" "svjour" "article (Springer - svjour/jog)" "false" + "article" "article" "article" "false" "article.cls" + "scrbook" "scrbook" "book (koma-script)" "false" "scrbook.cls" + "svjog" "svjour" "article (Springer - svjour/jog)" "false" "svjour.cls,svjog.clo" ''' + def checkForClassExtension(x): + '''if the extension for a latex class is not + provided, add .cls to the classname''' + if not '.' in x: + return x.strip() + '.cls' + else: + return x.strip() classname = file.split(os.sep)[-1].split('.')[0] # return ('LaTeX', '[a,b]', 'a', ',b,c', 'article') for \DeclareLaTeXClass[a,b,c]{article} p = re.compile(r'\Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}') @@ -623,8 +922,15 @@ def processLayoutFile(file, bool_docbook): avai = {'LaTeX':'false', 'DocBook':bool_docbook}[classtype] if opt == None: opt = classname - return '"%s" "%s" "%s" "%s"\n' % (classname, opt, desc, avai) - print "Layout file " + file + " has no \DeclareXXClass line. " + prereq_latex = checkForClassExtension(classname) + else: + prereq_list = optAll[1:-1].split(',') + prereq_list = map(checkForClassExtension, prereq_list) + prereq_latex = ','.join(prereq_list) + prereq_docbook = {'true':'', 'false':'docbook'}[bool_docbook] + prereq = {'LaTeX':prereq_latex, 'DocBook':prereq_docbook}[classtype] + return '"%s" "%s" "%s" "%s" "%s"\n' % (classname, opt, desc, avai, prereq) + logger.warning("Layout file " + file + " has no \DeclareXXClass line. ") return "" @@ -632,7 +938,7 @@ def checkLatexConfig(check_config, bool_docbook): ''' Explore the LaTeX configuration Return None (will be passed to sys.exit()) for success. ''' - print 'checking LaTeX configuration... ', + msg = 'checking LaTeX configuration... ' # if --without-latex-config is forced, or if there is no previous # version of textclass.lst, re-generate a default file. if not os.path.isfile('textclass.lst') or not check_config: @@ -641,8 +947,8 @@ def checkLatexConfig(check_config, bool_docbook): # # Then, generate a default textclass.lst. In case configure.py # fails, we still have something to start lyx. - print ' default values' - print '+checking list of textclasses... ' + logger.info(msg + ' default values') + logger.info('+checking list of textclasses... ') tx = open('textclass.lst', 'w') tx.write(''' # This file declares layouts and their associated definition files @@ -671,100 +977,100 @@ def checkLatexConfig(check_config, bool_docbook): if retval != "": tx.write(retval) tx.close() - print '\tdone' + logger.info('\tdone') if not check_config: return None # the following will generate textclass.lst.tmp, and packages.lst.tmp - else: - print '\tauto' - removeFiles(['wrap_chkconfig.ltx', 'chkconfig.vars', \ - 'chkconfig.classes', 'chklayouts.tex']) - rmcopy = False - if not os.path.isfile( 'chkconfig.ltx' ): - shutil.copyfile( os.path.join(srcdir, 'chkconfig.ltx'), 'chkconfig.ltx' ) - rmcopy = True - writeToFile('wrap_chkconfig.ltx', '%s\n\\input{chkconfig.ltx}\n' % docbook_cmd) - # Construct the list of classes to test for. - # build the list of available layout files and convert it to commands - # for chkconfig.ltx - p1 = re.compile(r'\Declare(LaTeX|DocBook)Class') - testclasses = list() - for file in glob.glob( os.path.join('layouts', '*.layout') ) + \ - glob.glob( os.path.join(srcdir, 'layouts', '*.layout' ) ) : - if not os.path.isfile(file): + logger.info(msg + '\tauto') + removeFiles(['wrap_chkconfig.ltx', 'chkconfig.vars', \ + 'chkconfig.classes', 'chklayouts.tex']) + rmcopy = False + if not os.path.isfile( 'chkconfig.ltx' ): + shutil.copyfile( os.path.join(srcdir, 'chkconfig.ltx'), 'chkconfig.ltx' ) + rmcopy = True + writeToFile('wrap_chkconfig.ltx', '%s\n\\input{chkconfig.ltx}\n' % docbook_cmd) + # Construct the list of classes to test for. + # build the list of available layout files and convert it to commands + # for chkconfig.ltx + p1 = re.compile(r'\Declare(LaTeX|DocBook)Class') + testclasses = list() + for file in glob.glob( os.path.join('layouts', '*.layout') ) + \ + glob.glob( os.path.join(srcdir, 'layouts', '*.layout' ) ) : + if not os.path.isfile(file): + continue + classname = file.split(os.sep)[-1].split('.')[0] + for line in open(file).readlines(): + if p1.search(line) == None: continue - classname = file.split(os.sep)[-1].split('.')[0] - for line in open(file).readlines(): - if p1.search(line) == None: - continue - if line[0] != '#': - print "Wrong input layout file with line '" + line - sys.exit(3) - testclasses.append("\\TestDocClass{%s}{%s}" % (classname, line[1:].strip())) - break - testclasses.sort() - cl = open('chklayouts.tex', 'w') - for line in testclasses: - cl.write(line + '\n') - cl.close() - # - # we have chklayouts.tex, then process it - fout = os.popen(LATEX + ' wrap_chkconfig.ltx') - while True: - line = fout.readline() - if not line: - break; - if re.match('^\+', line): - print line, - # if the command succeeds, None will be returned - ret = fout.close() - # - # currently, values in chhkconfig are only used to set - # \font_encoding - values = {} - for line in open('chkconfig.vars').readlines(): - key, val = re.sub('-', '_', line).split('=') - val = val.strip() - values[key] = val.strip("'") - # chk_fontenc may not exist - try: - addToRC(r'\font_encoding "%s"' % values["chk_fontenc"]) - except: - pass - if rmcopy: # remove the copied file - removeFiles( [ 'chkconfig.ltx' ] ) - # if configure successed, move textclass.lst.tmp to textclass.lst - # and packages.lst.tmp to packages.lst - if os.path.isfile('textclass.lst.tmp') and len(open('textclass.lst.tmp').read()) > 0 \ - and os.path.isfile('packages.lst.tmp') and len(open('packages.lst.tmp').read()) > 0: - shutil.move('textclass.lst.tmp', 'textclass.lst') - shutil.move('packages.lst.tmp', 'packages.lst') - return ret + if line[0] != '#': + logger.error("Wrong input layout file with line '" + line) + sys.exit(3) + testclasses.append("\\TestDocClass{%s}{%s}" % (classname, line[1:].strip())) + break + testclasses.sort() + cl = open('chklayouts.tex', 'w') + for line in testclasses: + cl.write(line + '\n') + cl.close() + # + # we have chklayouts.tex, then process it + fout = os.popen(LATEX + ' wrap_chkconfig.ltx') + while True: + line = fout.readline() + if not line: + break; + if re.match('^\+', line): + logger.info(line.strip()) + # if the command succeeds, None will be returned + ret = fout.close() + # + # currently, values in chhkconfig are only used to set + # \font_encoding + values = {} + for line in open('chkconfig.vars').readlines(): + key, val = re.sub('-', '_', line).split('=') + val = val.strip() + values[key] = val.strip("'") + # chk_fontenc may not exist + try: + addToRC(r'\font_encoding "%s"' % values["chk_fontenc"]) + except: + pass + if rmcopy: # remove the copied file + removeFiles( [ 'chkconfig.ltx' ] ) + # if configure successed, move textclass.lst.tmp to textclass.lst + # and packages.lst.tmp to packages.lst + if os.path.isfile('textclass.lst.tmp') and len(open('textclass.lst.tmp').read()) > 0 \ + and os.path.isfile('packages.lst.tmp') and len(open('packages.lst.tmp').read()) > 0: + shutil.move('textclass.lst.tmp', 'textclass.lst') + shutil.move('packages.lst.tmp', 'packages.lst') + return ret def checkModulesConfig(): - removeFiles(['lyxmodules.lst']) + removeFiles(['lyxmodules.lst', 'chkmodules.tex']) - print '+checking list of modules... ' + logger.info('+checking list of modules... ') tx = open('lyxmodules.lst', 'w') tx.write('''## This file declares modules and their associated definition files. ## It has been automatically generated by configure ## Use "Options/Reconfigure" if you need to update it after a ## configuration change. +## "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category" ''') # build the list of available modules foundClasses = [] for file in glob.glob( os.path.join('layouts', '*.module') ) + \ glob.glob( os.path.join(srcdir, 'layouts', '*.module' ) ) : # valid file? - print file + logger.info(file) if not os.path.isfile(file): continue retval = processModuleFile(file, bool_docbook) if retval != "": tx.write(retval) tx.close() - print '\tdone' + logger.info('\tdone') def processModuleFile(file, bool_docbook): @@ -772,22 +1078,24 @@ def processModuleFile(file, bool_docbook): The top of a module file should look like this: #\DeclareLyXModule[LaTeX Packages]{ModuleName} - #BeginDescription + #DescriptionBegin #...body of description... - #EndDescription + #DescriptionEnd #Requires: [list of required modules] #Excludes: [list of excluded modules] - The last two lines are optional + #Category: [category name] + The last three lines are optional (though do give a category). We expect output: - "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" + "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category" ''' - p = re.compile(r'\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}') - r = re.compile(r'#+\s*Requires: (.*)') - x = re.compile(r'#+\s*Excludes: (.*)') - b = re.compile(r'#+\s*DescriptionBegin\s*$') - e = re.compile(r'#+\s*DescriptionEnd\s*$') - - modname = desc = pkgs = req = excl = "" + remods = re.compile(r'\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}') + rereqs = re.compile(r'#+\s*Requires: (.*)') + reexcs = re.compile(r'#+\s*Excludes: (.*)') + recaty = re.compile(r'#+\s*Category: (.*)') + redbeg = re.compile(r'#+\s*DescriptionBegin\s*$') + redend = re.compile(r'#+\s*DescriptionEnd\s*$') + + modname = desc = pkgs = req = excl = catgy = "" readingDescription = False descLines = [] filename = file.split(os.sep)[-1] @@ -795,18 +1103,20 @@ def processModuleFile(file, bool_docbook): for line in open(file).readlines(): if readingDescription: - res = e.search(line) + res = redend.search(line) if res != None: readingDescription = False desc = " ".join(descLines) + # Escape quotes. + desc = desc.replace('"', '\\"') continue descLines.append(line[1:].strip()) continue - res = b.search(line) + res = redbeg.search(line) if res != None: readingDescription = True continue - res = p.search(line) + res = remods.search(line) if res != None: (pkgs, modname) = res.groups() if pkgs == None: @@ -815,39 +1125,63 @@ def processModuleFile(file, bool_docbook): tmp = [s.strip() for s in pkgs.split(",")] pkgs = ",".join(tmp) continue - res = r.search(line) + res = rereqs.search(line) if res != None: req = res.group(1) tmp = [s.strip() for s in req.split("|")] req = "|".join(tmp) continue - res = x.search(line) + res = reexcs.search(line) if res != None: excl = res.group(1) tmp = [s.strip() for s in excl.split("|")] excl = "|".join(tmp) continue - if modname != "": - return '"%s" "%s" "%s" "%s" "%s" "%s"\n' % (modname, filename, desc, pkgs, req, excl) - print "Module file without \DeclareLyXModule line. " - return "" + res = recaty.search(line) + if res != None: + catgy = res.group(1) + continue + + if modname == "": + logger.warning("Module file without \DeclareLyXModule line. ") + return "" + + if pkgs != "": + # this module has some latex dependencies: + # append the dependencies to chkmodules.tex, + # which is \input'ed by chkconfig.ltx + testpackages = list() + for pkg in pkgs.split(","): + if "->" in pkg: + # this is a converter dependency: skip + continue + if pkg.endswith(".sty"): + pkg = pkg[:-4] + testpackages.append("\\TestPackage{%s}" % (pkg,)) + cm = open('chkmodules.tex', 'a') + for line in testpackages: + cm.write(line + '\n') + cm.close() + + return '"%s" "%s" "%s" "%s" "%s" "%s" "%s"\n' % (modname, filename, desc, pkgs, req, excl, catgy) + def checkTeXAllowSpaces(): ''' Let's check whether spaces are allowed in TeX file names ''' tex_allows_spaces = 'false' if lyx_check_config: - print "Checking whether TeX allows spaces in file names... ", + msg = "Checking whether TeX allows spaces in file names... " writeToFile('a b.tex', r'\message{working^^J}' ) if os.name == 'nt': latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """) else: latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """) if 'working' in latex_out: - print 'yes' + logger.info(msg + 'yes') tex_allows_spaces = 'true' else: - print 'no' + logger.info(msg + 'no') tex_allows_spaces = 'false' addToRC(r'\tex_allows_spaces ' + tex_allows_spaces) removeFiles( [ 'a b.tex', 'a b.log', 'texput.log' ]) @@ -858,7 +1192,7 @@ def removeTempFiles(): if not lyx_keep_temps: removeFiles(['chkconfig.vars', \ 'wrap_chkconfig.ltx', 'wrap_chkconfig.log', \ - 'chklayouts.tex', 'missfont.log', + 'chklayouts.tex', 'chkmodules.tex', 'missfont.log', 'chklatex.ltx', 'chklatex.log']) @@ -868,7 +1202,6 @@ if __name__ == '__main__': rc_entries = '' lyx_keep_temps = False version_suffix = '' - logfile = 'configure.log' ## Parse the command line for op in sys.argv[1:]: # default shell/for list is $*, the options if op in [ '-help', '--help', '-h' ]: @@ -890,16 +1223,12 @@ Options: print "Unknown option", op sys.exit(1) # - # set up log file for stdout and stderr - log = open(logfile, 'w') - sys.stdout = Tee(sys.stdout, log) - sys.stderr = Tee(sys.stderr, log) # check if we run from the right directory srcdir = os.path.dirname(sys.argv[0]) if srcdir == '': srcdir = '.' if not os.path.isfile( os.path.join(srcdir, 'chkconfig.ltx') ): - print "configure: error: cannot find chkconfig.ltx script" + logger.error("configure: error: cannot find chkconfig.ltx script") sys.exit(1) setEnviron() createDirectories() @@ -922,9 +1251,9 @@ Options: if windows_style_tex_paths != '': addToRC(r'\tex_expects_windows_paths %s' % windows_style_tex_paths) checkOtherEntries() + checkModulesConfig() # --without-latex-config can disable lyx_check_config ret = checkLatexConfig(lyx_check_config and LATEX != '', bool_docbook) - checkModulesConfig() #lyx_check_config and LATEX != '') removeTempFiles() # The return error code can be 256. Because most systems expect an error code # in the range 0-127, 256 can be interpretted as 'success'. Because we expect