release: 1.3.140

[lilypond.git] / scripts / ly2dvi.py

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 8728e28f50755ca85780a6af2288bab146aced9b..461258cb973ee569fcf99c31e7ff3893164a65f9 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -7,16 +7,7 @@
 '''
 TODO:
 
-  * check --dependencies
-
-  * move versatile taglines, 
-  
-     \header {
-        beginfooter=\mutopiaPD
-        endfooter=\tagline  -> 'lily was here <version>'
-     }
-
-  * head/header tagline/endfooter
+  * --dependencies
 
   * dvi from lilypond .tex output?  This is hairy, because we create dvi
     from lilypond .tex *and* header output.
@@ -52,7 +43,7 @@ extra_init = {
        'latexheaders' : [],
        'latexpackages' :  ['geometry'],
        'papersize' : [],
-       'pagenumber' : [1],
+       'pagenumber' : [],
        'textheight' : [], 
        'linewidth' : [],
        'orientation' : []
@@ -412,35 +403,26 @@ 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{}\makelilypondfooter}}%
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
 '''
-       
-       if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no':
+       if extra['pagenumber'] and  extra['pagenumber'][-1]:
                s = s + r'''
-\renewcommand{\@oddhead}{\parbox{\textwidth}%
-    {\mbox{}\small\makelilypondheader\hfill\textbf{\thepage}}}
-'''
+               \renewcommand{\@oddhead}{\parbox{\textwidth}%%
+               {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%%'''
        else:
-               s = s + '\\pagestyle{empty}\n'
-
-       s = s + '\\makeatother\n'
-       s = s + '\\begin{document}\n'
-
+               s = s + '\\pagestyle{empty}'
+               
+       s = s + '\\begin{document}'
 
        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