#!@PYTHON@
+
+# TODO:
+#
+# * Rewrite this. The control structure is too hairy.
+# * (c) on page 1
+# * more helpful info on lily crashes
+# * Should use files in /tmp/ only. This potentially messes with
+# user generated files in the CWD
+
+
"""
=======================================================================
LilyPond to dvi converter
"""
name = 'ly2dvi'
-version = '0.0.12'
+version = '@TOPLEVEL_VERSION@'
errorlog = ''
import sys
import string
import time
import glob
+import tempfile
+
+# Can't grep localized msgs
+os.environ['LC_ALL'] = ''
+os.environ['LANG'] = ''
+os.environ['LC_LANG'] = ''
+
class Input:
"""
This class handles all ly2dvi.py input file methods
-
+
Public methods:
__init__() Constructor
varTable = [
# regexp set method
# ------ ----------
- ( 'language', Props.setLanguage ),
- ( 'latexheaders', Props.setHeader ),
- ( 'orientation', Props.setOrientation ),
- ( 'paperpapersize', Props.setPaperZize ),
- ( 'papertextheight', Props.setTextHeight ),
- ( 'paperlinewidth', Props.setLineWidth ),
- ( 'filename', Props.setFilename ),
+ ( 'language', Props.setLanguage ),
+ ( 'latexheaders', Props.setHeader ),
+ ( 'latexpackages', Props.setPackages ),
+ ( 'paperorientation', Props.setOrientation ),
+ ( 'paperpapersize', Props.setPaperZize ),
+ ( 'papertextheight', Props.setTextHeight ),
+ ( 'paperlinewidth', Props.setLineWidth ),
+ ( 'filename', Props.setFilename ),
]
titles={}
for line in this.__fd.readlines():
- m=re.match('\\\\def\\\\mudela([\w]+){(.*)}',line)
+ m=re.match('\\\\def\\\\lilypond([\w]+){(.*)}',line)
if m:
for var in varTable:
if m.group(1) == var[0]:
This class handles all ly2dvi.py output file methods
private methods:
- __mudelaDefs(opt) Send title info to output file
+ __lilypondDefs(opt) Send title info to output file
Public methods:
__init__() Constructor
#
# __medelaDefs
#
- def __mudelaDefs(this,opt):
+ def __lilypondDefs(this,opt):
"""
Write titles to output
titles = Props.get('titles')
for key in titles.keys():
- this.write('%s\\mudela%s{%s}%%\n' % (opt,key,titles[key]))
+ this.write('%s\\lilypond%s{%s}%%\n' % (opt,key,titles[key]))
#
# write
#
def start(this,file):
"""
- Start LaTeX file. Calculates the horizontal and vertical
- margin using pagewidth, pageheight, linewidth, and textheight.
- Creates temporary output filename and opens it for write.
- Sends the LaTeX header information to output. Lastly sends
- the title information to output.
+ Start LaTeX file. Sets the linewidth (and possibly the
+ textheight) and leaves the page layout to the geometry
+ package. Creates temporary output filename and opens it
+ for write. Sends the LaTeX header information to output.
+ Lastly sends the title information to output.
input: file output file name
output: None
"""
now=time.asctime(time.localtime(time.time()))
- linewidth = Props.get('linewidth')
- textheight = Props.get('textheight')
- if Props.get('orientation') == 'landscape':
- pagewidth = Props.get('pageheight')
- pageheight = Props.get('pagewidth')
+ # Only set the textheight if it was explicitly set by the user,
+ # otherwise use the default. Helps to handle landscape correctly!
+ if Props.get('textheight') > 0:
+ textheightsetting = ',textheight=' + `Props.get('textheight')` + 'pt'
else:
- pageheight = Props.get('pageheight')
- pagewidth = Props.get('pagewidth')
-
- horizontalMarginArg = ( (pagewidth - linewidth)/2 )
- verticalMarginArg = ( (pageheight - textheight)/2 )
+ textheightsetting = ''
- top="""\
+
+ top= r"""
%% Creator: %s
-%% Automatically generated from %s, %s
+%% Generated automatically by: %s, from %s, at %s
-\\documentclass[%s]{article}
+\documentclass[%s]{article}
%s
-\\usepackage{geometry}
-\\usepackage[latin1]{inputenc}
-%%\\usepackage[T1]{fontenc}
-%s
-%%\\addtolength{\\oddsidemargin}{-1cm}
-%%\\addtolength{\\topmargin}{-1cm}
-%%\\setlength{\\textwidth}{%s}
-%%\\setlength{\\textheight}{%s}
-\\geometry{width=%spt, left=%spt, height=%spt, top=%spt}
-\\input lilyponddefs
-\\input titledefs
-%s
-\\begin{document}
-""" % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
- Props.get('language'), Props.get('pagenumber'), linewidth, textheight,
- linewidth, horizontalMarginArg, textheight, verticalMarginArg,
- Props.get('header') )
+\usepackage{geometry}
+\usepackage[latin1]{inputenc}
+%%\usepackage[T1]{fontenc}
+%%
+%% don not waste unused space at bottom of page
+%% (unless we have footnotes ...)
+%%\headheight9pt
+%%\headsep0pt
+%% Maybe this is too drastic, but let us give it a try.
+\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}
+\input{titledefs}
+%s
+\makeatletter
+\renewcommand{\@oddhead}{\parbox{\textwidth}%%
+ {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%
+%% UGR.
+%%\renewcommand{\@evenhead}{eve!{\small\lilypondinstrument{,}\quad\textbf{\thepage}}\hfil}%%
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
+%s
+\begin{document}
+""" % ( program_id(), program_id(), Props.get('filename'), now, Props.get('papersize'),
+ Props.get('language'), Props.get('linewidth'), textheightsetting,
+ Props.get('orientation'), Props.get('header'), Props.get('pagenumber'))
- pathcomp = os.path.splitext(file)
- this.__base = pathcomp[0]
- this.__outfile = '%s.%d%s' % (pathcomp[0], os.getpid(), pathcomp[1])
+ base, ext = os.path.splitext(file)
+ this.__base = base
+ tempfile.template= base + '_ly'
+ this.__outfile = tempfile.mktemp(ext)
+ base, ext = os.path.splitext(this.__outfile)
+ this.__tmpbase = base
try:
this.__fd = open(this.__outfile,"w")
except:
sys.exit('ExitNoWrite', this.__outfile)
this.write(top)
- this.__mudelaDefs('')
+ this.__lilypondDefs('')
this.write("""\
-\\cmrtwenty% ugh
\\makelilytitle
""")
this.write("""\
\\def\\theopus{}%
\\def\\thepiece{}%
-\\def\\mudelaopus{}%
-\\def\\mudelapiece{}%
+\\def\\lilypondopus{}%
+\\def\\lilypondpiece{}%
""")
- this.__mudelaDefs("\\def")
+ this.__lilypondDefs("\\def")
this.write("""\
-\\def\\theopus{\\mudelaopus}% ugh
-\\def\\thepiece{\\mudelapiece}%
+\\def\\theopus{\\lilypondopus}% ugh
+\\def\\thepiece{\\lilypondpiece}%
\\makelilypiecetitle
""")
outfile=this.__base + '.dvi'
if Props.get('output') != '':
+ if not os.path.exists(Props.get('output')):
+ os.mkdir(Props.get('output'))
+
outfile = os.path.join(Props.get('output'), outfile )
- this.write("""\
-\\vfill\\hfill{\\mudelatagline}
-\\end{document}
+ this.write(r"""
+%% \vfill\hfill{\lilypondtagline}
+\makeatletter
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\lilypondtagline}}%%
+\makeatother
+\end{document}
""")
this.__fd.close()
+ if os.path.isfile(outfile):
+ os.remove(outfile)
if ( os.name == 'posix' ):
stat = os.system('latex \'\\nonstopmode \\input %s\'' %
(this.__outfile))
(this.__outfile))
if stat:
sys.exit('ExitBadLatex')
- if os.path.isfile(outfile):
- os.remove(outfile)
- os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile)
- sys.stderr.write( '\n' + program_id() + ': dvi file name is %s\n\n'
- % (outfile))
+ if not os.path.isfile(outfile):
+ os.rename(this.__tmpbase + '.dvi', outfile)
+
+ sys.stderr.write('\n' + program_id() + ': dvi file name is %s\n\n'
+ % (outfile))
if Props.get('postscript'):
+ dvipsopts=''
+ if Props.get('orientation') == 'landscape':
+ dvipsopts=dvipsopts + ' -t landscape'
psoutfile=this.__base + '.ps'
if Props.get('output') != '':
psoutfile = os.path.join(Props.get('output'), psoutfile )
- stat = os.system('dvips -o %s %s' % (psoutfile,outfile))
+ stat = os.system('dvips %s -o %s %s' % (dvipsopts,psoutfile,outfile))
if stat:
sys.exit('ExitBadPostscript')
\f
+
+# ARG! THIS CODE IS BLOATED:
+# FIXME: Junk all set/get methods.
+
class Properties:
"""
This class handles all ly2dvi.py property manipulation
# Requester Description
# --------- -----------
# init Initial default values
- # file The values found in the lilypond generated TeX files
+ # file The values found in the LilyPond generated TeX files
# environment Envrionment variables LILYINCLUDE, LILYPONDPREFIX
# rcfile $LILYPONDPREFIX/.lilyrc
# rcfile $HOME/.lilyrc
this.__roverrideTable[i[1]]=i[0]
this.__data = {
- 'pagewidth' : [597, this.__overrideTable['init']],
- 'pageheight' : [845, this.__overrideTable['init']],
'papersize' : ['a4paper', this.__overrideTable['init']],
'textheight' : [0, this.__overrideTable['init']],
'linewidth' : [500, this.__overrideTable['init']],
t=''
if os.environ.has_key ('MFINPUTS'):
t = os.environ['MFINPUTS']
- os.environ['MFINPUTS'] = os.pathsep + t + \
+ os.environ['MFINPUTS'] = t + os.pathsep + \
os.path.join(this.get('root'), 'mf')
if os.environ.has_key('TMP'):
this.__set('tmp',os.environ['TMP'],'environment')
-
+
+ def read_titledefs (this):
fd=this.get_texfile_path ('titledefs.tex')
mudefs=[]
for line in fd.readlines():
- m=re.match('\\\\newcommand\*{\\\\mudela([\w]+)}',line)
+ m=re.match('\\\\newcommand\*{\\\\lilypond([\w]+)}',line)
if m:
mudefs.append(m.group(1))
fd.close
( 'KEEPLY2DVI', this.setKeeply2dvi ),
( 'LANGUAGE', this.setLanguage ),
( 'LATEXHF', this.setHeader ),
+ ( 'LATEXPKG', this.setPackages ),
( 'LILYINCLUDE', this.setInclude ),
( 'LILYPONDPREFIX', this.setRoot ),
( 'NONUMBER', this.setNonumber ),
for paper in paperTable:
if re.match(paper[0],size):
found=1
- this.__set('pagewidth',paper[1],requester)
- this.__set('pageheight',paper[2],requester)
this.__set('papersize',paper[3],requester)
break
# Set latex header name
#
def setHeader(this,head, requester):
- this.__set('header',head,requester)
+ this.__set('header','\\input{' + head + '}'+this.get('header'),requester)
+
+ #
+ # Set latex package name
+ #
+ def setPackages(this,pkgs, requester):
+ this.__set('header','\\usepackage{' + pkgs + '}'+this.get('header'),requester)
#
# Set or Clear Dependencies flag to generate makefile dependencies
#
- def setDependencies(this, requester):
+ def setDependencies(this, value, requester):
"""
Set or Clear dependencies flag
"""
this.__set('tmp',dir,requester)
#
- # Set mudela source file name
+ # Set lilypond source file name
#
def setFilename(this,file, requester):
this.__set('filename',file,requester)
#
def setRoot(this,path, requester):
"""
- Set lilypond root directory
+ Set LilyPond root directory
"""
os.environ['LILYPONDPREFIX'] = path
inc = ''
if len(Props.get('include')) > 0:
inc = string.join (map (lambda x: '-I "%s"' % x, Props.get('include')))
- else:
-
- if Props.get('dependencies'):
- dep=' -d'
- else:
- dep=''
- return inc + dep
- return inc
+ dep=''
+ if Props.get('dependencies'):
+ dep=' --dependencies'
+ return inc + dep
-def writeLilylog(contents):
+def writeLilylog(file,contents):
if Props.get('keeplilypond'):
- file='lilylog.' + str(os.getpid())
+ base, ext = os.path.splitext(file)
+ tempfile.template=base + "_li"
+ file=tempfile.mktemp('.log')
output = Props.get('output')
if output != '':
file = os.path.join( output, file )
def getTeXFile(contents):
texfiles=[]
for line in string.split(contents,'\n'):
- m = re.search('^Paper output to (.+)\.\.\.', line)
+ m = re.search('paper output to (.+)\.\.\.', line)
if m:
texfiles.append(m.group(1))
else:
return texfiles
+def getDepFiles (log):
+ files=[]
+ for line in string.split (log,'\n'):
+ m = re.search ("dependencies output to (.+)\.\.\.", line)
+ if m:
+ files.append (m.group (1))
+ return files
+
def unc2dos(path):
"""
Convert a path of format //<drive>/this/that/the/other to
def program_id ():
- return name + ' ' + version;
+ return 'ly2dvi (GNU LilyPond) ' + version;
def mailaddress():
def identify ():
sys.stderr.write (program_id () + '\n')
+def print_version ():
+ sys.stdout.write (program_id () + '\n')
+
def help ():
- sys.stderr.write (
- 'Generate dvi file from mudela or lilypond output\n'
- 'Usage: ' + name + ' [OPTION]... [FILE]...\n'
- '\n'
- 'Options:\n'
- ' -D,--debug increase verbosity\n'
- ' -F,--headers= name of additional LaTeX headers file\n'
- ' -H,--Height= set paper height (points) (see manual page)\n'
- ' -I,--include=DIR add DIR to LilyPond\'s search path\n'
- ' -K,--keeplilypond keep lilypond output files\n'
- ' -L,--landscape set landscape orientation\n'
- ' -N,--nonumber switch off page numbering\n'
- ' -O,--orientation= set orientation (obsolete - use -L instead)\n'
- ' -P,--postscript generate postscript file\n'
- ' -W,--Width= set paper width (points) (see manual page)\n'
- ' -d,--dependencies tell lilypond make a dependencies file\n'
- ' -h,--help this help text\n'
- ' -k,--keeply2dvi keep ly2dvi output files\n'
- ' -l,--language= give LaTeX language (babel)\n'
- ' -o,--output= set output directory\n'
- ' -p,--papersize= give LaTeX papersize (eg. a4)\n'
- ' -s,--separate run all files separately through LaTeX\n'
- '\n'
- 'files may be (a mix of) input to or output from lilypond(1)\n'
- )
+ sys.stdout.write (
+"""Usage: %s [OPTION]... [FILE]...
+
+Generate dvi file from LilyPond source/output
+
+Options:
+ -D,--debug increase verbosity
+ -F,--headers= name of additional LaTeX headers file
+ -H,--Height= set paper height (points) (see manual page)
+ -I,--include=DIR add DIR to LilyPond\'s search path
+ -K,--keeplilypond keep LilyPond output files
+ -L,--landscape set landscape orientation
+ -N,--nonumber switch off page numbering
+ -O,--orientation= set orientation (obsolete -- use -L instead)
+ -P,--postscript generate PostScript file
+ -W,--Width= set paper width (points) (see manual page)
+ -M,--dependencies tell LilyPond to make a dependencies file
+ -h,--help this help text
+ -k,--keeply2dvi keep ly2dvi output files
+ -l,--language= give LaTeX language (babel)
+ -o,--outdir= set output directory
+ --output= set output directory
+ -p,--papersize= give LaTeX papersize (eg. a4)
+ -s,--separate run all files separately through LaTeX
+
+files may be (a mix of) input to or output from LilyPond(1)
+""" % name)
\f
#
def main():
- """Generate dvi files from lilypond source/output"""
+ """Generate dvi files from LilyPond source/output"""
infile = Input()
outfile = TeXOutput()
texInputFiles=[]
+ tempfile.tempdir=""
(options, files) = getopt.getopt (sys.argv[1:],
- 'DF:H:I:KLNPW:dhkl:o:p:s',
+ 'DF:H:I:KLNPW:Mhkl:o:p:s',
['debug', 'headers=', 'Height=',
'include=', 'keeplilypond', 'landscape',
'nonumber', 'Width=', 'dependencies',
'help', 'keeply2dvi', 'language=',
- 'output=', 'papersize=', 'separate',
- 'postscript'])
+ 'outdir=', 'output=', 'version',
+ 'papersize=', 'separate', 'postscript'])
+
for opt in options:
o = opt[0]
a = opt[1]
Props.setNonumber(1,'commandline')
elif o == '--Width' or o == '-W':
Props.setLineWidth(a,'commandline')
- elif o == '--dependencies' or o == '-d':
+ elif o == '--dependencies' or o == '-M':
Props.setDependencies(1,'commandline')
elif o == '--help' or o == '-h':
help()
- return 0
+ sys.exit (0)
elif o == '--keeply2dvi' or o == '-k':
Props.setKeeply2dvi(1,'commandline')
elif o == '--language' or o == '-l':
Props.setLanguage(a,'commandline')
- elif o == '--output' or o == '-o':
+ elif o == '--outdir' or o == '-o' or o == '--output':
Props.setOutput(a,'commandline')
elif o == '--papersize' or o == '-p':
Props.setPaperZize(a,'commandline')
Props.setSeparate(1,'commandline')
elif o == '--postscript' or o == '-P':
Props.setPostscript(1,'commandline')
-
+ elif o == '--version':
+ print_version ()
+ return 0
+ else:
+ print o
+ raise getopt.error
+
+ identify()
+ Props.read_titledefs ()
+
if len(files):
for file in files:
infile.open(file)
if stat:
sys.exit('ExitBadLily', cmd )
texFiles=getTeXFile(log)
- writeLilylog(log)
+ depFiles=getDepFiles (log)
+ writeLilylog(file,log)
Props.addLilyOutputFiles(texFiles,'program')
texInputFiles = texInputFiles + texFiles
else:
if Props.get('debug'):
Props.printProps()
if firstfile:
- outfile.start(file)
+ outfile.start(file) # allow for specified name
else:
outfile.next()
outfile.write("""\
firstfile=0
if not Props.get('separate'):
outfile.end()
+
+ # --outdir mess
+ if Props.get ('output'):
+ outdir=Props.get ('output')
+ for i in depFiles:
+ text=open (i).read ()
+ # ugh, should use lilypond -o DIR/foo.tex
+ # or --dep-prefix to fix dependencies
+ text=re.sub ('\n([^:]*).tex', '\n' + outdir + '/\\1.dvi', text)
+ text=re.sub (' ([^:]*).tex', ' ' + outdir + '/\\1.dvi', text)
+ open (os.path.join (outdir, i), 'w').write (text)
+ os.remove (i)
+
else:
help()
sys.exit('ExitBadArgs','No files specified')
'ExitBadWidth' : ['Invalid Width specification', 6 ],
'ExitBadOrient' : ['Invalid Orientation specification', 7 ],
'ExitNoWrite' : ['Permission denied', 8 ],
- 'ExitNoTeXName' : ['hmm, I could not find an output file name', 9 ],
- 'ExitBadLily' : ['Lilypond failed', 10 ],
+ 'ExitNoTeXName' : ['Hmm, I could not find an output file name', 9 ],
+ 'ExitBadLily' : ['LilyPond failed', 10 ],
'ExitBadLatex' : ['Latex failed', 11 ],
'ExitBadPostscript' : ['Postscript failed', 12 ],
'ExitUnknown' : ['Unknown Exit Code', 20 ],
if not Props.get('keeplilypond'):
lilyfiles = Props.get('lilyOutputFiles')
if not Props.get('keeply2dvi'):
- tmpfiles = glob.glob('*.' + str(os.getpid()) + '.*' )
+ tmpfiles = glob.glob('*_ly[0-9]*.*')
for file in lilyfiles + tmpfiles:
if os.path.isfile(file):
os.remove(file)
-identify()
Props = Properties()
try:
projects / lilypond.git / blobdiff