From 80f165dd09892544421c3f13901b17bf38f3e82b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Mar 2001 22:39:39 +0100 Subject: [PATCH] patch::: 1.3.137.jcn1 1.3.136.jcn1 ============ * Bugfix: ly2dvi: linewidth < 0. * Bugfix: documentation build: fixed two macros in refman, that makeinfo groks, but make texi2dvi barf. * Bugfix: listing of engraver contexts in autogerated documentation. --- Generated by janneke@gnu.org, From = lilypond-1.3.137, To = lilypond-1.3.137.jcn1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.137.jcn1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 17 +++++++++++++- Documentation/regression-test.tely | 2 +- Documentation/user/refman.itely | 5 ++-- VERSION | 2 +- input/bugs/drarn.ly | 23 +++++++++++++++++++ input/test/drarn.ly | 21 +++++++++++++++++ .../tricks/{ophee-slurs.ly => drarn-slurs.ly} | 0 scm/engraver-documentation-lib.scm | 2 +- scripts/ly2dvi.py | 16 ++++++++++--- 9 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 input/bugs/drarn.ly create mode 100644 input/test/drarn.ly rename input/tricks/{ophee-slurs.ly => drarn-slurs.ly} (100%) diff --git a/CHANGES b/CHANGES index b0e5f71b8b..672cc4297e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,19 @@ -1.3.137.rz1 +--- ../lilypond-1.3.137/CHANGES Sun Mar 11 20:00:15 2001 +++ b/CHANGES Mon Mar 12 22:39:39 2001 +@@ -1,3 +1,13 @@ +1.3.136.jcn1 +============ + +* Bugfix: ly2dvi: linewidth < 0. + +* Bugfix: documentation build: fixed two macros in refman, that +makeinfo groks, but make texi2dvi barf. + +* Bugfix: listing of engraver contexts in autogerated documentation. + + 1.3.136.hwn2 + ============ + 1.3.137.rz1 =========== * Added nested staffgroups/choirstaffs support diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 470b7cec0f..91fc390181 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -109,7 +109,7 @@ and documenting bugfixes. @lilypondfile[printfilename]{slur-attachment-override.ly} -@lilypondfile[printfilename]{ophee-slurs.ly} +@lilypondfile[printfilename]{drarn-slurs.ly} @lilypondfile[printfilename]{phrasing-slur.ly} diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 2e982306d5..7d49a981c1 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -784,7 +784,7 @@ control the number of beams through the properties @subsection Slur @cindex slur -A slur indicates that notes are to be played bound or @em{legato}. In +A slur indicates that notes are to be played bound or @emph{legato}. In lilypond, they are entered using parentheses: @lilypond[fragment,verbatim,center] f'()g'()a' [a'8 b'(] a'4 g'2 )f'4 @@ -797,6 +797,7 @@ stem end. If you want to override this layout you can do this through @code{Voice.Slur}'s grob-property @code{attachment}: [TODO: remove this section] +maybe reinclude other slur features and move back to tricks? @quotation @lilypond[fragment,relative,verbatim] @@ -1064,7 +1065,7 @@ string or a markup text. @example foo = \textscript #'(finger "6") - @ldots{} + @dots{} c4-\foo @end example diff --git a/VERSION b/VERSION index 53621fde10..d8754fc588 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=137 -MY_PATCH_LEVEL=rz1 +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/drarn.ly b/input/bugs/drarn.ly new file mode 100644 index 0000000000..c3c131aa08 --- /dev/null +++ b/input/bugs/drarn.ly @@ -0,0 +1,23 @@ +%% oops, weird small ties + +\score { + \context Staff \notes < + \time 3/8; + \context Voice=one \relative c'' { + \property Voice.Stem \set #'direction = #1 + \property Voice.Tie \set #'direction = #1 + \property Voice.Slur \set #'direction = #1 + \property Voice.Slur \set #'attachment = #'(head . head) + c8~c()c + } + \context Voice=two \relative c'' { + \property Voice.Stem \set #'direction = #-1 + \property Voice.Tie \set #'direction = #-1 + \property Voice.Slur \set #'direction = #-1 + \property Voice.Slur \set #'attachment = #'(head . head) + a8()a~a + } + > + \paper { linewidth = -1.; } +% \paper { linewidth = 40*\staffspace; } +} diff --git a/input/test/drarn.ly b/input/test/drarn.ly new file mode 100644 index 0000000000..8d16f8b420 --- /dev/null +++ b/input/test/drarn.ly @@ -0,0 +1,21 @@ + +\score { + \context Staff \notes < + \time 3/8; + \context Voice=one \relative c'' { + \property Voice.Stem \set #'direction = #1 + \property Voice.Tie \set #'direction = #1 + \property Voice.Slur \set #'direction = #1 + \property Voice.Slur \set #'attachment = #'(head . head) + c8~c()c + } + \context Voice=two \relative c'' { + \property Voice.Stem \set #'direction = #-1 + \property Voice.Tie \set #'direction = #-1 + \property Voice.Slur \set #'direction = #-1 + \property Voice.Slur \set #'attachment = #'(head . head) + a8()a~a + } + > + \paper { linewidth = 40*\staffspace; } +} diff --git a/input/tricks/ophee-slurs.ly b/input/tricks/drarn-slurs.ly similarity index 100% rename from input/tricks/ophee-slurs.ly rename to input/tricks/drarn-slurs.ly diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm index b21356f96e..862a1da057 100644 --- a/scm/engraver-documentation-lib.scm +++ b/scm/engraver-documentation-lib.scm @@ -60,7 +60,7 @@ (cdr (assoc 'consists x)) (cdr (assoc 'end-consists x))))) - (if (member name-sym consists) + (if (member name consists) (list context) '()))) context-description-alist)))) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 3127bc3280..03b04ae75c 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -4,7 +4,13 @@ # Note: gettext work best if we use ' for docstrings and " # for gettextable strings -''' TODO: --dependencies +''' +TODO: + + * --dependencies + + * dvi from lilypond .tex output? This is hairy, because we create dvi + from lilypond .tex *and* header output. ''' @@ -376,8 +382,12 @@ def global_latex_definition (tfiles, extra): orientation = 'portrait' if extra['orientation']: orientation = extra['orientation'][0] - - s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (extra['linewidth'][0], textheight, orientation) + + # set sane geometry width (a4-width) for linewidth = -1. + linewidth = extra['linewidth'][0] + if linewidth < 0: + 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} -- 2.39.5