X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.py;h=97cd5e006cdffe0843ce9a0a3987c3b694f21f8a;hb=c5ca33dd61063933055b4970faef3b641d22e278;hp=7d9c3b91c812c6cf54136e0bb09d5c89affb31a3;hpb=35be7672f415f7b637d3e54941534b9beea88dc1;p=lyx.git diff --git a/lib/configure.py b/lib/configure.py index 7d9c3b91c8..97cd5e006c 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -1,4 +1,5 @@ #! /usr/bin/env python +# -*- coding: utf-8 -*- # # file configure.py # This file is part of LyX, the document processor. @@ -7,9 +8,6 @@ # \author Bo Peng # Full author contact details are available in file CREDITS. -# This is an experimental version of the configure script, written -# in Python. - import sys, os, re, shutil, glob @@ -240,8 +238,8 @@ 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', ['xv', 'kview', 'gimp']) - path, ie = checkViewer('a raster image editor', ['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" "" \Format jpg jpg JPEG "" "%s" "%s" "" @@ -271,7 +269,7 @@ def checkFormatEntries(dtl_tools): \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 (paragraphs)" "" "" "%%" "document"''' ]) +\Format textparagraph txt "Plain Text, Join Lines" "" "" "%%" "document"''' ]) # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) @@ -291,23 +289,31 @@ def checkFormatEntries(dtl_tools): # Windows only: DraftDVI addToRC(r'\Format dvi2 dvi DraftDVI "" "" "document,vector"') # - checkViewer('a HTML previewer', ['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'], + rc_entry = [r'\Format noteedit not Noteedit "" "%%" "%%" "vector"']) + # # entried that do not need checkProg addToRC(r'''\Format date "" "date command" "" "" "" "" \Format fax "" Fax "" "" "" "document" \Format lyx lyx LyX "" "" "" "" \Format lyx13x lyx13 "LyX 1.3.x" "" "" "" "document" +\Format lyx14x lyx14 "LyX 1.4.x" "" "" "" "document" +\Format clyx cjklyx "CJK LyX 1.4.x (big5)" "" "" "" "document" +\Format jlyx cjklyx "CJK LyX 1.4.x (euc-jp)" "" "" "" "document" +\Format klyx cjklyx "CJK LyX 1.4.x (euc-kr)" "" "" "" "document" \Format lyxpreview lyxpreview "LyX Preview" "" "" "" "" \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 Writer" O "" "" "document,vector" +\Format sxw sxw "OpenOffice.Org (sxw)" "" "" "" "document,vector" +\Format odt odt "Open Document" O "" "" "document,vector" \Format wmf wmf "Windows Meta File" "" "" "" "vector" \Format word doc "MS Word" W "" "" "document,vector" -\Format wordhtml html "MS Word (HTML)" "" "" "" "document" +\Format wordhtml html "HTML (MS Word)" "" "" "" "document" ''') @@ -335,20 +341,27 @@ def checkConverterEntries(): checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'], rc_entry = [ r'\converter literate latex "%%" ""' ]) # - checkProg('a HTML -> LaTeX converter', ['html2latex $$i'], + checkProg('an HTML -> LaTeX converter', ['html2latex $$i'], rc_entry = [ r'\converter html latex "%%" ""' ]) # - checkProg('a MSWord -> LaTeX converter', ['wvCleanLatex $$i $$o'], + checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'], rc_entry = [ r'\converter word latex "%%" ""' ]) # checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"], - rc_entry = [ r'\converter latex wordhtml "%%" ""' ]) + rc_entry = [ r'\converter latex wordhtml "%%" "needaux"' ]) # checkProg('an OpenOffice.org -> LaTeX converter', ['w2l -clean $$i'], rc_entry = [ r'\converter sxw latex "%%" ""' ]) # - checkProg('a LaTeX -> OpenOffice.org converter', ['oolatex $$i', 'oolatex.sh $$i'], - rc_entry = [ r'\converter latex sxw "%%" "latex"' ]) + checkProg('an OpenDocument -> LaTeX converter', ['w2l -clean $$i'], + rc_entry = [ r'\converter odt latex "%%" ""' ]) + # + checkProg('a LaTeX -> Open Document converter', ['oolatex $$i', 'oolatex.sh $$i'], + rc_entry = [ r'\converter latex odt "%%" "latex"' ]) + # + #FIXME Looking for the commands needed to make oolatex output sxw instad of odt... + #checkProg('a LaTeX -> OpenOffice.org (sxw) converter', ['oolatex $$i', 'oolatex.sh $$i'], + # rc_entry = [ r'\converter latex odt "%%" "latex"' ]) # 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"' ]) @@ -401,9 +414,13 @@ def checkConverterEntries(): checkProg('a WMF -> EPS converter', ['wmf2eps -o $$o $$i'], rc_entry = [ r'\converter wmf eps "%%" ""', '']) # - checkProg('a EPS -> PDF converter', ['epstopdf'], + checkProg('an EPS -> PDF converter', ['epstopdf'], rc_entry = [ r'\converter eps pdf "epstopdf --outfile=$$o $$i" ""', '']) # + # no agr -> pdf converter, since the pdf library used by gracebat is not + # free software and therefore not compiled in in many installations. + # Fortunately, this is not a big problem, because we will use epstopdf to + # convert from agr to pdf via eps without loss of quality. checkProg('a Grace -> Image converter', ['gracebat'], rc_entry = [ r'''\converter agr eps "gracebat -hardcopy -printfile $$o -hdevice EPS $$i 2>/dev/null" "" @@ -414,7 +431,7 @@ def checkConverterEntries(): # checkProg('a LaTeX -> HTML converter', ['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 "%%" "originaldir,needaux"' ]) + rc_entry = [ r'\converter latex html "%%" "needaux"' ]) # path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond']) if (lilypond != ''): @@ -434,17 +451,27 @@ def checkConverterEntries(): else: print '+ found LilyPond, but could not extract version number.' # + checkProg('a Noteedit -> LilyPond converter', ['noteedit --export-lilypond $$i'], + rc_entry = [ r'\converter noteedit lilypond "%%" ""', '']) + # # FIXME: no rc_entry? comment it out # checkProg('Image converter', ['convert $$i $$o']) # - # Entried that do not need checkProg + # Entries that do not need checkProg addToRC(r'''\converter lyxpreview ppm "python -tt $$s/scripts/lyxpreview2bitmap.py" "" -\converter date dateout "date +%d-%m-%Y > $$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" "" \converter fig pdftex "python -tt $$s/scripts/fig2pdftex.py $$i $$o" "" \converter fig pstex "python -tt $$s/scripts/fig2pstex.py $$i $$o" "" \converter lyx lyx13x "python -tt $$s/lyx2lyx/lyx2lyx -t 221 $$i > $$o" "" +\converter lyx lyx14x "python -tt $$s/lyx2lyx/lyx2lyx -t 245 $$i > $$o" "" +\converter lyx clyx "python -tt $$s/lyx2lyx/lyx2lyx -c big5 -t 245 $$i > $$o" "" +\converter lyx jlyx "python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp -t 245 $$i > $$o" "" +\converter lyx klyx "python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr -t 245 $$i > $$o" "" +\converter clyx lyx "python -tt $$s/lyx2lyx/lyx2lyx -c big5 $$i > $$o" "" +\converter jlyx lyx "python -tt $$s/lyx2lyx/lyx2lyx -c euc_jp $$i > $$o" "" +\converter klyx lyx "python -tt $$s/lyx2lyx/lyx2lyx -c euc_kr $$i > $$o" "" ''') @@ -488,9 +515,9 @@ def checkOtherEntries(): ''' entries other than Format and Converter ''' checkProg('a *roff formatter', ['groff', 'nroff'], rc_entry = [ - r'\ascii_roff_command "groff -t -Tlatin1 $$FName"', - r'\ascii_roff_command "tbl $$FName | nroff"', - r'\ascii_roff_command ""' ]) + r'\plaintext_roff_command "groff -t -Tlatin1 $$FName"', + r'\plaintext_roff_command "tbl $$FName | nroff"', + r'\plaintext_roff_command ""' ]) checkProg('ChkTeX', ['chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38'], rc_entry = [ r'\chktex_command "%%"' ]) checkProg('a spellchecker', ['ispell'], @@ -516,7 +543,7 @@ def checkOtherEntries(): def processLayoutFile(file, bool_docbook, bool_linuxdoc): ''' process layout file and get a line of result - Declear line are like this: (article.layout, scrbook.layout, svjog.layout) + Declare lines look like this: (article.layout, scrbook.layout, svjog.layout) \DeclareLaTeXClass{article} \DeclareLaTeXClass[scrbook]{book (koma-script)} @@ -529,8 +556,8 @@ def processLayoutFile(file, bool_docbook, bool_linuxdoc): "svjog" "svjour" "article (Springer - svjour/jog)" "false" ''' classname = file.split(os.sep)[-1].split('.')[0] - # return ('LaTeX', '[a,b]', 'a', ',b,c', 'article') for \DeclearLaTeXClass[a,b,c]{article} - p = re.compile(r'\Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}') + # return ('LaTeX', '[a,b]', 'a', ',b,c', 'article') for \DeclareLaTeXClass[a,b,c]{article} + p = re.compile(r'\Declare(LaTeX|DocBook|LinuxDoc)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}') for line in open(file).readlines(): res = p.search(line) if res != None: @@ -539,7 +566,7 @@ def processLayoutFile(file, bool_docbook, bool_linuxdoc): if opt == None: opt = classname return '"%s" "%s" "%s" "%s"\n' % (classname, opt, desc, avai) - print "Layout file without \DeclearXXClass line. " + print "Layout file without \DeclareXXClass line. " sys.exit(2)