remove

@hyphenatedinternalsref.

diff --git a/ChangeLog b/ChangeLog
index 35a5d68489ee38fa66892b237108e0e04005c399..d49aebd3ecda1a404c53ab7a7e035eb77d2c3140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/user/notation.itely: remove
+       @hyphenatedinternalsref.
+
 2004-10-29  Werner Lemberg  <wl@gnu.org>
 
        * scm/framework-tex.scm (dump-line): Fix dimensions for \lybox.
@@ -10,6 +15,9 @@
 
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/lookup.cc (triangle): use (0, interval.length()) for X
+       extent, since the stencil is translated later on.
+
        * lily/ledger-line-spanner.cc (print): swap linear_combination
        arguments, effectively shortens ledger line. 
 

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 9e595fd779ce64a3cd2a2971e3bedb63a5d1338f..c903f39a89d3ee33b86de0775e5771fc3ef2b2b9 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -78,15 +78,6 @@
 @findex \NAME\
 @end macro
 
- @c what is this? -- jcn
- @macro hyphenatedinternalsref{NAME,NODENAME}
- @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
- @c @inforef{\NODENAME\,,lilypond-internals}@c
- @c should we do this? 
- @c using @ref without punctuation is OK without for formats other than info
- @ref{\NODENAME\,,\NAME\,lilypond-internals}@c
- @findex \NAME\
- @end macro
 
  @macro inputfileref{DIR,NAME}
  @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
@@ -107,12 +98,6 @@
  @findex @code{\NAME\}
  @end macro
 
- @macro hyphenatedinternalsref{NAME,NODENAME}
- @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
- @inforef{\NODENAME\,,lilypond-internals}@c
- @c should we do this? 
- @findex @code{\NAME\}
- @end macro
 
  @macro inputfileref{DIR,NAME}
  @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
@@ -128,12 +113,6 @@
 @findex \NAME\@c
 @end macro
 
-@macro hyphenatedinternalsref{NAME,NODENAME}
-@c FIXME: suspicious info file name?
-@inforef{\NODENAME\,,lilypond-internals}@c
-@c should we do this? 
-@findex @code{\NAME\}
-@end macro
 
 @macro inputfileref{DIR,NAME}
 @file{\DIR\/\NAME\}
@@ -158,13 +137,6 @@
 @file{\DIR\/\NAME\}@c
 @end macro
 
-@macro hyphenatedinternalsref{NAME,NODENAME}
-@code{\NAME\}@c
-@c should we do this? 
-@cindex @code{\NAME\} @c
-@end macro
-
-
 
 @macro seeinternals{NAME}
 internals document,  @internalsref{\NAME\}

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index ca8228a6b46f5d3abc076973bcd04af4722df101..d1b3a265df55a7b3275430e04b4631b411951e84 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -4437,8 +4437,8 @@ twoWays = \transpose c c' {
   <f bes d'>
 }
 
-  << \context ChordNames \twoWays
-     \context Voice \twoWays >> 
+<< \context ChordNames \twoWays
+   \context Voice \twoWays >> 
 @end lilypond
 
 This example also shows that the chord printing routines do not try to
@@ -4461,7 +4461,7 @@ In chord mode sets of pitches (chords) are entered with normal note
 names.  A chord is entered by the root, which is entered like a
 normal pitch
 
-@lilypond[quote,raggedright,fragment,verbatim,relative=2]
+@lilypond[quote,raggedright,fragment,verbatim]
   \chordmode { es4. d8 c2 }
 @end lilypond
 
@@ -5493,8 +5493,8 @@ to an articulation, for example,
 
 This defines a note with a conditional fingering indication.
 
-By applying the @code{\keepWithTag} command, tagged expressions
-can be filtered.  For example,
+By applying the @code{\keepWithTag} and @code{\removeWithTag}
+commands, tagged expressions can be filtered.  For example,
 @example
 <<
   @var{the music}
@@ -5513,6 +5513,8 @@ of symbols, for example,
   \tag #'(original-part transposed-part) @dots{}
 @end example
 
+
+
 @seealso
 
 Examples: @inputfileref{input/regression,tag-filter.ly}.

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 9d91aab0098e613d6dd5cf0af4d98b4d8555c4af..672b0582f2c8856703a405bf265ef50a08c5d95c 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -106,7 +106,7 @@ A music object has three kinds of types:
 leads to a @internalsref{NoteEvent}, and @code{\simultaneous} leads to
 a @internalsref{SimultaneousMusic}. A list of all expressions
 available is in the internals manual, under
-@hyphenatedinternalsref{Music expressions,Music-expressions}.
+@internalsref{Music expressions}.
 
 @item
   `type' or interface: Each music name has several `types' or
@@ -114,7 +114,7 @@ interfaces, for example, a note is an @code{event}, but it is also a
 @code{note-event}, a @code{rhythmic-event} and a @code{melodic-event}.
 
   All classes of music are listed in the internals manual, under
-  @hyphenatedinternalsref{Music classes,Music-classes}.
+  @internalsref{Music classes}.
 
   @item
 C++ object: Each music object is represented by a C++ object. For

diff --git a/THANKS b/THANKS
index 4993d2af9a70329b52c2bf567bca5dd62512b6d6..17d1d00486e0ac8d2a49e5b548da61dea1cc9a77 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -4,11 +4,11 @@ Release 2.3
 
 DEVELOPMENT TEAM
 
-Han-Wen Nienhuys
-Jan Nieuwenhuizen
-Erik Sandberg - Bug Meister
-Pedro Kroger - Build Meister
-Graham Parcival - Documentation Editor
+Han-Wen Nienhuys  - Core development
+Jan Nieuwenhuizen - Core development
+Erik Sandberg     - Bug Meister
+Pedro Kroger      - Build Meister
+Graham Parcival   - Documentation Editor
 
 
 CONTRIBUTORS
@@ -40,6 +40,7 @@ Doug Asherman
 Ed Jackson
 Heinz Stolba
 Jefferson dos Santos Felix
+Karl Hammar
 Martin Norbäck
 Matthias Neeracher
 Maurizio Tomasi

diff --git a/lily/lookup.cc b/lily/lookup.cc
index d0c7ed4dbde58a467ab836f479901e06c500a428..69db6c10868843f9577d138053f901363f579df8 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -687,7 +687,7 @@ Stencil
 Lookup::triangle (Interval iv, Real thick, Real protude)
 {
   Box b ;
-  b[X_AXIS] = iv;
+  b[X_AXIS] = Interval (0, iv.length());
   b[Y_AXIS] = Interval (0 <? protude , 0 >? protude);
 
   SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"),

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index 538782e8c533dcdb946d7e393b34b6ea625c3f50..2d89889d84f289750f4a9ea54008aa6bb4db68d6 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,7 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book lilypond-latex abc2ly etf2ly mup2ly midi2ly
+SEXECUTABLES=convert-ly lilypond-book lilypond-latex abc2ly etf2ly mup2ly midi2ly ps2png
+
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond
 HELP2MAN_EXECS = $(SEXECUTABLES)