1.3.117.mb1
===========
* Bugfix: fetdefs.tex: don't redefine the standard TeX macros
\sharp,\natural or \flat.
* Bugfix: ly2dvi: handle the --landscape option. Leave the textheight
calculation to the geometry package. Remove some dead code.
* Bugfix: correct font-family for TextSpanner.
* Bugfix: script-engraver.cc: forced script directions work again.
---
Generated by (address unknown),
From = lilypond-1.3.117, To = lilypond-1.3.117.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.117.mb1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
+--- ../lilypond-1.3.117/CHANGES Thu Dec 14 18:44:08 2000
+++ b/CHANGES Sat Dec 16 21:58:37 2000
+@@ -1,3 +1,16 @@
+1.3.117.mb1
+===========
+
+* Bugfix: fetdefs.tex: don't redefine the standard TeX macros
+ \sharp,\natural or \flat.
+
+* Bugfix: ly2dvi: handle the --landscape option. Leave the textheight
+ calculation to the geometry package. Remove some dead code.
+
+* Bugfix: correct font-family for TextSpanner.
+
+* Bugfix: script-engraver.cc: forced script directions work again.
+
+ 1.3.116.jcn4
+ ============
+ 1.3.117.jcn1
============
* Resurrected direct postscript output, ie. lilypond --output-format=ps.
============
* Resurrected direct postscript output, ie. lilypond --output-format=ps.
Keep LilyPond output after the run.
@item -L,--landscape
Set landscape orientation - portrait is the default.
Keep LilyPond output after the run.
@item -L,--landscape
Set landscape orientation - portrait is the default.
- (@strong{-L} produces @code{\usepackage[landscape]@{article@}})
+ Use together with @code{dvips -t landscape} if you run dvips
+ separately.
@item -N,--nonumber
Switch off page numbering.
@item -O,--orientation=
@item -N,--nonumber
Switch off page numbering.
@item -O,--orientation=
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=117
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=117
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
art = gh_cdr(art);
SCM force_dir = l->get_mus_property ("direction");
art = gh_cdr(art);
SCM force_dir = l->get_mus_property ("direction");
- if (isdir_b (force_dir) && to_dir (force_dir))
+ if (isdir_b (force_dir) && !to_dir (force_dir))
force_dir = gh_car (art);
art = gh_cdr(art);
force_dir = gh_car (art);
art = gh_cdr(art);
%textheight = \staffheight/20.0 * \textheight20;
linewidth = \hsize - 2.\cm;
%textheight = \staffheight/20.0 * \textheight20;
linewidth = \hsize - 2.\cm;
-textheight = \vsize - 4.\cm;
+% Leave the textheight calculation to the geometry package. /MB
+%textheight = \vsize - 4.\cm;
indent = \linewidth / 14.0;
indent = \linewidth / 14.0;
(TextSpanner . (
(molecule-callback . ,Text_spanner::brew_molecule)
(font-shape . italic)
(TextSpanner . (
(molecule-callback . ,Text_spanner::brew_molecule)
(font-shape . italic)
(type . "line")
;; urg, only for (de)cresc. text spanners
(type . "line")
;; urg, only for (de)cresc. text spanners
#
def start(this,file):
"""
#
def start(this,file):
"""
- Start LaTeX file. Calculates the horizontal and vertical
- margin using pagewidth, pageheight, linewidth, and textheight.
- Creates temporary output filename and opens it for write.
- Sends the LaTeX header information to output. Lastly sends
- the title information to output.
+ Start LaTeX file. Sets the linewidth (and possibly the
+ textheight) and leaves the page layout to the geometry
+ package. Creates temporary output filename and opens it
+ for write. Sends the LaTeX header information to output.
+ Lastly sends the title information to output.
input: file output file name
output: None
input: file output file name
output: None
"""
now=time.asctime(time.localtime(time.time()))
"""
now=time.asctime(time.localtime(time.time()))
- linewidth = Props.get('linewidth')
- textheight = Props.get('textheight')
- if Props.get('orientation') == 'landscape':
- pagewidth = Props.get('pageheight')
- pageheight = Props.get('pagewidth')
+ # Only set the textheight if it was explicitly set by the user,
+ # otherwise use the default. Helps to handle landscape correctly!
+ if Props.get('textheight') > 0:
+ textheightsetting = ',textheight=' + `Props.get('textheight')` + 'pt'
- pageheight = Props.get('pageheight')
- pagewidth = Props.get('pagewidth')
-
+ textheightsetting = ''
+
%%\headheight9pt
%%\headsep0pt
%% Maybe this is too drastic, but let us give it a try.
%%\headheight9pt
%%\headsep0pt
%% Maybe this is too drastic, but let us give it a try.
-\geometry{width=%spt, textheight=%spt,headheight=2mm,headsep=0pt,footskip=2mm}
+\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}
\input{titledefs}
%s
\makeatletter
\input{titledefs}
%s
\makeatletter
\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
\begin{document}
""" % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
\begin{document}
""" % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
- Props.get('language'), Props.get('pagenumber'), linewidth,
- textheight, Props.get('header') )
+ Props.get('language'), Props.get('pagenumber'), Props.get('linewidth'),
+ textheightsetting, Props.get('orientation'), Props.get('header') )
base, ext = os.path.splitext(file)
this.__base = base
base, ext = os.path.splitext(file)
this.__base = base
% (outfile))
if Props.get('postscript'):
% (outfile))
if Props.get('postscript'):
+ dvipsopts=''
+ if Props.get('orientation') == 'landscape':
+ dvipsopts=dvipsopts + ' -t landscape'
psoutfile=this.__base + '.ps'
if Props.get('output') != '':
psoutfile = os.path.join(Props.get('output'), psoutfile )
psoutfile=this.__base + '.ps'
if Props.get('output') != '':
psoutfile = os.path.join(Props.get('output'), psoutfile )
- stat = os.system('dvips -o %s %s' % (psoutfile,outfile))
+ stat = os.system('dvips %s -o %s %s' % (dvipsopts,psoutfile,outfile))
if stat:
sys.exit('ExitBadPostscript')
if stat:
sys.exit('ExitBadPostscript')
this.__roverrideTable[i[1]]=i[0]
this.__data = {
this.__roverrideTable[i[1]]=i[0]
this.__data = {
- 'pagewidth' : [597, this.__overrideTable['init']],
- 'pageheight' : [845, this.__overrideTable['init']],
'papersize' : ['a4paper', this.__overrideTable['init']],
'textheight' : [0, this.__overrideTable['init']],
'linewidth' : [500, this.__overrideTable['init']],
'papersize' : ['a4paper', this.__overrideTable['init']],
'textheight' : [0, this.__overrideTable['init']],
'linewidth' : [500, this.__overrideTable['init']],
for paper in paperTable:
if re.match(paper[0],size):
found=1
for paper in paperTable:
if re.match(paper[0],size):
found=1
- this.__set('pagewidth',paper[1],requester)
- this.__set('pageheight',paper[2],requester)
this.__set('papersize',paper[3],requester)
break
this.__set('papersize',paper[3],requester)
break
\def\fetdef#1#2{%
\def#1{\hbox{\char#2}}}
\def\fetdef#1#2{%
\def#1{\hbox{\char#2}}}
-\fetdef\sharp{16}
-\fetdef\natural{17}
-\fetdef\flat{18}
+\fetdef\fetasharp{16}
+\fetdef\fetanatural{17}
+\fetdef\fetaflat{18}
\font\fetasixteenfont=feta16
\def\fetafont{\fetasixteenfont}
\font\fetasixteenfont=feta16
\def\fetafont{\fetasixteenfont}
-\def\textflat{{\fetafont\raise 1ex\hbox{\flat}}}
-\def\textnatural{{\fetafont\raise 1ex\hbox{\natural}}}
-\def\textsharp{{\fetafont\raise1ex\hbox{\sharp}}}
+\def\textflat{{\fetafont\raise 1ex\hbox{\fetaflat}}}
+\def\textnatural{{\fetafont\raise 1ex\hbox{\fetanatural}}}
+\def\textsharp{{\fetafont\raise1ex\hbox{\fetasharp}}}