Merge from upstream.

* scripts/lilypond-book.py (process_snippets): Argument fix.

* SConstruct:
* buildscripts/builder.py:
* lily/SConscript:
* mf/SConscript:
* Documentation/user/SConscript:  More SCons fixes.

* lily/font-config.cc (init_fontconfig): Only initialize if
global cache_file is found.

* Documentation/user/instrument-notation.itely,
input/regression/breathing-sign-ancient.ly,
input/test/divisiones.ly: Removed redundant property settings for
vaticana contexts.

* ly/gregorian-init.ly: Minor edit of comments.

    * ly/music-functions-init.ly: Updated \overrideProperty to use the
        new \applyOutput.

*** empty log message ***

* lily/ledger-line-engraver.cc (stop_translation_timestep): new
function. Delay ledger modifying ledgered grobs to
stop_translation_timestep(), to ensure that we're ledgering
according to the new spanner.
(acknowledge_staff_symbol): don't check for non-NULL
staff_sym->get_bound()

* lily/staff-symbol-engraver.cc (start_spanner): set left bound on
creation.

* Documentation/pictures/GNUmakefile (XPM_FILES): src-wildcard for
pictures too.

* Documentation/misc/GNUmakefile (TEXTS): use src-wildcard for
disting MISC files.

(dist-toplevel-txt-files): dist aclocal.m4
directly from srcdir/stepmake/aclocal.m4

* Documentation/misc/GNUmakefile (TEXTS): use src-wildcard for
disting MISC files.

* lily/simple-spacer.cc (get_column_desc): desc -> description.

* lily/simple-spacer.cc (get_line_configuration): add
keep-inside-line rods
(struct Column_desc): add constructor
(struct Rod_desc): add constructor
(get_line_forces): check for forced page breaks here too

* lily/instrument-name-engraver.cc (acknowledge_axis_group): prevent
support/elements cycles between InstrumentNames and AxisGroups

* stepmake/stepmake/topdocs-targets.make (make-txt-files): define
make-txt-files target.

* stepmake/stepmake/toplevel-targets.make (do-top-doc): use
make-txt-files target.

* configure.in (LINK_GXX_STATICALLY): $srcdir for readlink.py

*** empty log message ***

*** empty log message ***

* ly/gregorian-init.ly: Rewrote \versus and \responsum in order to
fix lyrics alignment problems.  They are implemented now as scheme
functions that add the appropriate unicode char to the first lyric
event rather than adding a separate lyric event.

* buildscripts/output-distance.py
(ComparisonData.create_html_result_page): put version/directories
in table header.

* Documentation/topdocs/NEWS.tely (Top): document spacing section
feature.

(Top): document spacing section
feature.

* configure.in (LINK_GXX_STATICALLY): use readlink.py to resolve links.

* buildscripts/readlink.py: add  file.

lily/tuplet-number.cc (print): prevent stencil from being
garbage collected.

(write-system-signature): explicitly
-well, superfluously- close output port.

(main): oops. Add extra argument.

*** empty log message ***

Clarified example from Francisco Vila, thanks!

(main): use compare-XXX for
compare files.
(main): --threshold option, default at 0.30

(paper-system-annotate): fix problem when
annotating an empty system

reinstate old web tar/copying.

* lily/lyric-combine-music-iterator.cc (find_voice): return 0 if
nothing changes. (Erik S)

* lily/percent-repeat-iterator.cc (get_music_list): fix repeat
count. (Erik S)

*** empty log message ***

* scm/define-markup-commands.scm (whiteout): do not force
foreground color of argument markup to black.

* scm/stencil.scm (annotate-y-interval): put arrow dimension at
the left of the arrow, instead of below the arrow name, so that,
when two little arrows are vertically stacked, their dimensions
and name should not overlap. Add a color key parameter.

* scm/paper-system.scm (paper-system-annotate): Annotate
next-space+next-padding instead of next-space. Annotate space
between next-padding and next-space+padding, respectively, and
following system extent and refpoint-Y-extent. Use colors.

* scm/page.scm (annotate-page): translate annotations slightly to
the right.

* buildscripts/output-distance.py
(SystemLink.output_expression_change_count): keep track of changed
details, and dump in details html page.

* lily/figured-bass-position-engraver.cc (acknowledge_slur):
add slurs and ties to support too.

* buildscripts/output-distance.py (main): set dest_dir
argument. Add --max-count option.

add note about setting
properties in Staff context.

(acknowledge_slur):
add slurs and ties to support too.

