def checkLatex(dtl_tools):
''' Check latex, return lyx_check_config '''
+ path, LATEX = checkProg('a Latex2e program', ['latex $$i', 'platex $$i', 'latex2e $$i'])
+ path, PPLATEX = checkProg('a DVI postprocessing program', ['pplatex $$i'])
+ # use LATEX to convert from latex to dvi if PPLATEX is not available
+ if PPLATEX == '':
+ PPLATEX = LATEX
if dtl_tools:
# Windows only: DraftDVI
- converter_entry = r'''\converter latex dvi2 "%%" "latex"
-\converter dvi2 dvi "python -tt $$s/scripts/clean_dvi.py $$i $$o" ""'''
+ addToRC(r'''\converter latex dvi2 "%s" "latex"
+\converter dvi2 dvi "python -tt $$s/scripts/clean_dvi.py $$i $$o" ""''' % PPLATEX)
else:
- converter_entry = r'\converter latex dvi "%%" "latex"'
- path, LATEX = checkProg('a Latex2e program', ['pplatex $$i', 'platex $$i', 'latex $$i', 'latex2e $$i'],
- rc_entry = [converter_entry])
+ addToRC(r'\converter latex dvi "%s" "latex"' % PPLATEX)
# no latex
if LATEX != '':
# Check if latex is usable
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-remote', 'gimp'])
+ path, iv = checkViewer('a raster image viewer', ['xdg-open', '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 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', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
+ checkViewer('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)" "" "" "%%" ""
#
#checkProg('a Postscript interpreter', ['gs'],
# rc_entry = [ r'\ps_command "%%"' ])
- checkViewer('a Postscript previewer', ['kghostview', 'evince', 'gv', 'ghostview -swap'],
+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', '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', \
+ checkViewer('a PDF previewer', ['xdg-open', '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', ['xdvi', 'kdvi'],
+ checkViewer('a DVI previewer', ['xdg-open', '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', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format html html HTML H "%%" "" "document"'])
#
checkViewer('Noteedit', ['noteedit'],
tx.close()
print '\tdone'
+
def processModuleFile(file, bool_docbook, bool_linuxdoc):
''' process module file and get a line of result
- Declare lines look like this:
- \DeclareLyXModule[LaTeX Packages]{Description}{ModuleName}...
+ The top of a module file should look like this:
+ #\DeclareLyXModule[LaTeX Packages]{ModuleName}
+ #BeginDescription
+ #...body of description...
+ #EndDescription
+ #Requires: [list of required modules]
+ #Excludes: [list of excluded modules]
+ The last two lines are optional
We expect output:
- "ModuleName" "filename" "Description" "Packages"
- "
+ "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes"
'''
- p = re.compile(r'\DeclareLyXModule\s*(?:\[([^]]*)\])?{(.*)}{(.*)}')
+ 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 = ""
+ readingDescription = False
+ descLines = []
+ filename = file.split(os.sep)[-1]
+ filename = filename[:-7]
+
for line in open(file).readlines():
- res = p.search(line)
+ if readingDescription:
+ res = e.search(line)
if res != None:
- (packages, desc, modname) = res.groups()
- #check availability...need to add that
- if packages == None:
- packages = ""
- else:
- pkgs = [s.strip() for s in packages.split(",")]
- packages = ",".join(pkgs)
-
- filename = file.split(os.sep)[-1]
- return '"%s" "%s" "%s" "%s"\n' % (modname, filename, desc, packages)
+ readingDescription = False
+ desc = " ".join(descLines)
+ continue
+ descLines.append(line[1:].strip())
+ continue
+ res = b.search(line)
+ if res != None:
+ readingDescription = True
+ continue
+ res = p.search(line)
+ if res != None:
+ (pkgs, modname) = res.groups()
+ if pkgs == None:
+ pkgs = ""
+ else:
+ tmp = [s.strip() for s in pkgs.split(",")]
+ pkgs = ",".join(tmp)
+ continue
+ res = r.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)
+ 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. "
sys.exit(2)
-
-
def checkTeXAllowSpaces():
''' Let's check whether spaces are allowed in TeX file names '''
tex_allows_spaces = 'false'
bool_docbook, bool_linuxdoc)
checkModulesConfig() #lyx_check_config and LATEX != '')
removeTempFiles()
- sys.exit(ret)
+ # 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
+ # a None for success, 'ret is not None' is used to exit.
+ sys.exit(ret is not None)
projects / lyx.git / blobdiff