import os
import sys
import re
-
-# Users of python modules should include this snippet
-# and customize variables below.
-
-# We'll suffer this path initialization stuff as long as we don't install
-# our python packages in <prefix>/lib/pythonX.Y
-
-# If set, LILYPONDPREFIX must take prevalence.
-# if datadir is not set, we're doing a build and LILYPONDPREFIX.
+import md5
################
# RELOCATION
################
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
- datadir = '@lilypond_datadir@'
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
-
-if os.environ.has_key ('LILYPONDPREFIX'):
- datadir = os.environ['LILYPONDPREFIX']
- while datadir[-1] == os.sep:
- datadir = datadir[:-1]
- if not os.path.exists (os.path.join (datadir, 'python/lilylib.py')):
- datadir = os.path.join (datadir, 'share/lilypond/current/')
-sys.path.insert (0, os.path.join (datadir, 'python'))
+for d in ['@lilypond_datadir@',
+ '@lilypond_libdir@']:
+ sys.path.insert (0, os.path.join (d, 'python'))
# dynamic relocation, for GUB binaries.
-bindir = os.path.split (sys.argv[0])[0]
+bindir = os.path.abspath (os.path.split (sys.argv[0])[0])
-
-for prefix_component in ['share', 'lib']:
- datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % prefix_component)
+os.environ['PATH'] = bindir + os.pathsep + os.environ['PATH']
+for p in ['share', 'lib']:
+ datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p)
sys.path.insert (0, datadir)
backend = 'ps'
help_summary = _ (
-'''Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.
+'''Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document.
Example usage:
help=_ ("pipe snippets through FILTER [convert-ly -n -]"),
default=None)
p.add_option ('-f', '--format',
- help=_('''use output format FORMAT (texi [default], texi-html, latex, html)'''),
+ help=_('''use output format FORMAT (texi [default], texi-html, latex, html, docbook)'''),
action='store')
+
p.add_option ("-I", '--include', help=_('add DIR to include path'),
metavar="DIR",
action='append', dest='include_path',
default=False)
p.add_option ('', '--psfonts', action="store_true", dest="psfonts",
- help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX'''
- '''must use this with dvips -h INPUT.psfonts'''),
+ help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX
+must use this with dvips -h INPUT.psfonts'''),
default=None)
p.add_option ('-V', '--verbose', help=_("be verbose"),
action="store_true",
#
AFTER = 'after'
BEFORE = 'before'
+DOCBOOK = 'docbook'
EXAMPLEINDENT = 'exampleindent'
FILTER = 'filter'
FRAGMENT = 'fragment'
# (?x) -- Ignore whitespace in patterns.
no_match = 'a\ba'
snippet_res = {
+ ##
+ DOCBOOK: {
+ 'include':
+ no_match,
+
+ 'lilypond':
+ r'''(?smx)
+ (?P<match>
+ <(?P<inline>(inline)?)mediaobject>\s*<textobject.*?>\s*<programlisting\s+language="lilypond".*?(role="(?P<options>.*?)")?>(?P<code>.*?)</programlisting\s*>\s*</textobject\s*>\s*</(inline)?mediaobject>)''',
+
+ 'lilypond_block':
+ r'''(?smx)
+ (?P<match>
+ <(?P<inline>(inline)?)mediaobject>\s*<textobject.*?>\s*<programlisting\s+language="lilypond".*?(role="(?P<options>.*?)")?>(?P<code>.*?)</programlisting\s*>\s*</textobject\s*>\s*</(inline)?mediaobject>)''',
+
+ 'lilypond_file':
+ r'''(?smx)
+ (?P<match>
+ <(?P<inline>(inline)?)mediaobject>\s*<imageobject.*?>\s*<imagedata\s+fileref="(?P<filename>.*?\.ly)"\s*(role="(?P<options>.*?)")?\s*(/>|>\s*</imagedata>)\s*</imageobject>\s*</(inline)?mediaobject>)''',
+
+ 'multiline_comment':
+ r'''(?smx)
+ (?P<match>
+ \s*(?!@c\s+)
+ (?P<code><!--\s.*?!-->)
+ \s)''',
+
+ 'singleline_comment':
+ no_match,
+
+ 'verb':
+ no_match,
+
+ 'verbatim':
+ no_match,
+
+ },
##
HTML: {
'include':
format_res = {
+ DOCBOOK: {
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*',
+ },
HTML: {
'intertext': r',?\s*intertext=\".*?\"',
'option_sep': '\s*',
}
output = {
+ ##
+ DOCBOOK: {
+ FILTER: r'''<mediaobject><textobject><programlisting language="lilypond" role="%(options)s">%(code)s</programlisting></textobject></mediaobject>''',
+
+ OUTPUT: r'''
+ <imageobject role="latex">
+ <imagedata fileref="%(base)s.pdf" format="PDF"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="%(base)s.png" format="PNG"/></imageobject>''',
+
+ VERBATIM: r'''<programlisting>%(verb)s</programlisting>''',
+
+ PRINTFILENAME: '<textobject><simpara><ulink url="%(base)s.ly"><filename>%(filename)s</filename></ulink></simpara></textobject>'
+ },
##
HTML: {
FILTER: r'''<lilypond %(options)s>
LATEX: {
OUTPUT: r'''{%%
\parindent 0pt%%
-\catcode`\@=12%%
\ifx\preLilyPondExample \undefined%%
\relax%%
\else%%
\preLilyPondExample%%
\fi%%
\def\lilypondbook{}%%
-\input %(base)s-systems.%(texextension)s%%
+\input %(base)s-systems.tex%%
\ifx\postLilyPondExample \undefined%%
\relax%%
\else%%
self.do_options (os, self.type)
def ly (self):
- return self.substring ('code')
+ contents = self.substring ('code')
+ return ('\\sourcefileline %d\n%s'
+ % (self.line_number - 1, contents))
def full_ly (self):
s = self.ly ()
options = split_options (option_string)
for i in options:
- if string.find (i, '=') > 0:
+ if '=' in i:
(key, value) = re.split ('\s*=\s*', i)
self.option_dict[key] = value
else:
d.update (locals())
return (PREAMBLE_LY + body) % d
- # TODO: Use md5?
def get_hash (self):
if not self.hash:
- self.hash = abs (hash (self.full_ly ()))
+ hash = md5.md5 (self.relevant_contents (self.full_ly ()))
+
+ ## let's not create too long names.
+ self.hash = hash.hexdigest ()[:10]
+
return self.hash
def basename (self):
if FILENAME in self.option_dict:
return self.option_dict[FILENAME]
if global_options.use_hash:
- return 'lily-%d' % self.get_hash ()
+ return 'lily-%s' % self.get_hash ()
raise 'to be done'
def write_ly (self):
outf = open (self.basename () + '.ly', 'w')
outf.write (self.full_ly ())
-
open (self.basename () + '.txt', 'w').write ('image of music')
+ def relevant_contents (self, ly):
+ return re.sub (r'\\(version|sourcefileline)[^\n]*\n', '', ly)
+
def ly_is_outdated (self):
base = self.basename ()
-
- tex_file = '%s.tex' % base
- eps_file = '%s.eps' % base
- system_file = '%s-systems.tex' % base
- ly_file = '%s.ly' % base
- ok = os.path.exists (ly_file) \
- and os.path.exists (system_file)\
- and os.stat (system_file)[stat.ST_SIZE] \
- and re.match ('% eof', open (system_file).readlines ()[-1])
- if ok and (not global_options.use_hash or FILENAME in self.option_dict):
- ok = (self.full_ly () == open (ly_file).read ())
- if ok:
- # TODO: Do something smart with target formats
- # (ps, png) and m/ctimes.
+ ly_file = base + '.ly'
+ tex_file = base + '.tex'
+ eps_file = base + '.eps'
+ systems_file = base + '-systems.tex'
+
+ if (os.path.exists (ly_file)
+ and os.path.exists (systems_file)
+ and os.stat (systems_file)[stat.ST_SIZE]
+ and re.match ('% eof', open (systems_file).readlines ()[-1])
+ and (global_options.use_hash or FILENAME in self.option_dict)
+ and (self.relevant_contents (self.full_ly ())
+ == self.relevant_contents (open (ly_file).read ()))):
return None
+ if global_options.verbose:
+ print 'OUT OF DATE: ', ly_file
return self
def png_is_outdated (self):
base = self.basename ()
+ # FIXME: refactor stupid OK stuff
ok = not self.ly_is_outdated ()
if global_options.format in (HTML, TEXINFO):
ok = ok and os.path.exists (base + '.eps')
if backend == 'ps':
return 0
+ # FIXME: refactor stupid OK stuff
base = self.basename ()
ok = self.ly_is_outdated ()
ok = ok and (os.path.exists (base + '.texstr'))
images = tuple (images)
return images
+ def output_docbook (self):
+ str = ''
+ base = self.basename ()
+ for image in self.get_images ():
+ (base, ext) = os.path.splitext (image)
+ str += output[DOCBOOK][OUTPUT] % vars ()
+ str += self.output_print_filename (DOCBOOK)
+ if (self.substring('inline') == 'inline'):
+ str = '<inlinemediaobject>' + str + '</inlinemediaobject>'
+ else:
+ str = '<mediaobject>' + str + '</mediaobject>'
+ if VERBATIM in self.option_dict:
+ verb = verbatim_html (self.substring ('code'))
+ str = output[DOCBOOK][VERBATIM] % vars () + str
+ return str
+
def output_html (self):
str = ''
base = self.basename ()
verb = self.substring ('code')
str += (output[LATEX][VERBATIM] % vars ())
- texextension = 'tex'
- if global_options.create_pdf:
- texextension = 'pdftex'
str += (output[LATEX][OUTPUT] % vars ())
## todo: maintain breaks
def ly (self):
name = self.substring ('filename')
contents = open (find_file (name)).read ()
-
- ## strip version string to make automated regtest comparisons
- ## across versions easier.
- contents = re.sub (r'\\version *"[^"]*"', '', contents)
-
- return ('\\sourcefilename \"%s\"\n%s'
+ return ('\\sourcefilename \"%s\"\n\\sourcefileline 0\n%s'
% (name, contents))
snippet_type_to_class = {
status = 0
def my_system (cmd):
status = ly.system (cmd,
- be_verbose=global_options.verbose,
- progress_p=1)
+ be_verbose=global_options.verbose,
+ progress_p=1)
if global_options.format in (HTML, TEXINFO):
cmd += ' --formats=png '
-
+ if global_options.format in (DOCBOOK):
+ cmd += ' --formats=png,pdf '
# UGH
# the --process=CMD switch is a bad idea
# it is too generic for lilypond-book.
my_system ('latex %s.texstr' % l)
if ly_names:
- my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names))
+ open ('snippet-names', 'wb').write ('\n'.join (['snippet-map.ly']
+ + ly_names))
+
+ my_system (string.join ([cmd, 'snippet-names']))
+
LATEX_INSPECTION_DOCUMENT = r'''
\nonstopmode
'.texi': TEXINFO,
'.texinfo': TEXINFO,
'.xml': HTML,
+ '.lyxml': DOCBOOK
}
format2ext = {
# TEXINFO: '.texinfo',
TEXINFO: '.texi',
LATEX: '.tex',
+ DOCBOOK: '.xml'
}
class Compile_error:
#(ly:add-file-name-alist '(
""")
for ly in lys:
- snippet_map.write ('("%s.ly" . "%s:%d (%s.ly)")\n'
+ snippet_map.write ('("%s.ly" . "%s")\n'
% (ly.basename (),
- name,
- ly.line_number,
- ly.basename ()))
+ name))
snippet_map.write ('))\n')
return args
def main ():
+ # FIXME: 85 lines of `main' macramee??
files = do_options ()
file = files[0]
global_options.format = guess_format (files[0])
formats = 'ps'
- if global_options.format in (TEXINFO, HTML):
+ if global_options.format in (TEXINFO, HTML, DOCBOOK):
formats += ',png'
- if (global_options.format in (TEXINFO, LATEX)
- and global_options.create_pdf):
- formats += ",pdf"
if global_options.process_cmd == '':
global_options.process_cmd = (lilypond_binary
+ ' --formats=%s --backend eps ' % formats)
- if global_options.create_pdf:
- global_options.process_cmd += ' -dgs-font-load -deps-font-include '
-
if global_options.process_cmd:
- global_options.process_cmd += string.join ([(' -I %s' % commands.mkarg (p))
+ global_options.process_cmd += string.join ([(' -I %s' % ly.mkarg (p))
for p in global_options.include_path])
+ if global_options.format in (TEXINFO, LATEX):
+ ## prevent PDF from being switched on by default.
+ global_options.process_cmd += ' --formats=eps '
+
+ if (global_options.format in (TEXINFO, LATEX)
+ and global_options.create_pdf):
+ global_options.process_cmd += "--pdf -dinclude-eps-fonts -dgs-load-fonts "
+
+
+
+ if global_options.verbose:
+ global_options.process_cmd += " --verbose "
+
+ global_options.process_cmd += " -dread-file-list -deps-box-padding=-3 "
+
identify ()
try:
projects / lilypond.git / blobdiff