(main): set dest_dir
argument. Add --max-count option.

Trivial fix.

* ly/gregorian-init.ly: Converted to utf-8.  Added memorable
shortcuts for special unicode chars that are useful in chant
notation.  Revised exisiting and added new comments.

*** empty log message ***

tweaks.

*** empty log message ***

* tex/texinfo.cnf: Add support for U+0132 (IJ) and U+0133 (ij).

* tex/texinfo.cnf: Fix typo (\euro -> \minus).

(FileLink): new class. collect
info systems from one .ly file.

Partial fix for @funindex (doesn't break anything).

(sectionheading, q.v.): call \quoteexpand for
@example too. Backportme.

* scm/define-grob-properties.scm: Previous patch contained
spurious line from another patch not yet committed.  Fixed.

Francisco's latest Spanish glossary fixes and Werner's UTF-8 texinfo
patch; thanks both of you!

* scm/define-grob-properties.scm: Add missing doc strings for
ancient notation.

* buildscripts/output-distance.py
(ComparisonData.write_text_result_page): separate the scores, sort
by geo_score.

* buildscripts/output-distance.py (me_path): use argv[0] for
sys.path extension
(ComparisonData.img_cell): use colored borders.

(output-classic-framework): start at 1 for
system signatures.

* buildscripts/output-distance.py (me_path): use argv[0] for
sys.path extension
(ComparisonData.img_cell): use colored borders.

* scm/stencil.scm (write-system-signature): escape newlines too.
(write-system-signature): use (1,-1) interval for empty interval

(write-system-signature): escape newlines too.

*** empty log message ***

*** empty log message ***

Various additions and edits.

(tree-lib-prefix-current):
(tree-share-prefix-current): Use version number in tree, add
`current' symlinks.

* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
$(outdir)/%.ly $(outdir)/%.ps): dump sigs for normal files too.

* stepmake/aclocal.m4: robuster version detection.

robuster version detection.

* stepmake/aclocal.m4: revert version detection.

* buildscripts/output-distance.py
(ComparisonData.create_html_result_page): copy only if file
exists, fixup src paths.

* stepmake/bin/add-html-footer.py (built): junk gulp_file()

* stepmake/aclocal.m4: Robustification for (gcc) version detection.

* cygwin/postinstall-lilypond.sh: Do not fail if info docs aren't
available.  This should be moved to postinstall-lilypond-doc.

simplify local-WWW-post.
remove -type l from find.

simplify local-WWW-post.
remove -type l from find.

simplify local-WWW-post.

(ComparisonData.compare_trees):
fixes. Don't follow symlinks.
(ComparisonData.create_html_result_page): remove previous results.
insert ../python in path.

* buildscripts/output-distance.py (ComparisonData.compare_trees):
fixes. Don't follow symlinks.
(ComparisonData.create_html_result_page): remove previous results.

* scripts/lilypond-book.py (PREAMBLE_LY): spacing fixes.

* config.make.in (datadir): Add datarootdir to silence autoconf.

* stepmake/aclocal.m4: Update for autoconf-2.59d.

Fix some bugs in the dynamic engraver and PostScript backend

release commit

* lily/relocate.cc (read_relocation_dir): Do not blindly
dereference DIR.

replace THIS by PARSER

add lily/figured-bass-position-engraver.cc

* Documentation/index.html.in: add link to test-results.html page.

* Documentation/topdocs/NEWS.tely (Top): update NEWS entry.

(Top): update NEWS entry.

* scm/translation-functions.scm (format-bass-figure): translate
digits over 10 to the left

* scm/define-markup-commands.scm (translate-scaled): new markup.

* mf/feta-nummer-code.mf (code): overshoot the topright tip of the
7 glyph.

* ly/engraver-init.ly: add Figured_bass_engraver

* lily/engraver-group.cc (acknowledge_grobs): use start/stop drul.

* lily/figured-bass-engraver.cc (clear_spanners): use everywhere.

* lily/score-engraver.cc (announce_grob): only note START announces.

* lily/include/engraver-group.hh (Translator_group):
acknowledge_hash_table_ is now drul.

* lily/engraver.cc (announce_end_grob): new method.

* lily/include/grob-info.hh (class Grob_info): add start_end_ member.

* lily/translator-dispatch-list.cc (create): take start_end argument.

* lily/include/translator.hh (TRANSLATOR_DECLARATIONS): change
acknowledge_static_array_ to drul

* lily/include/translator.icc (ADD_END_ACKNOWLEDGER): new macro.

* scm/define-grob-interfaces.scm
(bass-figure-alignment-interface): add bass-figure-alignment-interface

* scm/define-grobs.scm (all-grob-descriptions): add
BassFigureAlignmentPositioning

* ly/Welcome-to-LilyPond-MacOS.ly: include in LilyPond, so version number
stays up to date. Backportme.

* Documentation/user/basic-notation.itely (Bar lines): Document
the "||:" bar type.

* Resurrect `scons lily' build.

* SConstruct (symlink_tree): Bugfix: link
music-drawing-routines.ps to file iso directory.

* lily/SConscript: Remove kpath-guile from LIBS.

* SConstruct (libdir_package_version): Typo.
(configure): Comment-out fontforge for lack of fontforge.pc .
Also add libdir* to environment.

Various small additions and editing, plus Spanish glossary update
from Francisco Vila.

(ComparisonData.create_html_result_page): new routine: summarise
results in HTML page with images.
(ComparisonData.create_text_result_page): create summary text files too.

*** empty log message ***

(ComparisonData.create_html_result_page): new routine: summarise
results in HTML page with images.

* GNUmakefile.in (web-ext): package .signature files too. They
compress well.

* GNUmakefile.in: create web-root/VERSION to help upload scripts.

* GNUmakefile.in: create web-signature-root/ too

* scm/stencil.scm (write-system-signature): typo.

* GNUmakefile.in: create web-root/VERSION to help upload scripts.

* scm/stencil.scm (write-system-signature): better escaping.
only write signature for music systems, not for markup systems.

* GNUmakefile.in: create web-signature-root/ too

* scm/stencil.scm (write-system-signature): better escaping.
only write signature for music systems, not for markup systems.

* GNUmakefile.in: create web-signature-root/ too

* scm/stencil.scm (write-system-signature): better escaping.

* scm/framework-ps.scm (output-framework): dump-signatures support
for plain output.

* GNUmakefile.in: create web-signature-root/ too

* make/lilypond-vars.make (LILYPOND_BOOK_FLAGS): add -ddump-signatures.

* scm/framework-ps.scm (write-preamble): redefine mark_URI to nop
for -dno-point-and-click

* scm/framework-ps.scm (write-preamble): redefine mark_URI to nop
for -dno-point-and-click

* lily/grob.cc (get_print_stencil): don't read
point_and_click_global to determine whether to set grob-cause.

*** empty log message ***

* lily/ledger-line-engraver.cc (acknowledge_staff_symbol): be more
careful with generating new LedgerLineSpanners.

* lily/ledger-line-spanner.cc (set_spacing_rods): suicide if no staff.

* buildscripts/output-distance.py (SystemLink.distance): new
file. Compare signatures.

* ly/engraver-init.ly: remove Ledger_line_engraver from Voice
context. This fixes double ledger lines in output.

* lily/system.cc (get_paper_system): remove 3 layer limit.

* buildscripts/output-distance.py (SystemLink.distance): new
file. Compare signatures.

* python/safeeval.py (SafeEval.visitUnarySub): new file.

* lily/grob-array.cc (remove_duplicates): rename from
uniq(). Sort before calling uniq() so it actually works.

(Lilypond_file_snippet.ly): strip
\version from lilypond file snippet.
(Lilypond_file_snippet.ly): oops. typo.
(find_toplevel_snippets): urgh. again.

(Lilypond_file_snippet.ly): strip
\version from lilypond file snippet.
(Lilypond_file_snippet.ly): oops. typo.

(Lilypond_file_snippet.ly): strip
\version from lilypond file snippet.

(get_paper_systems): uniq all_elements_ , to
prevent duplicated broken items in output.

* scm/framework-eps.scm (output-classic-framework): only dump if
dump-signatures is set.

* scm/lily.scm (define-scheme-options): add dump-signatures option.

(write-system-signature): new routine: write
python parseable signature of a separate paper system.

(process_music): use is_markup()
iso is_string().
include header.

(process_music): use is_markup()
iso is_string().

*** empty log message ***

STEPMAKE_PYTHON(): clear cached value since
arg 2 might point us to a new binary (patch by Karl Hammar)

(Top): trim explanation.

release commit

*** empty log message ***

*** empty log message ***

* input/no-notation/display-lily-tests.ly: fix \applyOutput
test. Add \break, \pageBreak, \pageTurn, etc, tests.

* scm/define-music-display-methods.scm: display methods for
breaks. Fix \applyOutput.