*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index bf9947f00320b4e214c84f33cf911143fc36ab9b..0926d2a03825aec3d7c228614d45634e19f43876 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+v/lil2005-02-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * GNUmakefile.in (web-ext): don't ship ps.gz
+
+       * tex/GNUmakefile ($(outdir)/latin1.enc): redirect stderr to
+       stdout
+
 2005-02-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/general-scheme.cc (LY_DEFINE): Compile fix for systems
@@ -25,6 +32,8 @@
 
 2005-02-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/output-ps.scm (grob-cause): only do mark_URI if non-empty.
+
        * scm/framework-ps.scm (write-preamble): remove pdf-viewer code.
  
        * THANKS: add sponsor.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index a0e31e79de9631221c8706e97ff43c2f338ac8bb..694cfc1ba083875b93948c8ee19c3c4ae17d6409 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -13,7 +13,7 @@
 @uref{../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 @macro usermanref{NAME}
-@inforef{\NAME\,,../../user/out-www/lilypond/index}@c
+@inforef{\NAME\,,../../user/out-www/lilypond/lilypond}@c
 @end macro
 @end ifhtml
 
@@ -42,8 +42,6 @@ the section Point and click in he user manual.
 @end ifnothtml
 
 
-
-
 @item
 With the new @code{tieWaitForNote} property, arpeggios may be written
 out using ties, for example,

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index e0026e3de66554c36b287769b38e5c157ea248ef..3c5b0390a535db168befdd6ea2164c428a6b93bd 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -11,11 +11,11 @@
 This chapter deals with rarely-used and advanced notation.
 
 @menu
-* Accidentals::
-* Expressive stuff::
-* Orchestral music::
-* Contemporary notation::
-* Educational use::
+* Accidentals::                 
+* Expressive stuff::            
+* Orchestral music::            
+* Contemporary notation::       
+* Educational use::             
 @end menu
 
 
@@ -181,6 +181,7 @@ notes and rhythms.
 * Text scripts::                
 * Text spanners::               
 * Analysis brackets::           
+* Articulations::               
 @end menu
 
 
@@ -448,7 +449,6 @@ some common problems in orchestral music.
 
 
 @menu
-* Aligning to cadenzas::        
 * Rehearsal marks::             
 * Bar numbers::                 
 * Instrument names::            
@@ -1233,7 +1233,7 @@ LilyPond is limited.
 * Clusters::                    
 * Special fermatas::            
 * Feathered beams::             
-* Improvisation::
+* Improvisation::               
 @end menu
 
 @node Polymetric notation

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index bd3e94ef20af3e14c4b3e6b8e94c83e05b0b18cd..2cab325c68f73489fc18bae87863cdde86a5909a 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -11,13 +11,13 @@
 This chapter explains how to use all basic notation features.
 
 @menu
-* Note entry::
-* Easier music entry::
-* Staff notation::
-* Polyphony::
-* Beaming::
-* Repeats::
-* Expressive marks::
+* Note entry::                  
+* Easier music entry::          
+* Staff notation::              
+* Polyphony::                   
+* Beaming::                     
+* Repeats::                     
+* Expressive marks::            
 @end menu
 
 
@@ -43,7 +43,7 @@ related constructs, such as stems, tuplets and ties.
 * Stems::                       
 * Ties::                        
 * Tuplets::                     
-* Transposition::
+* Transpose::                   
 @end menu
 
 
@@ -939,7 +939,8 @@ such as key signatures, clefs and time signatures.
 * Bar lines::                   
 * Time administration::         
 * Controlling formatting of prefatory matter::  
-* System start delimiters::
+* System start delimiters::     
+* Aligning to cadenzas::        
 @end menu
 
 @node Staff symbol
@@ -1598,9 +1599,9 @@ a piece of music.  Polyphony in LilyPond refers to having more than
 one voice on the same staff.
 
 @menu
-* Basic polyphony::    
-* Explicitly instantiating voices::
-* Collision Resolution::
+* Basic polyphony::             
+* Explicitly instantiating voices::  
+* Collision Resolution::        
 @end menu
 
 @node Basic polyphony
@@ -2476,15 +2477,14 @@ Expressive marks help musicians to bring more to the music than simple
 notes and rhythms.
 
 @menu
-* Slurs::
-* Phrasing slurs::
-* Breath marks::
-* Articulations::
-* Running trills::
-* Fingering instructions::
-* Grace notes::
-* Glissando::
-* Dynamics:: 
+* Slurs::                       
+* Phrasing slurs::              
+* Breath marks::                
+* Running trills::              
+* Fingering instructions::      
+* Grace notes::                 
+* Glissando::                   
+* Dynamics::                    
 @end menu
 
 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 57469e30f006e328629570ed3ff884da16e1dc47..b0497e7d0d8dd5e3d3d5ced5677f5e042322d5fa 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -834,7 +834,10 @@ commands are described in
 @ifhtml
 the
 @end ifhtml
-@ref{Notation manual}, under the sections for slurs and stems
+@c @ref{Notation manual},
+Notation manual
+@c FIXME 
+under the sections for slurs and stems
 respectively.
 
 The exact tuning possibilities for each type of layout object are

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 618584f03459d7ed24f76d892ac795003d7dc92e..8e8a80c9e456cc0d66c4abad196ac35985a6f34e 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -11,9 +11,12 @@
 This is a placeholder until I can write a nice intro for this chapter.
 
 @menu
-* Global layout:: 
-* File structure::
-* Sound::
+* Global layout::               
+* File structure::              
+* Sound::                       
+* Creating MIDI files::         
+* MIDI block::                  
+* MIDI instrument names::       
 @end menu
 
 

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 573c653296bc9faa7106c8da506a8ae0a0bf9f67..bed07c2b7b53e94f84ebd3aae496d2a5529c2da9 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -11,13 +11,13 @@
 This chapter explains how to use notation for specific instruments.
 
 @menu
-* Rhythmic music::
-* Piano music::
-* Vocal music::
-* Other instrument specific notation::
-* Tablatures::
-* Popular music::
-* Ancient notation::
+* Rhythmic music::              
+* Piano music::                 
+* Vocal music::                 
+* Other instrument specific notation::  
+* Tablatures::                  
+* Popular music::               
+* Ancient notation::            
 @end menu
 
 
@@ -1373,7 +1373,7 @@ section.
 @end lilypond
 
 
-@node Other instrument specific notation, Tablatures, Vocal music, Notation manual
+@node Other instrument specific notation
 @section Other instrument specific notation
 
 This section includes extra information for writing string music, and may
@@ -1383,7 +1383,7 @@ include extra information for other instruments in the future.
 * Harmonic notes::              
 @end menu
 
-@node Harmonic notes, , Other instrument specific notation, Other instrument specific notation
+@node Harmonic notes
 @subsection Harmonic notes
 
 @cindex artificial harmonics
@@ -1397,7 +1397,7 @@ are entered by marking the harmonic pitch with @code{\harmonic}.
 @end lilypond
 
 
-@node Tablatures, Popular music, Other instrument specific notation, Notation manual
+@node Tablatures
 @section Tablatures
 
 @cindex tablature
@@ -1413,7 +1413,7 @@ offers limited support for tablature.
 * Non-guitar tablatures::       
 @end menu
 
-@node Tablatures basic, Non-guitar tablatures, Tablatures, Tablatures
+@node Tablatures basic
 @subsection Tablatures basic
 @cindex Tablatures basic
 
@@ -1469,7 +1469,7 @@ string selector may easily select the same string to two notes in a
 chord.
 
 
-@node Non-guitar tablatures, , Tablatures basic, Tablatures
+@node Non-guitar tablatures
 @subsection Non-guitar tablatures
 @cindex Non-guitar tablatures
 
@@ -1502,7 +1502,7 @@ No guitar special effects have been implemented.
 Program reference: @internalsref{Tab_note_heads_engraver}.
 
 
-@node Popular music, Orchestral music, Tablatures, Notation manual
+@node Popular music
 @section Popular music
 
 This section discusses issues that arise when writing popular music.
@@ -1514,7 +1514,7 @@ This section discusses issues that arise when writing popular music.
 * Fret diagrams::               
 @end menu
 
-@node Chord names, Chords mode, Popular music, Popular music
+@node Chord names
 @subsection Chord names
 @cindex Chords
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index f368f5300ad5cf253b0e573e686eab228f7d8f4a..5cd0be255874fbdcb762befce10459b15fb53464 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -662,7 +662,8 @@ template into a file, add notes, and you're done!
 @ifhtml
 The
 @end ifhtml
-@emph{@ref{Notation manual}}
+@c @emph{@ref{Notation manual}} @c FIXME
+@emph{Notation manual}
 discusses topics grouped by notation construct.  Once you master the
 basics, this is the place to look up details.
 

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index f4993f4e30f2612cd1fb26ceaa65af6228ef510b..5b4a769f9b2f696a27f67dfcff96927dfc82ae7b 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -260,10 +260,6 @@ of this and other documentation.
 * Advanced notation::              Less frequently used notation.
 * Global issues::                  Non-notation commands.
 
-* Notation manual::                All notation supported, and how to
-                                   produce it.  (SOON OBSOLETE)
-* Sound::                          Producing MIDI output  (SOON OBSOLETE)
-
 * Changing defaults::              Tuning output.
 * Interfaces for programmers::
 * Running LilyPond::               Operation.

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4f0873eda154c192fff183ed1d641a1d535f367b..00b07bd79eba5eecf406ad5efc0cf53675edff83 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -920,7 +920,7 @@ To mark a file for version 2.4.0, use
 @noindent
 These annotations make future upgrades of LilyPond go more
 smoothly.  Changes in the syntax are handled with a special program,
-@file{convert-ly} (see @ref{Invoking convert-ly}), and it uses
+@file{convert-ly} (see @ref{Updating files with convert-ly}), and it uses
 @code{\version} to determine what rules to apply.
 
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index be27d482005a110b5a9e96124cca70b0b8d43c33..45b946f3d65219982bb17b56eed3955393d78839 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -66,7 +66,7 @@ final-install:
        @echo '*** when you log in.  So, please log out now and log in again.'
        @echo '*** For more information see Invoking LilyPond in the manual.'
 
-web-ext = gz html midi pdf png txt ly
+web-ext = html midi pdf png txt ly
 
 footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
 footifymail = MAILADDRESS=bug-lilypond@gnu.org

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 37abb9961d56bdfbea908fed84c866efec23a029..97604610c26ac49398277f49658721f6c3c8c3a4 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -761,7 +761,6 @@ Spacing_spanner::breakable_column_spacing (Grob*me, Item* l, Item *r, Moment sho
              space *= 0.8;
            }
 
-
          compound_space += space;
          compound_fixed += fixed_space;
          wish_count ++ ;

diff --git a/ly/init.ly b/ly/init.ly
index b5471de7c5758acedb0256010240e1d0de05e530..72c57c1bf12883cf73474f29fc49e4bd3a73e32f 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -1,6 +1,5 @@
 %% Toplevel initialisation file. 
 
-#(define-public point-and-click #f)
 #(define-public midi-debug  #f)
 
 

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 57708061edafedbf31212ef69ff51455706a5931..736ee7cf8ee535d2f25c2a2f9c4ddbdd99c4d836 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -154,11 +154,11 @@ scrollkeeper-update
 %{_bindir}/convert-ly
 %{_bindir}/etf2ly
 %{_bindir}/lilypond
-%{_bindir}/lilypond-latex
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
 %{_bindir}/ps2png
+%{_bindir}/lilypond-pdfpc-helper
 
 %doc THANKS
 %doc COPYING
@@ -175,12 +175,12 @@ scrollkeeper-update
 %{_mandir}/man1/abc2ly.1.gz
 %{_mandir}/man1/convert-ly.1.gz
 %{_mandir}/man1/etf2ly.1.gz
-%{_mandir}/man1/lilypond-latex.1.gz
 %{_mandir}/man1/lilypond.1.gz
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/mup2ly.1.gz
 %{_mandir}/man1/ps2png.1.gz
+%{_mandir}/man1/lilypond-pdfpc-helper.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/
 %{_datadir}/locale/*/LC_MESSAGES/lilypond.mo

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 01a73c12e01932fddf5c0a49587de9c226d73109..fbdffd487b0058ec08c9250b42a3693342a209ab 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -221,7 +221,10 @@
         (y-ext (ly:grob-extent grob grob Y)) 
         )
 
-    (if location
+    (if (and location
+            (< 0 (interval-length x-ext))
+            (< 0 (interval-length y-ext)))
+       
        (format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
                (+ (car offset) (car x-ext))
                (+ (cdr offset) (car y-ext))

diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
index ca11b211d988833d588ff136db553f7de7960837..b0d99517a1ecb12f12108fc4d674be0b64a2ecd7 100644 (file)
--- a/scripts/GNUmakefile
+++ b/scripts/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book lilypond-latex abc2ly etf2ly mup2ly midi2ly ps2png lilypond-pdfpc-helper
+SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly ps2png lilypond-pdfpc-helper
 
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond

diff --git a/scripts/lilypond-pdfpc-helper.py b/scripts/lilypond-pdfpc-helper.py
index 8f9500dbd7baf4259c9d22a9518a55635c27272b..25a72591077736dced7f9907d6ec10c5d2866962 100644 (file)
--- a/scripts/lilypond-pdfpc-helper.py
+++ b/scripts/lilypond-pdfpc-helper.py
@@ -22,7 +22,8 @@ print os.getcwd()
 def usage():
        sys.stdout.write ('Usage: %s FILE:LINE:COLUMN' % program_name)
        sys.stdout.write ('\n\n')
-       sys.stdout.write ('Call remote editor given Mozilla remote link command')
+       sys.stdout.write ('''PDF Point & Click helper.
+Start a text-editor when given textedit:///path/to/file:line:column URI.''')
        sys.stdout.write ('\n\n')
        sys.stdout.write (_ ("Report bugs to %s.") % "bug-lilypond@gnu.org")
        sys.stdout.write ('\n')

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 623b9a0aa1c78b270d2eaf60ddacd8bdd8420210..239f4f8f9be7496eef4162ae0b36948cd6070361 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -18,11 +18,12 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps
        -ln $< $@
 
 $(outdir)/latin1.enc: GNUmakefile
-       echo '/ISOLatin1Encoding' > $@ 
+       echo '/ISOLatin1Encoding' > $@.orig
        echo 'ISOLatin1Encoding pstack' \
-         | gs -sDEVICE=nullpage  -quiet - \
-         | sed 's|/minus|/hyphen|' >> $@
-       echo 'def' >> $@
+         | gs -sDEVICE=nullpage  -quiet - 2>> $@.orig
+       echo 'def' >> $@.orig
+       sed 's|/minus|/hyphen|' < $@.orig > $@
+
 
 # teTeX-2.0.x compatibility.
 local-install: