From: Jan Nieuwenhuizen Date: Mon, 19 Mar 2001 09:21:46 +0000 (+0100) Subject: patch::: 1.3.139.jcn6 X-Git-Tag: release/1.3.140~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c0d7f8fdaaf1b9a4ebc64fc129cfc14357ff3a95;p=lilypond.git patch::: 1.3.139.jcn6 1.3.139.jcn6 ============ * Bugfix: ly2dvi sets footers, headers, tagline. Pagenumbering on by default. --- Generated by janneke@gnu.org, From = lilypond-1.3.139.jcn5, To = lilypond-1.3.139.jcn6 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.139.jcn6.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- diff --git a/CHANGES b/CHANGES index 58f7195cc1..4ee650a8de 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,14 @@ ---- ../lilypond-1.3.139.jcn4/CHANGES Sun Mar 18 23:27:12 2001 +--- ../lilypond-1.3.139.jcn5/CHANGES Sun Mar 18 23:47:14 2001 +++ b/CHANGES Mon Mar 19 10:21:46 2001 +@@ -1,3 +1,8 @@ +1.3.139.jcn6 +============ + +* Bugfix: ly2dvi sets footers, headers, tagline. Pagenumbering on by default. + + 1.3.139.jcn5 + ============ + --- ../lilypond-1.3.139.jcn4/CHANGES Sun Mar 18 23:27:12 2001 ++ b/CHANGES Sun Mar 18 23:47:14 2001 @@ -1,3 +1,8 @@ 1.3.139.jcn5 diff --git a/VERSION b/VERSION index 914c6c4083..b9e1a60ddf 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=139 -MY_PATCH_LEVEL=jcn5 +MY_PATCH_LEVEL=jcn6 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/example-1.ly b/input/example-1.ly index 475ab4811d..cd62668b8b 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -1,20 +1,14 @@ +% A simple scale in LilyPond +% +% Type: +% +% ly2dvi example-1 +% xdvi example-1 # or your dvi viewer here +% \score { \context Voice \notes\relative c { c' d e f g a b c - - % A simple scale in Mudela. - % - % Type: - % - % ly2dvi example-1 - % xdvi example-1 # or your dvi viewer here - % - % For more elaborate examples see twinkle.ly, input/* and mutopia/*. - % - % A docmument on Mudela is under construction: Documentation/tex/mudela.doc - % (available as .ps from the website too). - } \paper { } \midi { } diff --git a/input/example-2.ly b/input/example-2.ly index 116e0ad818..da40b648ef 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -1,20 +1,14 @@ +% Some beamed and slurred notes of different taste in LilyPond +% +% Type: +% +% ly2dvi example-2 +% xdvi example-2 # or your dvi viewer here +% \score { \context Voice \notes\relative c { a''2 ~ c4( [e8 )e] [a,16 a a a] - - % Some beamed and slurred notes of different taste in Mudela. - % - % Type: - % - % ly2dvi example-2 - % xdvi example-2 # or your dvi viewer here - % - % For more elaborate examples see twinkle.ly, input/* and mutopia/*. - % - % A docmument on Mudela is under construction: Documentation/tex/mudela.doc - % (available as .ps from the website too). - } \paper { } \midi { } diff --git a/input/example-3.ly b/input/example-3.ly index 547f2fa40a..92e05eaf04 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -17,14 +17,9 @@ two = \notes\relative c{ \midi{} } -% A full-mudela example with two staffs +% A full example with two staffs % % Type: % % ly2dvi example-3 % xdvi example-3 # or your dvi viewer here -% -% For more elaborate examples see twinkle.ly, input/* and mutopia/*. -% -% A docmument on Mudela is under construction: Documentation/tex/mudela.doc -% (available as .ps from the website too). diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 461258cb97..8728e28f50 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -7,7 +7,16 @@ ''' TODO: - * --dependencies + * check --dependencies + + * move versatile taglines, + + \header { + beginfooter=\mutopiaPD + endfooter=\tagline -> 'lily was here ' + } + + * head/header tagline/endfooter * dvi from lilypond .tex output? This is hairy, because we create dvi from lilypond .tex *and* header output. @@ -43,7 +52,7 @@ extra_init = { 'latexheaders' : [], 'latexpackages' : ['geometry'], 'papersize' : [], - 'pagenumber' : [], + 'pagenumber' : [1], 'textheight' : [], 'linewidth' : [], 'orientation' : [] @@ -403,26 +412,35 @@ def global_latex_definition (tfiles, extra): linewidth = 597 s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation) - s= s + r''' -\usepackage[latin1]{inputenc} + s = s + r''' +\usepackage[latin1]{inputenc} \input{titledefs} \makeatletter -\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%% +\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\makelilypondfooter}}% ''' - if extra['pagenumber'] and extra['pagenumber'][-1]: + + if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no': s = s + r''' - \renewcommand{\@oddhead}{\parbox{\textwidth}%% - {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%''' +\renewcommand{\@oddhead}{\parbox{\textwidth}% + {\mbox{}\small\makelilypondheader\hfill\textbf{\thepage}}} +''' else: - s = s + '\\pagestyle{empty}' - - s = s + '\\begin{document}' + s = s + '\\pagestyle{empty}\n' + + s = s + '\\makeatother\n' + s = s + '\\begin{document}\n' + first = 1 for t in tfiles: s = s + one_latex_definition (t, first) first = 0 - + + s = s + r''' +\makeatletter +\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\lilypondtagline}}% +\makeatother +''' s = s + '\\end{document}' return s diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 92e3747de4..e8c4a1fec7 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -49,5 +49,16 @@ \global\let\lilypondpiece\relax% \global\let\mustmakelilypondpiecetitle\undefined% } +% header -- head ? +\def\makelilypondheader +{ + \ifx\lilypondhead\undefined\else% + \parbox{\textwidth}{\mbox{}\lilypondhead}\fi +} +\def\makelilypondfooter +{ + \ifx\lilypondfooter\undefined\else% + \parbox{\textwidth}{\mbox{}\lilypondfooter}\fi +} \endinput