X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=051be5b43202af38d6364f49756e13ebd62ad995;hb=bd436353a3f79f43b3c94c550f6ddef399272ec5;hp=e08032af8104d9d4d7c79c72e4b63ed43222d78c;hpb=7c28905b177b8366531915903ac903a0fff716de;p=lyx.git diff --git a/lib/configure.py b/lib/configure.py index e08032af81..051be5b432 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -235,7 +235,7 @@ def checkFormatEntries(dtl_tools): checkViewer('a Tgif viewer and editor', ['tgif'], rc_entry = [r'\Format tgif obj Tgif "" "%%" "%%" "vector"']) # - checkViewer('a FIG viewer and editor', ['xfig'], + checkViewer('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'], @@ -244,7 +244,7 @@ def checkFormatEntries(dtl_tools): checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], rc_entry = [r'\Format fen fen FEN "" "%%" "%%" ""']) # - path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp']) + path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp']) path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp']) addToRC(r'''\Format bmp bmp BMP "" "%s" "%s" "" \Format gif gif GIF "" "%s" "%s" "" @@ -266,6 +266,7 @@ def checkFormatEntries(dtl_tools): \Format dateout tmp "date (output)" "" "" "%%" "" \Format docbook sgml DocBook B "" "%%" "document" \Format docbook-xml xml "Docbook (XML)" "" "" "%%" "document" +\Format dot dot "Graphviz Dot" "" "" "%%" "vector" \Format literate nw NoWeb N "" "%%" "document" \Format lilypond ly "LilyPond music" "" "" "%%" "vector" \Format latex tex "LaTeX (plain)" L "" "%%" "document" @@ -276,26 +277,33 @@ def checkFormatEntries(dtl_tools): \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', \ + 'pybliographic', 'bibdesk', 'gbib', 'kbib', \ + 'kbibtex', 'sixpack', 'bibedit', 'tkbibtex' \ + 'xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \ + 'nedit', 'gedit', 'notepad'], + rc_entry = [r'''\Format bibtex bib "BibTeX" "" "" "%%" ""''' ]) # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) - checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'evince', 'gv', 'ghostview -swap'], + checkViewer('a Postscript previewer', ['kghostview', 'evince', 'gv', 'ghostview -swap'], rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" \Format ps ps Postscript t "%%" "" "document,vector"''']) # - checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \ + checkViewer('a PDF previewer', ['kpdf', '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"''']) # - checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi'], + checkViewer('a DVI previewer', ['xdvi', 'kdvi'], rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"']) if dtl_tools: # Windows only: DraftDVI addToRC(r'\Format dvi2 dvi DraftDVI "" "" "" "vector"') # - checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'], + checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'], rc_entry = [r'\Format html html HTML H "%%" "" "document"']) # checkViewer('Noteedit', ['noteedit'], @@ -306,6 +314,7 @@ def checkFormatEntries(dtl_tools): # # entried that do not need checkProg addToRC(r'''\Format date "" "date command" "" "" "" "" +\Format csv csv "Table (CSV)" "" "" "" "document" \Format fax "" Fax "" "" "" "document" \Format lyx lyx LyX "" "" "" "" \Format lyx13x lyx13 "LyX 1.3.x" "" "" "" "document" @@ -351,7 +360,8 @@ def checkConverterEntries(): checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'], rc_entry = [ r'\converter literate latex "%%" ""' ]) # - checkProg('an HTML -> LaTeX converter', ['html2latex $$i'], + checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex $$i', \ + 'htmltolatex -input $$i -output $$o', 'java -jar htmltolatex.jar -input $$i -output $$o'], rc_entry = [ r'\converter html latex "%%" ""' ]) # checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], @@ -381,14 +391,18 @@ def checkConverterEntries(): rc_entry = [ r'\converter odt latex "%%" ""' ]) # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/ # Both SuSE and debian have oolatex - checkProg('a LaTeX -> Open Document converter', ['oolatex $$i', 'oolatex.sh $$i', \ - '/usr/share/tex4ht/oolatex $$i', \ - 'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\''], + checkProg('a LaTeX -> Open Document converter', [ + 'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\'', \ + 'oolatex $$i', 'oolatex.sh $$i', \ + '/usr/share/tex4ht/oolatex $$i'], rc_entry = [ r'\converter latex odt "%%" "needaux"' ]) # On windows it is called latex2rt.exe checkProg('a LaTeX -> RTF converter', ['latex2rtf -p -S -o $$o $$i', 'latex2rt -p -S -o $$o $$i'], rc_entry = [ r'\converter latex rtf "%%" "needaux"' ]) # + checkProg('a RTF -> HTML converter', ['unrtf --html $$i > $$o'], + rc_entry = [ r'\converter rtf html "%%" ""' ]) + # checkProg('a PS to PDF converter', ['ps2pdf13 $$i $$o'], rc_entry = [ r'\converter ps pdf "%%" ""' ]) # @@ -398,6 +412,15 @@ def checkConverterEntries(): checkProg('a PS to TXT converter', ['ps2ascii $$i $$o'], rc_entry = [ r'\converter ps text3 "%%" ""' ]) # + checkProg('a PS to EPS converter', ['ps2eps $$i'], + rc_entry = [ r'\converter ps eps "%%" ""' ]) + # + checkProg('a PDF to PS converter', ['pdf2ps $$i $$o', 'pdftops $$i $$o'], + rc_entry = [ r'\converter pdf ps "%%" ""' ]) + # + checkProg('a PDF to EPS converter', ['pdftops -eps -f 1 -l 1 $$i $$o'], + rc_entry = [ r'\converter pdf eps "%%" ""' ]) + # checkProg('a DVI to TXT converter', ['catdvi $$i > $$o'], rc_entry = [ r'\converter dvi text4 "%%" ""' ]) # @@ -455,6 +478,9 @@ 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 "%%" ""']) + # # path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond']) if (lilypond != ''): @@ -482,6 +508,7 @@ def checkConverterEntries(): # # Entries that do not need checkProg addToRC(r'''\converter lyxpreview ppm "python -tt $$s/scripts/lyxpreview2bitmap.py" "" +\converter csv lyx "python -tt $$s/scripts/csv2lyx.py $$i $$o" "" \converter date dateout "python -tt $$s/scripts/date.py %d-%m-%Y > $$o" "" \converter docbook docbook-xml "cp $$i $$o" "xml" \converter fen asciichess "python -tt $$s/scripts/fen2ascii.py $$i $$o" "" @@ -544,6 +571,10 @@ def checkOtherEntries(): r'\plaintext_roff_command ""' ]) 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 "%%"' ]) checkProg('a spellchecker', ['ispell'], rc_entry = [ r'\spell_command "%%"' ]) ## FIXME: OCTAVE is not used anywhere @@ -754,6 +785,8 @@ def processModuleFile(file, bool_docbook, bool_linuxdoc): modname = desc = pkgs = req = excl = "" readingDescription = False descLines = [] + filename = file.split(os.sep)[-1] + filename = filename[:-7] for line in open(file).readlines(): if readingDescription: @@ -776,8 +809,6 @@ def processModuleFile(file, bool_docbook, bool_linuxdoc): else: tmp = [s.strip() for s in pkgs.split(",")] pkgs = ",".join(tmp) - - filename = file.split(os.sep)[-1] continue res = r.search(line) if res != None: