lilypond-book --process="lilypond" BOOK.tely
TODO:
- * ly-options: intertext ?
+ * ly-options: intertext?
* --linewidth?
- * eps in latex / eps by lilypond -fps ?
+ * eps in latex / eps by lilypond -b ps?
* check latex parameters, twocolumn, multicolumn?
+ * use --png --ps --pdf for making images?
* Converting from lilypond-book source, substitute:
@mbinclude foo.itely -> @include foo.itely
import stat
import string
-#
-# TODO:
-#
-# * use --png --ps --pdf for making images?
-#
-
-################################################################
# Users of python modules should include this snippet
# and customize variables below.
-# We'll suffer this path init stuff as long as we don't install our
-# python packages in <prefix>/lib/pythonx.y (and don't kludge around
-# it as we do with teTeX on Red Hat Linux: set some environment var
-# (PYTHONPATH) in profile)
+# We'll suffer this path initialization stuff as long as we don't install
+# our python packages in <prefix>/lib/pythonX.Y (and don't kludge around
+# it as we do with teTeX on Red Hat Linux: set some environment variables
+# (PYTHONPATH) in `etc/profile').
-# If set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX
+# If set, LILYPONDPREFIX must take prevalence.
+# if datadir is not set, we're doing a build and LILYPONDPREFIX.
import getopt, os, sys
datadir = '@local_lilypond_datadir@'
if not os.path.isdir (datadir):
sys.path.insert (0, os.path.join (datadir, 'python'))
-# Customize these
+# Customize these.
#if __name__ == '__main__':
import lilylib as ly
global _;_=ly._
global re;re = ly.re
-
-# lilylib globals
+# Lilylib globals.
program_version = '@TOPLEVEL_VERSION@'
program_name = sys.argv[0]
verbose_p = 0
pseudo_filter_p = 0
original_dir = os.getcwd ()
-
-help_summary = _ ("""Process LilyPond snippets in hybrid HTML, LaTeX or texinfo document.
+help_summary = _ (
+'''Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.
Example usage:
lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
lilypond-book --process='lilypond -I include' BOOK
-
-""")
+''')
copyright = ('Jan Nieuwenhuizen <janneke@gnu.org>',
'Han-Wen Nienhuys <hanwen@cs.uu.nl>')
option_definitions = [
- (_ ("EXT"), 'f', 'format', _ ("use output format EXT (texi [default], texi-html, latex, html)")),
- (_ ("FILTER"), 'F', 'filter', _ ("pipe snippets through FILTER [convert-ly -n -]")),
- ('', 'h', 'help', _ ("print this help")),
- (_ ("DIR"), 'I', 'include', _ ("add DIR to include path")),
- (_ ("COMMAND"), 'P', 'process', _ ("process ly_files using COMMAND FILE...")),
- (_ ("DIR"), 'o', 'output', _ ("write output to DIR")),
- ('', 'V', 'verbose', _ ("be verbose")),
- ('', 'v', 'version', _ ("print version information")),
- ('', 'w', 'warranty', _ ("show warranty and copyright")),
- ]
+ (_ ("EXT"), 'f', 'format',
+ _ ('''use output format EXT (texi [default], texi-html,
+ latex, html)''')),
+ (_ ("FILTER"), 'F', 'filter',
+ _ ("pipe snippets through FILTER [convert-ly -n -]")),
+ ('', 'h', 'help',
+ _ ("print this help")),
+ (_ ("DIR"), 'I', 'include',
+ _ ("add DIR to include path")),
+ (_ ("DIR"), 'o', 'output',
+ _ ("write output to DIR")),
+ (_ ("COMMAND"), 'P', 'process',
+ _ ("process ly_files using COMMAND FILE...")),
+ ('', 'V', 'verbose',
+ _ ("be verbose")),
+ ('', 'v', 'version',
+ _ ("print version information")),
+ ('', 'w', 'warranty',
+ _ ("show warranty and copyright")),
+]
include_path = [ly.abspath (os.getcwd ())]
lilypond_binary = os.path.join ('@bindir@', 'lilypond')
-# only use installed binary when we're installed too.
+# Only use installed binary when we are installed too.
if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
lilypond_binary = 'lilypond'
-
use_hash_p = 1
format = 0
output_name = 0
default_ly_options = {}
#
-# is this pythonic? Personally, I find this rather #define-nesque. --hwn
+# Is this pythonic? Personally, I find this rather #define-nesque. --hwn
#
AFTER = 'after'
BEFORE = 'before'
LINEWIDTH = 'linewidth'
NOFRAGMENT = 'nofragment'
NOINDENT = 'noindent'
+NOQUOTE = 'noquote'
NOTES = 'body'
NOTIME = 'notime'
OUTPUT = 'output'
TEXINFO = 'texinfo'
VERBATIM = 'verbatim'
-# Recognize special sequences in the input;
+# NOTIME has no opposite so it isn't part of this dictionary.
+# NOQUOTE is used internally only.
+no_options = {
+ NOFRAGMENT: FRAGMENT,
+ NOINDENT: INDENT,
+}
+
+# Recognize special sequences in the input.
#
-# (?P<name>regex) -- assign result of REGEX to NAME
-# *? -- match non-greedily.
-# (?m) -- multiline regex: make ^ and $ match at each line
-# (?s) -- make the dot match all characters including newline
-# (?x) -- ignore whitespace in patterns
+# (?P<name>regex) -- Assign result of REGEX to NAME.
+# *? -- Match non-greedily.
+# (?m) -- Multiline regex: Make ^ and $ match at each line.
+# (?s) -- Make the dot match all characters including newline.
+# (?x) -- Ignore whitespace in patterns.
no_match = 'a\ba'
snippet_res = {
+ ##
HTML: {
- 'include':
- no_match,
- 'lilypond':
- r'''(?mx)
- (?P<match>
- <lilypond
- ((?P<options>[^:]*):)
- (?P<code>.*?)
- />)''',
- 'lilypond_block':
- r'''(?msx)
- (?P<match>
- <lilypond
- (?P<options>[^>]+)?
- >
- (?P<code>.*?)
- </lilypond>)''',
- 'lilypond_file':
- r'''(?mx)
- (?P<match>
- <lilypondfile
- (?P<options>[^>]+)?
- >\s*
- (?P<filename>[^<]+)\s*
- </lilypondfile>)''',
- 'multiline_comment':
- r'''(?smx)
- (?P<match>
- \s*(?!@c\s+)
- (?P<code><!--\s.*?!-->)
- \s)''',
- 'singleline_comment':
- no_match,
- 'verb':
- r'''(?x)
- (?P<match>
- (?P<code><pre>.*?</pre>))''',
- 'verbatim':
- r'''(?x)
- (?s)
- (?P<match>
- (?P<code><pre>\s.*?</pre>\s))''',
+ 'include':
+ no_match,
+
+ 'lilypond':
+ r'''(?mx)
+ (?P<match>
+ <lilypond
+ (\s*(?P<options>.*?)\s*:)?\s*
+ (?P<code>.*?)
+ />)''',
+
+ 'lilypond_block':
+ r'''(?msx)
+ (?P<match>
+ <lilypond
+ \s*(?P<options>.*?)\s*
+ >
+ (?P<code>.*?)
+ </lilypond>)''',
+
+ 'lilypond_file':
+ r'''(?mx)
+ (?P<match>
+ <lilypondfile
+ \s*(?P<options>.*?)\s*
+ >
+ \s*(?P<filename>.*?)\s*
+ </lilypondfile>)''',
+
+ 'multiline_comment':
+ r'''(?smx)
+ (?P<match>
+ \s*(?!@c\s+)
+ (?P<code><!--\s.*?!-->)
+ \s)''',
+
+ 'singleline_comment':
+ no_match,
+
+ 'verb':
+ r'''(?x)
+ (?P<match>
+ (?P<code><pre>.*?</pre>))''',
+
+ 'verbatim':
+ r'''(?x)
+ (?s)
+ (?P<match>
+ (?P<code><pre>\s.*?</pre>\s))''',
},
+ ##
LATEX: {
- 'include':
- r'''(?smx)
- ^[^%\n]*?
- (?P<match>
- \\input\s*{
- (?P<filename>\S+?)
- })''',
- 'lilypond':
- r'''(?smx)
- ^[^%\n]*?
- (?P<match>
- \\lilypond\s*(
- \[
- (?P<options>.*?)
- \])?\s*{
- (?P<code>.*?)
- })''',
- 'lilypond_block':
- r'''(?smx)
- ^[^%\n]*?
- (?P<match>
- \\begin\s*(
- \[
- (?P<options>.*?)
- \])?\s*{lilypond}
- (?P<code>.*?)
- ^[^%\n]*?
- \\end\s*{lilypond})''',
- 'lilypond_file':
- r'''(?smx)
- ^[^%\n]*?
- (?P<match>
- \\lilypondfile\s*(
- \[
- (?P<options>.*?)
- \])?\s*\{
- (?P<filename>\S+?)
- })''',
- 'multiline_comment':
- no_match,
- 'singleline_comment':
- r'''(?mx)
- ^.*?
- (?P<match>
- (?P<code>
- %.*$\n+))''',
- 'verb':
- r'''(?mx)
- ^[^%\n]*?
- (?P<match>
- (?P<code>
- \\verb(?P<del>.)
- .*?
- (?P=del)))''',
- 'verbatim':
- r'''(?msx)
- ^[^%\n]*?
- (?P<match>
- (?P<code>
- \\begin\s*{verbatim}
- .*?
- \\end\s*{verbatim}))''',
+ 'include':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P<match>
+ \\input\s*{
+ (?P<filename>\S+?)
+ })''',
+
+ 'lilypond':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P<match>
+ \\lilypond\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s*{
+ (?P<code>.*?)
+ })''',
+
+ 'lilypond_block':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P<match>
+ \\begin\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s*{lilypond}
+ (?P<code>.*?)
+ ^[^%\n]*?
+ \\end\s*{lilypond})''',
+
+ 'lilypond_file':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P<match>
+ \\lilypondfile\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s*\{
+ (?P<filename>\S+?)
+ })''',
+
+ 'multiline_comment':
+ no_match,
+
+ 'singleline_comment':
+ r'''(?mx)
+ ^.*?
+ (?P<match>
+ (?P<code>
+ %.*$\n+))''',
+
+ 'verb':
+ r'''(?mx)
+ ^[^%\n]*?
+ (?P<match>
+ (?P<code>
+ \\verb(?P<del>.)
+ .*?
+ (?P=del)))''',
+
+ 'verbatim':
+ r'''(?msx)
+ ^[^%\n]*?
+ (?P<match>
+ (?P<code>
+ \\begin\s*{verbatim}
+ .*?
+ \\end\s*{verbatim}))''',
},
+ ##
TEXINFO: {
- 'include':
- r'''(?mx)
- ^(?P<match>
- @include\s+
- (?P<filename>\S+))''',
- 'lilypond':
- r'''(?smx)
- ^[^\n]*?(?!@c\s+)[^\n]*?
- (?P<match>
- @lilypond\s*(
- \[
- (?P<options>.*?)
- \])?\s*{
- (?P<code>.*?)
- })''',
- 'lilypond_block':
- r'''(?msx)
- ^(?P<match>
- @lilypond\s*(
- \[
- (?P<options>.*?)
- \])?\s+?
- ^(?P<code>.*?)
- ^@end\s+lilypond)\s''',
- 'lilypond_file':
- r'''(?mx)
- ^(?P<match>
- @lilypondfile\s*(
- \[
- (?P<options>.*?)
- \])?\s*{
- (?P<filename>\S+)
- })''',
- 'multiline_comment':
- r'''(?smx)
- ^(?P<match>
- (?P<code>
- @ignore\s
- .*?
- @end\s+ignore))\s''',
- 'singleline_comment':
- r'''(?mx)
- ^.*
- (?P<match>
- (?P<code>
- @c([ \t][^\n]*|)\n))''',
-
-# don't do this: fucks up with @code{@{}
-# 'verb': r'''(?P<code>@code{.*?})''',
- 'verbatim':
- r'''(?sx)
- (?P<match>
- (?P<code>
- @example
- \s.*?
- @end\s+example\s))''',
+ 'include':
+ r'''(?mx)
+ ^(?P<match>
+ @include\s+
+ (?P<filename>\S+))''',
+
+ 'lilypond':
+ r'''(?smx)
+ ^[^\n]*?(?!@c\s+)[^\n]*?
+ (?P<match>
+ @lilypond\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s*{
+ (?P<code>.*?)
+ })''',
+
+ 'lilypond_block':
+ r'''(?msx)
+ ^(?P<match>
+ @lilypond\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s+?
+ ^(?P<code>.*?)
+ ^@end\s+lilypond)\s''',
+
+ 'lilypond_file':
+ r'''(?mx)
+ ^(?P<match>
+ @lilypondfile\s*(
+ \[
+ \s*(?P<options>.*?)\s*
+ \])?\s*{
+ (?P<filename>\S+)
+ })''',
+
+ 'multiline_comment':
+ r'''(?smx)
+ ^(?P<match>
+ (?P<code>
+ @ignore\s
+ .*?
+ @end\s+ignore))\s''',
+
+ 'singleline_comment':
+ r'''(?mx)
+ ^.*
+ (?P<match>
+ (?P<code>
+ @c([ \t][^\n]*|)\n))''',
+
+ # Don't do this: It interferes with @code{@{}.
+ # 'verb': r'''(?P<code>@code{.*?})''',
+
+ 'verbatim':
+ r'''(?sx)
+ (?P<match>
+ (?P<code>
+ @example
+ \s.*?
+ @end\s+example\s))''',
},
}
format_res = {
HTML: {
- 'option-sep': '\s*',
- 'intertext': r',?\s*intertext=\".*?\"',
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*',
},
+
LATEX: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option-sep': ',\s*',
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*,\s*',
},
+
TEXINFO: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option-sep': ',\s*',
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*,\s*',
},
}
+# Options without a pattern in ly_options.
+simple_options = [
+ EXAMPLEINDENT,
+ FRAGMENT,
+ NOFRAGMENT,
+ NOINDENT,
+ PRINTFILENAME,
+ TEXIDOC,
+ VERBATIM
+]
+
ly_options = {
+ ##
NOTES: {
RELATIVE: r'''\relative c%(relative_quotes)s''',
},
+
+ ##
PAPER: {
- INDENT: r'''
- indent = %(indent)s''',
- 'linewidth': r'''
- linewidth = %(linewidth)s''',
- NOINDENT: r'''
- indent = 0.0\mm''',
- QUOTE: r'''
- linewidth = %(linewidth)s - 2.0 * %(exampleindent)s
-''',
- RAGGEDRIGHT: r'''
- indent = 0.0\mm
- raggedright = ##t''',
+ INDENT: r'''indent = %(indent)s''',
+
+ LINEWIDTH: r'''linewidth = %(linewidth)s''',
+
+ QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''',
+
+ RAGGEDRIGHT: r'''raggedright = ##t''',
},
##
LAYOUT: {
- EXAMPLEINDENT: '',
-
- NOTIME: r'''
- \context {
- \Staff
- \remove Time_signature_engraver
- }''',
+ NOTIME: r'''\context {
+ \Staff
+ \remove Time_signature_engraver
+ }''',
},
##
PREAMBLE: {
- STAFFSIZE: r'''
-#(set-global-staff-size %(staffsize)s)''',
+ STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''',
},
}
output = {
+ ##
HTML: {
- FILTER: r'''<lilypond %(options)s>
+ FILTER: r'''<lilypond %(options)s>
%(code)s
</lilypond>
''',
- AFTER: r'''
+ AFTER: r'''
</a>
</p>''',
- BEFORE: r'''<p>
+
+ BEFORE: r'''<p>
<a href="%(base)s.ly">''',
- OUTPUT: r'''
+
+ OUTPUT: r'''
<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>',
- QUOTE: r'''<blockquote>
+
+ PRINTFILENAME: '<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
+
+ QUOTE: r'''<blockquote>
%(str)s
</blockquote>
''',
- VERBATIM: r'''<pre>
+
+ VERBATIM: r'''<pre>
%(verb)s</pre>''',
},
- LATEX: {
- AFTER: '',
- BEFORE: '',
- OUTPUT: r'''{\parindent 0pt
+ ##
+ LATEX: {
+ OUTPUT: r'''{%%
+\parindent 0pt
\catcode`\@=12
-\ifx\preLilyPondExample\undefined\relax\else\preLilyPondExample\fi
+\ifx\preLilyPondExample \undefined
+ \relax
+\else
+ \preLilyPondExample
+\fi
\def\lilypondbook{}%%
\input %(base)s.tex
-\ifx\postLilyPondExample\undefined\relax\else\postLilyPondExample\fi
-\catcode`\@=0}''',
- PRINTFILENAME: '''\\texttt{%(filename)s}
+\ifx\postLilyPondExample \undefined
+ \relax
+\else
+ \postLilyPondExample
+\fi
+}''',
+
+ PRINTFILENAME: '''\\texttt{%(filename)s}
''',
- QUOTE: r'''\begin{quotation}
+
+ QUOTE: r'''\begin{quotation}
%(str)s
\end{quotation}
''',
- VERBATIM: r'''\noindent
+
+ VERBATIM: r'''\noindent
\begin{verbatim}
%(verb)s\end{verbatim}
''',
- FILTER: r'''\begin{lilypond}[%(options)s]
+
+ FILTER: r'''\begin{lilypond}[%(options)s]
%(code)s
\end{lilypond}''',
},
+ ##
TEXINFO: {
- FILTER: r'''@lilypond[%(options)s]
+ FILTER: r'''@lilypond[%(options)s]
%(code)s
@lilypond''',
- AFTER: '',
- BEFORE: '',
- OUTPUT: r'''@noindent
+
+ OUTPUT: r'''@noindent
@image{%(base)s,,,[image of music],%(ext)s}''',
- PRINTFILENAME: '''@file{%(filename)s}
+
+ PRINTFILENAME: '''@file{%(filename)s}
''',
- QUOTE: r'''@quotation
-%(str)s
-@end quotation
+
+ QUOTE: r'''@quotation
+%(str)s@end quotation
+''',
+
+ NOQUOTE: r'''@format
+%(str)s@end format
''',
- # FIXME: @exampleindent 5 is the default...
- VERBATIM: r'''@exampleindent 0
+
+ VERBATIM: r'''@exampleindent 0
@example
%(verb)s@end example
-@exampleindent 5
''',
},
}
-PREAMBLE_LY = r"""%%%% Generated by %(program_name)s
+PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
%%%% Options: [%(option_string)s]
+
#(set! toplevel-score-handler ly:parser-print-score)
#(set! toplevel-music-handler (lambda (p m)
(ly:parser-print-score
- p (ly:music-scorify m p))
- ))
+ p (ly:music-scorify m p))))
+
+#(define version-seen? #t)
%(preamble_string)s
+
\paper {
#(define dump-extents #t)
%(paper_string)s
}
-\layout { %(layout_string)s
-}
-"""
+\layout {
+ %(layout_string)s
+}
+'''
FRAGMENT_LY = r'''
- %(notes_string)s{
- %(code)s }
+%(notes_string)s
+{
+%% ly snippet contents follows:
+%(code)s
+%% end ly snippet
+}
+'''
+
+FULL_LY = '''
+%% ly snippet:
+%(code)s
+%% end ly snippet
'''
-FULL_LY = '%(code)s'
texinfo_linewidths = {
- '@afourpaper': '160 \\mm',
- '@afourwide': '6.5 \\in',
- '@afourlatex': '150 \\mm',
- '@smallbook': '5 \\in' ,
+ '@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
- m = re.search ('relative\s*([-0-9])', o)
- if m:
- return 'relative=%s' % m.group (1)
- m = re.match ('([0-9]+)pt', o)
- if m:
- return 'staffsize=%s' % m.group (1)
- m = re.match ('indent=([-.0-9]+)(cm|in|mm|pt|staffspace)', o)
+def classic_lilypond_book_compatibility (key, value):
+ if key == 'singleline' and value == None:
+ return (RAGGEDRIGHT, None)
+
+ m = re.search ('relative\s*([-0-9])', key)
if m:
- f = float (m.group (1))
- return 'indent=%f\\%s' % (f, m.group (2))
- m = re.match ('linewidth=([-.0-9]+)(cm|in|mm|pt|staffspace)', o)
+ return ('relative', m.group (1))
+
+ m = re.match ('([0-9]+)pt', key)
if m:
- f = float (m.group (1))
- return 'linewidth=%f\\%s' % (f, m.group (2))
- return None
+ return ('staffsize', m.group (1))
+
+ if key == 'indent' or key == 'linewidth':
+ m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value)
+ if m:
+ f = float (m.group (1))
+ return (key, '%f\\%s' % (f, m.group (2)))
+
+ return (None, None)
+
+def compose_ly (code, options, type):
+ option_dict = {}
+
+ for i in options:
+ if string.find (i, '=') > 0:
+ (key, value) = re.split ('\s*=\s*', i)
+ option_dict[key] = value
+ else:
+ if i in no_options.keys ():
+ if no_options[i] in option_dict.keys ():
+ del option_dict[no_options[i]]
+ else:
+ option_dict[i] = None
+
+ has_linewidth = option_dict.has_key (LINEWIDTH)
+ no_linewidth_value = 0
+
+ # If LINEWIDTH is used without parameter, set it to default.
+ if has_linewidth and option_dict[LINEWIDTH] == None:
+ no_linewidth_value = 1
+ del option_dict[LINEWIDTH]
-def compose_ly (code, options):
- #Hmm
for i in default_ly_options.keys ():
- if i not in options:
- options.append (i)
+ if i not in option_dict.keys ():
+ option_dict[i] = default_ly_options[i]
- #Hmm
- if QUOTE in options and LINEWIDTH in options:
- options.remove (LINEWIDTH)
+ if not has_linewidth:
+ if type == 'lilypond' or FRAGMENT in option_dict.keys ():
+ option_dict[RAGGEDRIGHT] = None
- if FRAGMENT in options:
- if RAGGEDRIGHT not in options:
- options.append (RAGGEDRIGHT)
+ if type == 'lilypond':
+ if LINEWIDTH in option_dict.keys ():
+ del option_dict[LINEWIDTH]
+ else:
+ if RAGGEDRIGHT in option_dict.keys ():
+ if LINEWIDTH in option_dict.keys ():
+ del option_dict[LINEWIDTH]
+
+ if QUOTE in option_dict.keys () or type == 'lilypond':
+ if LINEWIDTH in option_dict.keys ():
+ del option_dict[LINEWIDTH]
+
+ if not INDENT in option_dict.keys ():
+ option_dict[INDENT] = '0\\mm'
+
+ # The QUOTE pattern from ly_options only emits the `linewidth'
+ # keyword.
+ if has_linewidth and QUOTE in option_dict.keys ():
+ if no_linewidth_value:
+ del option_dict[LINEWIDTH]
+ else:
+ del option_dict[QUOTE]
+
+ if FRAGMENT in option_dict.keys ():
body = FRAGMENT_LY
else:
body = FULL_LY
- # defaults
+ # Defaults.
relative = 1
- staffsize = 16
override = {}
- #FIXME: where to get sane value for exampleindent?
- override[EXAMPLEINDENT] = r'9.0 \mm'
- override[LINEWIDTH] = None
+ # The original concept of the `exampleindent' option is broken.
+ # It is not possible to get a sane value for @exampleindent at all
+ # without processing the document itself. Saying
+ #
+ # @exampleindent 0
+ # @example
+ # ...
+ # @end example
+ # @exampleindent 5
+ #
+ # causes ugly results with the DVI backend of texinfo since the
+ # default value for @exampleindent isn't 5em but 0.4in (or a smaller
+ # value). Executing the above code changes the environment
+ # indentation to an unknown value because we don't know the amount
+ # of 1em in advance since it is font-dependent. Modifying
+ # @exampleindent in the middle of a document is simply not
+ # supported within texinfo.
+ #
+ # As a consequence, the only function of @exampleindent is now to
+ # specify the amount of indentation for the `quote' option.
+ #
+ # To set @exampleindent locally to zero, we use the @format
+ # environment for non-quoted snippets.
+ override[EXAMPLEINDENT] = r'0.4\in'
+ override[LINEWIDTH] = texinfo_linewidths['@smallbook']
override.update (default_ly_options)
- option_string = string.join (options, ',')
-
- options_dict = {}
- option_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
- for a in option_types:
- options_dict[a] = []
-
- for i in options:
- c = classic_lilypond_book_compatibility (i)
- if c:
- ly.warning (_ ("deprecated ly-option used: %s" % i))
- ly.warning (_ ("compatibility mode translation: %s" \
- % c))
- i = c
-
- if string.find (i, '=') > 0:
- key, value = string.split (i, '=')
+ option_list = []
+ for (key, value) in option_dict.items ():
+ if value == None:
+ option_list.append (key)
+ else:
+ option_list.append (key + '=' + value)
+ option_string = string.join (option_list, ',')
+
+ compose_dict = {}
+ compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
+ for a in compose_types:
+ compose_dict[a] = []
+
+ for (key, value) in option_dict.items():
+ (c_key, c_value) = \
+ classic_lilypond_book_compatibility (key, value)
+ if c_key:
+ if c_value:
+ ly.warning \
+ (_ ("deprecated ly-option used: %s=%s" \
+ % (key, value)))
+ ly.warning \
+ (_ ("compatibility mode translation: %s=%s" \
+ % (c_key, c_value)))
+ else:
+ ly.warning \
+ (_ ("deprecated ly-option used: %s" \
+ % key))
+ ly.warning \
+ (_ ("compatibility mode translation: %s" \
+ % c_key))
+
+ (key, value) = (c_key, c_value)
+
+ if value:
override[key] = value
else:
- key = i
- if not override.has_key (i):
- override[i] = None
+ if not override.has_key (key):
+ override[key] = None
found = 0
- for type in option_types:
+ for type in compose_types:
if ly_options[type].has_key (key):
-
- options_dict[type].append (ly_options[type][key])
+ compose_dict[type].append (ly_options[type][key])
found = 1
break
- if not found and key not in (FRAGMENT, NOFRAGMENT, PRINTFILENAME,
- RELATIVE, VERBATIM, TEXIDOC):
- ly.warning (_("ignoring unknown ly option: %s") % i)
+ if not found and key not in simple_options:
+ ly.warning (_ ("ignoring unknown ly option: %s") % i)
- #URGS
+ # URGS
if RELATIVE in override.keys () and override[RELATIVE]:
relative = string.atoi (override[RELATIVE])
program_name = __main__.program_name
- paper_string = string.join (options_dict[PAPER], '\n ') % override
- layout_string = string.join (options_dict[LAYOUT], '\n ') % override
- notes_string = string.join (options_dict[NOTES], '\n ') % vars ()
- preamble_string = string.join (options_dict[PREAMBLE], '\n ') % override
- return (PREAMBLE_LY + body) % vars ()
+ paper_string = \
+ string.join (compose_dict[PAPER], '\n ') % override
+ layout_string = \
+ string.join (compose_dict[LAYOUT], '\n ') % override
+ notes_string = \
+ string.join (compose_dict[NOTES], '\n ') % vars ()
+ preamble_string = \
+ string.join (compose_dict[PREAMBLE], '\n ') % override
+ return (PREAMBLE_LY + body) % vars ()
# BARF
-# use lilypond for latex (.lytex) books,
+# Use lilypond for latex (.lytex) books,
# and lilypond --preview for html, texinfo books?
def to_eps (file):
cmd = r'latex "\nonstopmode \input %s"' % file
- # Ugh. (La)TeX writes progress and error messages on stdout
- # Redirect to stderr
+ # Ugh. (La)TeX writes progress and error messages on stdout.
+ # Redirect to stderr.
cmd = '(( %s >&2 ) >&- )' % cmd
ly.system (cmd)
- ly.system ('dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -E -o %s.eps %s' \
- % (file, file))
-
+ ly.system (
+ 'dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -E -o %s.eps %s' \
+ % (file, file))
- # check if it really is EPS.
+ # Check if it really is EPS.
# Otherwise music glyphs disappear from 2nd and following pages.
- # TODO: should run dvips -pp -E per page, then we get proper
- # cropping as well.
+ # TODO: Should run dvips -pp -E per page, then we get proper
+ # cropping as well.
f = open ('%s.eps' % file)
- for x in range(0,10):
- if re.search ("^%%Pages: ", f.readline ()):
-
- # make non EPS.
- ly.system ('dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -o %s.eps %s' \
- % (file, file))
+ for x in range (0, 10):
+ if re.search ('^%%Pages: ', f.readline ()):
+ # Make non-EPS.
+ ly.system (
+ 'dvips -Ppdf -u+ec-mftrace.map -u+lilypond.map -o %s.eps %s' \
+ % (file, file))
break
-
def find_file (name):
for i in include_path:
full = os.path.join (i, name)
if os.path.exists (full):
return full
- ly.error (_ ('file not found: %s') % name + '\n')
+ ly.error (_ ("file not found: %s") % name + '\n')
ly.exit (1)
return ''
re.sub ('@', '@@', s)))
def split_options (option_string):
- return re.split (format_res[format]['option-sep'], option_string)
-
+ return re.split (format_res[format]['option_sep'], option_string)
class Chunk:
def replacement_text (self):
def filter_text (self):
return self.replacement_text ()
-
def ly_is_outdated (self):
return 0
self.end = end
def replacement_text (self):
- return self.source [self.start:self.end]
+ return self.source[self.start:self.end]
class Snippet (Chunk):
def __init__ (self, type, match, format):
self.format = format
def replacement_text (self):
- return self.match.group (0)
+ return self.match.group ('match')
def substring (self, s):
return self.match.group (s)
def __repr__ (self):
- return `self.__class__` + " type = " + self.type
+ return `self.__class__` + ' type = ' + self.type
class Include_snippet (Snippet):
def processed_filename (self):
return os.path.splitext (f)[0] + format2ext[format]
def replacement_text (self):
- s = self.match.group (0)
+ s = self.match.group ('match')
f = self.substring ('filename')
return re.sub (f, self.processed_filename (), s)
def full_ly (self):
s = self.ly ()
if s:
- return compose_ly (s, self.options)
+ return compose_ly (s, self.options, self.type)
return ''
- # todo: use md5?
+ # TODO: Use md5?
def get_hash (self):
if not self.hash:
self.hash = abs (hash (self.full_ly ()))
outf = open (self.basename () + '.ly', 'w')
outf.write (self.full_ly ())
- open (self.basename() + '.txt', 'w').write("image of music")
-
+ open (self.basename () + '.txt', 'w').write ('image of music')
def ly_is_outdated (self):
base = self.basename ()
tex_file = '%s.tex' % base
ly_file = '%s.ly' % base
- ok = os.path.exists (ly_file) and os.path.exists (tex_file)\
+ ok = os.path.exists (ly_file) \
+ and os.path.exists (tex_file)\
and os.stat (tex_file)[stat.ST_SIZE] \
and open (tex_file).readlines ()[-1][1:-1] \
- == 'lilypondend'
+ == 'lilypondend'
- if ok and (use_hash_p or self.ly () == open (ly_file).read ()):
- # TODO: something smart with target formats
- # (ps, png) and m/ctimes
+ if ok and (use_hash_p \
+ or self.ly () == open (ly_file).read ()):
+ # TODO: Do something smart with target formats
+ # (ps, png) and m/ctimes.
return None
return self
ok = ok and (os.path.exists (base + '.png')
or glob.glob (base + '-page*.png'))
return not ok
-
+ def texstr_is_outdated (self):
+ base = self.basename ()
+ ok = self.ly_is_outdated ()
+ ok = ok and (os.path.exists (base + '.texstr'))
+ return not ok
+
def filter_text (self):
code = self.substring ('code')
s = run_filter (code)
d = {
- 'code': s,
- 'options': self.match.group ('options')
+ 'code': s,
+ 'options': self.match.group ('options')
}
# TODO
return output[self.format][FILTER] % d
def replacement_text (self):
- func = Lilypond_snippet.__dict__ ['output_' + self.format]
+ func = Lilypond_snippet.__dict__['output_' + self.format]
return func (self)
def get_images (self):
base = self.basename ()
- # URGUGHUGHUGUGHU
+ # URGUGHUGHUGUGH
single = '%(base)s.png' % vars ()
multiple = '%(base)s-page1.png' % vars ()
images = (single,)
if os.path.exists (multiple) \
- and (not os.path.exists (single)\
+ 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 ())
str += output[HTML][BEFORE] % vars ()
for image in self.get_images ():
- base, ext = os.path.splitext (image)
+ (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)
+ (base, ext) = os.path.splitext (image)
- # URG, makeinfo implicitely prepends dot to ext
- # specifying no extension is most robust
+ # URG, makeinfo implicitly prepends dot to extension.
+ # Specifying no extension is most robust.
ext = ''
str += output[TEXINFO][OUTPUT] % vars ()
- str += output[TEXINFO][AFTER] % vars ()
return str
def output_latex (self):
if QUOTE in self.options:
str = output[LATEX][QUOTE] % vars ()
- str += (output[LATEX][BEFORE]
- + (output[LATEX][OUTPUT] % vars ())
- + output[LATEX][AFTER])
+ str += (output[LATEX][OUTPUT] % vars ())
return str
- def output_print_filename (self,format):
+ def output_print_filename (self, format):
str = ''
if PRINTFILENAME in self.options:
base = self.basename ()
def output_texinfo (self):
str = ''
- # self.output_print_filename (TEXINFO)
- if self.output_print_filename (0):
- str += ('@html\n' + self.output_print_filename (HTML)
+ if 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)
+ str += ('@tex\n'
+ + self.output_print_filename (LATEX)
+ '\n@end tex\n')
base = self.basename ()
if TEXIDOC in self.options:
if VERBATIM in self.options:
verb = verbatim_texinfo (self.substring ('code'))
str += (output[TEXINFO][VERBATIM] % vars ())
+ if not QUOTE in self.options:
+ str = output[TEXINFO][NOQUOTE] % vars()
str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
class Lilypond_file_snippet (Lilypond_snippet):
def ly (self):
name = self.substring ('filename')
- return '\\renameinput \"%s\"\n%s' % (name, open (find_file (name)).read ())
+ return '\\renameinput \"%s\"\n%s' \
+ % (name, open (find_file (name)).read ())
snippet_type_to_class = {
'lilypond_file': Lilypond_file_snippet,
snippets = []
index = 0
- ## found = dict (map (lambda x: (x, None), types))
+ ## found = dict (map (lambda x: (x, None),
+ ## types))
## urg python2.1
found = {}
- map (lambda x, f=found: f.setdefault (x, None), types)
+ 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.
found[type] = (start, snip)
if found[type] \
- and (not first or found[type][0] < found[first][0]):
+ and (not first \
+ or found[type][0] < found[first][0]):
first = type
# FIXME.
def filter_pipe (input, cmd):
if verbose_p:
- ly.progress (_ ("Opening filter `%s\'") % cmd)
+ ly.progress (_ ("Opening filter `%s'") % cmd)
- stdin, stdout, stderr = os.popen3 (cmd)
+ (stdin, stdout, stderr) = os.popen3 (cmd)
stdin.write (input)
status = stdin.close ()
signal = 0x0f & status
if status or (not output and error):
exit_status = status >> 8
- ly.error (_ ("`%s\' failed (%d)") % (cmd, exit_status))
+ ly.error (_ ("`%s' failed (%d)") % (cmd, exit_status))
ly.error (_ ("The error log is as follows:"))
sys.stderr.write (error)
sys.stderr.write (stderr.read ())
return 1
return 0
-
-def process_snippets (cmd, ly_snippets, png_snippets):
- ly_names = filter (lambda x: x, map (Lilypond_snippet.basename, ly_snippets))
- png_names = filter (lambda x: x, map (Lilypond_snippet.basename, png_snippets))
-
+def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
+ ly_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, ly_snippets))
+ texstr_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, texstr_snippets))
+ png_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, png_snippets))
status = 0
- if ly_names:
- status = ly.system (string.join ([cmd] + ly_names),
+ def my_system (cmd):
+ status = ly.system (cmd,
ignore_error = 1, progress_p = 1)
+ if status:
+ ly.error ('Process %s exited unsuccessfully.' % cmd)
+ raise Compile_error
+
+ # UGH
+ # the --process=CMD switch is a bad idea
+ # it is too generic for lilypond-book.
+ if texstr_names and re.search ('^[0-9A-Za-z/]*lilypond', cmd):
+
+ my_system (string.join ([cmd + ' --backend texstr ' ] + texstr_names))
+ for l in texstr_names:
+ my_system ('latex %s.texstr' % l)
+
+
+ if ly_names:
+ my_system (string.join ([cmd] + ly_names))
+
- if status:
- ly.error( 'Process %s exited unsuccessfully.' % cmd )
- raise Compile_error
if format == HTML or format == TEXINFO:
for i in png_names:
- if not os.path.exists (i + '.eps') and os.path.exists (i + '.tex'):
+ if not os.path.exists (i + '.eps') \
+ and os.path.exists (i + '.tex'):
to_eps (i)
- ly.make_ps_images (i + '.eps', resolution=110)
+ ly.make_ps_images (i + '.eps',
+ resolution = 110)
# elif os.path.exists (i + '.ps'):
-# ly.make_ps_images (i + '.ps', resolution=110)
-
+# ly.make_ps_images (i + '.ps', resolution = 110)
LATEX_DOCUMENT = r'''
%(preamble)s
\makeatletter\if@twocolumn\typeout{columns=2}\fi\makeatother
\end{document}
'''
-#need anything else besides textwidth?
+
+# Do we need anything else besides `textwidth'?
def get_latex_textwidth (source):
m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
preamble = source[:m.start (0)]
columnsep = string.atof (m.group (1))
textwidth = 0
- m = re.search('textwidth=([0-9.]*)pt', parameter_string)
+ m = re.search ('textwidth=([0-9.]*)pt', parameter_string)
if m:
textwidth = string.atof (m.group (1))
if columns:
format2ext = {
HTML: '.html',
- #TEXINFO: '.texinfo',
+ # TEXINFO: '.texinfo',
TEXINFO: '.texi',
LATEX: '.tex',
}
pass
def do_process_cmd (chunks):
- ly_outdated = filter (lambda x: is_derived_class (x.__class__, Lilypond_snippet) \
- and x.ly_is_outdated (), chunks)
- png_outdated = filter (lambda x: is_derived_class (x.__class__, Lilypond_snippet) \
- and x.png_is_outdated (), chunks)
+ ly_outdated = \
+ filter (lambda x: is_derived_class (x.__class__,
+ Lilypond_snippet)
+ and x.ly_is_outdated (),
+ chunks)
+ texstr_outdated = \
+ filter (lambda x: is_derived_class (x.__class__,
+ Lilypond_snippet)
+ and x.texstr_is_outdated (),
+ chunks)
+ png_outdated = \
+ filter (lambda x: is_derived_class (x.__class__,
+ Lilypond_snippet)
+ and x.png_is_outdated (),
+ chunks)
ly.progress (_ ("Writing snippets..."))
map (Lilypond_snippet.write_ly, ly_outdated)
ly.progress ('\n')
if ly_outdated:
- ly.progress (_ ("Processing..."))
- process_snippets (process_cmd, ly_outdated, png_outdated)
+ ly.progress (_ ("Processing...\n"))
+ process_snippets (process_cmd, ly_outdated, texstr_outdated, png_outdated)
else:
ly.progress (_ ("All snippets are up to date..."))
ly.progress ('\n')
-
def do_file (input_filename):
- #ugh
+ # Ugh.
global format
if not format:
e = os.path.splitext (input_filename)[1]
if e in ext2format.keys ():
- #FIXME
+ # FIXME
format = ext2format[e]
else:
ly.error (_ ("cannot determine format for: %s" \
input_base = os.path.basename \
(os.path.splitext (input_filename)[0])
- # only default to stdout when filtering
+ # Only default to stdout when filtering.
if output_name == '-' or (not output_name and filter_cmd):
output_filename = '-'
output_file = sys.stdout
+ '/' + 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."))
+ 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."))
ly.exit (2)
output_file = open (output_filename, 'w')
source = in_handle.read ()
ly.progress ('\n')
- # FIXME: containing blocks must be first, see find_toplevel_snippets
+ # FIXME: Containing blocks must be first, see
+ # find_toplevel_snippets.
snippet_types = (
'multiline_comment',
'verbatim',
'singleline_comment',
'lilypond_file',
'include',
- 'lilypond', )
+ 'lilypond',
+ )
ly.progress (_ ("Dissecting..."))
chunks = find_toplevel_snippets (source, snippet_types)
ly.progress ('\n')
if not default_ly_options.has_key (LINEWIDTH):
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 texinfo_linewidths.items ():
- # FIXME: @layout is usually not in chunk #0:
- # \input texinfo @c -*-texinfo-*-
- # bluntly search first K of source
+ # FIXME: @layout is usually not in
+ # chunk #0:
+ #
+ # \input texinfo @c -*-texinfo-*-
+ #
+ # Bluntly search first K items of
+ # source.
# s = chunks[0].replacement_text ()
if re.search (k, source[:1024]):
default_ly_options[LINEWIDTH] = v
break
if filter_cmd:
- output_file.writelines ([c.filter_text () for c in chunks])
-
+ output_file.writelines ([c.filter_text () \
+ for c in chunks])
elif process_cmd:
do_process_cmd (chunks)
def process_include (snippet):
os.chdir (original_dir)
name = snippet.substring ('filename')
- ly.progress (_ ('Processing include: %s') % name)
+ ly.progress (_ ("Processing include: %s") % name)
ly.progress ('\n')
do_file (name)
map (process_include,
- filter (lambda x: is_derived_class (x.__class__, Include_snippet), chunks))
+ filter (lambda x: is_derived_class (x.__class__,
+ Include_snippet),
+ chunks))
except Compile_error:
os.chdir (original_dir)
- ly.progress (_('Removing `%s\'') % output_filename)
+ ly.progress (_ ("Removing `%s'") % output_filename)
ly.progress ('\n')
os.unlink (output_filename)
raise Compile_error
-
def do_options ():
global format, output_name
global filter_cmd, process_cmd, verbose_p
(options, files) = getopt.getopt (sys.argv[1:], sh, long)
except getopt.error, s:
sys.stderr.write ('\n')
- ly.error (_ ("getopt says: `%s\'" % s))
+ ly.error (_ ("getopt says: `%s'" % s))
sys.stderr.write ('\n')
ly.help ()
ly.exit (2)
files = do_options ()
global process_cmd
if process_cmd == '':
- process_cmd = lilypond_binary + " -f tex "
+ process_cmd = lilypond_binary
if process_cmd:
process_cmd += string.join ([(' -I %s' % p)
if __name__ == '__main__':
main ()
+
+# EOF