ly-options: intertext, quote ?
--linewidth?
eps in latex?
- check latex parameters, twocolumn
- multicolumn?
- papersizes?
- ly2dvi/notexidoc?
+ check latex parameters, twocolumn, multicolumn?
Example usage:
'''
-import string
import __main__
+import glob
+import string
################################################################
# Users of python modules should include this snippet
""")
-copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>>',
+copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
option_definitions = [
latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"'
filter_cmd = 0
process_cmd = lilypond_binary
-default_ly_options = { }
+default_ly_options = {}
AFTER = 'after'
BEFORE = 'before'
+FRAGMENT = 'fragment'
HTML = 'html'
LATEX = 'latex'
LINEWIDTH = 'linewidth'
+NOFRAGMENT = 'nofragment'
NOTES = 'body'
OUTPUT = 'output'
PAPER = 'paper'
PREAMBLE = 'preamble'
+PRINTFILENAME = 'printfilename'
+RAGGEDRIGHT = 'raggedright'
+RELATIVE = 'relative'
+STAFFSIZE = 'staffsize'
+TEXIDOC = 'texidoc'
TEXINFO = 'texinfo'
VERBATIM = 'verbatim'
-PRINTFILENAME = 'printfilename'
# Recognize special sequences in the input
#
},
TEXINFO: {
- 'include': '(?m)^[^%\n]*?(?P<match>@include\s+(?P<filename>\S*))',
+ 'include': '(?m)^[^%\n]*?(?P<match>@include\s+(?P<filename>\S+))',
'lilypond' : '(?m)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?{(?P<code>.*?)})',
'lilypond_block': r'''(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end lilypond)\s''',
'lilypond_file': '(?m)^(?P<match>@lilypondfile(\[(?P<options>[^]]*)\])?{(?P<filename>[^}]+)})',
- 'multiline_comment': r"(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end ignore)\s",
- 'singleline_comment': r"(?m)^.*(?P<match>(?P<code>@c([ \t][^\n]*|)\n))",
+ 'multiline_comment': r'(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end\s+ignore)\s',
+ 'singleline_comment': r'(?m)^.*(?P<match>(?P<code>@c([ \t][^\n]*|)\n))',
# don't do this: fucks up with @code{@{}
# 'verb': r'''(?P<code>@code{.*?})''',
ly_options = {
NOTES: {
- 'relative': r'''\relative c%(relative_quotes)s''',
+ RELATIVE: r'''\relative c%(relative_quotes)s''',
},
PAPER: {
'indent' : r'''
'noindent' : r'''
indent = 0.0\mm''',
'notime' : r'''
- \translator {
+ \context {
\StaffContext
\remove Time_signature_engraver
}''',
- 'raggedright' : r'''
+ RAGGEDRIGHT : r'''
indent = 0.0\mm
raggedright = ##t''',
},
PREAMBLE: {
- 'staffsize': r'''
+ STAFFSIZE: r'''
#(set-global-staff-size %(staffsize)s)''',
},
}
output = {
HTML : {
- AFTER: '',
- PRINTFILENAME:'<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
- BEFORE: '',
+ AFTER: r'''
+ </a>
+</p>''',
+ BEFORE: r'''
+<p>
+ <a href="%(base)s.ly">''',
OUTPUT: r'''
-<img align="center" valign="center"
-border="0" src="%(base)s.png" alt="[picture of music]">''',
+ <img align="center" valign="center"
+ border="0" src="%(image)s" alt="[image of music]">''',
+ PRINTFILENAME:'<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
VERBATIM: r'''<pre>
%(verb)s</pre>''',
},
-
+
LATEX : {
AFTER: '',
- PRINTFILENAME: '''\\texttt{%(filename)s}
-
- ''',
BEFORE: '',
OUTPUT: r'''{\parindent 0pt
\catcode`\@=12
\input %(base)s.tex
\ifx\preLilyPondExample\postLilyPondExample\fi
\catcode`\@=0}''',
+ PRINTFILENAME: '''\\texttt{%(filename)s}
+
+ ''',
VERBATIM: r'''\begin{verbatim}
%(verb)s\end{verbatim}
''',
},
-
- TEXINFO : {
+
+ TEXINFO : {
+ AFTER: '',
+ BEFORE: '',
+ OUTPUT: r'''
+ @image{%(base)s,,,[image of music],%(ext)s}
+''',
PRINTFILENAME: '''@file{%(filename)s}
''',
- BEFORE: '',
- AFTER: '',
VERBATIM: r'''@example
%(verb)s@end example
''',
-
},
-
}
PREAMBLE_LY = r'''%% Generated by %(program_name)s
}'''
FULL_LY = '%(code)s'
-texi_linewidths = { 'afourpaper': '160 \\mm',
- 'afourwide': '6.5\\in',
- 'afourlatex': '150 \\mm',
- 'smallbook': '5 \\in' ,
- 'letterpaper': '6\\in'}
+texinfo_linewidths = {
+ '@afourpaper': '160 \\mm',
+ '@afourwide': '6.5 \\in',
+ '@afourlatex': '150 \\mm',
+ '@smallbook': '5 \\in' ,
+ '@letterpaper': '6\\in',
+ }
def classic_lilypond_book_compatibility (o):
if o == 'singleline':
- return 'raggedright'
+ return RAGGEDRIGHT
m = re.search ('relative\s*([-0-9])', o)
if m:
return 'relative=%s' % m.group (1)
return None
def compose_ly (code, options):
+ #Hmm
+ for i in default_ly_options.keys ():
+ if i not in options:
+ options.append (i)
- options += default_ly_options.keys ()
- vars ().update (default_ly_options)
-
m = re.search (r'''\\score''', code)
if not m and (not options \
- or not 'nofragment' in options \
- or 'fragment' in options):
- options.append ('raggedright')
+ or not NOFRAGMENT in options or FRAGMENT in options):
+ if RAGGEDRIGHT not in options:
+ options.append (RAGGEDRIGHT)
body = FRAGMENT_LY
else:
body = FULL_LY
# defaults
- relative = 0
- staffsize = '16'
+ relative = 1
+ staffsize = 16
+ override = {}
+ override.update (default_ly_options)
+
option_string = string.join (options, ',')
notes_options = []
paper_options = []
if string.find (i, '=') > 0:
key, value = string.split (i, '=')
- # hmm
- vars ()[key] = value
+ override[key] = value
else:
key = i
+ if i not in override.keys ():
+ override[i] = None
if key in ly_options[NOTES].keys ():
notes_options.append (ly_options[NOTES][key])
preamble_options.append (ly_options[PREAMBLE][key])
elif key in ly_options[PAPER].keys ():
paper_options.append (ly_options[PAPER][key])
- elif key not in ('fragment', 'nofragment', 'printfilename',
- 'relative', 'verbatim', 'texidoc'):
+ elif key not in (FRAGMENT, NOFRAGMENT, PRINTFILENAME,
+ RELATIVE, VERBATIM, TEXIDOC):
ly.warning (_("ignoring unknown ly option: %s") % i)
- relative_quotes = (",,,", ",,", ",", "", "'", "''", "'''")[relative-3]
+ #URGS
+ if RELATIVE in override.keys () and override[RELATIVE]:
+ relative = string.atoi (override[RELATIVE])
+
+ relative_quotes = ''
+
+ # 1 = central C
+ if relative < 0:
+ relative_quotes += ',' * (- relative)
+ elif relative > 0:
+ relative_quotes += "'" * relative
+
program_name = __main__.program_name
+ paper_string = string.join (paper_options, '\n ') % override
+ preamble_string = string.join (preamble_options, '\n ') % override
notes_string = string.join (notes_options, '\n ') % vars ()
- paper_string = string.join (paper_options, '\n ') % vars ()
- preamble_string = string.join (preamble_options, '\n ') % vars ()
return (PREAMBLE_LY + body) % vars ()
-
# BARF
# use lilypond-bin for latex (.lytex) books,
# and lilypond --preview for html, texinfo books?
class Chunk:
def replacement_text (self):
return ''
+
def is_outdated (self):
return 0
self.source = source
self.start = start
self.end = end
+
def replacement_text (self):
return self.source [self.start:self.end]
self.hash = 0
self.options = []
self.format = format
+
def replacement_text (self):
return self.match.group (0)
def substring (self, s):
return self.match.group (s)
+
def filter_code (self):
pass # todo
- def __repr__(self):
- return `self.__class__` + " type = " + self.type
+
+ def __repr__ (self):
+ return `self.__class__` + " type = " + self.type
class Include_snippet (Snippet):
def processed_filename (self):
f = self.substring ('filename')
return os.path.splitext (f)[0] + format2ext[format]
-
+
def replacement_text (self):
s = self.match.group (0)
f = self.substring ('filename')
os = match.group ('options')
if os:
self.options = split_options (os)
-
def ly (self):
if self.type == 'lilypond_file':
def is_outdated (self):
base = self.basename ()
+ ## FIXME: adding PNG to is_outdated test fixes
+ ## interrupted (web) builds.
+ ## should only do this if PNG is actually target
if os.path.exists (base + '.ly') \
and os.path.exists (base + '.tex') \
+ and os.path.exists (base + '.png') \
and (use_hash_p \
or self.ly () == open (base + '.ly').read ()):
# TODO: something smart with target formats
# (ps, png) and m/ctimes
return None
-
return self
def replacement_text (self):
func = Lilypond_snippet.__dict__ ['output_' + self.format]
return func (self)
+ def get_images (self):
+ base = self.basename ()
+ # URGUGHUGHUGUGHU
+ single = '%(base)s.png' % vars ()
+ multiple = '%(base)s-page1.png' % vars ()
+ images = (single,)
+ if os.path.exists (multiple) \
+ and (not os.path.exists (single)\
+ or (os.stat (multiple)[stat.ST_MTIME] \
+ > os.stat (single)[stat.ST_MTIME])):
+ images = glob.glob ('%(base)s-page*.png' % vars ())
+ return images
+
def output_html (self):
+ str = ''
base = self.basename ()
- str = self.output_print_filename (HTML)
- if VERBATIM in self.options and format == HTML:
- verb = verbatim_html (self.substring ('code'))
- str += write (output[HTML][VERBATIM] % vars ())
- str += (output[HTML][BEFORE]
- + (output[HTML][OUTPUT] % vars ())
- + output[HTML][AFTER])
+ if format == HTML:
+ str += self.output_print_filename (HTML)
+ if VERBATIM in self.options:
+ verb = verbatim_html (self.substring ('code'))
+ str += write (output[HTML][VERBATIM] % vars ())
+
+ str += output[HTML][BEFORE] % vars ()
+ for image in self.get_images ():
+ base, ext = os.path.splitext (image)
+ str += output[HTML][OUTPUT] % vars ()
+ str += output[HTML][AFTER] % vars ()
+ return str
+ def output_info (self):
+ str = self.output_print_filename (HTML)
+ str = output[TEXINFO][BEFORE] % vars ()
+ for image in self.get_images ():
+ base, ext = os.path.splitext (image)
+ # URG, makeinfo implicitely prepends dot to ext
+ # specifying no extension is most robust
+ ext = ''
+ str += output[TEXINFO][OUTPUT] % vars ()
+ str += output[TEXINFO][AFTER] % vars ()
return str
-
+
def output_latex (self):
- str = self.output_print_filename (LATEX)
-
+ str = ''
base = self.basename ()
- if VERBATIM in self.options\
- and format == LATEX:
- verb = self.substring ('code')
- str += (output[LATEX][VERBATIM] % vars ())
-
+ if format == LATEX:
+ str += self.output_print_filename (LATEX)
+ if VERBATIM in self.options:
+ verb = self.substring ('code')
+ str += (output[LATEX][VERBATIM] % vars ())
str += (output[LATEX][BEFORE]
+ (output[LATEX][OUTPUT] % vars ())
+ output[LATEX][AFTER])
-
-
return str
def output_print_filename (self,format):
if PRINTFILENAME in self.options:
base = self.basename ()
filename = self.substring ('filename')
- str += output[format][PRINTFILENAME] % vars ()
-
+ str = output[format][PRINTFILENAME] % vars ()
return str
-
+
def output_texinfo (self):
str = ''
-
- ## Ugh, this breaks texidoc.
- str = self.output_print_filename (TEXINFO)
-
+ # self.output_print_filename (TEXINFO)
+ str += ('@html\n' + self.output_print_filename (HTML)
+ + '\n@end html\n')
+ str += ('@tex\n' + self.output_print_filename (LATEX)
+ + '\n@end tex\n')
base = self.basename ()
-
- str = ""
- if 'texidoc' in self.options :
+ if TEXIDOC in self.options:
texidoc = base + '.texidoc'
if os.path.exists (texidoc):
- str += '@include %s\n' % texidoc
-
- str += '\n@tex\n'
- str += (output[LATEX][BEFORE]
- + (output[LATEX][OUTPUT] % vars ())
- + output[LATEX][AFTER])
- str += ('\n@end tex\n')
-
- str += ('\n\n@html\n')
- str += (output[HTML][BEFORE]
- + (output[HTML][OUTPUT] % vars ())
- + output[HTML][AFTER])
- str += ('\n@end html\n\n') # need par after picture.
+ str += '@include %(texidoc)s\n' % vars ()
if VERBATIM in self.options:
verb = verbatim_texinfo (self.substring ('code'))
str += (output[TEXINFO][VERBATIM] % vars ())
-
+
+ str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
+ str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
+ str += ('@html\n' + self.output_html () + '\n@end html\n')
+ # need par after image
+ str += '\n'
+
return str
-
snippet_type_to_class = {
'lilypond_file' : Lilypond_snippet,
'lilypond_block' : Lilypond_snippet,
'lilypond' : Lilypond_snippet,
- 'include' : Include_snippet
+ 'include' : Include_snippet,
}
-
-def find_toplevel_snippets (infile, types):
- s = infile.read ()
+def find_toplevel_snippets (s, types):
res = {}
for i in types:
res[i] = ly.re.compile (snippet_res[format][i])
snippets = []
index = 0
- found = dict ([(t, None) for t in types] )
+ ## found = dict (map (lambda x: (x, None), types))
+ ## urg python2.1
+ found = {}
+ map (lambda x, f=found: f.setdefault (x, None), types)
- #
- # We want to search for multiple regexes,
- # without searching the string multiple times for one regex.
- #
+ # We want to search for multiple regexes, without searching
+ # the string multiple times for one regex.
# Hence, we use earlier results to limit the string portion
# where we search.
# Since every part of the string is traversed at most once for
# every type of snippet, this is linear.
-
+
while 1:
first = None
endex = 1 << 30
m = res[type].search (s[index:endex])
if not m:
continue
-
+
cl = Snippet
if snippet_type_to_class.has_key (type):
cl = snippet_type_to_class[type]
start = index + m.start (0)
found[type] = (start, snip)
- if found[type] and (first == None
- or found[type][0] < found[first][0]):
-
+ if found[type] \
+ and (not first or found[type][0] < found[first][0]):
first = type
+
+ # FIXME.
+
+ # Limiting the search space is a cute
+ # idea, but this *requires* to search
+ # for possible containing blocks
+ # first, at least long as we do not
+ # search for the start of blocks, but
+ # always/directly for the entire
+ # @block ... @end block.
+
endex = found[first][0]
if not first:
(start , snip) = found[first]
snippets.append (Substring (s, index, start))
snippets.append (snip)
+ found[first] = None
index = start + len (snip.match.group (0))
return snippets
-
def filter_pipe (input, cmd):
if verbose_p:
ly.progress (_ ("Opening filter `%s\'") % cmd)
return filter_pipe (s, filter_cmd)
def process_snippets (cmd, snippets):
- names = filter (lambda x:x, [y.basename () for y in snippets])
+ names = filter (lambda x: x, map (Lilypond_snippet.basename, snippets))
if names:
ly.system (string.join ([cmd] + names))
return textwidth
-
ext2format = {
'.html' : HTML,
'.itely' : TEXINFO,
TEXINFO: '.texi',
LATEX: '.tex',
}
-
def do_file (input_filename):
#ugh
ly.error (_ ("cannot determine format for: %s" \
% input_filename))
- ly.progress (_ ("Reading %s...") % input_filename)
if not input_filename or input_filename == '-':
- ih = sys.stdin
+ in_handle = sys.stdin
+ input_fullname = '<stdin>'
+ else:
+ if os.path.exists (input_filename):
+ input_fullname = input_filename
+ elif format == LATEX:
+ # urg python interface to libkpathsea?
+ input_fullname = ly.read_pipe ('kpsewhich '
+ + input_filename)[:-1]
+ else:
+ input_fullname = find_file (input_filename)
+ in_handle = open (input_fullname)
+
+ if input_filename == '-':
+ input_base = 'stdin'
else:
- ih = open (input_filename)
+ input_base = os.path.basename \
+ (os.path.splitext (input_filename)[0])
+
+ # only default to stdout when filtering
+ if output_name == '-' or (not output_name and filter_cmd):
+ output_filename = '-'
+ output_file = sys.stdout
+ else:
+ if not output_name:
+ output_filename = input_base + format2ext[format]
+ else:
+ if not os.path.isdir (output_name):
+ os.mkdir (output_name, 0777)
+ output_filename = (output_name
+ + '/' + input_base
+ + format2ext[format])
+
+
+ if (os.path.exists (input_filename) and
+ os.path.exists (output_filename) and
+ os.path.samefile (output_filename, input_fullname)):
+ ly.error (_("Output would overwrite input file; use --output."))
+ sys.exit (2)
+ output_file = open (output_filename, 'w')
+ if output_name:
+ os.chdir (output_name)
+
+ ly.progress (_ ("Reading %s...") % input_fullname)
+ source = in_handle.read ()
ly.progress ('\n')
- ly.progress (_ ("Dissecting..."))
+ # FIXME: containing blocks must be first, see find_toplevel_snippets
snippet_types = (
+ 'multiline_comment',
+ 'verbatim',
'lilypond_block',
# 'verb',
- 'verbatim',
'singleline_comment',
- 'multiline_comment',
'lilypond_file',
'include',
'lilypond', )
-
- output_file = None
- if output_name == '-' or not output_name:
- output_file = sys.stdout
- output_filename = '-'
- else:
- if not os.path.isdir (output_name):
- os.mkdir (output_name, 0777)
- if input_filename == '-':
- input_base = 'stdin'
- else:
- input_base = os.path.splitext (input_filename)[0]
- input_base = os.path.basename (input_base)
-
- output_filename = output_name + '/' + input_base \
- + format2ext[format]
- output_file = open (output_filename, 'w')
- os.chdir (output_name)
-
-
- chunks = find_toplevel_snippets (ih, snippet_types)
+ ly.progress (_ ("Dissecting..."))
+ chunks = find_toplevel_snippets (source, snippet_types)
ly.progress ('\n')
global default_ly_options
if LINEWIDTH not in default_ly_options.keys ():
if format == LATEX:
textwidth = get_latex_textwidth (source)
- default_ly_options[LINEWIDTH] = '''%.0f\\pt''' % textwidth
+ default_ly_options[LINEWIDTH] = '''%.0f\\pt''' \
+ % textwidth
elif format == TEXINFO:
- for (k,v) in texi_linewidths.items ():
- s = chunks[0].replacement_text()
- if re.search (k, s):
+ for (k, v) in texinfo_linewidths.items ():
+ # FIXME: @paper is usually not in chunk #0:
+ # \input texinfo @c -*-texinfo-*-
+ # bluntly search first K of source
+ # s = chunks[0].replacement_text ()
+ if re.search (k, source[:1024]):
default_ly_options[LINEWIDTH] = v
break
if filter_cmd:
pass # todo
elif process_cmd:
- outdated = filter (lambda x: x.__class__ == Lilypond_snippet and x.is_outdated (),
- chunks)
+ outdated = filter (lambda x: x.__class__ == Lilypond_snippet \
+ and x.is_outdated (), chunks)
ly.progress (_ ("Writing snippets..."))
map (Lilypond_snippet.write_ly, outdated)
ly.progress ('\n')
-
+
if outdated:
ly.progress (_ ("Processing..."))
process_snippets (process_cmd, outdated)
else:
ly.progress (_ ("All snippets are up to date..."))
ly.progress ('\n')
-
+
ly.progress (_ ("Compiling %s...") % output_filename)
+ output_file.writelines ([s.replacement_text () \
+ for s in chunks])
ly.progress ('\n')
def process_include (snippet):
ly.progress (_ ('Processing include: %s') % name)
ly.progress ('\n')
do_file (name)
-
-
- output_file.writelines ([s.replacement_text () for s in chunks])
-
-
- included_files = [input_filename]
- def notice_include (target, snip):
- included_files.append (snip.match.group ('filename'))
- included_files.append (os.path.join (output_name, snip.processed_filename ()))
-
- [notice_include (output_filename, x) for x in
-
- ## UGH. how do you do dynamic_cast/typecheck in Python?
- filter (lambda x: x.__class__ == Include_snippet, chunks)]
-
- target = re.sub (r'^\./','', output_filename)
- open (os.path.split (output_filename)[1] + '.dep', 'w').write ('%s: %s\n' % (target,
- string.join (included_files)))
-
- map (process_include, filter (lambda x: x.__class__ == Include_snippet, chunks))
-
+ map (process_include,
+ filter (lambda x: x.__class__ == Include_snippet, chunks))
def do_options ():
global format, output_name
return files
def main ():
-
files = do_options ()
global process_cmd
if process_cmd:
ly.setup_environment ()
if files:
do_file (files[0])
+
if __name__ == '__main__':
main ()
projects / lilypond.git / blobdiff