From f40100ec7da8bfd4fbf09ae2b072e3e660e1b0d3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 5 Mar 2001 12:20:24 +0100 Subject: [PATCH] patch::: 1.3.135.jcn1 1.3.135.jcn1 ============ * Bugfix: website build. * Fixed titling: cleaned out titledefs.tex for use by ly2dvi. --- CHANGES | 7 +++ Documentation/user/ly2dvi.itexi | 1 - VERSION | 2 +- input/test/coriolan-margin.ly | 8 +-- scripts/ly2dvi.py | 16 +++--- tex/lilyponddefs.tex | 4 ++ tex/titledefs.tex | 86 ++++++++------------------------- 7 files changed, 46 insertions(+), 78 deletions(-) diff --git a/CHANGES b/CHANGES index 2d1d01d407..d26b9e213d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.135.jcn1 +============ + +* Bugfix: website build. + +* Fixed titling: cleaned out titledefs.tex for use by ly2dvi. + 1.3.134.jcn2 ============ diff --git a/Documentation/user/ly2dvi.itexi b/Documentation/user/ly2dvi.itexi index 9806395296..e2351c5eae 100644 --- a/Documentation/user/ly2dvi.itexi +++ b/Documentation/user/ly2dvi.itexi @@ -99,7 +99,6 @@ so you can add multiple packages using multiple @code{-s=latexpackages} options. Set orientation. Choices are @code{portrait} or @code{landscape}. Is read from the @code{\paper} block, if set. -@cindex @item linewidth Is read from the @code{\paper} block. diff --git a/VERSION b/VERSION index 223333d735..4e3fec04d6 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=135 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index 2a003157e3..f16b1dce13 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -63,13 +63,13 @@ timpani = \notes \relative c' { c1 c } -violinoB = \notes \relative c' { +violinoI = \notes \relative c' { \property Staff.instrument = #"Violino I " \property Staff.instr = #"Vl. I " c1 c } -violinoC = \notes \relative c' { +violinoII = \notes \relative c' { \property Staff.instrument = #"Violino II " \property Staff.instr = #"Vl. II " c1 c @@ -112,8 +112,8 @@ violoncello = \notes \relative c' { > \context StaffGroup ="archi" < \context GrandStaff ="violini" < - \context Staff ="violino1" \violino1 - \context Staff ="violino2" \violino2 + \context Staff ="violinoI" \violinoI + \context Staff ="violinoII" \violinoII > \context Staff ="viola" \viola \context Staff ="violoncello" \violoncello diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 1bfc299d89..42cf6cb29e 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -69,7 +69,7 @@ option_definitions = [ def identify(): - sys.stdout.write ('lilypond-book (GNU LilyPond) %s\n' % program_version) + sys.stdout.write ('ly2dvi (GNU LilyPond) %s\n' % program_version) def print_version (): identify() @@ -81,7 +81,7 @@ NO WARRANTY.""") def progress (s): """Make the progress messages stand out between lilypond stuff""" - sys.stderr.write (' *** ' + s+ '\n') + sys.stderr.write ('*** ' + s+ '\n') def error (s): sys.stderr.write (s) @@ -311,9 +311,9 @@ def one_latex_definition (defn, first): s = r"""\def\the%s{%s}""" % (k,open (v).read ()) if first: - s = s + '\\makelilytitle\n' + s = s + '\\def\\mustmakelilypondtitle{}\n' else: - s = s + '\\makelilypiecetitle\n' + s = s + '\\def\\mustmakelilypondpiecetitle{}\n' s = s + '\\input %s' % defn[0] return s @@ -505,14 +505,16 @@ if files: system ('cp \"%s\" \"%s\"' % (srcname, dest )) system ('cp *.midi %s' % outdir, ignore_error = 1) - progress ("%s file left in `%s'\n" % (type, dest)) - depfile = os.path.join (outdir, base + '.dep') if track_dependencies_p: generate_dependency_file (depfile, dest) - progress ("Dependency file left in `%s'\n" % depfile) cleanup_temp () + # most insteresting info last + progress ("Dependency file left in `%s'" % depfile) + progress ("%s file left in `%s'" % (type, dest)) + + diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index acaa11d23a..0536b3c333 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -73,6 +73,10 @@ nolilyfooter\texsuffix\endcsname \fi +% If we must make titles, do so +\ifx\mustmakelilypondtitle\undefined\else\makelilypondtitle\fi +\ifx\mustmakelilypondpiecetitle\undefined\else\makelilypondpiecetitle\fi + % fix chord.cc::banter_str before removing these \input fetdefs diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 1c853c8366..7e33f30190 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -1,88 +1,44 @@ % -% ideally, we should create a LaTeX/TeX class -% for setting music in different sizes. +% LilyPond titling for LaTeX % -% Version 0.1 -% -\def\thetitle{} -\def\thesubtitle{} -\def\thesubsubtitle{} -\def\thecomposer{} -\def\thearranger{} -\def\theinstrument{} -\def\theopus{} -\def\thepiece{} -\def\themeter{} -\def\thepoet{} -\def\theheader{} -\def\thefooter{} -\def\theorchestralinstrument{} -% -% duh. LaTeX has a \title too. -\renewcommand*{\title}[1]{\def\thetitle{#1}} -\newcommand*{\subtitle}[1]{\def\thesubtitle{#1}} -\newcommand*{\subsubtitle}[1]{\def\thesubsubtitle{#1}} -\newcommand*{\composer}[1]{\def\thecomposer{#1}} -\newcommand*{\arranger}[1]{\def\thearranger{#1}} -\newcommand*{\instrument}[1]{\def\theinstrument{#1}} -\newcommand*{\opus}[1]{\def\theopus{#1}} -\newcommand*{\piece}[1]{\def\thepiece{#1}} -\newcommand*{\meter}[1]{\def\themeter{#1}} -\newcommand*{\poet}[1]{\def\thepoet{#1}} -% -\newcommand*{\lilypondtitle}[1]{\def\thetitle{#1}} -\newcommand*{\lilypondsubtitle}[1]{\def\thesubtitle{#1}} -\newcommand*{\lilypondsubsubtitle}[1]{\def\thesubsubtitle{#1}} -\newcommand*{\lilypondfooter}[1]{\def\thefooter{#1}} -\newcommand*{\lilypondhead}[1]{\def\theheader{#1}} -\newcommand*{\lilypondcomposer}[1]{\def\thecomposer{#1}} -\newcommand*{\lilypondarranger}[1]{\def\thearranger{#1}} -\newcommand*{\lilypondinstrument}[1]{\def\theinstrument{#1}} -\newcommand*{\lilypondopus}[1]{\def\theopus{#1}} -\newcommand*{\lilypondpiece}[1]{\def\thepiece{#1}} -\newcommand*{\lilypondmetre}[1]{\def\themeter{#1}} -\newcommand*{\lilypondmeter}[1]{\def\themeter{#1}} -\newcommand*{\lilypondpoet}[1]{\def\thepoet{#1}} -% -% -\def\lilypondnull{}% -% -\def\makelilytitle{% +\def\makelilypondtitle +{ \begin{center} \bfseries - \ifx\lilypondnull\thetitle\else{\huge\thetitle}\\ \fi - \ifx\lilypondnull\thesubtitle\else{\Large\thesubtitle}\\ \fi - \ifx\lilypondnull\thesubsubtitle\else{\large\thesubsubtitle}\\ \fi + \ifx\lilypondtitle\undefined\else{\huge\lilypondtitle}\\ \fi + \ifx\lilypondsubtitle\undefined\else{\Large\lilypondsubtitle}\\ \fi + \ifx\lilypondsubsubtitle\undefined\else{\large\lilypondsubsubtitle}\\ \fi \end{center} \bigskip % urg \edef\saveparskip{\parskip}\parskip-5mm \begin{minipage}[t]{0.45\textwidth} - \ifx\lilypondnull\thepoet\else{\thepoet}\\ \fi - \ifx\lilypondnull\themeter\else{\themeter}\\ \fi + \ifx\lilypondpoet\undefined\else{\lilypondpoet}\\ \fi + \ifx\lilypondmeter\undefined\else{\lilypondmeter}\\ \fi \end{minipage}\hspace*{\fill} \begin{minipage}[t]{0.45\textwidth} \begin{flushright} - \ifx\lilypondnull\thecomposer\else{\large\normalfont\scshape\thecomposer}\\ \fi - \ifx\lilypondnull\theopus\else{\theopus}\\ \fi - \ifx\lilypondnull\thearranger\else{\thearranger}\\ \fi + \ifx\lilypondcomposer\undefined\else{\large\normalfont\scshape\lilypondcomposer}\\ \fi + \ifx\lilypondopus\undefined\else{\lilypondopus}\\ \fi + \ifx\lilypondarranger\undefined\else{\lilypondarranger}\\ \fi \end{flushright}% \end{minipage}\par \parskip\saveparskip - {\center{\large\theinstrument}\par} - {\flushleft{\large\normalfont\scshape\thepiece}\par} + \ifx\lilypondinstrument\undefined\else{\center{\large\lilypondinstrument}\par}\fi + \ifx\lilypondpiece\undefined\else{\flushleft{\large\normalfont\scshape\lilypondpiece}\par}\fi % \leavevmode - \global\let\theopus\relax% - \global\let\thepiece\relax% + \global\let\lilypondopus\relax% + \global\let\lilypondpiece\relax% } -\def\makelilypiecetitle +% +\def\makelilypondpiecetitle { \bigskip\myfilbreak - {\flushright{\theopus}\par} - {\flushleft{\large\normalfont\scshape\thepiece}\par} + \ifx\lilypondopus\undefined\else{\flushright{\lilypondopus}\par}\fi + \ifx\lilypondpiece\undefined\else{\flushleft{\large\normalfont\scshape\lilypondpiece}\par}\fi \nopagebreak% - \global\let\theopus\relax% - \global\let\thepiece\relax% + \global\let\lilypondopus\relax% + \global\let\lilypondpiece\relax% } \endinput -- 2.39.2