From 69f0ec479a6ade46d0a227755bb02562112c6743 Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 25 Jul 2009 15:44:39 +0200
Subject: [PATCH] Docs: reorganize documentation directory structure

* rename manuals by stripping "lilypond-" prefix from all source file names
  and HTML and PDF output (it is kept in Info output, where it is necessary),

* move manuals in Documentation/user one directory higher, in addition
  rename lilypond-program to application, and put .itely files in
  subdirectories,

* move Documentation/topdocs/NEWS.tely to Documentation,

* move Documentation/devel/contrib-guide.texi to
  Documentation/contributor.texi,

* move input/lsr/lilypond-snippets.tely to Documentation/, move the
  rest input/lsr to Documentation/snippets,

* move input/new to Documentation/snippets/new,

* move input/texidocs contents to
  Documentation/<language_codes>/texidocs, splitting texidocs by
  language,

* do the same changes in all translations when applicable,

* move Documentation/devel/index.html.in back to Documentation/deve.html.in.

'make all', 'make doc' and 'make dist' have been tested, although tons
of broken HTML and PDF links and Info cross-references are expected.

Maintenance makefiles (Documentation/GNUmakefile) and scripts
(scripts/auxiliar) are known to be broken, they will be updated in a
future commit.

TODO: Documentation/GNUmakefile is still a bit of a mess.
---
 .gitignore                                    |   3 +-
 Documentation/GNUmakefile                     | 241 +++++++++++++++---
 ...lilypond-program.tely => application.tely} |  24 +-
 Documentation/application/GNUmakefile         |   5 +
 .../{user => application}/converters.itely    |   2 +-
 .../{user => application}/install.itely       |   4 +-
 .../{user => application}/lilypond-book.itely |   2 +-
 .../{user => application}/running.itely       |   2 +-
 .../{user => application}/setup.itely         |   2 +-
 Documentation/{user => }/baer-flat-bw.png     | Bin
 Documentation/{user => }/baer-flat-gray.png   | Bin
 .../{topdocs/NEWS.tely => changes.tely}       |   8 +-
 Documentation/common-macros.itexi             |   3 +-
 Documentation/{user => }/context-example.eps  |   0
 .../contrib-guide.texi => contributor.texi}   |  28 +-
 Documentation/contributor/GNUmakefile         |   5 +
 .../compile.itexi}                            |   2 +-
 .../{devel => contributor}/compiling.itexi    |   0
 .../doc-translation-list.itexi                |   2 +-
 .../{devel => contributor}/doc-work.itexi     |   2 +-
 .../{devel => contributor}/git-starting.itexi |   0
 .../{devel => contributor}/issues.itexi       |   0
 .../{devel => contributor}/lsr-work.itexi     |   0
 .../programming-work.itexi                    |   0
 .../{devel => contributor}/regressions.itexi  |   0
 .../{devel => contributor}/release-work.itexi |   0
 .../{devel => contributor}/website-work.itexi |   0
 Documentation/de/GNUmakefile                  |   4 +-
 ...lilypond-program.tely => application.tely} |  20 +-
 Documentation/de/application/GNUmakefile      |   5 +
 .../de/{user => application}/converters.itely |   2 +-
 .../de/{user => application}/install.itely    |  10 +-
 .../{user => application}/lilypond-book.itely |   2 +-
 .../de/{user => application}/running.itely    |   2 +-
 .../de/{user => application}/setup.itely      |   2 +-
 Documentation/de/{user => }/dedication.itely  |   2 +-
 Documentation/de/index.html.in                |  42 +--
 .../lilypond-learning.tely => learning.tely}  |  24 +-
 Documentation/de/learning/GNUmakefile         |   5 +
 .../de/{user => learning}/fundamental.itely   |   2 +-
 .../de/{user => learning}/introduction.itely  |   2 +-
 .../de/{user => learning}/preface.itely       |   2 +-
 .../{user => learning}/scheme-tutorial.itely  |   2 +-
 .../de/{user => learning}/templates.itely     |   2 +-
 .../de/{user => learning}/tutorial.itely      |   2 +-
 .../de/{user => learning}/tweaks.itely        |   2 +-
 .../de/{user => learning}/working.itely       |   2 +-
 Documentation/de/{user => }/macros.itexi      |  60 ++---
 .../de/{user/lilypond.tely => notation.tely}  |  26 +-
 Documentation/de/notation/GNUmakefile         |   5 +
 .../de/{user => notation}/ancient.itely       |   2 +-
 .../changing-defaults.itely                   |   2 +-
 .../de/{user => notation}/cheatsheet.itely    |   2 +-
 .../de/{user => notation}/chords.itely        |   2 +-
 .../de/{user => notation}/editorial.itely     |   0
 .../de/{user => notation}/expressive.itely    |   0
 .../{user => notation}/fretted-strings.itely  |   2 +-
 .../de/{user => notation}/input.itely         |   2 +-
 .../de/{user => notation}/keyboards.itely     |   2 +-
 .../de/{user => notation}/literature.itely    |   2 +-
 .../notation-appendices.itely                 |   2 +-
 .../de/{user => notation}/notation.itely      |  16 +-
 .../de/{user => notation}/percussion.itely    |   2 +-
 .../de/{user => notation}/pitches.itely       |   0
 .../programming-interface.itely               |   2 +-
 .../de/{user => notation}/repeats.itely       |   0
 .../de/{user => notation}/rhythms.itely       |   0
 .../de/{user => notation}/simultaneous.itely  |   0
 .../de/{user => notation}/spacing.itely       |   2 +-
 .../de/{user => notation}/specialist.itely    |  18 +-
 .../de/{user => notation}/staff.itely         |   0
 .../de/{user => notation}/text.itely          |   2 +-
 .../unfretted-strings.itely                   |   2 +-
 .../de/{user => notation}/vocal.itely         |   0
 .../de/{user => notation}/wind.itely          |   2 +-
 .../de/{user => notation}/world.itely         |   2 +-
 .../de}/texidocs/GNUmakefile                  |   2 +-
 .../accordion-discant-symbols.texidoc         |   7 +
 .../texidocs/adding-ambitus-per-voice.texidoc |   7 -
 ...ng-bar-lines-to-chordnames-context.texidoc |   7 +
 ...olta-brackets-to-additional-staves.texidoc |  10 +
 ...itional-voices-to-avoid-collisions.texidoc |  10 -
 ...sting-the-shape-of-falls-and-doits.texidoc |   7 +
 .../de/texidocs/aligning-bar-numbers.texidoc  |  13 +
 ...arks-with-various-notation-objects.texidoc |  16 ++
 ...ngs-to-be-printed-inside-the-staff.texidoc |   7 +
 .../ambitus-with-multiple-voices.texidoc      |   9 -
 ...n-transcription-of-gregorian-music.texidoc |  10 +
 ...rn-transcription-of-mensural-music.texidoc |  14 +
 ...depending-on-the-step-of-the-scale.texidoc |  21 ++
 .../de/texidocs/arabic-improvisation.texidoc  |  12 +
 .../beam-endings-in-score-context.texidoc     |  10 +
 .../beam-grouping-in-7-8-time.texidoc         |  10 +
 .../texidocs/beams-across-line-breaks.texidoc |   9 +
 .../changing--flageolet-mark-size.texidoc     |   7 +
 .../texidocs/changing-beam-knee-gap.texidoc   |  14 +
 .../texidocs/changing-chord-separator.texidoc |   7 +
 ...anging-form-of-multi-measure-rests.texidoc |  11 +
 .../changing-partcombine-texts.texidoc        |   7 +
 ...d-spanner-styles-for-text-dynamics.texidoc |  11 +
 .../changing-the-breath-mark-symbol.texidoc   |   8 +
 ...itions-of-figured-bass-alterations.texidoc |   8 +
 ...the-tempo-without-a-metronome-mark.texidoc |   9 -
 ...ture-without-affecting-the-beaming.texidoc |  13 +
 .../changing-the-tuplet-number.texidoc        |  11 +
 .../de/texidocs/chord-name-exceptions.texidoc |   7 +
 .../de}/texidocs/chord-name-major7.texidoc    |   8 -
 .../chordchanges-for-fretboards.texidoc       |   9 -
 ...bining-two-parts-on-the-same-staff.texidoc |  19 ++
 .../texidocs/compound-time-signatures.texidoc |  12 +
 ...ting-signs,-measure-grouping-signs.texidoc |  17 ++
 .../texidocs/contemporary-glissando.texidoc   |   8 -
 ...-the-placement-of-chord-fingerings.texidoc |   6 +
 ...g-the-vertical-ordering-of-scripts.texidoc |  16 --
 .../texidocs/creating-a-delayed-turn.texidoc  |  11 +
 ...s-across-notes-in-different-voices.texidoc |   8 +
 ...s-staff-arpeggios-in-a-piano-staff.texidoc |   9 -
 ...-staff-arpeggios-in-other-contexts.texidoc |   9 +
 ...ing-metronome-marks-in-markup-mode.texidoc |   8 -
 ...ustomizing-fretboard-fret-diagrams.texidoc |  11 +
 .../customizing-markup-fret-diagrams.texidoc  |   9 +
 ...ms-on-the-center-line-of-the-staff.texidoc |   7 +
 ...d-fretboards-for-other-instruments.texidoc |  17 ++
 ...et-with-only-one-staff-in-a-system.texidoc |  13 +
 ...s-for-each-note-including-naturals.texidoc |  12 +
 .../texidocs/engraving-ties-manually.texidoc  |  12 +
 ...lets-using-only-one--times-command.texidoc |  16 ++
 ...cations,-and-right-hand-fingerings.texidoc |   7 +
 .../texidocs/flat-flags-and-beam-nibs.texidoc |  30 +++
 .../forcing-horizontal-shift-of-notes.texidoc |   8 +
 ...d-lines--changing-their-appearance.texidoc |   7 +
 .../de/texidocs/grouping-beats.texidoc        |   9 +
 .../de/texidocs/guitar-strum-rhythms.texidoc  |   9 +
 ...he-extender-line-for-text-dynamics.texidoc |   8 +
 ...staff-chords-with-arpeggio-bracket.texidoc |  12 +
 .../de}/texidocs/inserting-a-caesura.texidoc  |   9 -
 .../texidocs/isolated-percent-repeats.texidoc |   8 +
 .../de/texidocs/jazz-combo-template.texidoc   |  10 +
 .../de/texidocs/makam-example.texidoc         |  10 +
 ...-slurs-with-complex-dash-structure.texidoc |  19 ++
 ...taff-lines-thicker-than-the-others.texidoc |  11 -
 ...ayout-bar-lines-between-the-staves.texidoc |   9 +
 ...or-articulation-shorthand-notation.texidoc |  13 +
 .../multi-measure-rest-markup.texidoc         |  17 ++
 .../de}/texidocs/nesting-staves.texidoc       |  18 --
 .../non-default-tuplet-numbers.texidoc        |   9 +
 .../non-traditional-key-signatures.texidoc    |  22 ++
 .../de}/texidocs/ottava-text.texidoc          |  12 -
 .../percent-repeat-count-visibility.texidoc   |   6 +
 .../texidocs/percent-repeat-counter.texidoc   |   7 +
 ...-line-breaks-within-beamed-tuplets.texidoc |  11 +
 .../de/texidocs/piano-template-simple.texidoc |   6 +
 ...no-template-with-centered-dynamics.texidoc |   8 +
 ...iano-template-with-centered-lyrics.texidoc |   7 +
 ...no-template-with-melody-and-lyrics.texidoc |   8 +
 ...placement-of-right-hand-fingerings.texidoc |   8 +
 .../texidocs/polyphony-in-tablature.texidoc   |   7 +
 ...ng-grace-notes-with-floating-space.texidoc |  12 +
 .../positioning-multi-measure-rests.texidoc   |  12 +
 ...itioning-text-markups-inside-slurs.texidoc |   7 +
 ...als-from-being-automatically-added.texidoc |  10 +
 ...ted-when-the-key-signature-changes.texidoc |   9 +
 ...t-sign-at-the-beginning-of-a-piece.texidoc |   7 +
 ...g-bar-numbers-at-regular-intervals.texidoc |  11 +
 ...ar-numbers-inside-boxes-or-circles.texidoc |   8 +
 ...-hairpins-using-al-niente-notation.texidoc |   9 -
 ...ks-at-the-end-of-a-line-or-a-score.texidoc |  14 -
 .../printing-marks-on-every-staff.texidoc     |   7 +
 ...nd-rehearsal-marks-below-the-staff.texidoc |   8 +
 ...e-bar-number-for-the-first-measure.texidoc |  13 +
 ...g-another-voice-with-transposition.texidoc |  10 +
 .../de/texidocs/quoting-another-voice.texidoc |  13 +
 ...efining-grace-note-global-defaults.texidoc |  14 +
 .../removing-bar-numbers-from-a-score.texidoc |  10 +
 .../removing-the-first-empty-line.texidoc     |  15 ++
 Documentation/de/texidocs/rest-styles.texidoc |   8 +
 .../reverting-default-beam-endings.texidoc    |  10 +
 ...ting-hairpin-behavior-at-bar-lines.texidoc |   8 +
 ...ing-the-minimum-length-of-hairpins.texidoc |   9 -
 .../shortening-volta-brackets.texidoc         |   9 +
 .../showing-chords-at-changes.texidoc         |   8 -
 .../de/texidocs/simple-lead-sheet.texidoc     |   6 +
 ...ate-with-notes,-lyrics,-and-chords.texidoc |   8 +
 ...aff-template-with-notes-and-chords.texidoc |   8 +
 ...aff-template-with-notes-and-lyrics.texidoc |  13 +
 ...gle-staff-template-with-only-notes.texidoc |  10 +
 ...-pizzicato-markup-bartok-pizzicato.texidoc |  11 +
 ...ecifying-context-with-beatgrouping.texidoc |  11 +
 .../stand-alone-two-column-markup.texidoc     |   7 +
 ...tem-and-beam-behavior-in-tablature.texidoc |   8 +
 .../string-quartet-template-simple.texidoc    |   9 +
 ...artet-template-with-separate-parts.texidoc |  19 ++
 .../de/texidocs/sub-dividing-beams.texidoc    |  14 +
 ...inimum-accidentals-smart-transpose.texidoc |  31 ---
 .../texidocs/tweaking-clef-properties.texidoc |  35 ---
 ...tweaking-grace-layout-within-music.texidoc |  12 +
 ...cket-at-the-start-of-a-staff-group.texidoc |   9 -
 .../using-beatlength-and-beatgrouping.texidoc |  13 +
 ...ing-double-slurs-for-legato-chords.texidoc |   8 -
 .../using-ties-with-arpeggios.texidoc         |  12 +
 ...y-aligned-dynamics-and-textscripts.texidoc |  14 +
 ...tically-aligning-ossias-and-lyrics.texidoc |   8 +
 ...ate-with-automatic-piano-reduction.texidoc |   9 +
 ...aligned-below-and-above-the-staves.texidoc |   9 +
 .../texidocs/vocal-ensemble-template.texidoc  |  10 +
 .../de/texidocs/volta-below-chords.texidoc    |   8 +
 Documentation/de/user/GNUmakefile             |   4 -
 Documentation/de/user/compile.itely           |  91 -------
 Documentation/{user => }/dedication.itely     |   2 +-
 .../{devel/index.html.in => devel.html.in}    |  18 +-
 Documentation/devel/GNUmakefile               |  39 ---
 Documentation/es/GNUmakefile                  |   4 +-
 ...lilypond-program.tely => application.tely} |  18 +-
 Documentation/es/application/GNUmakefile      |   5 +
 .../es/{user => application}/converters.itely |   2 +-
 .../es/{user => application}/install.itely    |   7 +-
 .../{user => application}/lilypond-book.itely |   2 +-
 .../es/{user => application}/running.itely    |   2 +-
 .../es/{user => application}/setup.itely      |   2 +-
 .../es/{topdocs/NEWS.tely => changes.tely}    |   3 +-
 Documentation/es/{user => }/dedication.itely  |   2 +-
 Documentation/es/index.html.in                |  38 +--
 .../lilypond-learning.tely => learning.tely}  |  24 +-
 Documentation/es/learning/GNUmakefile         |   5 +
 .../es/{user => learning}/fundamental.itely   |   2 +-
 .../es/{user => learning}/introduction.itely  |   2 +-
 .../es/{user => learning}/preface.itely       |   2 +-
 .../{user => learning}/scheme-tutorial.itely  |   2 +-
 .../es/{user => learning}/templates.itely     |   2 +-
 .../es/{user => learning}/tutorial.itely      |   2 +-
 .../es/{user => learning}/tweaks.itely        |   2 +-
 .../es/{user => learning}/working.itely       |   2 +-
 Documentation/es/{user => }/macros.itexi      |  60 ++---
 .../es/{user/lilypond.tely => notation.tely}  |  27 +-
 Documentation/es/notation/GNUmakefile         |   5 +
 .../es/{user => notation}/ancient.itely       |   2 +-
 .../changing-defaults.itely                   |   2 +-
 .../es/{user => notation}/cheatsheet.itely    |   2 +-
 .../es/{user => notation}/chords.itely        |   2 +-
 .../es/{user => notation}/editorial.itely     |   0
 .../es/{user => notation}/expressive.itely    |   0
 .../{user => notation}/fretted-strings.itely  |   2 +-
 .../es/{user => notation}/input.itely         |   2 +-
 .../es/{user => notation}/keyboards.itely     |   2 +-
 .../es/{user => notation}/literature.itely    |   2 +-
 .../notation-appendices.itely                 |   2 +-
 .../es/{user => notation}/notation.itely      |  16 +-
 .../es/{user => notation}/percussion.itely    |   2 +-
 .../es/{user => notation}/pitches.itely       |   0
 .../programming-interface.itely               |   2 +-
 .../es/{user => notation}/repeats.itely       |   0
 .../es/{user => notation}/rhythms.itely       |   0
 .../es/{user => notation}/simultaneous.itely  |   0
 .../es/{user => notation}/spacing.itely       |   2 +-
 .../es/{user => notation}/specialist.itely    |  18 +-
 .../es/{user => notation}/staff.itely         |   0
 .../es/{user => notation}/text.itely          |   0
 .../unfretted-strings.itely                   |   2 +-
 .../es/{user => notation}/vocal.itely         |   2 +-
 .../es/{user => notation}/wind.itely          |   2 +-
 .../es/{user => notation}/world.itely         |   2 +-
 Documentation/es/texidocs/GNUmakefile         |   5 +
 .../accordion-discant-symbols.texidoc         |   7 -
 ...ured-bass-above-or-below-the-notes.texidoc |   2 -
 .../texidocs/adding-ambitus-per-voice.texidoc |   7 +
 ...ing-an-extra-staff-at-a-line-break.texidoc |   0
 .../texidocs/adding-an-extra-staff.texidoc    |   0
 ...ng-bar-lines-to-chordnames-context.texidoc |   7 -
 ...sing-tuplet-and-non-tuplet-rhythms.texidoc |   0
 .../es/texidocs/adding-drum-parts.texidoc     |  13 +
 ...an-expressive-mark-or-chordal-note.texidoc |   0
 ...adding-the-current-date-to-a-score.texidoc |   7 +
 ...olta-brackets-to-additional-staves.texidoc |  10 -
 ...itional-voices-to-avoid-collisions.texidoc |  10 +
 .../adjusting-lyrics-vertical-spacing.texidoc |   8 -
 ...sting-the-shape-of-falls-and-doits.texidoc |   7 -
 ...ing-and-centering-instrument-names.texidoc |   0
 .../es/texidocs/aligning-bar-numbers.texidoc  |  14 +
 ...arks-with-various-notation-objects.texidoc |  16 --
 ...ngs-to-be-printed-inside-the-staff.texidoc |   9 +
 .../ambitus-with-multiple-voices.texidoc      |   9 +
 .../analysis-brackets-above-the-staff.texidoc |   0
 .../es}/texidocs/ancient-fonts.texidoc        |   7 -
 ...n-transcription-of-gregorian-music.texidoc |  10 -
 ...rn-transcription-of-mensural-music.texidoc |  15 ++
 .../texidocs/ancient-time-signatures.texidoc  |   0
 ...depending-on-the-step-of-the-scale.texidoc |  21 --
 .../es}/texidocs/arabic-improvisation.texidoc |  12 -
 .../automatic-beam-subdivisions.texidoc       |   0
 ...r-two-in-4-4-or-2-2-time-signature.texidoc |  11 +
 .../beam-endings-in-score-context.texidoc     |  10 +
 .../beam-grouping-in-7-8-time.texidoc         |  11 +
 .../texidocs/beams-across-line-breaks.texidoc |   9 +
 ...-lines-using-the--whiteout-command.texidoc |   0
 .../texidocs/broken-crescendo-hairpin.texidoc |   0
 .../caesura-railtracks-with-fermata.texidoc   |   0
 ...center-text-below-hairpin-dynamics.texidoc |   0
 .../changing--flageolet-mark-size.texidoc     |   8 +
 ...ing-a-single-notes-size-in-a-chord.texidoc |   0
 .../texidocs/changing-beam-knee-gap.texidoc   |  14 +
 .../texidocs/changing-chord-separator.texidoc |   7 -
 ...anging-form-of-multi-measure-rests.texidoc |  11 +
 ...di-output-to-one-channel-per-voice.texidoc |   0
 .../changing-partcombine-texts.texidoc        |   7 -
 ...d-spanner-styles-for-text-dynamics.texidoc |  11 -
 ...lur-from-solid-to-dotted-or-dashed.texidoc |   0
 .../changing-the-breath-mark-symbol.texidoc   |   8 -
 ...-to-german-or-semi-german-notation.texidoc |   0
 ...itions-of-figured-bass-alterations.texidoc |   8 -
 ...the-tempo-without-a-metronome-mark.texidoc |   9 +
 ...ture-without-affecting-the-beaming.texidoc |  13 +
 .../changing-the-tuplet-number.texidoc        |  12 +
 ...tric-section-using--scaledurations.texidoc |   0
 .../texidocs/chant-or-psalms-notation.texidoc |   0
 .../texidocs/chord-name-exceptions.texidoc    |   7 -
 .../es/texidocs/chord-name-major7.texidoc     |   8 +
 .../chordchanges-for-fretboards.texidoc       |   9 +
 .../es}/texidocs/clusters.texidoc             |   0
 ...mbining-dynamics-with-markup-texts.texidoc |   0
 ...bining-two-parts-on-the-same-staff.texidoc |  19 --
 .../texidocs/compound-time-signatures.texidoc |  14 +
 ...ting-signs,-measure-grouping-signs.texidoc |  17 ++
 .../texidocs/contemporary-glissando.texidoc   |   8 +
 ...-the-placement-of-chord-fingerings.texidoc |   8 +
 ...g-the-vertical-ordering-of-scripts.texidoc |  16 ++
 .../texidocs/creating-a-delayed-turn.texidoc  |  11 -
 ...quence-of-notes-on-various-pitches.texidoc |   0
 ...s-across-notes-in-different-voices.texidoc |   8 -
 .../texidocs/creating-blank-staves.texidoc    |   0
 ...s-staff-arpeggios-in-a-piano-staff.texidoc |   9 +
 ...-staff-arpeggios-in-other-contexts.texidoc |   9 -
 ...ing-metronome-marks-in-markup-mode.texidoc |   8 +
 ...eating-real-parenthesized-dynamics.texidoc |   0
 ...ating-simultaneous-rehearsal-marks.texidoc |   0
 .../creating-slurs-across-voices.texidoc      |   0
 .../texidocs/creating-text-spanners.texidoc   |   0
 .../es}/texidocs/custodes.texidoc             |   0
 ...ustomizing-fretboard-fret-diagrams.texidoc |  11 -
 .../customizing-markup-fret-diagrams.texidoc  |  10 +
 ...ms-on-the-center-line-of-the-staff.texidoc |   7 -
 ...d-fretboards-for-other-instruments.texidoc |  19 ++
 ...et-with-only-one-staff-in-a-system.texidoc |  13 -
 ...s-for-each-note-including-naturals.texidoc |  12 -
 ...tive-postscript-in-a--markup-block.texidoc |   0
 .../es}/texidocs/engravers-one-by-one.texidoc |   0
 .../texidocs/engraving-ties-manually.texidoc  |  11 +
 ...lets-using-only-one--times-command.texidoc |  18 ++
 ...cations,-and-right-hand-fingerings.texidoc |   9 +
 .../texidocs/flat-flags-and-beam-nibs.texidoc |  35 +++
 .../forcing-horizontal-shift-of-notes.texidoc |   8 -
 .../texidocs/generating-random-notes.texidoc  |   0
 ...d-lines--changing-their-appearance.texidoc |   7 -
 ...-rhythms-and-notes-synchronization.texidoc |   0
 .../es/texidocs/grouping-beats.texidoc        |   8 +
 .../es/texidocs/guitar-strum-rhythms.texidoc  |   8 +
 ...he-extender-line-for-text-dynamics.texidoc |   8 -
 .../es}/texidocs/incipit.texidoc              |   0
 ...staff-chords-with-arpeggio-bracket.texidoc |  12 -
 .../es/texidocs/inserting-a-caesura.texidoc   |   9 +
 .../texidocs/isolated-percent-repeats.texidoc |   8 -
 .../es}/texidocs/jazz-combo-template.texidoc  |  10 -
 .../es}/texidocs/line-arrows.texidoc          |   0
 .../es}/texidocs/lyrics-alignment.texidoc     |   0
 .../es}/texidocs/makam-example.texidoc        |  10 -
 ...-slurs-with-complex-dash-structure.texidoc |  19 --
 ...taff-lines-thicker-than-the-others.texidoc |  11 +
 .../es}/texidocs/measure-counter.texidoc      |   0
 ...ayout-bar-lines-between-the-staves.texidoc |   9 -
 ...or-articulation-shorthand-notation.texidoc |  13 -
 .../multi-measure-rest-markup.texidoc         |  19 ++
 .../es/texidocs/nesting-staves.texidoc        |  18 ++
 .../non-default-tuplet-numbers.texidoc        |  11 +
 .../non-traditional-key-signatures.texidoc    |  22 --
 ...rchestra,-choir-and-piano-template.texidoc |   0
 Documentation/es/texidocs/ottava-text.texidoc |  12 +
 .../percent-repeat-count-visibility.texidoc   |   6 -
 .../texidocs/percent-repeat-counter.texidoc   |   7 -
 ...-line-breaks-within-beamed-tuplets.texidoc |  10 +
 .../texidocs/piano-template-simple.texidoc    |   6 -
 ...no-template-with-centered-dynamics.texidoc |  10 +
 ...iano-template-with-centered-lyrics.texidoc |   8 +
 ...no-template-with-melody-and-lyrics.texidoc |   8 +
 ...placement-of-right-hand-fingerings.texidoc |   9 +
 .../texidocs/polyphony-in-tablature.texidoc   |   8 +
 ...ng-grace-notes-with-floating-space.texidoc |  15 ++
 .../positioning-multi-measure-rests.texidoc   |  13 +
 ...itioning-text-markups-inside-slurs.texidoc |   7 -
 ...als-from-being-automatically-added.texidoc |  13 +
 ...ted-when-the-key-signature-changes.texidoc |   9 -
 ...t-sign-at-the-beginning-of-a-piece.texidoc |   7 -
 ...g-bar-numbers-at-regular-intervals.texidoc |  13 +
 ...ar-numbers-inside-boxes-or-circles.texidoc |   9 +
 ...-hairpins-using-al-niente-notation.texidoc |   9 +
 ...ks-at-the-end-of-a-line-or-a-score.texidoc |  14 +
 .../printing-marks-on-every-staff.texidoc     |   7 -
 ...nd-rehearsal-marks-below-the-staff.texidoc |   8 -
 ...e-bar-number-for-the-first-measure.texidoc |  15 ++
 ...g-another-voice-with-transposition.texidoc |  10 -
 .../texidocs/quoting-another-voice.texidoc    |  13 -
 ...efining-grace-note-global-defaults.texidoc |  16 ++
 .../removing-bar-numbers-from-a-score.texidoc |  11 +
 .../removing-the-first-empty-line.texidoc     |  15 --
 Documentation/es/texidocs/rest-styles.texidoc |   5 +
 .../reverting-default-beam-endings.texidoc    |  11 +
 .../es}/texidocs/script-chart.texidoc         |   0
 ...ting-hairpin-behavior-at-bar-lines.texidoc |   8 -
 ...ing-the-minimum-length-of-hairpins.texidoc |   9 +
 .../shortening-volta-brackets.texidoc         |   9 -
 .../showing-chords-at-changes.texidoc         |   8 +
 .../es}/texidocs/simple-lead-sheet.texidoc    |   6 -
 ...ate-with-notes,-lyrics,-and-chords.texidoc |   8 +
 ...th-notes,-lyrics,-chords-and-frets.texidoc |   0
 ...aff-template-with-notes-and-chords.texidoc |   9 +
 ...aff-template-with-notes-and-lyrics.texidoc |  11 +
 ...gle-staff-template-with-only-notes.texidoc |   9 +
 ...-pizzicato-markup-bartok-pizzicato.texidoc |  11 -
 ...ecifying-context-with-beatgrouping.texidoc |  12 +
 .../stand-alone-two-column-markup.texidoc     |   7 -
 ...tem-and-beam-behavior-in-tablature.texidoc |   9 +
 .../string-quartet-template-simple.texidoc    |   8 +
 ...artet-template-with-separate-parts.texidoc |  21 ++
 .../es/texidocs/sub-dividing-beams.texidoc    |  20 ++
 ...tion-of-ancient-music-with-incipit.texidoc |   0
 ...inimum-accidentals-smart-transpose.texidoc |  31 +++
 .../texidocs/tweaking-clef-properties.texidoc |  35 +++
 ...tweaking-grace-layout-within-music.texidoc |  16 ++
 ...cket-at-the-start-of-a-staff-group.texidoc |   9 +
 .../using-beatlength-and-beatgrouping.texidoc |  13 +
 ...ing-double-slurs-for-legato-chords.texidoc |   8 +
 ...ace-note-slashes-with-normal-heads.texidoc |   8 -
 .../using-ties-with-arpeggios.texidoc         |  12 +
 ...y-aligned-dynamics-and-textscripts.texidoc |  14 -
 ...ing-dynamics-across-multiple-notes.texidoc |   0
 ...tically-aligning-ossias-and-lyrics.texidoc |   8 -
 ...ate-with-automatic-piano-reduction.texidoc |  12 +
 ...aligned-below-and-above-the-staves.texidoc |  10 +
 .../texidocs/vocal-ensemble-template.texidoc  |  11 +
 .../es}/texidocs/volta-below-chords.texidoc   |   8 -
 Documentation/es/topdocs/GNUmakefile          |   8 -
 Documentation/es/user/GNUmakefile             |   4 -
 Documentation/{user => }/fdl.itexi            |   0
 Documentation/fr/GNUmakefile                  |   4 +-
 ...lilypond-program.tely => application.tely} |  18 +-
 Documentation/fr/application/GNUmakefile      |   5 +
 .../fr/{user => application}/converters.itely |   2 +-
 .../fr/{user => application}/install.itely    |   2 +-
 .../{user => application}/lilypond-book.itely |   2 +-
 .../fr/{user => application}/running.itely    |   2 +-
 .../fr/{user => application}/setup.itely      |   2 +-
 Documentation/fr/{user => }/dedication.itely  |   2 +-
 Documentation/fr/index.html.in                |  40 +--
 .../lilypond-learning.tely => learning.tely}  |  24 +-
 Documentation/fr/learning/GNUmakefile         |   5 +
 .../fr/{user => learning}/fundamental.itely   |   2 +-
 .../fr/{user => learning}/introduction.itely  |   2 +-
 .../fr/{user => learning}/preface.itely       |   2 +-
 .../{user => learning}/scheme-tutorial.itely  |   2 +-
 .../fr/{user => learning}/templates.itely     |   2 +-
 .../fr/{user => learning}/tutorial.itely      |   2 +-
 .../fr/{user => learning}/tweaks.itely        |   2 +-
 .../fr/{user => learning}/working.itely       |   2 +-
 Documentation/fr/{user => }/macros.itexi      |  60 ++---
 .../fr/{user/lilypond.tely => notation.tely}  |  26 +-
 Documentation/fr/notation/GNUmakefile         |   5 +
 .../fr/{user => notation}/ancient.itely       |   2 +-
 .../changing-defaults.itely                   |   2 +-
 .../fr/{user => notation}/cheatsheet.itely    |   2 +-
 .../fr/{user => notation}/chords.itely        |   2 +-
 .../fr/{user => notation}/editorial.itely     |   0
 .../fr/{user => notation}/expressive.itely    |   0
 .../{user => notation}/fretted-strings.itely  |   2 +-
 .../fr/{user => notation}/input.itely         |   2 +-
 .../fr/{user => notation}/keyboards.itely     |   2 +-
 .../fr/{user => notation}/literature.itely    |   2 +-
 .../notation-appendices.itely                 |   2 +-
 .../fr/{user => notation}/notation.itely      |  16 +-
 .../fr/{user => notation}/percussion.itely    |   2 +-
 .../fr/{user => notation}/pitches.itely       |   0
 .../programming-interface.itely               |   2 +-
 .../fr/{user => notation}/repeats.itely       |   0
 .../fr/{user => notation}/rhythms.itely       |   0
 .../fr/{user => notation}/simultaneous.itely  |   0
 .../fr/{user => notation}/spacing.itely       |   2 +-
 .../fr/{user => notation}/specialist.itely    |  18 +-
 .../fr/{user => notation}/staff.itely         |   0
 .../fr/{user => notation}/text.itely          |   0
 .../unfretted-strings.itely                   |   2 +-
 .../fr/{user => notation}/vocal.itely         |   2 +-
 .../fr/{user => notation}/wind.itely          |   2 +-
 .../fr/{user => notation}/world.itely         |   2 +-
 Documentation/fr/texidocs/GNUmakefile         |   5 +
 ...ured-bass-above-or-below-the-notes.texidoc |   2 +
 .../fr}/texidocs/adding-drum-parts.texidoc    |  13 -
 .../adding-fingerings-to-tablatures.texidoc   |   0
 ...adding-the-current-date-to-a-score.texidoc |   7 -
 .../adjusting-lyrics-vertical-spacing.texidoc |   8 +
 .../fr/texidocs/aligning-bar-numbers.texidoc  |   9 +
 ...ngs-to-be-printed-inside-the-staff.texidoc |   7 +
 .../fr/texidocs/ancient-fonts.texidoc         |   7 +
 ...rn-transcription-of-mensural-music.texidoc |  13 +
 ...r-two-in-4-4-or-2-2-time-signature.texidoc |  11 -
 .../beam-endings-in-score-context.texidoc     |   8 +
 .../beam-grouping-in-7-8-time.texidoc         |   9 +
 .../texidocs/beams-across-line-breaks.texidoc |   8 +
 .../changing--flageolet-mark-size.texidoc     |   9 +
 .../texidocs/changing-beam-knee-gap.texidoc   |  11 +
 ...anging-form-of-multi-measure-rests.texidoc |   9 +
 ...ture-without-affecting-the-beaming.texidoc |  12 +
 .../changing-the-tuplet-number.texidoc        |  10 +
 .../texidocs/compound-time-signatures.texidoc |  10 +
 ...ting-signs,-measure-grouping-signs.texidoc |  15 ++
 ...-the-placement-of-chord-fingerings.texidoc |   8 +
 .../customizing-markup-fret-diagrams.texidoc  |  12 +
 ...d-fretboards-for-other-instruments.texidoc |  18 ++
 .../texidocs/engraving-ties-manually.texidoc  |   9 +
 ...lets-using-only-one--times-command.texidoc |  13 +
 ...cations,-and-right-hand-fingerings.texidoc |   9 +
 .../texidocs/flat-flags-and-beam-nibs.texidoc |  30 +++
 .../fr/texidocs/grouping-beats.texidoc        |   7 +
 .../fr/texidocs/guitar-strum-rhythms.texidoc  |   8 +
 .../multi-measure-rest-markup.texidoc         |  15 ++
 .../non-default-tuplet-numbers.texidoc        |   8 +
 ...-line-breaks-within-beamed-tuplets.texidoc |   8 +
 ...placement-of-right-hand-fingerings.texidoc |  10 +
 .../texidocs/polyphony-in-tablature.texidoc   |   9 +
 ...ng-grace-notes-with-floating-space.texidoc |  10 +
 .../positioning-multi-measure-rests.texidoc   |  10 +
 ...als-from-being-automatically-added.texidoc |   8 +
 ...g-bar-numbers-at-regular-intervals.texidoc |   9 +
 ...ar-numbers-inside-boxes-or-circles.texidoc |   6 +
 ...e-bar-number-for-the-first-measure.texidoc |  12 +
 ...efining-grace-note-global-defaults.texidoc |  10 +
 .../removing-bar-numbers-from-a-score.texidoc |   9 +
 Documentation/fr/texidocs/rest-styles.texidoc |   6 +
 .../reverting-default-beam-endings.texidoc    |   8 +
 ...ecifying-context-with-beatgrouping.texidoc |  10 +
 ...tem-and-beam-behavior-in-tablature.texidoc |  10 +
 .../fr/texidocs/sub-dividing-beams.texidoc    |  16 ++
 ...tweaking-grace-layout-within-music.texidoc |  11 +
 .../using-beatlength-and-beatgrouping.texidoc |  10 +
 ...ace-note-slashes-with-normal-heads.texidoc |   8 +
 ...-generate-special-note-head-shapes.texidoc |   0
 .../using-ties-with-arpeggios.texidoc         |   9 +
 Documentation/fr/user/GNUmakefile             |   4 -
 Documentation/{user => }/henle-flat-bw.png    | Bin
 Documentation/{user => }/henle-flat-gray.png  | Bin
 Documentation/index.html.in                   |  38 +--
 Documentation/ja/GNUmakefile                  |   4 +-
 ...lilypond-program.tely => application.tely} |  18 +-
 Documentation/ja/application/GNUmakefile      |   5 +
 .../ja/{user => application}/converters.itely |   2 +-
 .../ja/{user => application}/install.itely    |   2 +-
 .../{user => application}/lilypond-book.itely |   2 +-
 .../ja/{user => application}/running.itely    |   2 +-
 .../ja/{user => application}/setup.itely      |   2 +-
 Documentation/ja/{user => }/dedication.itely  |   2 +-
 Documentation/ja/index.html.in                |  39 ++-
 .../lilypond-learning.tely => learning.tely}  |  26 +-
 Documentation/ja/learning/GNUmakefile         |   5 +
 .../ja/{user => learning}/fundamental.itely   |   2 +-
 .../ja/{user => learning}/introduction.itely  |   2 +-
 .../ja/{user => learning}/preface.itely       |   2 +-
 .../{user => learning}/scheme-tutorial.itely  |   2 +-
 .../ja/{user => learning}/templates.itely     |   2 +-
 .../ja/{user => learning}/tutorial.itely      |   2 +-
 .../ja/{user => learning}/tweaks.itely        |   2 +-
 .../ja/{user => learning}/working.itely       |   2 +-
 Documentation/ja/{user => }/macros.itexi      |  60 ++---
 Documentation/ja/texidocs/GNUmakefile         |   5 +
 ...no-template-with-centered-dynamics.texidoc |   6 +
 ...iano-template-with-centered-lyrics.texidoc |   4 +
 ...no-template-with-melody-and-lyrics.texidoc |   4 +
 ...ate-with-notes,-lyrics,-and-chords.texidoc |   4 +
 ...aff-template-with-notes-and-chords.texidoc |   4 +
 ...aff-template-with-notes-and-lyrics.texidoc |   8 +
 ...gle-staff-template-with-only-notes.texidoc |   6 +
 .../string-quartet-template-simple.texidoc    |   5 +
 ...artet-template-with-separate-parts.texidoc |  14 +
 ...ate-with-automatic-piano-reduction.texidoc |   7 +
 ...aligned-below-and-above-the-staves.texidoc |   5 +
 .../texidocs/vocal-ensemble-template.texidoc  |   6 +
 Documentation/ja/user/GNUmakefile             |   7 -
 Documentation/{user => }/latex-example.latex  |   0
 .../{user => }/latex-lilypond-example.latex   |   0
 .../lilypond-learning.tely => learning.tely}  |  24 +-
 Documentation/learning/GNUmakefile            |   5 +
 .../{user => learning}/fundamental.itely      |   2 +-
 .../{user => learning}/introduction.itely     |   2 +-
 .../{user => learning}/preface.itely          |   2 +-
 .../{user => learning}/scheme-tutorial.itely  |   2 +-
 .../{user => learning}/templates.itely        |   2 +-
 .../{user => learning}/tutorial.itely         |   2 +-
 Documentation/{user => learning}/tweaks.itely |   2 +-
 .../{user => learning}/working.itely          |   2 +-
 Documentation/{user => }/lily-flat-bw.png     | Bin
 Documentation/macros.itexi                    | 114 +++++++--
 Documentation/misc/GNUmakefile                |   2 +-
 Documentation/{user => }/music-glossary.tely  |  10 +-
 .../{user/lilypond.tely => notation.tely}     |  47 ++--
 Documentation/notation/GNUmakefile            |   5 +
 .../{user => notation}/ancient.itely          |   0
 .../changing-defaults.itely                   |   2 +-
 .../{user => notation}/cheatsheet.itely       |   2 +-
 Documentation/{user => notation}/chords.itely |   0
 .../{user => notation}/editorial.itely        |   0
 .../{user => notation}/expressive.itely       |   0
 .../{user => notation}/fretted-strings.itely  |   0
 Documentation/{user => notation}/input.itely  |   2 +-
 .../{user => notation}/keyboards.itely        |   0
 .../{user => notation}/literature.itely       |   2 +-
 .../notation-appendices.itely                 |   2 +-
 .../{user => notation}/notation.itely         |  16 +-
 .../{user => notation}/percussion.itely       |   0
 .../{user => notation}/pitches.itely          |   0
 .../programming-interface.itely               |   2 +-
 .../{user => notation}/repeats.itely          |   0
 .../{user => notation}/rhythms.itely          |   0
 .../{user => notation}/simultaneous.itely     |   0
 .../{user => notation}/spacing.itely          |   2 +-
 .../{user => notation}/specialist.itely       |  18 +-
 Documentation/{user => notation}/staff.itely  |   0
 Documentation/{user => notation}/text.itely   |   0
 .../unfretted-strings.itely                   |   0
 Documentation/{user => notation}/vocal.itely  |   0
 Documentation/{user => notation}/wind.itely   |   0
 Documentation/{user => notation}/world.itely  |   0
 Documentation/po/GNUmakefile                  |   4 +
 .../snippets.tely                             |  74 +-----
 Documentation/snippets/GNUmakefile            |   7 +
 {input/lsr => Documentation/snippets}/README  |   0
 .../snippets}/accordion-discant-symbols.ly    |   0
 ...a-figured-bass-above-or-below-the-notes.ly |   0
 .../snippets}/adding-ambitus-per-voice.ly     |   0
 .../adding-an-extra-staff-at-a-line-break.ly  |   0
 .../snippets}/adding-an-extra-staff.ly        |   0
 .../adding-bar-lines-to-chordnames-context.ly |   0
 ...hen-using-tuplet-and-non-tuplet-rhythms.ly |   0
 .../snippets}/adding-drum-parts.ly            |   0
 .../snippets}/adding-fingerings-to-a-score.ly |   0
 .../adding-fingerings-to-tablatures.ly        |   0
 ...ound-an-expressive-mark-or-chordal-note.ly |   0
 .../adding-the-current-date-to-a-score.ly     |   0
 ...ing-volta-brackets-to-additional-staves.ly |   0
 .../additional-voices-to-avoid-collisions.ly  |   0
 .../adjusting-lyrics-vertical-spacing.ly      |   0
 .../adjusting-the-shape-of-falls-and-doits.ly |   0
 ...aligning-and-centering-instrument-names.ly |   0
 .../snippets}/aligning-bar-numbers.ly         |   0
 ...ing-marks-with-various-notation-objects.ly |   0
 ...-objects-created-with-the--mark-command.ly |   0
 ...ngerings-to-be-printed-inside-the-staff.ly |   0
 .../snippets}/ambitus-with-multiple-voices.ly |   0
 .../lsr => Documentation/snippets}/ambitus.ly |   0
 .../analysis-brackets-above-the-staff.ly      |   0
 .../snippets}/ancient-fonts.ly                |   0
 .../snippets}/ancient-notation-intro.itely    |   0
 ...modern-transcription-of-gregorian-music.ly |   0
 ...-modern-transcription-of-mensural-music.ly |   0
 .../snippets}/ancient-notation.snippet-list   |   0
 .../snippets}/ancient-time-signatures.ly      |   0
 ...yles-depending-on-the-step-of-the-scale.ly |   0
 .../snippets}/arabic-improvisation.ly         |   0
 .../snippets}/automatic-beam-subdivisions.ly  |   0
 ...wo-per-two-in-4-4-or-2-2-time-signature.ly |   0
 ...oiding-collisions-with-chord-fingerings.ly |   0
 .../beam-endings-in-score-context.ly          |   0
 .../snippets}/beam-grouping-in-7-8-time.ly    |   0
 .../snippets}/beams-across-line-breaks.ly     |   0
 ...staff-lines-using-the--whiteout-command.ly |   0
 .../snippets}/book-parts.ly                   |   0
 .../snippets}/breaks.snippet-list             |   0
 .../snippets}/breathing-signs.ly              |   0
 .../snippets}/broken-crescendo-hairpin.ly     |   0
 .../caesura-railtracks-with-fermata.ly        |   0
 .../center-text-below-hairpin-dynamics.ly     |   0
 .../changing--flageolet-mark-size.ly          |   0
 ...changing-a-single-notes-size-in-a-chord.ly |   0
 .../snippets}/changing-beam-knee-gap.ly       |   0
 .../snippets}/changing-chord-separator.ly     |   0
 .../changing-form-of-multi-measure-rests.ly   |   0
 ...ng-midi-output-to-one-channel-per-voice.ly |   0
 .../snippets}/changing-partcombine-texts.ly   |   0
 ...hanging-properties-for-individual-grobs.ly |   0
 .../snippets}/changing-stanza-fonts.ly        |   0
 ...xt-and-spanner-styles-for-text-dynamics.ly |   0
 ...f-a-slur-from-solid-to-dotted-or-dashed.ly |   0
 .../changing-the-breath-mark-symbol.ly        |   0
 ...names-to-german-or-semi-german-notation.ly |   0
 .../changing-the-default-text-font-family.ly  |   0
 ...changing-the-number-of-lines-in-a-staff.ly |   0
 ...e-positions-of-figured-bass-alterations.ly |   0
 .../snippets}/changing-the-staff-size.ly      |   0
 ...ging-the-tempo-without-a-metronome-mark.ly |   0
 ...signature-without-affecting-the-beaming.ly |   0
 .../snippets}/changing-the-tuplet-number.ly   |   0
 ...olymetric-section-using--scaledurations.ly |   0
 .../snippets}/chant-or-psalms-notation.ly     |   0
 .../snippets}/chord-name-exceptions.ly        |   0
 .../snippets}/chord-name-major7.ly            |   0
 .../snippets}/chordchanges-for-fretboards.ly  |   0
 .../snippets}/chords-intro.itely              |   0
 .../snippets}/chords.snippet-list             |   0
 .../snippets}/clip-systems.ly                 |   0
 .../snippets}/clusters.ly                     |   0
 ...coloring-notes-depending-on-their-pitch.ly |   0
 .../combining-dynamics-with-markup-texts.ly   |   0
 .../combining-two-parts-on-the-same-staff.ly  |   0
 .../snippets}/compound-time-signatures.ly     |   0
 ...onducting-signs,-measure-grouping-signs.ly |   0
 .../snippets}/contemporary-glissando.ly       |   0
 .../contexts-and-engravers-intro.itely        |   0
 .../contexts-and-engravers.snippet-list       |   0
 ...lling-the-placement-of-chord-fingerings.ly |   0
 ...olling-the-vertical-ordering-of-scripts.ly |   0
 .../controlling-tuplet-bracket-visibility.ly  |   0
 .../snippets}/creating-a-delayed-turn.ly      |   0
 ...-a-sequence-of-notes-on-various-pitches.ly |   0
 ...eggios-across-notes-in-different-voices.ly |   0
 .../snippets}/creating-blank-staves.ly        |   0
 ...-cross-staff-arpeggios-in-a-piano-staff.ly |   0
 ...cross-staff-arpeggios-in-other-contexts.ly |   0
 ...creating-metronome-marks-in-markup-mode.ly |   0
 .../creating-real-parenthesized-dynamics.ly   |   0
 .../creating-simultaneous-rehearsal-marks.ly  |   0
 .../snippets}/creating-slurs-across-voices.ly |   0
 .../snippets}/creating-text-spanners.ly       |   0
 .../snippets}/custodes.ly                     |   0
 .../customizing-fretboard-fret-diagrams.ly    |   0
 .../customizing-markup-fret-diagrams.ly       |   0
 ...f-stems-on-the-center-line-of-the-staff.ly |   0
 ...efined-fretboards-for-other-instruments.ly |   0
 .../snippets}/demo-midiinstruments.ly         |   0
 .../snippets}/demonstrating-all-headers.ly    |   0
 ...bracket-with-only-one-staff-in-a-system.ly |   0
 .../snippets}/displaying-complex-chords.ly    |   0
 ...entals-for-each-note-including-naturals.ly |   0
 .../snippets}/dotted-harmonics.ly             |   0
 .../snippets}/double-glissando.ly             |   0
 .../snippets}/drawing-boxes-around-grobs.ly   |   0
 .../drawing-circles-around-various-objects.ly |   0
 .../editorial-annotations-intro.itely         |   0
 .../editorial-annotations.snippet-list        |   0
 ...ng-native-postscript-in-a--markup-block.ly |   0
 .../snippets}/engravers-one-by-one.ly         |   0
 .../snippets}/engraving-ties-manually.ly      |   0
 .../engraving-tremolos-with-floating-beams.ly |   0
 ...l-tuplets-using-only-one--times-command.ly |   0
 .../snippets}/expressive-marks-intro.itely    |   0
 .../snippets}/expressive-marks.snippet-list   |   0
 .../faking-a-hammer-in-tablatures.ly          |   0
 .../snippets}/fine-tuning-pedal-brackets.ly   |   0
 ...-indications,-and-right-hand-fingerings.ly |   0
 .../snippets}/flamenco-notation.ly            |   0
 .../snippets}/flat-flags-and-beam-nibs.ly     |   0
 .../snippets}/flute-slap-notation.ly          |   0
 .../forcing-horizontal-shift-of-notes.ly      |   0
 ...-to-start-from-a-given-letter-or-number.ly |   0
 .../snippets}/formatting-lyrics-syllables.ly  |   0
 .../fret-diagrams-explained-and-developed.ly  |   0
 .../snippets}/fretted-strings-intro.itely     |   0
 .../snippets}/fretted-strings.snippet-list    |   0
 .../snippets}/generating-random-notes.ly      |   0
 .../grid-lines--changing-their-appearance.ly  |   0
 ...izing-rhythms-and-notes-synchronization.ly |   0
 .../snippets}/grouping-beats.ly               |   0
 .../snippets}/guitar-strum-rhythms.ly         |   0
 ...y-customized-polymetric-time-signatures.ly |   0
 ...ing-the-extender-line-for-text-dynamics.ly |   0
 ...ynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly |   0
 .../how-to-change-fret-diagram-position.ly    |   0
 ...to-put-ties-between-syllables-in-lyrics.ly |   0
 .../lsr => Documentation/snippets}/incipit.ly |   0
 ...ross-staff-chords-with-arpeggio-bracket.ly |   0
 .../snippets}/inserting-a-caesura.ly          |   0
 ...ore-fragments-above-a-staff,-as-markups.ly |   0
 .../snippets}/isolated-percent-repeats.ly     |   0
 .../snippets}/jazz-combo-template.ly          |   0
 .../snippets}/keyboards-intro.itely           |   0
 .../snippets}/keyboards.snippet-list          |   0
 .../snippets}/laissez-vibrer-ties.ly          |   0
 .../snippets}/letter-tablature-formatting.ly  |   0
 .../snippets}/line-arrows.ly                  |   0
 .../snippets}/lyrics-alignment.ly             |   0
 .../snippets}/makam-example.ly                |   0
 ...invisible-with-the-transparent-property.ly |   0
 ...aking-slurs-with-complex-dash-structure.ly |   0
 ...ome-staff-lines-thicker-than-the-others.ly |   0
 ...ed-bass-extenders-for-only-some-numbers.ly |   0
 .../manually-controlling-beam-positions.ly    |   0
 ...f-spoken-parts-with-a-cross-on-the-stem.ly |   0
 .../snippets}/markup-lines.ly                 |   0
 .../snippets}/measure-counter.ly              |   0
 ...che-layout-bar-lines-between-the-staves.ly |   0
 ...ulti-measure-rests-in-a-polyphonic-part.ly |   0
 .../snippets}/midi-intro.itely                |   0
 .../snippets}/midi.snippet-list               |   0
 .../snippets}/modern-tab-text-clef.ly         |   0
 ...ues-for-articulation-shorthand-notation.ly |   0
 .../modifying-tuplet-bracket-length.ly        |   0
 .../snippets}/multi-measure-rest-markup.ly    |   0
 .../snippets}/nesting-staves.ly               |   0
 Documentation/snippets/new/GNUmakefile        |   6 +
 {input => Documentation/snippets}/new/README  |   0
 .../new/chordchanges-for-fretboards.ly        |   0
 ...aking-slurs-with-complex-dash-structure.ly |   0
 .../new/non-default-tuplet-numbers.ly         |   0
 .../new/non-traditional-key-signatures.ly     |   0
 .../snippets}/non-default-tuplet-numbers.ly   |   0
 .../non-traditional-key-signatures.ly         |   0
 .../orchestra,-choir-and-piano-template.ly    |   0
 .../snippets}/ottava-text.ly                  |   0
 .../outputting-the-version-number.ly          |   0
 .../snippets}/page-label.ly                   |   0
 .../snippets}/paper-and-layout-intro.itely    |   0
 .../snippets}/paper-and-layout.snippet-list   |   0
 .../percent-repeat-count-visibility.ly        |   0
 .../snippets}/percent-repeat-counter.ly       |   0
 .../snippets}/percussion-beaters.ly           |   0
 .../snippets}/percussion-intro.itely          |   0
 .../snippets}/percussion.snippet-list         |   0
 ...tting-line-breaks-within-beamed-tuplets.ly |   0
 .../snippets}/piano-template-simple.ly        |   0
 .../piano-template-with-centered-dynamics.ly  |   0
 .../piano-template-with-centered-lyrics.ly    |   0
 .../piano-template-with-melody-and-lyrics.ly  |   0
 .../snippets}/pitches-intro.itely             |   0
 .../snippets}/pitches.snippet-list            |   0
 .../placement-of-right-hand-fingerings.ly     |   0
 .../snippets}/polyphony-in-tablature.ly       |   0
 ...tioning-fingering-indications-precisely.ly |   0
 ...tioning-grace-notes-with-floating-space.ly |   0
 .../positioning-multi-measure-rests.ly        |   0
 ...itioning-segno-and-coda-with-line-break.ly |   0
 .../positioning-text-markups-inside-slurs.ly  |   0
 ...naturals-from-being-automatically-added.ly |   0
 ...-printed-when-the-key-signature-changes.ly |   0
 ...repeat-sign-at-the-beginning-of-a-piece.ly |   0
 ...inting-bar-numbers-at-regular-intervals.ly |   0
 ...ing-bar-numbers-inside-boxes-or-circles.ly |   0
 ...nting-hairpins-using-al-niente-notation.ly |   0
 ...g-marks-at-the-end-of-a-line-or-a-score.ly |   0
 .../printing-marks-on-every-staff.ly          |   0
 ...ome-and-rehearsal-marks-below-the-staff.ly |   0
 ...ng-music-with-different-time-signatures.ly |   0
 .../printing-text-from-right-to-left.ly       |   0
 ...ng-the-bar-number-for-the-first-measure.ly |   0
 .../proportional-strict-notespacing.ly        |   0
 ...uoting-another-voice-with-transposition.ly |   0
 .../snippets}/quoting-another-voice.ly        |   0
 .../redefining-grace-note-global-defaults.ly  |   0
 .../removing-bar-numbers-from-a-score.ly      |   0
 .../removing-the-first-empty-line.ly          |   0
 .../snippets}/repeats-intro.itely             |   0
 .../snippets}/repeats.snippet-list            |   0
 .../snippets}/rest-styles.ly                  |   0
 .../reverting-default-beam-endings.ly         |   0
 .../snippets}/rhythmic-slashes.ly             |   0
 .../snippets}/rhythms-intro.itely             |   0
 .../snippets}/rhythms.snippet-list            |   0
 .../snippets}/score-for-diatonic-accordion.ly |   0
 ...ancellations-from-key-signature-changes.ly |   0
 .../setting-hairpin-behavior-at-bar-lines.ly  |   0
 .../setting-the-minimum-length-of-hairpins.ly |   0
 .../snippets}/shortening-volta-brackets.ly    |   0
 .../snippets}/showing-chords-at-changes.ly    |   0
 .../snippets}/simple-lead-sheet.ly            |   0
 .../snippets}/simultaneous-notes-intro.itely  |   0
 .../snippets}/simultaneous-notes.snippet-list |   0
 ...template-with-notes,-lyrics,-and-chords.ly |   0
 ...te-with-notes,-lyrics,-chords-and-frets.ly |   0
 ...le-staff-template-with-notes-and-chords.ly |   0
 ...le-staff-template-with-notes-and-lyrics.ly |   0
 .../single-staff-template-with-only-notes.ly  |   0
 .../snippets}/skips-in-lyric-mode-2.ly        |   0
 .../snippets}/skips-in-lyric-mode.ly          |   0
 .../snap-pizzicato-markup-bartok-pizzicato.ly |   0
 .../snippets}/spacing-intro.itely             |   0
 .../snippets}/spacing.snippet-list            |   0
 .../specifying-context-with-beatgrouping.ly   |   0
 .../snippets}/staff-notation-intro.itely      |   0
 .../snippets}/staff-notation.snippet-list     |   0
 .../stand-alone-two-column-markup.ly          |   0
 .../stem-and-beam-behavior-in-tablature.ly    |   0
 .../snippets}/stemlets.ly                     |   0
 .../string-quartet-template-simple.ly         |   0
 ...ng-quartet-template-with-separate-parts.ly |   0
 .../snippets}/sub-dividing-beams.ly           |   0
 ...sing-warnings-for-clashing-note-columns.ly |   0
 .../snippets}/table-of-contents.ly            |   0
 .../snippets}/template-intro.itely            |   0
 .../snippets}/template.snippet-list           |   0
 .../snippets}/text-intro.itely                |   0
 .../snippets}/text.snippet-list               |   0
 .../snippets}/three-sided-box.ly              |   0
 .../snippets}/tick-bar-lines.ly               |   0
 .../time-signature-in-parentheses.ly          |   0
 .../snippets}/titles-intro.itely              |   0
 .../snippets}/titles.snippet-list             |   0
 ...scription-of-ancient-music-with-incipit.ly |   0
 ...ith-minimum-accidentals-smart-transpose.ly |   0
 .../snippets}/tweaking-clef-properties.ly     |   0
 .../tweaking-grace-layout-within-music.ly     |   0
 .../tweaks-and-overrides-intro.itely          |   0
 .../tweaks-and-overrides.snippet-list         |   0
 .../snippets}/unfretted-strings-intro.itely   |   0
 .../snippets}/unfretted-strings.snippet-list  |   0
 ...e-bracket-at-the-start-of-a-staff-group.ly |   0
 .../using-beatlength-and-beatgrouping.ly      |   0
 .../using-double-slurs-for-legato-chords.ly   |   0
 ...ng-grace-note-slashes-with-normal-heads.ly |   0
 ...pt-to-generate-special-note-head-shapes.ly |   0
 ...tweak-command-to-tweak-individual-grobs.ly |   0
 .../snippets}/using-ties-with-arpeggios.ly    |   0
 .../lsr => Documentation/snippets}/utf-8.ly   |   0
 ...ically-aligned-dynamics-and-textscripts.ly |   0
 ...aligning-dynamics-across-multiple-notes.ly |   0
 .../vertically-aligning-ossias-and-lyrics.ly  |   0
 .../vertically-centered-common-lyrics.ly      |   0
 ...template-with-automatic-piano-reduction.ly |   0
 ...rics-aligned-below-and-above-the-staves.ly |   0
 .../snippets}/vocal-ensemble-template.ly      |   0
 .../snippets}/vocal-music-intro.itely         |   0
 .../snippets}/vocal-music.snippet-list        |   0
 .../snippets}/volta-below-chords.ly           |   0
 .../snippets}/volta-multi-staff.ly            |   0
 .../volta-text-markup-using-repeatcommands.ly |   0
 .../snippets}/winds-intro.itely               |   0
 .../snippets}/winds.snippet-list              |   0
 .../snippets}/world-music-intro.itely         |   0
 .../snippets}/world-music.snippet-list        |   0
 Documentation/user/GNUmakefile                | 155 -----------
 Documentation/user/README.txt                 |   5 -
 Documentation/user/glossary.html.in           |   8 -
 input/GNUmakefile                             |   2 +-
 input/lsr/GNUmakefile                         |  70 -----
 input/new/GNUmakefile                         |   7 -
 input/texidocs/aligning-bar-numbers.texidoc   |  36 ---
 ...ngs-to-be-printed-inside-the-staff.texidoc |  23 --
 ...rn-transcription-of-mensural-music.texidoc |  42 ---
 .../beam-endings-in-score-context.texidoc     |  28 --
 .../beam-grouping-in-7-8-time.texidoc         |  30 ---
 .../texidocs/beams-across-line-breaks.texidoc |  26 --
 .../changing--flageolet-mark-size.texidoc     |  24 --
 input/texidocs/changing-beam-knee-gap.texidoc |  39 ---
 ...anging-form-of-multi-measure-rests.texidoc |  31 ---
 ...ture-without-affecting-the-beaming.texidoc |  38 ---
 .../changing-the-tuplet-number.texidoc        |  33 ---
 .../texidocs/compound-time-signatures.texidoc |  36 ---
 ...ting-signs,-measure-grouping-signs.texidoc |  49 ----
 ...-the-placement-of-chord-fingerings.texidoc |  22 --
 .../customizing-markup-fret-diagrams.texidoc  |  31 ---
 ...d-fretboards-for-other-instruments.texidoc |  54 ----
 .../texidocs/engraving-ties-manually.texidoc  |  32 ---
 ...lets-using-only-one--times-command.texidoc |  47 ----
 ...cations,-and-right-hand-fingerings.texidoc |  25 --
 .../texidocs/flat-flags-and-beam-nibs.texidoc |  95 -------
 input/texidocs/grouping-beats.texidoc         |  24 --
 input/texidocs/guitar-strum-rhythms.texidoc   |  25 --
 .../multi-measure-rest-markup.texidoc         |  51 ----
 .../non-default-tuplet-numbers.texidoc        |  28 --
 ...-line-breaks-within-beamed-tuplets.texidoc |  29 ---
 ...no-template-with-centered-dynamics.texidoc |  24 --
 ...iano-template-with-centered-lyrics.texidoc |  19 --
 ...no-template-with-melody-and-lyrics.texidoc |  20 --
 ...placement-of-right-hand-fingerings.texidoc |  27 --
 input/texidocs/polyphony-in-tablature.texidoc |  24 --
 ...ng-grace-notes-with-floating-space.texidoc |  37 ---
 .../positioning-multi-measure-rests.texidoc   |  35 ---
 ...als-from-being-automatically-added.texidoc |  31 ---
 ...g-bar-numbers-at-regular-intervals.texidoc |  33 ---
 ...ar-numbers-inside-boxes-or-circles.texidoc |  23 --
 ...e-bar-number-for-the-first-measure.texidoc |  40 ---
 ...efining-grace-note-global-defaults.texidoc |  40 ---
 .../removing-bar-numbers-from-a-score.texidoc |  30 ---
 input/texidocs/rest-styles.texidoc            |  19 --
 .../reverting-default-beam-endings.texidoc    |  29 ---
 ...ate-with-notes,-lyrics,-and-chords.texidoc |  20 --
 ...aff-template-with-notes-and-chords.texidoc |  21 --
 ...aff-template-with-notes-and-lyrics.texidoc |  32 ---
 ...gle-staff-template-with-only-notes.texidoc |  25 --
 ...ecifying-context-with-beatgrouping.texidoc |  33 ---
 ...tem-and-beam-behavior-in-tablature.texidoc |  27 --
 .../string-quartet-template-simple.texidoc    |  22 --
 ...artet-template-with-separate-parts.texidoc |  54 ----
 input/texidocs/sub-dividing-beams.texidoc     |  50 ----
 ...tweaking-grace-layout-within-music.texidoc |  39 ---
 .../using-beatlength-and-beatgrouping.texidoc |  36 ---
 .../using-ties-with-arpeggios.texidoc         |  33 ---
 ...ate-with-automatic-piano-reduction.texidoc |  28 --
 ...aligned-below-and-above-the-staves.texidoc |  24 --
 .../texidocs/vocal-ensemble-template.texidoc  |  27 --
 make/doc-i18n-root-rules.make                 |  40 ++-
 make/doc-i18n-root-targets.make               |  14 +-
 make/doc-i18n-root-vars.make                  |  48 ++++
 make/doc-i18n-topdocs-rules.make              |  14 -
 make/doc-i18n-topdocs-targets.make            |   9 -
 make/doc-i18n-topdocs-vars.make               |  26 --
 make/doc-i18n-user-rules.make                 |  39 ---
 make/doc-i18n-user-targets.make               |  16 --
 make/doc-i18n-user-vars.make                  |  46 ----
 make/lilypond-vars.make                       |   4 +-
 python/auxiliar/postprocess_html.py           |  39 ++-
 scm/documentation-generate.scm                |  19 +-
 scripts/auxiliar/makelsr.py                   |  59 +++--
 scripts/build/www_post.py                     |  15 --
 stepmake/stepmake/texinfo-rules.make          |   7 +-
 stepmake/stepmake/texinfo-vars.make           |  10 +-
 stepmake/stepmake/topdocs-vars.make           |   3 +-
 1008 files changed, 3871 insertions(+), 4044 deletions(-)
 rename Documentation/{user/lilypond-program.tely => application.tely} (84%)
 create mode 100644 Documentation/application/GNUmakefile
 rename Documentation/{user => application}/converters.itely (99%)
 rename Documentation/{user => application}/install.itely (97%)
 rename Documentation/{user => application}/lilypond-book.itely (99%)
 rename Documentation/{user => application}/running.itely (99%)
 rename Documentation/{user => application}/setup.itely (99%)
 rename Documentation/{user => }/baer-flat-bw.png (100%)
 rename Documentation/{user => }/baer-flat-gray.png (100%)
 rename Documentation/{topdocs/NEWS.tely => changes.tely} (94%)
 rename Documentation/{user => }/context-example.eps (100%)
 rename Documentation/{devel/contrib-guide.texi => contributor.texi} (79%)
 create mode 100644 Documentation/contributor/GNUmakefile
 rename Documentation/{user/compile.itely => contributor/compile.itexi} (99%)
 rename Documentation/{devel => contributor}/compiling.itexi (100%)
 rename Documentation/{devel => contributor}/doc-translation-list.itexi (98%)
 rename Documentation/{devel => contributor}/doc-work.itexi (99%)
 rename Documentation/{devel => contributor}/git-starting.itexi (100%)
 rename Documentation/{devel => contributor}/issues.itexi (100%)
 rename Documentation/{devel => contributor}/lsr-work.itexi (100%)
 rename Documentation/{devel => contributor}/programming-work.itexi (100%)
 rename Documentation/{devel => contributor}/regressions.itexi (100%)
 rename Documentation/{devel => contributor}/release-work.itexi (100%)
 rename Documentation/{devel => contributor}/website-work.itexi (100%)
 rename Documentation/de/{user/lilypond-program.tely => application.tely} (92%)
 create mode 100644 Documentation/de/application/GNUmakefile
 rename Documentation/de/{user => application}/converters.itely (99%)
 rename Documentation/de/{user => application}/install.itely (95%)
 rename Documentation/de/{user => application}/lilypond-book.itely (99%)
 rename Documentation/de/{user => application}/running.itely (99%)
 rename Documentation/de/{user => application}/setup.itely (99%)
 rename Documentation/de/{user => }/dedication.itely (92%)
 rename Documentation/de/{user/lilypond-learning.tely => learning.tely} (91%)
 create mode 100644 Documentation/de/learning/GNUmakefile
 rename Documentation/de/{user => learning}/fundamental.itely (99%)
 rename Documentation/de/{user => learning}/introduction.itely (99%)
 rename Documentation/de/{user => learning}/preface.itely (98%)
 rename Documentation/de/{user => learning}/scheme-tutorial.itely (99%)
 rename Documentation/de/{user => learning}/templates.itely (99%)
 rename Documentation/de/{user => learning}/tutorial.itely (99%)
 rename Documentation/de/{user => learning}/tweaks.itely (99%)
 rename Documentation/de/{user => learning}/working.itely (99%)
 rename Documentation/de/{user => }/macros.itexi (77%)
 rename Documentation/de/{user/lilypond.tely => notation.tely} (93%)
 create mode 100644 Documentation/de/notation/GNUmakefile
 rename Documentation/de/{user => notation}/ancient.itely (99%)
 rename Documentation/de/{user => notation}/changing-defaults.itely (99%)
 rename Documentation/de/{user => notation}/cheatsheet.itely (99%)
 rename Documentation/de/{user => notation}/chords.itely (99%)
 rename Documentation/de/{user => notation}/editorial.itely (100%)
 rename Documentation/de/{user => notation}/expressive.itely (100%)
 rename Documentation/de/{user => notation}/fretted-strings.itely (99%)
 rename Documentation/de/{user => notation}/input.itely (99%)
 rename Documentation/de/{user => notation}/keyboards.itely (99%)
 rename Documentation/de/{user => notation}/literature.itely (98%)
 rename Documentation/de/{user => notation}/notation-appendices.itely (99%)
 rename Documentation/de/{user => notation}/notation.itely (78%)
 rename Documentation/de/{user => notation}/percussion.itely (99%)
 rename Documentation/de/{user => notation}/pitches.itely (100%)
 rename Documentation/de/{user => notation}/programming-interface.itely (99%)
 rename Documentation/de/{user => notation}/repeats.itely (100%)
 rename Documentation/de/{user => notation}/rhythms.itely (100%)
 rename Documentation/de/{user => notation}/simultaneous.itely (100%)
 rename Documentation/de/{user => notation}/spacing.itely (99%)
 rename Documentation/de/{user => notation}/specialist.itely (70%)
 rename Documentation/de/{user => notation}/staff.itely (100%)
 rename Documentation/de/{user => notation}/text.itely (99%)
 rename Documentation/de/{user => notation}/unfretted-strings.itely (99%)
 rename Documentation/de/{user => notation}/vocal.itely (100%)
 rename Documentation/de/{user => notation}/wind.itely (99%)
 rename Documentation/de/{user => notation}/world.itely (99%)
 rename {input => Documentation/de}/texidocs/GNUmakefile (85%)
 create mode 100644 Documentation/de/texidocs/accordion-discant-symbols.texidoc
 rename {input => Documentation/de}/texidocs/adding-ambitus-per-voice.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/adding-bar-lines-to-chordnames-context.texidoc
 create mode 100644 Documentation/de/texidocs/adding-volta-brackets-to-additional-staves.texidoc
 rename {input => Documentation/de}/texidocs/additional-voices-to-avoid-collisions.texidoc (53%)
 create mode 100644 Documentation/de/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
 create mode 100644 Documentation/de/texidocs/aligning-bar-numbers.texidoc
 create mode 100644 Documentation/de/texidocs/aligning-marks-with-various-notation-objects.texidoc
 create mode 100644 Documentation/de/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
 rename {input => Documentation/de}/texidocs/ambitus-with-multiple-voices.texidoc (52%)
 create mode 100644 Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
 create mode 100644 Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
 create mode 100644 Documentation/de/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
 create mode 100644 Documentation/de/texidocs/arabic-improvisation.texidoc
 create mode 100644 Documentation/de/texidocs/beam-endings-in-score-context.texidoc
 create mode 100644 Documentation/de/texidocs/beam-grouping-in-7-8-time.texidoc
 create mode 100644 Documentation/de/texidocs/beams-across-line-breaks.texidoc
 create mode 100644 Documentation/de/texidocs/changing--flageolet-mark-size.texidoc
 create mode 100644 Documentation/de/texidocs/changing-beam-knee-gap.texidoc
 create mode 100644 Documentation/de/texidocs/changing-chord-separator.texidoc
 create mode 100644 Documentation/de/texidocs/changing-form-of-multi-measure-rests.texidoc
 create mode 100644 Documentation/de/texidocs/changing-partcombine-texts.texidoc
 create mode 100644 Documentation/de/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
 create mode 100644 Documentation/de/texidocs/changing-the-breath-mark-symbol.texidoc
 create mode 100644 Documentation/de/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
 rename {input => Documentation/de}/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc (53%)
 create mode 100644 Documentation/de/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
 create mode 100644 Documentation/de/texidocs/changing-the-tuplet-number.texidoc
 create mode 100644 Documentation/de/texidocs/chord-name-exceptions.texidoc
 rename {input => Documentation/de}/texidocs/chord-name-major7.texidoc (50%)
 rename {input => Documentation/de}/texidocs/chordchanges-for-fretboards.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/combining-two-parts-on-the-same-staff.texidoc
 create mode 100644 Documentation/de/texidocs/compound-time-signatures.texidoc
 create mode 100644 Documentation/de/texidocs/conducting-signs,-measure-grouping-signs.texidoc
 rename {input => Documentation/de}/texidocs/contemporary-glissando.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
 rename {input => Documentation/de}/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/creating-a-delayed-turn.texidoc
 create mode 100644 Documentation/de/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
 rename {input => Documentation/de}/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
 rename {input => Documentation/de}/texidocs/creating-metronome-marks-in-markup-mode.texidoc (51%)
 create mode 100644 Documentation/de/texidocs/customizing-fretboard-fret-diagrams.texidoc
 create mode 100644 Documentation/de/texidocs/customizing-markup-fret-diagrams.texidoc
 create mode 100644 Documentation/de/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
 create mode 100644 Documentation/de/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
 create mode 100644 Documentation/de/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
 create mode 100644 Documentation/de/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
 create mode 100644 Documentation/de/texidocs/engraving-ties-manually.texidoc
 create mode 100644 Documentation/de/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
 create mode 100644 Documentation/de/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
 create mode 100644 Documentation/de/texidocs/flat-flags-and-beam-nibs.texidoc
 create mode 100644 Documentation/de/texidocs/forcing-horizontal-shift-of-notes.texidoc
 create mode 100644 Documentation/de/texidocs/grid-lines--changing-their-appearance.texidoc
 create mode 100644 Documentation/de/texidocs/grouping-beats.texidoc
 create mode 100644 Documentation/de/texidocs/guitar-strum-rhythms.texidoc
 create mode 100644 Documentation/de/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
 create mode 100644 Documentation/de/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
 rename {input => Documentation/de}/texidocs/inserting-a-caesura.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/isolated-percent-repeats.texidoc
 create mode 100644 Documentation/de/texidocs/jazz-combo-template.texidoc
 create mode 100644 Documentation/de/texidocs/makam-example.texidoc
 create mode 100644 Documentation/de/texidocs/making-slurs-with-complex-dash-structure.texidoc
 rename {input => Documentation/de}/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc (51%)
 create mode 100644 Documentation/de/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
 create mode 100644 Documentation/de/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
 create mode 100644 Documentation/de/texidocs/multi-measure-rest-markup.texidoc
 rename {input => Documentation/de}/texidocs/nesting-staves.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/non-default-tuplet-numbers.texidoc
 create mode 100644 Documentation/de/texidocs/non-traditional-key-signatures.texidoc
 rename {input => Documentation/de}/texidocs/ottava-text.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/percent-repeat-count-visibility.texidoc
 create mode 100644 Documentation/de/texidocs/percent-repeat-counter.texidoc
 create mode 100644 Documentation/de/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
 create mode 100644 Documentation/de/texidocs/piano-template-simple.texidoc
 create mode 100644 Documentation/de/texidocs/piano-template-with-centered-dynamics.texidoc
 create mode 100644 Documentation/de/texidocs/piano-template-with-centered-lyrics.texidoc
 create mode 100644 Documentation/de/texidocs/piano-template-with-melody-and-lyrics.texidoc
 create mode 100644 Documentation/de/texidocs/placement-of-right-hand-fingerings.texidoc
 create mode 100644 Documentation/de/texidocs/polyphony-in-tablature.texidoc
 create mode 100644 Documentation/de/texidocs/positioning-grace-notes-with-floating-space.texidoc
 create mode 100644 Documentation/de/texidocs/positioning-multi-measure-rests.texidoc
 create mode 100644 Documentation/de/texidocs/positioning-text-markups-inside-slurs.texidoc
 create mode 100644 Documentation/de/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
 create mode 100644 Documentation/de/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
 create mode 100644 Documentation/de/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
 create mode 100644 Documentation/de/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
 create mode 100644 Documentation/de/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
 rename {input => Documentation/de}/texidocs/printing-hairpins-using-al-niente-notation.texidoc (50%)
 rename {input => Documentation/de}/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/printing-marks-on-every-staff.texidoc
 create mode 100644 Documentation/de/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
 create mode 100644 Documentation/de/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
 create mode 100644 Documentation/de/texidocs/quoting-another-voice-with-transposition.texidoc
 create mode 100644 Documentation/de/texidocs/quoting-another-voice.texidoc
 create mode 100644 Documentation/de/texidocs/redefining-grace-note-global-defaults.texidoc
 create mode 100644 Documentation/de/texidocs/removing-bar-numbers-from-a-score.texidoc
 create mode 100644 Documentation/de/texidocs/removing-the-first-empty-line.texidoc
 create mode 100644 Documentation/de/texidocs/rest-styles.texidoc
 create mode 100644 Documentation/de/texidocs/reverting-default-beam-endings.texidoc
 create mode 100644 Documentation/de/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
 rename {input => Documentation/de}/texidocs/setting-the-minimum-length-of-hairpins.texidoc (52%)
 create mode 100644 Documentation/de/texidocs/shortening-volta-brackets.texidoc
 rename {input => Documentation/de}/texidocs/showing-chords-at-changes.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/simple-lead-sheet.texidoc
 create mode 100644 Documentation/de/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
 create mode 100644 Documentation/de/texidocs/single-staff-template-with-notes-and-chords.texidoc
 create mode 100644 Documentation/de/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
 create mode 100644 Documentation/de/texidocs/single-staff-template-with-only-notes.texidoc
 create mode 100644 Documentation/de/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
 create mode 100644 Documentation/de/texidocs/specifying-context-with-beatgrouping.texidoc
 create mode 100644 Documentation/de/texidocs/stand-alone-two-column-markup.texidoc
 create mode 100644 Documentation/de/texidocs/stem-and-beam-behavior-in-tablature.texidoc
 create mode 100644 Documentation/de/texidocs/string-quartet-template-simple.texidoc
 create mode 100644 Documentation/de/texidocs/string-quartet-template-with-separate-parts.texidoc
 create mode 100644 Documentation/de/texidocs/sub-dividing-beams.texidoc
 rename {input => Documentation/de}/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc (50%)
 rename {input => Documentation/de}/texidocs/tweaking-clef-properties.texidoc (51%)
 create mode 100644 Documentation/de/texidocs/tweaking-grace-layout-within-music.texidoc
 rename {input => Documentation/de}/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc (51%)
 create mode 100644 Documentation/de/texidocs/using-beatlength-and-beatgrouping.texidoc
 rename {input => Documentation/de}/texidocs/using-double-slurs-for-legato-chords.texidoc (50%)
 create mode 100644 Documentation/de/texidocs/using-ties-with-arpeggios.texidoc
 create mode 100644 Documentation/de/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
 create mode 100644 Documentation/de/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
 create mode 100644 Documentation/de/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
 create mode 100644 Documentation/de/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
 create mode 100644 Documentation/de/texidocs/vocal-ensemble-template.texidoc
 create mode 100644 Documentation/de/texidocs/volta-below-chords.texidoc
 delete mode 100644 Documentation/de/user/GNUmakefile
 delete mode 100644 Documentation/de/user/compile.itely
 rename Documentation/{user => }/dedication.itely (91%)
 rename Documentation/{devel/index.html.in => devel.html.in} (79%)
 delete mode 100644 Documentation/devel/GNUmakefile
 rename Documentation/es/{user/lilypond-program.tely => application.tely} (92%)
 create mode 100644 Documentation/es/application/GNUmakefile
 rename Documentation/es/{user => application}/converters.itely (99%)
 rename Documentation/es/{user => application}/install.itely (96%)
 rename Documentation/es/{user => application}/lilypond-book.itely (99%)
 rename Documentation/es/{user => application}/running.itely (99%)
 rename Documentation/es/{user => application}/setup.itely (99%)
 rename Documentation/es/{topdocs/NEWS.tely => changes.tely} (99%)
 rename Documentation/es/{user => }/dedication.itely (91%)
 rename Documentation/es/{user/lilypond-learning.tely => learning.tely} (91%)
 create mode 100644 Documentation/es/learning/GNUmakefile
 rename Documentation/es/{user => learning}/fundamental.itely (99%)
 rename Documentation/es/{user => learning}/introduction.itely (99%)
 rename Documentation/es/{user => learning}/preface.itely (98%)
 rename Documentation/es/{user => learning}/scheme-tutorial.itely (99%)
 rename Documentation/es/{user => learning}/templates.itely (99%)
 rename Documentation/es/{user => learning}/tutorial.itely (99%)
 rename Documentation/es/{user => learning}/tweaks.itely (99%)
 rename Documentation/es/{user => learning}/working.itely (99%)
 rename Documentation/es/{user => }/macros.itexi (73%)
 rename Documentation/es/{user/lilypond.tely => notation.tely} (93%)
 create mode 100644 Documentation/es/notation/GNUmakefile
 rename Documentation/es/{user => notation}/ancient.itely (99%)
 rename Documentation/es/{user => notation}/changing-defaults.itely (99%)
 rename Documentation/es/{user => notation}/cheatsheet.itely (99%)
 rename Documentation/es/{user => notation}/chords.itely (99%)
 rename Documentation/es/{user => notation}/editorial.itely (100%)
 rename Documentation/es/{user => notation}/expressive.itely (100%)
 rename Documentation/es/{user => notation}/fretted-strings.itely (99%)
 rename Documentation/es/{user => notation}/input.itely (99%)
 rename Documentation/es/{user => notation}/keyboards.itely (99%)
 rename Documentation/es/{user => notation}/literature.itely (98%)
 rename Documentation/es/{user => notation}/notation-appendices.itely (99%)
 rename Documentation/es/{user => notation}/notation.itely (77%)
 rename Documentation/es/{user => notation}/percussion.itely (99%)
 rename Documentation/es/{user => notation}/pitches.itely (100%)
 rename Documentation/es/{user => notation}/programming-interface.itely (99%)
 rename Documentation/es/{user => notation}/repeats.itely (100%)
 rename Documentation/es/{user => notation}/rhythms.itely (100%)
 rename Documentation/es/{user => notation}/simultaneous.itely (100%)
 rename Documentation/es/{user => notation}/spacing.itely (99%)
 rename Documentation/es/{user => notation}/specialist.itely (70%)
 rename Documentation/es/{user => notation}/staff.itely (100%)
 rename Documentation/es/{user => notation}/text.itely (100%)
 rename Documentation/es/{user => notation}/unfretted-strings.itely (99%)
 rename Documentation/es/{user => notation}/vocal.itely (99%)
 rename Documentation/es/{user => notation}/wind.itely (99%)
 rename Documentation/es/{user => notation}/world.itely (99%)
 create mode 100644 Documentation/es/texidocs/GNUmakefile
 rename {input => Documentation/es}/texidocs/accordion-discant-symbols.texidoc (51%)
 rename {input => Documentation/es}/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc (83%)
 create mode 100644 Documentation/es/texidocs/adding-ambitus-per-voice.texidoc
 rename {input => Documentation/es}/texidocs/adding-an-extra-staff-at-a-line-break.texidoc (100%)
 rename {input => Documentation/es}/texidocs/adding-an-extra-staff.texidoc (100%)
 rename {input => Documentation/es}/texidocs/adding-bar-lines-to-chordnames-context.texidoc (54%)
 rename {input => Documentation/es}/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/adding-drum-parts.texidoc
 rename {input => Documentation/es}/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/adding-the-current-date-to-a-score.texidoc
 rename {input => Documentation/es}/texidocs/adding-volta-brackets-to-additional-staves.texidoc (53%)
 create mode 100644 Documentation/es/texidocs/additional-voices-to-avoid-collisions.texidoc
 rename {input => Documentation/es}/texidocs/adjusting-lyrics-vertical-spacing.texidoc (51%)
 rename {input => Documentation/es}/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc (53%)
 rename {input => Documentation/es}/texidocs/aligning-and-centering-instrument-names.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/aligning-bar-numbers.texidoc
 rename {input => Documentation/es}/texidocs/aligning-marks-with-various-notation-objects.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
 create mode 100644 Documentation/es/texidocs/ambitus-with-multiple-voices.texidoc
 rename {input => Documentation/es}/texidocs/analysis-brackets-above-the-staff.texidoc (100%)
 rename {input => Documentation/es}/texidocs/ancient-fonts.texidoc (52%)
 rename {input => Documentation/es}/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc (51%)
 create mode 100644 Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
 rename {input => Documentation/es}/texidocs/ancient-time-signatures.texidoc (100%)
 rename {input => Documentation/es}/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc (50%)
 rename {input => Documentation/es}/texidocs/arabic-improvisation.texidoc (50%)
 rename {input => Documentation/es}/texidocs/automatic-beam-subdivisions.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
 create mode 100644 Documentation/es/texidocs/beam-endings-in-score-context.texidoc
 create mode 100644 Documentation/es/texidocs/beam-grouping-in-7-8-time.texidoc
 create mode 100644 Documentation/es/texidocs/beams-across-line-breaks.texidoc
 rename {input => Documentation/es}/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc (100%)
 rename {input => Documentation/es}/texidocs/broken-crescendo-hairpin.texidoc (100%)
 rename {input => Documentation/es}/texidocs/caesura-railtracks-with-fermata.texidoc (100%)
 rename {input => Documentation/es}/texidocs/center-text-below-hairpin-dynamics.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/changing--flageolet-mark-size.texidoc
 rename {input => Documentation/es}/texidocs/changing-a-single-notes-size-in-a-chord.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/changing-beam-knee-gap.texidoc
 rename {input => Documentation/es}/texidocs/changing-chord-separator.texidoc (54%)
 create mode 100644 Documentation/es/texidocs/changing-form-of-multi-measure-rests.texidoc
 rename {input => Documentation/es}/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc (100%)
 rename {input => Documentation/es}/texidocs/changing-partcombine-texts.texidoc (52%)
 rename {input => Documentation/es}/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc (54%)
 rename {input => Documentation/es}/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc (100%)
 rename {input => Documentation/es}/texidocs/changing-the-breath-mark-symbol.texidoc (50%)
 rename {input => Documentation/es}/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc (100%)
 rename {input => Documentation/es}/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
 create mode 100644 Documentation/es/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
 create mode 100644 Documentation/es/texidocs/changing-the-tuplet-number.texidoc
 rename {input => Documentation/es}/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc (100%)
 rename {input => Documentation/es}/texidocs/chant-or-psalms-notation.texidoc (100%)
 rename {input => Documentation/es}/texidocs/chord-name-exceptions.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/chord-name-major7.texidoc
 create mode 100644 Documentation/es/texidocs/chordchanges-for-fretboards.texidoc
 rename {input => Documentation/es}/texidocs/clusters.texidoc (100%)
 rename {input => Documentation/es}/texidocs/combining-dynamics-with-markup-texts.texidoc (100%)
 rename {input => Documentation/es}/texidocs/combining-two-parts-on-the-same-staff.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/compound-time-signatures.texidoc
 create mode 100644 Documentation/es/texidocs/conducting-signs,-measure-grouping-signs.texidoc
 create mode 100644 Documentation/es/texidocs/contemporary-glissando.texidoc
 create mode 100644 Documentation/es/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
 create mode 100644 Documentation/es/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
 rename {input => Documentation/es}/texidocs/creating-a-delayed-turn.texidoc (51%)
 rename {input => Documentation/es}/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc (100%)
 rename {input => Documentation/es}/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc (50%)
 rename {input => Documentation/es}/texidocs/creating-blank-staves.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
 rename {input => Documentation/es}/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc (52%)
 create mode 100644 Documentation/es/texidocs/creating-metronome-marks-in-markup-mode.texidoc
 rename {input => Documentation/es}/texidocs/creating-real-parenthesized-dynamics.texidoc (100%)
 rename {input => Documentation/es}/texidocs/creating-simultaneous-rehearsal-marks.texidoc (100%)
 rename {input => Documentation/es}/texidocs/creating-slurs-across-voices.texidoc (100%)
 rename {input => Documentation/es}/texidocs/creating-text-spanners.texidoc (100%)
 rename {input => Documentation/es}/texidocs/custodes.texidoc (100%)
 rename {input => Documentation/es}/texidocs/customizing-fretboard-fret-diagrams.texidoc (53%)
 create mode 100644 Documentation/es/texidocs/customizing-markup-fret-diagrams.texidoc
 rename {input => Documentation/es}/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc (55%)
 create mode 100644 Documentation/es/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
 rename {input => Documentation/es}/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc (53%)
 rename {input => Documentation/es}/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc (51%)
 rename {input => Documentation/es}/texidocs/embedding-native-postscript-in-a--markup-block.texidoc (100%)
 rename {input => Documentation/es}/texidocs/engravers-one-by-one.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/engraving-ties-manually.texidoc
 create mode 100644 Documentation/es/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
 create mode 100644 Documentation/es/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
 create mode 100644 Documentation/es/texidocs/flat-flags-and-beam-nibs.texidoc
 rename {input => Documentation/es}/texidocs/forcing-horizontal-shift-of-notes.texidoc (53%)
 rename {input => Documentation/es}/texidocs/generating-random-notes.texidoc (100%)
 rename {input => Documentation/es}/texidocs/grid-lines--changing-their-appearance.texidoc (51%)
 rename {input => Documentation/es}/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/grouping-beats.texidoc
 create mode 100644 Documentation/es/texidocs/guitar-strum-rhythms.texidoc
 rename {input => Documentation/es}/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc (53%)
 rename {input => Documentation/es}/texidocs/incipit.texidoc (100%)
 rename {input => Documentation/es}/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/inserting-a-caesura.texidoc
 rename {input => Documentation/es}/texidocs/isolated-percent-repeats.texidoc (50%)
 rename {input => Documentation/es}/texidocs/jazz-combo-template.texidoc (50%)
 rename {input => Documentation/es}/texidocs/line-arrows.texidoc (100%)
 rename {input => Documentation/es}/texidocs/lyrics-alignment.texidoc (100%)
 rename {input => Documentation/es}/texidocs/makam-example.texidoc (51%)
 rename {input => Documentation/es}/texidocs/making-slurs-with-complex-dash-structure.texidoc (53%)
 create mode 100644 Documentation/es/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
 rename {input => Documentation/es}/texidocs/measure-counter.texidoc (100%)
 rename {input => Documentation/es}/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc (50%)
 rename {input => Documentation/es}/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc (52%)
 create mode 100644 Documentation/es/texidocs/multi-measure-rest-markup.texidoc
 create mode 100644 Documentation/es/texidocs/nesting-staves.texidoc
 create mode 100644 Documentation/es/texidocs/non-default-tuplet-numbers.texidoc
 rename {input => Documentation/es}/texidocs/non-traditional-key-signatures.texidoc (51%)
 rename {input => Documentation/es}/texidocs/orchestra,-choir-and-piano-template.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/ottava-text.texidoc
 rename {input => Documentation/es}/texidocs/percent-repeat-count-visibility.texidoc (53%)
 rename {input => Documentation/es}/texidocs/percent-repeat-counter.texidoc (51%)
 create mode 100644 Documentation/es/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
 rename {input => Documentation/es}/texidocs/piano-template-simple.texidoc (54%)
 create mode 100644 Documentation/es/texidocs/piano-template-with-centered-dynamics.texidoc
 create mode 100644 Documentation/es/texidocs/piano-template-with-centered-lyrics.texidoc
 create mode 100644 Documentation/es/texidocs/piano-template-with-melody-and-lyrics.texidoc
 create mode 100644 Documentation/es/texidocs/placement-of-right-hand-fingerings.texidoc
 create mode 100644 Documentation/es/texidocs/polyphony-in-tablature.texidoc
 create mode 100644 Documentation/es/texidocs/positioning-grace-notes-with-floating-space.texidoc
 create mode 100644 Documentation/es/texidocs/positioning-multi-measure-rests.texidoc
 rename {input => Documentation/es}/texidocs/positioning-text-markups-inside-slurs.texidoc (54%)
 create mode 100644 Documentation/es/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
 rename {input => Documentation/es}/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc (50%)
 rename {input => Documentation/es}/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
 create mode 100644 Documentation/es/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
 create mode 100644 Documentation/es/texidocs/printing-hairpins-using-al-niente-notation.texidoc
 create mode 100644 Documentation/es/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
 rename {input => Documentation/es}/texidocs/printing-marks-on-every-staff.texidoc (51%)
 rename {input => Documentation/es}/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc (53%)
 create mode 100644 Documentation/es/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
 rename {input => Documentation/es}/texidocs/quoting-another-voice-with-transposition.texidoc (51%)
 rename {input => Documentation/es}/texidocs/quoting-another-voice.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/redefining-grace-note-global-defaults.texidoc
 create mode 100644 Documentation/es/texidocs/removing-bar-numbers-from-a-score.texidoc
 rename {input => Documentation/es}/texidocs/removing-the-first-empty-line.texidoc (51%)
 create mode 100644 Documentation/es/texidocs/rest-styles.texidoc
 create mode 100644 Documentation/es/texidocs/reverting-default-beam-endings.texidoc
 rename {input => Documentation/es}/texidocs/script-chart.texidoc (100%)
 rename {input => Documentation/es}/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc (51%)
 create mode 100644 Documentation/es/texidocs/setting-the-minimum-length-of-hairpins.texidoc
 rename {input => Documentation/es}/texidocs/shortening-volta-brackets.texidoc (54%)
 create mode 100644 Documentation/es/texidocs/showing-chords-at-changes.texidoc
 rename {input => Documentation/es}/texidocs/simple-lead-sheet.texidoc (56%)
 create mode 100644 Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
 rename {input => Documentation/es}/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/single-staff-template-with-notes-and-chords.texidoc
 create mode 100644 Documentation/es/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
 create mode 100644 Documentation/es/texidocs/single-staff-template-with-only-notes.texidoc
 rename {input => Documentation/es}/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/specifying-context-with-beatgrouping.texidoc
 rename {input => Documentation/es}/texidocs/stand-alone-two-column-markup.texidoc (54%)
 create mode 100644 Documentation/es/texidocs/stem-and-beam-behavior-in-tablature.texidoc
 create mode 100644 Documentation/es/texidocs/string-quartet-template-simple.texidoc
 create mode 100644 Documentation/es/texidocs/string-quartet-template-with-separate-parts.texidoc
 create mode 100644 Documentation/es/texidocs/sub-dividing-beams.texidoc
 rename {input => Documentation/es}/texidocs/transcription-of-ancient-music-with-incipit.texidoc (100%)
 create mode 100644 Documentation/es/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
 create mode 100644 Documentation/es/texidocs/tweaking-clef-properties.texidoc
 create mode 100644 Documentation/es/texidocs/tweaking-grace-layout-within-music.texidoc
 create mode 100644 Documentation/es/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
 create mode 100644 Documentation/es/texidocs/using-beatlength-and-beatgrouping.texidoc
 create mode 100644 Documentation/es/texidocs/using-double-slurs-for-legato-chords.texidoc
 rename {input => Documentation/es}/texidocs/using-grace-note-slashes-with-normal-heads.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/using-ties-with-arpeggios.texidoc
 rename {input => Documentation/es}/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc (50%)
 rename {input => Documentation/es}/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc (100%)
 rename {input => Documentation/es}/texidocs/vertically-aligning-ossias-and-lyrics.texidoc (50%)
 create mode 100644 Documentation/es/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
 create mode 100644 Documentation/es/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
 create mode 100644 Documentation/es/texidocs/vocal-ensemble-template.texidoc
 rename {input => Documentation/es}/texidocs/volta-below-chords.texidoc (50%)
 delete mode 100644 Documentation/es/topdocs/GNUmakefile
 delete mode 100644 Documentation/es/user/GNUmakefile
 rename Documentation/{user => }/fdl.itexi (100%)
 rename Documentation/fr/{user/lilypond-program.tely => application.tely} (91%)
 create mode 100644 Documentation/fr/application/GNUmakefile
 rename Documentation/fr/{user => application}/converters.itely (99%)
 rename Documentation/fr/{user => application}/install.itely (98%)
 rename Documentation/fr/{user => application}/lilypond-book.itely (98%)
 rename Documentation/fr/{user => application}/running.itely (96%)
 rename Documentation/fr/{user => application}/setup.itely (99%)
 rename Documentation/fr/{user => }/dedication.itely (92%)
 rename Documentation/fr/{user/lilypond-learning.tely => learning.tely} (91%)
 create mode 100644 Documentation/fr/learning/GNUmakefile
 rename Documentation/fr/{user => learning}/fundamental.itely (99%)
 rename Documentation/fr/{user => learning}/introduction.itely (99%)
 rename Documentation/fr/{user => learning}/preface.itely (98%)
 rename Documentation/fr/{user => learning}/scheme-tutorial.itely (91%)
 rename Documentation/fr/{user => learning}/templates.itely (97%)
 rename Documentation/fr/{user => learning}/tutorial.itely (99%)
 rename Documentation/fr/{user => learning}/tweaks.itely (99%)
 rename Documentation/fr/{user => learning}/working.itely (99%)
 rename Documentation/fr/{user => }/macros.itexi (74%)
 rename Documentation/fr/{user/lilypond.tely => notation.tely} (90%)
 create mode 100644 Documentation/fr/notation/GNUmakefile
 rename Documentation/fr/{user => notation}/ancient.itely (99%)
 rename Documentation/fr/{user => notation}/changing-defaults.itely (99%)
 rename Documentation/fr/{user => notation}/cheatsheet.itely (99%)
 rename Documentation/fr/{user => notation}/chords.itely (99%)
 rename Documentation/fr/{user => notation}/editorial.itely (100%)
 rename Documentation/fr/{user => notation}/expressive.itely (100%)
 rename Documentation/fr/{user => notation}/fretted-strings.itely (99%)
 rename Documentation/fr/{user => notation}/input.itely (99%)
 rename Documentation/fr/{user => notation}/keyboards.itely (99%)
 rename Documentation/fr/{user => notation}/literature.itely (90%)
 rename Documentation/fr/{user => notation}/notation-appendices.itely (98%)
 rename Documentation/fr/{user => notation}/notation.itely (77%)
 rename Documentation/fr/{user => notation}/percussion.itely (99%)
 rename Documentation/fr/{user => notation}/pitches.itely (100%)
 rename Documentation/fr/{user => notation}/programming-interface.itely (99%)
 rename Documentation/fr/{user => notation}/repeats.itely (100%)
 rename Documentation/fr/{user => notation}/rhythms.itely (100%)
 rename Documentation/fr/{user => notation}/simultaneous.itely (100%)
 rename Documentation/fr/{user => notation}/spacing.itely (99%)
 rename Documentation/fr/{user => notation}/specialist.itely (69%)
 rename Documentation/fr/{user => notation}/staff.itely (100%)
 rename Documentation/fr/{user => notation}/text.itely (100%)
 rename Documentation/fr/{user => notation}/unfretted-strings.itely (99%)
 rename Documentation/fr/{user => notation}/vocal.itely (99%)
 rename Documentation/fr/{user => notation}/wind.itely (99%)
 rename Documentation/fr/{user => notation}/world.itely (96%)
 create mode 100644 Documentation/fr/texidocs/GNUmakefile
 create mode 100644 Documentation/fr/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
 rename {input => Documentation/fr}/texidocs/adding-drum-parts.texidoc (52%)
 rename {input => Documentation/fr}/texidocs/adding-fingerings-to-tablatures.texidoc (100%)
 rename {input => Documentation/fr}/texidocs/adding-the-current-date-to-a-score.texidoc (50%)
 create mode 100644 Documentation/fr/texidocs/adjusting-lyrics-vertical-spacing.texidoc
 create mode 100644 Documentation/fr/texidocs/aligning-bar-numbers.texidoc
 create mode 100644 Documentation/fr/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
 create mode 100644 Documentation/fr/texidocs/ancient-fonts.texidoc
 create mode 100644 Documentation/fr/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
 rename {input => Documentation/fr}/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc (50%)
 create mode 100644 Documentation/fr/texidocs/beam-endings-in-score-context.texidoc
 create mode 100644 Documentation/fr/texidocs/beam-grouping-in-7-8-time.texidoc
 create mode 100644 Documentation/fr/texidocs/beams-across-line-breaks.texidoc
 create mode 100644 Documentation/fr/texidocs/changing--flageolet-mark-size.texidoc
 create mode 100644 Documentation/fr/texidocs/changing-beam-knee-gap.texidoc
 create mode 100644 Documentation/fr/texidocs/changing-form-of-multi-measure-rests.texidoc
 create mode 100644 Documentation/fr/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
 create mode 100644 Documentation/fr/texidocs/changing-the-tuplet-number.texidoc
 create mode 100644 Documentation/fr/texidocs/compound-time-signatures.texidoc
 create mode 100644 Documentation/fr/texidocs/conducting-signs,-measure-grouping-signs.texidoc
 create mode 100644 Documentation/fr/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
 create mode 100644 Documentation/fr/texidocs/customizing-markup-fret-diagrams.texidoc
 create mode 100644 Documentation/fr/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
 create mode 100644 Documentation/fr/texidocs/engraving-ties-manually.texidoc
 create mode 100644 Documentation/fr/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
 create mode 100644 Documentation/fr/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
 create mode 100644 Documentation/fr/texidocs/flat-flags-and-beam-nibs.texidoc
 create mode 100644 Documentation/fr/texidocs/grouping-beats.texidoc
 create mode 100644 Documentation/fr/texidocs/guitar-strum-rhythms.texidoc
 create mode 100644 Documentation/fr/texidocs/multi-measure-rest-markup.texidoc
 create mode 100644 Documentation/fr/texidocs/non-default-tuplet-numbers.texidoc
 create mode 100644 Documentation/fr/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
 create mode 100644 Documentation/fr/texidocs/placement-of-right-hand-fingerings.texidoc
 create mode 100644 Documentation/fr/texidocs/polyphony-in-tablature.texidoc
 create mode 100644 Documentation/fr/texidocs/positioning-grace-notes-with-floating-space.texidoc
 create mode 100644 Documentation/fr/texidocs/positioning-multi-measure-rests.texidoc
 create mode 100644 Documentation/fr/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
 create mode 100644 Documentation/fr/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
 create mode 100644 Documentation/fr/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
 create mode 100644 Documentation/fr/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
 create mode 100644 Documentation/fr/texidocs/redefining-grace-note-global-defaults.texidoc
 create mode 100644 Documentation/fr/texidocs/removing-bar-numbers-from-a-score.texidoc
 create mode 100644 Documentation/fr/texidocs/rest-styles.texidoc
 create mode 100644 Documentation/fr/texidocs/reverting-default-beam-endings.texidoc
 create mode 100644 Documentation/fr/texidocs/specifying-context-with-beatgrouping.texidoc
 create mode 100644 Documentation/fr/texidocs/stem-and-beam-behavior-in-tablature.texidoc
 create mode 100644 Documentation/fr/texidocs/sub-dividing-beams.texidoc
 create mode 100644 Documentation/fr/texidocs/tweaking-grace-layout-within-music.texidoc
 create mode 100644 Documentation/fr/texidocs/using-beatlength-and-beatgrouping.texidoc
 create mode 100644 Documentation/fr/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
 rename {input => Documentation/fr}/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc (100%)
 create mode 100644 Documentation/fr/texidocs/using-ties-with-arpeggios.texidoc
 delete mode 100644 Documentation/fr/user/GNUmakefile
 rename Documentation/{user => }/henle-flat-bw.png (100%)
 rename Documentation/{user => }/henle-flat-gray.png (100%)
 rename Documentation/ja/{user/lilypond-program.tely => application.tely} (92%)
 create mode 100644 Documentation/ja/application/GNUmakefile
 rename Documentation/ja/{user => application}/converters.itely (96%)
 rename Documentation/ja/{user => application}/install.itely (98%)
 rename Documentation/ja/{user => application}/lilypond-book.itely (99%)
 rename Documentation/ja/{user => application}/running.itely (99%)
 rename Documentation/ja/{user => application}/setup.itely (99%)
 rename Documentation/ja/{user => }/dedication.itely (94%)
 rename Documentation/ja/{user/lilypond-learning.tely => learning.tely} (91%)
 create mode 100644 Documentation/ja/learning/GNUmakefile
 rename Documentation/ja/{user => learning}/fundamental.itely (99%)
 rename Documentation/ja/{user => learning}/introduction.itely (99%)
 rename Documentation/ja/{user => learning}/preface.itely (98%)
 rename Documentation/ja/{user => learning}/scheme-tutorial.itely (91%)
 rename Documentation/ja/{user => learning}/templates.itely (99%)
 rename Documentation/ja/{user => learning}/tutorial.itely (99%)
 rename Documentation/ja/{user => learning}/tweaks.itely (99%)
 rename Documentation/ja/{user => learning}/working.itely (99%)
 rename Documentation/ja/{user => }/macros.itexi (72%)
 create mode 100644 Documentation/ja/texidocs/GNUmakefile
 create mode 100644 Documentation/ja/texidocs/piano-template-with-centered-dynamics.texidoc
 create mode 100644 Documentation/ja/texidocs/piano-template-with-centered-lyrics.texidoc
 create mode 100644 Documentation/ja/texidocs/piano-template-with-melody-and-lyrics.texidoc
 create mode 100644 Documentation/ja/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
 create mode 100644 Documentation/ja/texidocs/single-staff-template-with-notes-and-chords.texidoc
 create mode 100644 Documentation/ja/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
 create mode 100644 Documentation/ja/texidocs/single-staff-template-with-only-notes.texidoc
 create mode 100644 Documentation/ja/texidocs/string-quartet-template-simple.texidoc
 create mode 100644 Documentation/ja/texidocs/string-quartet-template-with-separate-parts.texidoc
 create mode 100644 Documentation/ja/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
 create mode 100644 Documentation/ja/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
 create mode 100644 Documentation/ja/texidocs/vocal-ensemble-template.texidoc
 delete mode 100644 Documentation/ja/user/GNUmakefile
 rename Documentation/{user => }/latex-example.latex (100%)
 rename Documentation/{user => }/latex-lilypond-example.latex (100%)
 rename Documentation/{user/lilypond-learning.tely => learning.tely} (87%)
 create mode 100644 Documentation/learning/GNUmakefile
 rename Documentation/{user => learning}/fundamental.itely (99%)
 rename Documentation/{user => learning}/introduction.itely (99%)
 rename Documentation/{user => learning}/preface.itely (98%)
 rename Documentation/{user => learning}/scheme-tutorial.itely (99%)
 rename Documentation/{user => learning}/templates.itely (99%)
 rename Documentation/{user => learning}/tutorial.itely (99%)
 rename Documentation/{user => learning}/tweaks.itely (99%)
 rename Documentation/{user => learning}/working.itely (99%)
 rename Documentation/{user => }/lily-flat-bw.png (100%)
 rename Documentation/{user => }/music-glossary.tely (99%)
 rename Documentation/{user/lilypond.tely => notation.tely} (80%)
 create mode 100644 Documentation/notation/GNUmakefile
 rename Documentation/{user => notation}/ancient.itely (100%)
 rename Documentation/{user => notation}/changing-defaults.itely (99%)
 rename Documentation/{user => notation}/cheatsheet.itely (99%)
 rename Documentation/{user => notation}/chords.itely (100%)
 rename Documentation/{user => notation}/editorial.itely (100%)
 rename Documentation/{user => notation}/expressive.itely (100%)
 rename Documentation/{user => notation}/fretted-strings.itely (100%)
 rename Documentation/{user => notation}/input.itely (99%)
 rename Documentation/{user => notation}/keyboards.itely (100%)
 rename Documentation/{user => notation}/literature.itely (98%)
 rename Documentation/{user => notation}/notation-appendices.itely (99%)
 rename Documentation/{user => notation}/notation.itely (76%)
 rename Documentation/{user => notation}/percussion.itely (100%)
 rename Documentation/{user => notation}/pitches.itely (100%)
 rename Documentation/{user => notation}/programming-interface.itely (99%)
 rename Documentation/{user => notation}/repeats.itely (100%)
 rename Documentation/{user => notation}/rhythms.itely (100%)
 rename Documentation/{user => notation}/simultaneous.itely (100%)
 rename Documentation/{user => notation}/spacing.itely (99%)
 rename Documentation/{user => notation}/specialist.itely (69%)
 rename Documentation/{user => notation}/staff.itely (100%)
 rename Documentation/{user => notation}/text.itely (100%)
 rename Documentation/{user => notation}/unfretted-strings.itely (100%)
 rename Documentation/{user => notation}/vocal.itely (100%)
 rename Documentation/{user => notation}/wind.itely (100%)
 rename Documentation/{user => notation}/world.itely (100%)
 rename input/lsr/lilypond-snippets.tely => Documentation/snippets.tely (69%)
 create mode 100644 Documentation/snippets/GNUmakefile
 rename {input/lsr => Documentation/snippets}/README (100%)
 rename {input/lsr => Documentation/snippets}/accordion-discant-symbols.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-a-figured-bass-above-or-below-the-notes.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-ambitus-per-voice.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-an-extra-staff-at-a-line-break.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-an-extra-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-bar-lines-to-chordnames-context.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-drum-parts.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-fingerings-to-a-score.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-fingerings-to-tablatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-the-current-date-to-a-score.ly (100%)
 rename {input/lsr => Documentation/snippets}/adding-volta-brackets-to-additional-staves.ly (100%)
 rename {input/lsr => Documentation/snippets}/additional-voices-to-avoid-collisions.ly (100%)
 rename {input/lsr => Documentation/snippets}/adjusting-lyrics-vertical-spacing.ly (100%)
 rename {input/lsr => Documentation/snippets}/adjusting-the-shape-of-falls-and-doits.ly (100%)
 rename {input/lsr => Documentation/snippets}/aligning-and-centering-instrument-names.ly (100%)
 rename {input/lsr => Documentation/snippets}/aligning-bar-numbers.ly (100%)
 rename {input/lsr => Documentation/snippets}/aligning-marks-with-various-notation-objects.ly (100%)
 rename {input/lsr => Documentation/snippets}/aligning-objects-created-with-the--mark-command.ly (100%)
 rename {input/lsr => Documentation/snippets}/allowing-fingerings-to-be-printed-inside-the-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/ambitus-with-multiple-voices.ly (100%)
 rename {input/lsr => Documentation/snippets}/ambitus.ly (100%)
 rename {input/lsr => Documentation/snippets}/analysis-brackets-above-the-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/ancient-fonts.ly (100%)
 rename {input/lsr => Documentation/snippets}/ancient-notation-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/ancient-notation-template----modern-transcription-of-gregorian-music.ly (100%)
 rename {input/lsr => Documentation/snippets}/ancient-notation-template----modern-transcription-of-mensural-music.ly (100%)
 rename {input/lsr => Documentation/snippets}/ancient-notation.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/ancient-time-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/applying-note-head-styles-depending-on-the-step-of-the-scale.ly (100%)
 rename {input/lsr => Documentation/snippets}/arabic-improvisation.ly (100%)
 rename {input/lsr => Documentation/snippets}/automatic-beam-subdivisions.ly (100%)
 rename {input/lsr => Documentation/snippets}/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly (100%)
 rename {input/lsr => Documentation/snippets}/avoiding-collisions-with-chord-fingerings.ly (100%)
 rename {input/lsr => Documentation/snippets}/beam-endings-in-score-context.ly (100%)
 rename {input/lsr => Documentation/snippets}/beam-grouping-in-7-8-time.ly (100%)
 rename {input/lsr => Documentation/snippets}/beams-across-line-breaks.ly (100%)
 rename {input/lsr => Documentation/snippets}/blanking-staff-lines-using-the--whiteout-command.ly (100%)
 rename {input/lsr => Documentation/snippets}/book-parts.ly (100%)
 rename {input/lsr => Documentation/snippets}/breaks.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/breathing-signs.ly (100%)
 rename {input/lsr => Documentation/snippets}/broken-crescendo-hairpin.ly (100%)
 rename {input/lsr => Documentation/snippets}/caesura-railtracks-with-fermata.ly (100%)
 rename {input/lsr => Documentation/snippets}/center-text-below-hairpin-dynamics.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing--flageolet-mark-size.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-a-single-notes-size-in-a-chord.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-beam-knee-gap.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-chord-separator.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-form-of-multi-measure-rests.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-midi-output-to-one-channel-per-voice.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-partcombine-texts.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-properties-for-individual-grobs.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-stanza-fonts.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-text-and-spanner-styles-for-text-dynamics.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-breath-mark-symbol.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-chord-names-to-german-or-semi-german-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-default-text-font-family.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-number-of-lines-in-a-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-positions-of-figured-bass-alterations.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-staff-size.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-tempo-without-a-metronome-mark.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-time-signature-without-affecting-the-beaming.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-the-tuplet-number.ly (100%)
 rename {input/lsr => Documentation/snippets}/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly (100%)
 rename {input/lsr => Documentation/snippets}/chant-or-psalms-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/chord-name-exceptions.ly (100%)
 rename {input/lsr => Documentation/snippets}/chord-name-major7.ly (100%)
 rename {input/lsr => Documentation/snippets}/chordchanges-for-fretboards.ly (100%)
 rename {input/lsr => Documentation/snippets}/chords-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/chords.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/clip-systems.ly (100%)
 rename {input/lsr => Documentation/snippets}/clusters.ly (100%)
 rename {input/lsr => Documentation/snippets}/coloring-notes-depending-on-their-pitch.ly (100%)
 rename {input/lsr => Documentation/snippets}/combining-dynamics-with-markup-texts.ly (100%)
 rename {input/lsr => Documentation/snippets}/combining-two-parts-on-the-same-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/compound-time-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/conducting-signs,-measure-grouping-signs.ly (100%)
 rename {input/lsr => Documentation/snippets}/contemporary-glissando.ly (100%)
 rename {input/lsr => Documentation/snippets}/contexts-and-engravers-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/contexts-and-engravers.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/controlling-the-placement-of-chord-fingerings.ly (100%)
 rename {input/lsr => Documentation/snippets}/controlling-the-vertical-ordering-of-scripts.ly (100%)
 rename {input/lsr => Documentation/snippets}/controlling-tuplet-bracket-visibility.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-a-delayed-turn.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-a-sequence-of-notes-on-various-pitches.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-arpeggios-across-notes-in-different-voices.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-blank-staves.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-cross-staff-arpeggios-in-a-piano-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-cross-staff-arpeggios-in-other-contexts.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-metronome-marks-in-markup-mode.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-real-parenthesized-dynamics.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-simultaneous-rehearsal-marks.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-slurs-across-voices.ly (100%)
 rename {input/lsr => Documentation/snippets}/creating-text-spanners.ly (100%)
 rename {input/lsr => Documentation/snippets}/custodes.ly (100%)
 rename {input/lsr => Documentation/snippets}/customizing-fretboard-fret-diagrams.ly (100%)
 rename {input/lsr => Documentation/snippets}/customizing-markup-fret-diagrams.ly (100%)
 rename {input/lsr => Documentation/snippets}/default-direction-of-stems-on-the-center-line-of-the-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/defining-predefined-fretboards-for-other-instruments.ly (100%)
 rename {input/lsr => Documentation/snippets}/demo-midiinstruments.ly (100%)
 rename {input/lsr => Documentation/snippets}/demonstrating-all-headers.ly (100%)
 rename {input/lsr => Documentation/snippets}/display-bracket-with-only-one-staff-in-a-system.ly (100%)
 rename {input/lsr => Documentation/snippets}/displaying-complex-chords.ly (100%)
 rename {input/lsr => Documentation/snippets}/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly (100%)
 rename {input/lsr => Documentation/snippets}/dotted-harmonics.ly (100%)
 rename {input/lsr => Documentation/snippets}/double-glissando.ly (100%)
 rename {input/lsr => Documentation/snippets}/drawing-boxes-around-grobs.ly (100%)
 rename {input/lsr => Documentation/snippets}/drawing-circles-around-various-objects.ly (100%)
 rename {input/lsr => Documentation/snippets}/editorial-annotations-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/editorial-annotations.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/embedding-native-postscript-in-a--markup-block.ly (100%)
 rename {input/lsr => Documentation/snippets}/engravers-one-by-one.ly (100%)
 rename {input/lsr => Documentation/snippets}/engraving-ties-manually.ly (100%)
 rename {input/lsr => Documentation/snippets}/engraving-tremolos-with-floating-beams.ly (100%)
 rename {input/lsr => Documentation/snippets}/entering-several-tuplets-using-only-one--times-command.ly (100%)
 rename {input/lsr => Documentation/snippets}/expressive-marks-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/expressive-marks.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/faking-a-hammer-in-tablatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/fine-tuning-pedal-brackets.ly (100%)
 rename {input/lsr => Documentation/snippets}/fingerings,-string-indications,-and-right-hand-fingerings.ly (100%)
 rename {input/lsr => Documentation/snippets}/flamenco-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/flat-flags-and-beam-nibs.ly (100%)
 rename {input/lsr => Documentation/snippets}/flute-slap-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/forcing-horizontal-shift-of-notes.ly (100%)
 rename {input/lsr => Documentation/snippets}/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly (100%)
 rename {input/lsr => Documentation/snippets}/formatting-lyrics-syllables.ly (100%)
 rename {input/lsr => Documentation/snippets}/fret-diagrams-explained-and-developed.ly (100%)
 rename {input/lsr => Documentation/snippets}/fretted-strings-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/fretted-strings.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/generating-random-notes.ly (100%)
 rename {input/lsr => Documentation/snippets}/grid-lines--changing-their-appearance.ly (100%)
 rename {input/lsr => Documentation/snippets}/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly (100%)
 rename {input/lsr => Documentation/snippets}/grouping-beats.ly (100%)
 rename {input/lsr => Documentation/snippets}/guitar-strum-rhythms.ly (100%)
 rename {input/lsr => Documentation/snippets}/heavily-customized-polymetric-time-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/hiding-the-extender-line-for-text-dynamics.ly (100%)
 rename {input/lsr => Documentation/snippets}/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly (100%)
 rename {input/lsr => Documentation/snippets}/how-to-change-fret-diagram-position.ly (100%)
 rename {input/lsr => Documentation/snippets}/how-to-put-ties-between-syllables-in-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/incipit.ly (100%)
 rename {input/lsr => Documentation/snippets}/indicating-cross-staff-chords-with-arpeggio-bracket.ly (100%)
 rename {input/lsr => Documentation/snippets}/inserting-a-caesura.ly (100%)
 rename {input/lsr => Documentation/snippets}/inserting-score-fragments-above-a-staff,-as-markups.ly (100%)
 rename {input/lsr => Documentation/snippets}/isolated-percent-repeats.ly (100%)
 rename {input/lsr => Documentation/snippets}/jazz-combo-template.ly (100%)
 rename {input/lsr => Documentation/snippets}/keyboards-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/keyboards.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/laissez-vibrer-ties.ly (100%)
 rename {input/lsr => Documentation/snippets}/letter-tablature-formatting.ly (100%)
 rename {input/lsr => Documentation/snippets}/line-arrows.ly (100%)
 rename {input/lsr => Documentation/snippets}/lyrics-alignment.ly (100%)
 rename {input/lsr => Documentation/snippets}/makam-example.ly (100%)
 rename {input/lsr => Documentation/snippets}/making-an-object-invisible-with-the-transparent-property.ly (100%)
 rename {input/lsr => Documentation/snippets}/making-slurs-with-complex-dash-structure.ly (100%)
 rename {input/lsr => Documentation/snippets}/making-some-staff-lines-thicker-than-the-others.ly (100%)
 rename {input/lsr => Documentation/snippets}/manually-break-figured-bass-extenders-for-only-some-numbers.ly (100%)
 rename {input/lsr => Documentation/snippets}/manually-controlling-beam-positions.ly (100%)
 rename {input/lsr => Documentation/snippets}/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly (100%)
 rename {input/lsr => Documentation/snippets}/markup-lines.ly (100%)
 rename {input/lsr => Documentation/snippets}/measure-counter.ly (100%)
 rename {input/lsr => Documentation/snippets}/mensurstriche-layout-bar-lines-between-the-staves.ly (100%)
 rename {input/lsr => Documentation/snippets}/merging-multi-measure-rests-in-a-polyphonic-part.ly (100%)
 rename {input/lsr => Documentation/snippets}/midi-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/midi.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/modern-tab-text-clef.ly (100%)
 rename {input/lsr => Documentation/snippets}/modifying-default-values-for-articulation-shorthand-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/modifying-tuplet-bracket-length.ly (100%)
 rename {input/lsr => Documentation/snippets}/multi-measure-rest-markup.ly (100%)
 rename {input/lsr => Documentation/snippets}/nesting-staves.ly (100%)
 create mode 100644 Documentation/snippets/new/GNUmakefile
 rename {input => Documentation/snippets}/new/README (100%)
 rename {input => Documentation/snippets}/new/chordchanges-for-fretboards.ly (100%)
 rename {input => Documentation/snippets}/new/making-slurs-with-complex-dash-structure.ly (100%)
 rename {input => Documentation/snippets}/new/non-default-tuplet-numbers.ly (100%)
 rename {input => Documentation/snippets}/new/non-traditional-key-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/non-default-tuplet-numbers.ly (100%)
 rename {input/lsr => Documentation/snippets}/non-traditional-key-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/orchestra,-choir-and-piano-template.ly (100%)
 rename {input/lsr => Documentation/snippets}/ottava-text.ly (100%)
 rename {input/lsr => Documentation/snippets}/outputting-the-version-number.ly (100%)
 rename {input/lsr => Documentation/snippets}/page-label.ly (100%)
 rename {input/lsr => Documentation/snippets}/paper-and-layout-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/paper-and-layout.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/percent-repeat-count-visibility.ly (100%)
 rename {input/lsr => Documentation/snippets}/percent-repeat-counter.ly (100%)
 rename {input/lsr => Documentation/snippets}/percussion-beaters.ly (100%)
 rename {input/lsr => Documentation/snippets}/percussion-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/percussion.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/permitting-line-breaks-within-beamed-tuplets.ly (100%)
 rename {input/lsr => Documentation/snippets}/piano-template-simple.ly (100%)
 rename {input/lsr => Documentation/snippets}/piano-template-with-centered-dynamics.ly (100%)
 rename {input/lsr => Documentation/snippets}/piano-template-with-centered-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/piano-template-with-melody-and-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/pitches-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/pitches.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/placement-of-right-hand-fingerings.ly (100%)
 rename {input/lsr => Documentation/snippets}/polyphony-in-tablature.ly (100%)
 rename {input/lsr => Documentation/snippets}/positioning-fingering-indications-precisely.ly (100%)
 rename {input/lsr => Documentation/snippets}/positioning-grace-notes-with-floating-space.ly (100%)
 rename {input/lsr => Documentation/snippets}/positioning-multi-measure-rests.ly (100%)
 rename {input/lsr => Documentation/snippets}/positioning-segno-and-coda-with-line-break.ly (100%)
 rename {input/lsr => Documentation/snippets}/positioning-text-markups-inside-slurs.ly (100%)
 rename {input/lsr => Documentation/snippets}/preventing-extra-naturals-from-being-automatically-added.ly (100%)
 rename {input/lsr => Documentation/snippets}/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-bar-numbers-at-regular-intervals.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-bar-numbers-inside-boxes-or-circles.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-hairpins-using-al-niente-notation.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-marks-at-the-end-of-a-line-or-a-score.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-marks-on-every-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-metronome-and-rehearsal-marks-below-the-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-music-with-different-time-signatures.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-text-from-right-to-left.ly (100%)
 rename {input/lsr => Documentation/snippets}/printing-the-bar-number-for-the-first-measure.ly (100%)
 rename {input/lsr => Documentation/snippets}/proportional-strict-notespacing.ly (100%)
 rename {input/lsr => Documentation/snippets}/quoting-another-voice-with-transposition.ly (100%)
 rename {input/lsr => Documentation/snippets}/quoting-another-voice.ly (100%)
 rename {input/lsr => Documentation/snippets}/redefining-grace-note-global-defaults.ly (100%)
 rename {input/lsr => Documentation/snippets}/removing-bar-numbers-from-a-score.ly (100%)
 rename {input/lsr => Documentation/snippets}/removing-the-first-empty-line.ly (100%)
 rename {input/lsr => Documentation/snippets}/repeats-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/repeats.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/rest-styles.ly (100%)
 rename {input/lsr => Documentation/snippets}/reverting-default-beam-endings.ly (100%)
 rename {input/lsr => Documentation/snippets}/rhythmic-slashes.ly (100%)
 rename {input/lsr => Documentation/snippets}/rhythms-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/rhythms.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/score-for-diatonic-accordion.ly (100%)
 rename {input/lsr => Documentation/snippets}/separating-key-cancellations-from-key-signature-changes.ly (100%)
 rename {input/lsr => Documentation/snippets}/setting-hairpin-behavior-at-bar-lines.ly (100%)
 rename {input/lsr => Documentation/snippets}/setting-the-minimum-length-of-hairpins.ly (100%)
 rename {input/lsr => Documentation/snippets}/shortening-volta-brackets.ly (100%)
 rename {input/lsr => Documentation/snippets}/showing-chords-at-changes.ly (100%)
 rename {input/lsr => Documentation/snippets}/simple-lead-sheet.ly (100%)
 rename {input/lsr => Documentation/snippets}/simultaneous-notes-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/simultaneous-notes.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/single-staff-template-with-notes,-lyrics,-and-chords.ly (100%)
 rename {input/lsr => Documentation/snippets}/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly (100%)
 rename {input/lsr => Documentation/snippets}/single-staff-template-with-notes-and-chords.ly (100%)
 rename {input/lsr => Documentation/snippets}/single-staff-template-with-notes-and-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/single-staff-template-with-only-notes.ly (100%)
 rename {input/lsr => Documentation/snippets}/skips-in-lyric-mode-2.ly (100%)
 rename {input/lsr => Documentation/snippets}/skips-in-lyric-mode.ly (100%)
 rename {input/lsr => Documentation/snippets}/snap-pizzicato-markup-bartok-pizzicato.ly (100%)
 rename {input/lsr => Documentation/snippets}/spacing-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/spacing.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/specifying-context-with-beatgrouping.ly (100%)
 rename {input/lsr => Documentation/snippets}/staff-notation-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/staff-notation.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/stand-alone-two-column-markup.ly (100%)
 rename {input/lsr => Documentation/snippets}/stem-and-beam-behavior-in-tablature.ly (100%)
 rename {input/lsr => Documentation/snippets}/stemlets.ly (100%)
 rename {input/lsr => Documentation/snippets}/string-quartet-template-simple.ly (100%)
 rename {input/lsr => Documentation/snippets}/string-quartet-template-with-separate-parts.ly (100%)
 rename {input/lsr => Documentation/snippets}/sub-dividing-beams.ly (100%)
 rename {input/lsr => Documentation/snippets}/suppressing-warnings-for-clashing-note-columns.ly (100%)
 rename {input/lsr => Documentation/snippets}/table-of-contents.ly (100%)
 rename {input/lsr => Documentation/snippets}/template-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/template.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/text-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/text.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/three-sided-box.ly (100%)
 rename {input/lsr => Documentation/snippets}/tick-bar-lines.ly (100%)
 rename {input/lsr => Documentation/snippets}/time-signature-in-parentheses.ly (100%)
 rename {input/lsr => Documentation/snippets}/titles-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/titles.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/transcription-of-ancient-music-with-incipit.ly (100%)
 rename {input/lsr => Documentation/snippets}/transposing-pitches-with-minimum-accidentals-smart-transpose.ly (100%)
 rename {input/lsr => Documentation/snippets}/tweaking-clef-properties.ly (100%)
 rename {input/lsr => Documentation/snippets}/tweaking-grace-layout-within-music.ly (100%)
 rename {input/lsr => Documentation/snippets}/tweaks-and-overrides-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/tweaks-and-overrides.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/unfretted-strings-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/unfretted-strings.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/use-square-bracket-at-the-start-of-a-staff-group.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-beatlength-and-beatgrouping.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-double-slurs-for-legato-chords.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-grace-note-slashes-with-normal-heads.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-postscript-to-generate-special-note-head-shapes.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-the--tweak-command-to-tweak-individual-grobs.ly (100%)
 rename {input/lsr => Documentation/snippets}/using-ties-with-arpeggios.ly (100%)
 rename {input/lsr => Documentation/snippets}/utf-8.ly (100%)
 rename {input/lsr => Documentation/snippets}/vertically-aligned-dynamics-and-textscripts.ly (100%)
 rename {input/lsr => Documentation/snippets}/vertically-aligning-dynamics-across-multiple-notes.ly (100%)
 rename {input/lsr => Documentation/snippets}/vertically-aligning-ossias-and-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/vertically-centered-common-lyrics.ly (100%)
 rename {input/lsr => Documentation/snippets}/vocal-ensemble-template-with-automatic-piano-reduction.ly (100%)
 rename {input/lsr => Documentation/snippets}/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly (100%)
 rename {input/lsr => Documentation/snippets}/vocal-ensemble-template.ly (100%)
 rename {input/lsr => Documentation/snippets}/vocal-music-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/vocal-music.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/volta-below-chords.ly (100%)
 rename {input/lsr => Documentation/snippets}/volta-multi-staff.ly (100%)
 rename {input/lsr => Documentation/snippets}/volta-text-markup-using-repeatcommands.ly (100%)
 rename {input/lsr => Documentation/snippets}/winds-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/winds.snippet-list (100%)
 rename {input/lsr => Documentation/snippets}/world-music-intro.itely (100%)
 rename {input/lsr => Documentation/snippets}/world-music.snippet-list (100%)
 delete mode 100644 Documentation/user/GNUmakefile
 delete mode 100644 Documentation/user/README.txt
 delete mode 100644 Documentation/user/glossary.html.in
 delete mode 100644 input/lsr/GNUmakefile
 delete mode 100644 input/new/GNUmakefile
 delete mode 100644 input/texidocs/aligning-bar-numbers.texidoc
 delete mode 100644 input/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
 delete mode 100644 input/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
 delete mode 100644 input/texidocs/beam-endings-in-score-context.texidoc
 delete mode 100644 input/texidocs/beam-grouping-in-7-8-time.texidoc
 delete mode 100644 input/texidocs/beams-across-line-breaks.texidoc
 delete mode 100644 input/texidocs/changing--flageolet-mark-size.texidoc
 delete mode 100644 input/texidocs/changing-beam-knee-gap.texidoc
 delete mode 100644 input/texidocs/changing-form-of-multi-measure-rests.texidoc
 delete mode 100644 input/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
 delete mode 100644 input/texidocs/changing-the-tuplet-number.texidoc
 delete mode 100644 input/texidocs/compound-time-signatures.texidoc
 delete mode 100644 input/texidocs/conducting-signs,-measure-grouping-signs.texidoc
 delete mode 100644 input/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
 delete mode 100644 input/texidocs/customizing-markup-fret-diagrams.texidoc
 delete mode 100644 input/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
 delete mode 100644 input/texidocs/engraving-ties-manually.texidoc
 delete mode 100644 input/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
 delete mode 100644 input/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
 delete mode 100644 input/texidocs/flat-flags-and-beam-nibs.texidoc
 delete mode 100644 input/texidocs/grouping-beats.texidoc
 delete mode 100644 input/texidocs/guitar-strum-rhythms.texidoc
 delete mode 100644 input/texidocs/multi-measure-rest-markup.texidoc
 delete mode 100644 input/texidocs/non-default-tuplet-numbers.texidoc
 delete mode 100644 input/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
 delete mode 100644 input/texidocs/piano-template-with-centered-dynamics.texidoc
 delete mode 100644 input/texidocs/piano-template-with-centered-lyrics.texidoc
 delete mode 100644 input/texidocs/piano-template-with-melody-and-lyrics.texidoc
 delete mode 100644 input/texidocs/placement-of-right-hand-fingerings.texidoc
 delete mode 100644 input/texidocs/polyphony-in-tablature.texidoc
 delete mode 100644 input/texidocs/positioning-grace-notes-with-floating-space.texidoc
 delete mode 100644 input/texidocs/positioning-multi-measure-rests.texidoc
 delete mode 100644 input/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
 delete mode 100644 input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
 delete mode 100644 input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
 delete mode 100644 input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
 delete mode 100644 input/texidocs/redefining-grace-note-global-defaults.texidoc
 delete mode 100644 input/texidocs/removing-bar-numbers-from-a-score.texidoc
 delete mode 100644 input/texidocs/rest-styles.texidoc
 delete mode 100644 input/texidocs/reverting-default-beam-endings.texidoc
 delete mode 100644 input/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
 delete mode 100644 input/texidocs/single-staff-template-with-notes-and-chords.texidoc
 delete mode 100644 input/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
 delete mode 100644 input/texidocs/single-staff-template-with-only-notes.texidoc
 delete mode 100644 input/texidocs/specifying-context-with-beatgrouping.texidoc
 delete mode 100644 input/texidocs/stem-and-beam-behavior-in-tablature.texidoc
 delete mode 100644 input/texidocs/string-quartet-template-simple.texidoc
 delete mode 100644 input/texidocs/string-quartet-template-with-separate-parts.texidoc
 delete mode 100644 input/texidocs/sub-dividing-beams.texidoc
 delete mode 100644 input/texidocs/tweaking-grace-layout-within-music.texidoc
 delete mode 100644 input/texidocs/using-beatlength-and-beatgrouping.texidoc
 delete mode 100644 input/texidocs/using-ties-with-arpeggios.texidoc
 delete mode 100644 input/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
 delete mode 100644 input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
 delete mode 100644 input/texidocs/vocal-ensemble-template.texidoc
 delete mode 100644 make/doc-i18n-topdocs-rules.make
 delete mode 100644 make/doc-i18n-topdocs-targets.make
 delete mode 100644 make/doc-i18n-topdocs-vars.make
 delete mode 100644 make/doc-i18n-user-rules.make
 delete mode 100644 make/doc-i18n-user-targets.make
 delete mode 100644 make/doc-i18n-user-vars.make

diff --git a/.gitignore b/.gitignore
index d2ab2e64f5..be455e3b63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,5 @@ tags
 test-output-distance
 ChangeLog
 RELEASE-COMMIT
-Documentation/user/lilypond
-input/lsr/lilypond-snippets
+Documentation/lilypond
 semantic.cache
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 12f25fefc9..eddd02822c 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -2,19 +2,81 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-SUBDIRS=devel user bibliography pictures topdocs misc po $(LANGS)
-STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond ly
-LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+SUBDIRS = application contributor learning notation snippets\
+  bibliography pictures misc po $(LANGS)
+STEPMAKE_TEMPLATES = documentation texinfo tex omf
+LOCALSTEPMAKE_TEMPLATES = lilypond ly
+
+### Extra flags
+
+LILYPOND_BOOK_FLAGS = --extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+TEXI2PDF_FLAGS = \
+  -I $(outdir) \
+  -I $(top-build-dir)/Documentation/$(outconfbase)
+$(outdir)/snippets-big-page.html: TEXI2HTML_FLAGS += -D short_toc
+$(outdir)/snippets/index..html: TEXI2HTML_FLAGS += -D short_toc
+
+### Extra source files
+
 README_TOP_FILES= DEDICATION THANKS
-EXTRA_DIST_FILES = lilypond-texi2html.init
+LATEX_FILES =$(call src-wildcard,*.latex)
+IMAGES=$(call src-wildcard,*.png)
+EPS_ILLUSTRATIONS=context-example.eps
 
-include $(depth)/make/stepmake.make
+IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
+SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
+
+
+### Extra out files
+
+# Dependencies
+GENERATED_ITELY_FILES = $(IN_ITELY_FILES:snippets/%-intro.itely=$(outdir)/%.itely)
+
+OUT_PDF_IMAGES = $(IMAGES:%.png=$(outdir)/%.pdf)
+OUT_PDF_IMAGES += $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf)
+OUT_PNG_IMAGES = $(OUT_PDF_IMAGES:%.pdf=%.png)
+
+XREF_MAPS_FILES += $(XREF_MAPS_DIR)/internals.xref-map
+OMF_FILES += $(outdir)/internals.html.omf $(outdir)/internals.pdf.omf
+
+# Main manuals
+
+OUT_MASTER_TEXI_FILES = $(outdir)/internals.texi
+#OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
+# $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+
+HTML_FILES = \
+$(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
+ $(TEXI_FILES:%.texi=$(outdir)/%-big-page.html)\
+ $(outdir)/internals-big-page.html
 
-HTML_PAGE_NAMES= index translations
+PDF_FILES = \
+$(TELY_FILES:%.tely=$(outdir)/%.pdf)\
+ $(TELY_FILES:%.texi=$(outdir)/%.pdf)\
+ $(outdir)/internals.pdf
+
+
+HTML_PAGE_NAMES= index translations devel
 OUT_HTML_FILES= $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 OUT_CSS_FILES= $(CSS_FILES:%.css=$(outdir)/%.css)
 
+MAIN_INFO_DOC = lilypond-notation
+INFO_DOCS = lilypond-application lilypond-changes lilypond-contributor lilypond-internals \
+ lilypond-learning lilypond-notation music-glossary
+ifeq ($(out),www)
+INFO_DOCS += lilypond-snippets 
+endif
+INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
+
+ifeq ($(out),www)
+INFO_IMAGES_DIR = lilypond
+DEST_INFO_IMAGES_SUBDIR = Documentation/
+endif
+
+
+include $(depth)/make/stepmake.make
+
+
 default: local-doc
 
 ifeq ($(out),www)
@@ -38,9 +100,149 @@ $(OUT_HTML_FILES): $(OUT_CSS_FILES)
 $(outdir)/%.css: %.css
 	ln -f $< $@
 
+local-help: extra-local-help
+
+extra-local-help:
+	@echo -e "\
+  check-xrefs [ISOLANG=LL] validate Texinfo cross-references\n\
+  fix-xrefs [ISOLANG=LL]   interactively fix Texinfo cross-references (use with caution)\n\
+  info        update info pages\n\
+  xml	      update Docbook xml documentation\n\
+\n\
+Translations specific targets (see TRANSLATION for details):\n\
+  new-lang ISOLANG=LL  create and initialize subdirectory \'LL' for language \'LL\n\
+  po-update            update and replace PO files for documentation with msgmerged versions\n\
+  check-translation ISOLANG=LL   show changes in English docs since last translation update\n\
+  update-translation ISOLANG=LL  call $$$$EDITOR to help updating the translation\n\
+  skeleton-update ISOLANG=LL     update Texinfo skeleton files\n\
+  snippet-update ISOLANG=LL      update ly snippets in Texinfo translation according to\n\
+                              docs in English (use with caution)\n\
+\n\
+LL refers to the desired locale (most often only the ISO 639 language code).\n"
+
+#####################################
+# Texinfo 
+
+info: $(INFO_FILES)
+	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
+	@echo export PYTHONPATH=$(PYTHONPATH)
+
+xml: $(outdir)/notation/notation.xml $(outdir)/internals/internals.xml
+
+
+local-clean:
+	rm -f $(INFO_IMAGES_DIR)
+
+
+#
+# Split manuals in HTML
+#
+$(outdir)/learning/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
+$(outdir)/notation/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
+
+
+#
+# Manuals in one big HTML page
+#
+$(outdir)/learning-big-page.html: $(OUT_PNG_IMAGES)
+$(outdir)/notation-big-page.html: $(OUT_PNG_IMAGES)
+
+# Ugh, using '%' twice not possible
+$(outdir)/notation/notation.xml: $(outdir)/notation.texi
+	mkdir -p $(dir $@)
+	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+
+$(outdir)/internals/internals.xml: $(outdir)/internals.texi
+	mkdir -p $(dir $@)
+	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+
+$(outdir)/learning.texi $(outdir)/notation.texi: $(OUT_PDF_IMAGES)
+
+$(foreach manual, application contributor learning notation,\
+$(eval $(outdir)/(i).texi: $(call src-wildcard,$(i)/*.ite??)))
+
+$(outdir)/%.png: %.png
+	convert -depth 8 -geometry 50x50% $< $@
+
+$(outdir)/%.png: %.eps
+	gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
+
+$(outdir)/%.pdf: %.png
+	convert -depth 8 $< $@
+
+$(outdir)/%.pdf: %.eps
+	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
+
+
+### Splitted HTML manuals
+
+DEEP_HTML_FILES =\
+ $(outdir)/application/index.html\
+ $(outdir)/internals/index.html\
+ $(outdir)/learning/index.html\
+ $(outdir)/notation/index.html\
+ $(outdir)/music-glossary/index.html\
+ $(outdir)/snippets/index.html
+
+# Symlinks to refer to external source documents from split and non-split HTML
+source-links = $(outdir)/source $(outdir)/notation/source $(outdir)/music-glossary/source \
+ $(outdir)/application/source $(outdir)/learning/source $(outdir)/internals/source \
+ $(outdir)/snippets/source
+
+$(outdir)/source:
+	@rm -f $(@)
+	ln -sf $(depth) $(@)
+
+$(outdir)/%/source:
+	@rm -f $(@)
+	mkdir -p $(dir $@)
+	ln -sf $(depth)/.. $(@)
+
+################################
+### Snippets rules idiosyncrases
+
+$(outdir)/%.itely: snippets/%-intro.itely snippets/%.snippet-list
+	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
+
+$(outdir)/snippets.texi: $(GENERATED_ITELY_FILES) $(SNIPPET_LY_FILES)
+
+###############
+### Web targets
+
+ifeq ($(out),www)
+local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) info
+
+local-WWW-2: $(HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
+endif
+
+$(outdir)/%.bib: %.bib
+	ln -f $< $@
+
+# lilypond.texi deps
+$(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
+	$(MAKE) -C $(top-src-dir)/mf
+
+$(outdir)/notation.texi: $(outdir)/ly-grammar.txt
+
+# Rules for the automatically generated documentation
+
+$(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
+	cd $(outdir) && $(BISON) -v $<
+	$(auxscript-dir)/yyout2grammar.py $(outdir)/parser.output $@
+
+# There used to be a dependency on a dummy target, to force a rebuild
+# of internals every time.  however, this triggers
+# compilation during install, which is a bad thing (tm).
+
+$(outdir)/internals.texi: $(LILYPOND_BINARY)
+	cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
+
+.SECONDARY:
 
-### Translations maintenance targets
 
+#####################################
+#  Translations maintenance targets #
+#####################################
 po-update:
 	make -C po po-update
 
@@ -61,7 +263,7 @@ new-lang:
 	cp fr/GNUmakefile $(ISOLANG)
 	cp fr/user/GNUmakefile $(ISOLANG)/user
 	sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(ISOLANG)/user/GNUmakefile
-	$(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) -o doc.pot --skeleton --gettext ../user/lilypond-learning.tely
+	$(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) -o doc.pot --skeleton --gettext ../learning.tely
 	mv $(outdir)/*.*tely $(ISOLANG)/user
 	msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot
 	cp po/lilypond-doc.pot po/$(ISOLANG).po
@@ -111,23 +313,4 @@ translation-status:
 	make -C po out=www messages
 	$(auxscript-dir)/translations-status.py
 
-local-help: extra-local-help
-
-extra-local-help:
-	@echo -e "\
-  check-xrefs [ISOLANG=LL] validate Texinfo cross-references\n\
-  fix-xrefs [ISOLANG=LL]   interactively fix Texinfo cross-references (use with caution)\n\
-\n\
-Translations specific targets (see TRANSLATION for details):\n\
-  new-lang ISOLANG=LL  create and initialize subdirectory \'LL' for language \'LL\n\
-  po-update            update and replace PO files for documentation with msgmerged versions\n\
-  check-translation ISOLANG=LL   show changes in English docs since last translation update\n\
-  update-translation ISOLANG=LL  call $$$$EDITOR to help updating the translation\n\
-  skeleton-update ISOLANG=LL     update Texinfo skeleton files\n\
-  snippet-update ISOLANG=LL      update ly snippets in Texinfo translation according to\n\
-                              docs in English (use with caution)\n\
-\n\
-LL refers to the desired locale (most often only the ISO 639 language code).\n"
-
-info:
-	$(MAKE) -C user info
+.SECONDARY:
diff --git a/Documentation/user/lilypond-program.tely b/Documentation/application.tely
similarity index 84%
rename from Documentation/user/lilypond-program.tely
rename to Documentation/application.tely
index ba1722c39f..21d9ec334f 100644
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/application.tely
@@ -5,8 +5,8 @@
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
-@setfilename lilypond-program.info
-@settitle GNU LilyPond program usage
+@setfilename lilypond-application.info
+@settitle GNU LilyPond Application usage
 @documentencoding UTF-8
 @documentlanguage en
 
@@ -18,7 +18,7 @@
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival
-@omfdescription Program Usage of the LilyPond music engraving system
+@omfdescription Application Usage of the LilyPond music engraving system
 @omftype program usage
 @omfcategory Applications|Publishing
 @omflanguage English
@@ -35,13 +35,13 @@
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-program.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-program-big-page.html,one big page}.
+@uref{source/Documentation/application.pdf,PDF} and as
+@uref{source/Documentation/application-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-program.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-program/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/application.pdf,PDF} and as
+@uref{source/Documentation/application/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
@@ -133,11 +133,11 @@ Appendices
 @contents
 
 
-@include install.itely
-@include setup.itely
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
+@include application/install.itely
+@include application/setup.itely
+@include application/running.itely
+@include application/lilypond-book.itely
+@include application/converters.itely
 
 @include fdl.itexi
 
diff --git a/Documentation/application/GNUmakefile b/Documentation/application/GNUmakefile
new file mode 100644
index 0000000000..c93c9e0624
--- /dev/null
+++ b/Documentation/application/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/user/converters.itely b/Documentation/application/converters.itely
similarity index 99%
rename from Documentation/user/converters.itely
rename to Documentation/application/converters.itely
index 5c7a6f6187..b3cafb8eac 100644
--- a/Documentation/user/converters.itely
+++ b/Documentation/application/converters.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/install.itely b/Documentation/application/install.itely
similarity index 97%
rename from Documentation/user/install.itely
rename to Documentation/application/install.itely
index f5ddb4f05e..ffe7797f16 100644
--- a/Documentation/user/install.itely
+++ b/Documentation/application/install.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
@@ -82,4 +82,4 @@ the @uref{Compiling-from-source.html,documentation in English}.
 @c and remove all stuff (menu, nodes, contents) below this line.
 
 
-@include compile.itely
+@include contributor/compile.itexi
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/application/lilypond-book.itely
similarity index 99%
rename from Documentation/user/lilypond-book.itely
rename to Documentation/application/lilypond-book.itely
index 9d166bb43d..436f017012 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/application/lilypond-book.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/running.itely b/Documentation/application/running.itely
similarity index 99%
rename from Documentation/user/running.itely
rename to Documentation/application/running.itely
index cdcd136f25..affb541b8a 100644
--- a/Documentation/user/running.itely
+++ b/Documentation/application/running.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/setup.itely b/Documentation/application/setup.itely
similarity index 99%
rename from Documentation/user/setup.itely
rename to Documentation/application/setup.itely
index da5bbe90ae..e5ab5c48b8 100644
--- a/Documentation/user/setup.itely
+++ b/Documentation/application/setup.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/baer-flat-bw.png b/Documentation/baer-flat-bw.png
similarity index 100%
rename from Documentation/user/baer-flat-bw.png
rename to Documentation/baer-flat-bw.png
diff --git a/Documentation/user/baer-flat-gray.png b/Documentation/baer-flat-gray.png
similarity index 100%
rename from Documentation/user/baer-flat-gray.png
rename to Documentation/baer-flat-gray.png
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/changes.tely
similarity index 94%
rename from Documentation/topdocs/NEWS.tely
rename to Documentation/changes.tely
index a949f8b378..8ce75ea5dc 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/changes.tely
@@ -1,6 +1,6 @@
 \input texinfo @c -*- coding: utf-8; mode: texinfo; -*-
-@setfilename NEWS.info
-@settitle NEWS
+@setfilename lilypond-changes.info
+@settitle LilyPond Changes
 
 @ifhtml
 @macro inputfileref{DIR,NAME}
@@ -36,8 +36,8 @@ See user manual, \NAME\
 @top New features in 2.13 since 2.12
 
 @ifhtml
-This document is also available in @uref{NEWS.pdf,PDF}. It is part of
-the @uref{../,LilyPond Documentation}.
+This document is also available in @uref{changes.pdf,PDF}. It is part of
+the @uref{lilypond/Manuals.html,LilyPond Documentation}.
 @end ifhtml
 
 
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index a971723ab7..599d4f3e7c 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -66,10 +66,11 @@
 
 @c   ***** Headers *****
 
+@ifclear snippets-sections
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
 @end macro
-
+@end ifclear
 
 @c   ***** Indexing *****
 
diff --git a/Documentation/user/context-example.eps b/Documentation/context-example.eps
similarity index 100%
rename from Documentation/user/context-example.eps
rename to Documentation/context-example.eps
diff --git a/Documentation/devel/contrib-guide.texi b/Documentation/contributor.texi
similarity index 79%
rename from Documentation/devel/contrib-guide.texi
rename to Documentation/contributor.texi
index d2af888142..ec1954e12a 100644
--- a/Documentation/devel/contrib-guide.texi
+++ b/Documentation/contributor.texi
@@ -5,7 +5,7 @@
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
-@setfilename contrib-guide.info
+@setfilename lilypond-contributor.info
 @settitle GNU LilyPond Contributor's Guide
 @documentencoding UTF-8
 @documentlanguage en
@@ -24,14 +24,14 @@
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/devel/contrib-guide.pdf,PDF} and as
+@uref{source/Documentation/contributor.pdf,PDF} and as
 @c FIXME: update @uref{} stuff.
-@uref{source/Documentation/devel/,one big page}.
+@uref{source/Documentation/contributor-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/devel/contrib-guide.pdf,PDF} and as a
-@uref{source/Documentation/devel/contrib-guide/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/devel/contributor.pdf,PDF} and as a
+@uref{source/Documentation/devel/contributor/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
@@ -112,15 +112,15 @@ on-line copies of this and other documentation.
 
 @contents
 
-@include git-starting.itexi
-@include compiling.itexi
-@include doc-work.itexi
-@include website-work.itexi
-@include lsr-work.itexi
-@include issues.itexi
-@include regressions.itexi
-@include programming-work.itexi
-@include release-work.itexi
+@include contributor/git-starting.itexi
+@include contributor/compiling.itexi
+@include contributor/doc-work.itexi
+@include contributor/website-work.itexi
+@include contributor/lsr-work.itexi
+@include contributor/issues.itexi
+@include contributor/regressions.itexi
+@include contributor/programming-work.itexi
+@include contributor/release-work.itexi
 
 @bye
 
diff --git a/Documentation/contributor/GNUmakefile b/Documentation/contributor/GNUmakefile
new file mode 100644
index 0000000000..c93c9e0624
--- /dev/null
+++ b/Documentation/contributor/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/user/compile.itely b/Documentation/contributor/compile.itexi
similarity index 99%
rename from Documentation/user/compile.itely
rename to Documentation/contributor/compile.itexi
index f597490323..c6a54e35f7 100644
--- a/Documentation/user/compile.itely
+++ b/Documentation/contributor/compile.itexi
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of install.itely and ../devel/compiling.itexi
+
 
 @c DO NOT TRANSLATE THIS FILE
 
diff --git a/Documentation/devel/compiling.itexi b/Documentation/contributor/compiling.itexi
similarity index 100%
rename from Documentation/devel/compiling.itexi
rename to Documentation/contributor/compiling.itexi
diff --git a/Documentation/devel/doc-translation-list.itexi b/Documentation/contributor/doc-translation-list.itexi
similarity index 98%
rename from Documentation/devel/doc-translation-list.itexi
rename to Documentation/contributor/doc-translation-list.itexi
index 3ef6c1d93b..1da5186c27 100644
--- a/Documentation/devel/doc-translation-list.itexi
+++ b/Documentation/contributor/doc-translation-list.itexi
@@ -1,5 +1,5 @@
 @c -*- coding: us-ascii; mode: texinfo; -*-
-@c This file is part of file doc-work.itexi
+
 @c Word counts are updated automatically by translations-status.py 
 
 Translation of @file{Documentation/foo/bar} should be
diff --git a/Documentation/devel/doc-work.itexi b/Documentation/contributor/doc-work.itexi
similarity index 99%
rename from Documentation/devel/doc-work.itexi
rename to Documentation/contributor/doc-work.itexi
index 2e447deb4c..6c91e7129d 100644
--- a/Documentation/devel/doc-work.itexi
+++ b/Documentation/contributor/doc-work.itexi
@@ -1162,7 +1162,7 @@ All files should be encoded in UTF-8.
 @node Files to be translated
 @unnumberedsubsubsec Files to be translated
 
-@include doc-translation-list.itexi
+@include contributor/doc-translation-list.itexi
 
 @node Translating the Learning Manual and other Texinfo documentation
 @unnumberedsubsubsec Translating the Learning Manual and other Texinfo documentation
diff --git a/Documentation/devel/git-starting.itexi b/Documentation/contributor/git-starting.itexi
similarity index 100%
rename from Documentation/devel/git-starting.itexi
rename to Documentation/contributor/git-starting.itexi
diff --git a/Documentation/devel/issues.itexi b/Documentation/contributor/issues.itexi
similarity index 100%
rename from Documentation/devel/issues.itexi
rename to Documentation/contributor/issues.itexi
diff --git a/Documentation/devel/lsr-work.itexi b/Documentation/contributor/lsr-work.itexi
similarity index 100%
rename from Documentation/devel/lsr-work.itexi
rename to Documentation/contributor/lsr-work.itexi
diff --git a/Documentation/devel/programming-work.itexi b/Documentation/contributor/programming-work.itexi
similarity index 100%
rename from Documentation/devel/programming-work.itexi
rename to Documentation/contributor/programming-work.itexi
diff --git a/Documentation/devel/regressions.itexi b/Documentation/contributor/regressions.itexi
similarity index 100%
rename from Documentation/devel/regressions.itexi
rename to Documentation/contributor/regressions.itexi
diff --git a/Documentation/devel/release-work.itexi b/Documentation/contributor/release-work.itexi
similarity index 100%
rename from Documentation/devel/release-work.itexi
rename to Documentation/contributor/release-work.itexi
diff --git a/Documentation/devel/website-work.itexi b/Documentation/contributor/website-work.itexi
similarity index 100%
rename from Documentation/devel/website-work.itexi
rename to Documentation/contributor/website-work.itexi
diff --git a/Documentation/de/GNUmakefile b/Documentation/de/GNUmakefile
index 8acbe9e78c..f07a3d060b 100644
--- a/Documentation/de/GNUmakefile
+++ b/Documentation/de/GNUmakefile
@@ -1,7 +1,7 @@
 ISOLANG = de
 depth = ../..
-SUBDIRS = user
+SUBDIRS = application learning notation texidocs
 STEPMAKE_TEMPLATES = documentation
-LOCALSTEPMAKE_TEMPLATES = doc-i18n-root
+LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 
 include $(depth)/make/stepmake.make
diff --git a/Documentation/de/user/lilypond-program.tely b/Documentation/de/application.tely
similarity index 92%
rename from Documentation/de/user/lilypond-program.tely
rename to Documentation/de/application.tely
index 62525233d7..9373d9b2cf 100644
--- a/Documentation/de/user/lilypond-program.tely
+++ b/Documentation/de/application.tely
@@ -7,7 +7,7 @@
 @end ignore
 @documentencoding UTF-8
 @documentlanguage de
-@setfilename lilypond-program.info
+@setfilename application.info
 @settitle GNU LilyPond Programmbenutzung
 
 @include macros.itexi
@@ -34,13 +34,13 @@
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-program.de.pdf,PDF} und auf
-@uref{source/Documentation/user/lilypond-program-big-page.html,einer großen Seite}
+@uref{source/Documentation/application.de.pdf,PDF} und auf
+@uref{source/Documentation/appplication-big-page.de.html,einer großen Seite}
 @end ifclear
 @ifset bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-program.pdf,PDF} und auf
-@uref{source/Documentation/user/lilypond-program/index.html,separaten HTML-Seiten mit Index}
+@uref{source/Documentation/application.de.pdf,PDF} und auf
+@uref{source/Documentation/application/index.de.html,separaten HTML-Seiten mit Index}
 @end ifset
 verfügbar.
 @end ifhtml
@@ -186,11 +186,11 @@ Anhänge
 @contents
 
 
-@include install.itely
-@include setup.itely
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
+@include application/install.itely
+@include application/setup.itely
+@include application/running.itely
+@include application/lilypond-book.itely
+@include application/converters.itely
 
 @include fdl.itexi
 
diff --git a/Documentation/de/application/GNUmakefile b/Documentation/de/application/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/de/application/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/de/user/converters.itely b/Documentation/de/application/converters.itely
similarity index 99%
rename from Documentation/de/user/converters.itely
rename to Documentation/de/application/converters.itely
index 6dc9f62837..40a31d8a59 100644
--- a/Documentation/de/user/converters.itely
+++ b/Documentation/de/application/converters.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/install.itely b/Documentation/de/application/install.itely
similarity index 95%
rename from Documentation/de/user/install.itely
rename to Documentation/de/application/install.itely
index b2c32c221c..fe6da9f8dc 100644
--- a/Documentation/de/user/install.itely
+++ b/Documentation/de/application/install.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: d415427752fa5fd83b0da189d677481d1c7f3043
 
@@ -62,11 +62,6 @@ Wenn Sie MacOS 10.3 oder 10.4 benutzen und Python-Skripte wie
 @command{convert-ly} und @command{lilypond-book} benutzen wollen,
 lesen Sie @ref{Setup for MacOS X,,,lilypond-program,Application Usage}.
 
-@include compile.itely
-
-@ignore
-this is now covered in compile.itely
-
 @node Compiling from source
 @section Compiling from source
 
@@ -90,6 +85,3 @@ englische Dokumentation verwiesen werden:
 @c   want to do so, they should be able to read the English docs,
 @c   because they'll probably need to ask questions in English
 @c   on the -devel list.   -gp
-
-@end ignore
-
diff --git a/Documentation/de/user/lilypond-book.itely b/Documentation/de/application/lilypond-book.itely
similarity index 99%
rename from Documentation/de/user/lilypond-book.itely
rename to Documentation/de/application/lilypond-book.itely
index ae38383538..5b48ed72ae 100644
--- a/Documentation/de/user/lilypond-book.itely
+++ b/Documentation/de/application/lilypond-book.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/running.itely b/Documentation/de/application/running.itely
similarity index 99%
rename from Documentation/de/user/running.itely
rename to Documentation/de/application/running.itely
index 08aa556dee..e712a752b6 100644
--- a/Documentation/de/user/running.itely
+++ b/Documentation/de/application/running.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: d415427752fa5fd83b0da189d677481d1c7f3043
 
diff --git a/Documentation/de/user/setup.itely b/Documentation/de/application/setup.itely
similarity index 99%
rename from Documentation/de/user/setup.itely
rename to Documentation/de/application/setup.itely
index 9d1abf2e49..16a2c514a4 100644
--- a/Documentation/de/user/setup.itely
+++ b/Documentation/de/application/setup.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: da96eee19a7529842725d0c374ea356987100f91
 
diff --git a/Documentation/de/user/dedication.itely b/Documentation/de/dedication.itely
similarity index 92%
rename from Documentation/de/user/dedication.itely
rename to Documentation/de/dedication.itely
index 8011853902..2c2d6af298 100644
--- a/Documentation/de/user/dedication.itely
+++ b/Documentation/de/dedication.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in
index 90a768d6e9..5b39efa996 100644
--- a/Documentation/de/index.html.in
+++ b/Documentation/de/index.html.in
@@ -36,15 +36,15 @@
           <td class="left-column">
 	  <ul>
 	    <li>
-	    <a class="title" href="user/lilypond-learning/index.de.html">Handbuch zum Lernen (LM)</a>
-	    (auf <a class="title" href="user/lilypond-learning-big-page.de.html">einer gro&szlig;en Seite</a> ~ 1.5 MB,
-als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
+	    <a class="title" href="learning/index.de.html">Handbuch zum Lernen (LM)</a>
+	    (auf <a class="title" href="learning-big-page.de.html">einer gro&szlig;en Seite</a> ~ 1.5 MB,
+als <a class="title" href="learning.de.pdf">PDF</a>)
               <br>(F&uuml;r den ersten Anfang.)</li>
 
  
- <li><a class="title" href="user/music-glossary/index.html">Musikglossar (MG)</a>
- (auf <a class="title" href="user/music-glossary-big-page.html">einer gro&szlig;en Seite</a> ~ 500 kB,
- als <a class="title" href="user/music-glossary.pdf">PDF</a>)
+ <li><a class="title" href="music-glossary/index.html">Musikglossar (MG)</a>
+ (auf <a class="title" href="music-glossary-big-page.html">einer gro&szlig;en Seite</a> ~ 500 kB,
+ als <a class="title" href="music-glossary.pdf">PDF</a>)
  
       <br>(&Uuml;bersetzung von musikalischen Begriffen aus dem Englischen in andere Sprachen.)</li>
         </ul>
@@ -52,7 +52,7 @@ als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
 	  <td class="right-column">
 	  <ul>
 	  <li>
-	    <a class="title" href="topdocs/NEWS.html">Neuigkeiten</a>
+	    <a class="title" href="changes.html">Neuigkeiten</a>
             <br>(&Auml;nderungen seit der letzten Hauptversion auf Englisch.)</li>
  
  <li><a class="title" href="../examples.html">Beispiele</a>
@@ -64,18 +64,18 @@ als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-<a class="title" href="user/lilypond/index.de.html">Notationsreferenz (NR)</a>
- (auf <a class="title" href="user/lilypond-big-page.de.html">einer gro&szlig;en Seite</a> ~ 4 MB,
- als <a class="title" href="user/lilypond.de.pdf">PDF</a>)
+<a class="title" href="notation/index.de.html">Notationsreferenz (NR)</a>
+ (auf <a class="title" href="notation-big-page.de.html">einer gro&szlig;en Seite</a> ~ 4 MB,
+ als <a class="title" href="notation.de.pdf">PDF</a>)
        <br>(Notation mit LilyPond setzen.)
        <br>(<strong>Achtung:</strong> dieses Dokument ist erst teilweise auf deutsch &uuml;bersetzt,<br>
        die vollständige Version liegt auf Englisch vor, siehe Link unten auf
        der Seite.)</li>
 
         <li>
-  <a  class="title" href="user/lilypond-internals/index.html">Referenz der Interna (IR)</a>
-  (auf <a class="title" href="user/lilypond-internals-big-page.html">einer gro&szlig;en Seite</a> ~ 1 Mb
-  als <a class="title" href="user/lilypond-internals.pdf">PDF</a>)
+  <a  class="title" href="internals/index.html">Referenz der Interna (IR)</a>
+  (auf <a class="title" href="internals-big-page.html">einer gro&szlig;en Seite</a> ~ 1 Mb
+  als <a class="title" href="internals.pdf">PDF</a>)
 
       <br>(Definitionen, wie die Standardeinstellungen ver&auml;ndert k&ouml;nnen.)</li>
          
@@ -84,15 +84,15 @@ als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
 	  <td valign="baseline" class="right-column">
 	  <ul>
 	  <li>
-            <a class="title" href="user/lilypond-program/index.de.html">Anwendungsbenutzung (AU)</a>
- (auf <a class="title" href="user/lilypond-program-big-page.de.html">einer gro&szlig;en Seite</a>,
- als <a class="title" href="user/lilypond-program.de.pdf">PDF</a>)
+            <a class="title" href="application/index.de.html">Anwendungsbenutzung (AU)</a>
+ (auf <a class="title" href="application-big-page.de.html">einer gro&szlig;en Seite</a>,
+ als <a class="title" href="application.de.pdf">PDF</a>)
        <br>(Wie das Programm installiert und gestartet wird.)</li>
           
           
-<li><a class="title" href="../input/lsr/lilypond-snippets/index.html">Schnipsel</a>
-(auf <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">einer gro&szlig;en Seite</a>,
-als <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
+<li><a class="title" href="snippets/index.html">Schnipsel</a>
+(auf <a class="title" href="snippets-big-page.html">einer gro&szlig;en Seite</a>,
+als <a class="title" href="snippets.pdf">PDF</a>)
       <br>(Schnelle Tricks, Tipps und Beispiele.)</li>
         </ul>
  
@@ -100,12 +100,12 @@ als <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
        <ul>
-            <li><a class="title"  href="devel/index.html">Resourcen f&uuml;r Entwickler</a>
+            <li><a class="title"  href="devel.html">Resourcen f&uuml;r Entwickler</a>
             <br>(Dokumentation f&uuml;r Entwickler und Mitwirkende.)</li>
        </ul>
     </td><td class="right-column">
 	<ul>
-          <li><a class="title"  href="translations.html">&Uuml;bersetzungsstatus</a>
+          <li><a class="title"  href="translations.de.html">&Uuml;bersetzungsstatus</a>
           <br>(siehe Fortschritt der &Uuml;bersetzungen)</li>
 	</ul>
          </td>
diff --git a/Documentation/de/user/lilypond-learning.tely b/Documentation/de/learning.tely
similarity index 91%
rename from Documentation/de/user/lilypond-learning.tely
rename to Documentation/de/learning.tely
index 1945a0c2e4..cb7df9470d 100644
--- a/Documentation/de/user/lilypond-learning.tely
+++ b/Documentation/de/learning.tely
@@ -33,14 +33,14 @@
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-learning.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond-learning-big-page.de.html,eine große Seite}
+@uref{source/Documentation/learning.de.pdf,PDF} und als
+@uref{source/Documentation/learning-big-page.de.html,eine große Seite}
 verfügbar.
 @end ifclear
 @ifset bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond-learning.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond-learning/index.de.html,Separate HTML-Seiten mit Index}
+@uref{source/Documentation/learning.de.pdf,PDF} und als
+@uref{source/Documentation/learning/index.de.html,Separate HTML-Seiten mit Index}
 verfügbar.
 @end ifset
 @end ifhtml
@@ -188,15 +188,15 @@ Anhänge
 @contents
 
 
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include fundamental.itely
-@include tweaks.itely
-@include working.itely
+@include learning/preface.itely
+@include learning/introduction.itely
+@include learning/tutorial.itely
+@include learning/fundamental.itely
+@include learning/tweaks.itely
+@include learning/working.itely
 
-@include templates.itely
-@include scheme-tutorial.itely
+@include learning/templates.itely
+@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index
diff --git a/Documentation/de/learning/GNUmakefile b/Documentation/de/learning/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/de/learning/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/learning/fundamental.itely
similarity index 99%
rename from Documentation/de/user/fundamental.itely
rename to Documentation/de/learning/fundamental.itely
index 1a9d369c10..62fcf84db5 100644
--- a/Documentation/de/user/fundamental.itely
+++ b/Documentation/de/learning/fundamental.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 01361d46dc9d514a79683d003eeea5f4fbf2b746
 
diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/learning/introduction.itely
similarity index 99%
rename from Documentation/de/user/introduction.itely
rename to Documentation/de/learning/introduction.itely
index 5932fd1ae5..c882860119 100644
--- a/Documentation/de/user/introduction.itely
+++ b/Documentation/de/learning/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d415427752fa5fd83b0da189d677481d1c7f3043
 
diff --git a/Documentation/de/user/preface.itely b/Documentation/de/learning/preface.itely
similarity index 98%
rename from Documentation/de/user/preface.itely
rename to Documentation/de/learning/preface.itely
index 3b2e5acb32..6fd7328ca2 100644
--- a/Documentation/de/user/preface.itely
+++ b/Documentation/de/learning/preface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/scheme-tutorial.itely b/Documentation/de/learning/scheme-tutorial.itely
similarity index 99%
rename from Documentation/de/user/scheme-tutorial.itely
rename to Documentation/de/learning/scheme-tutorial.itely
index 673d78837b..3a709defcc 100644
--- a/Documentation/de/user/scheme-tutorial.itely
+++ b/Documentation/de/learning/scheme-tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 5131c3292d30cabdf08839daa02a006e4d3c96c5
 
diff --git a/Documentation/de/user/templates.itely b/Documentation/de/learning/templates.itely
similarity index 99%
rename from Documentation/de/user/templates.itely
rename to Documentation/de/learning/templates.itely
index b88d665760..7343fa05ad 100644
--- a/Documentation/de/user/templates.itely
+++ b/Documentation/de/learning/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/learning/tutorial.itely
similarity index 99%
rename from Documentation/de/user/tutorial.itely
rename to Documentation/de/learning/tutorial.itely
index 311a741138..9bc6403ffe 100644
--- a/Documentation/de/user/tutorial.itely
+++ b/Documentation/de/learning/tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/learning/tweaks.itely
similarity index 99%
rename from Documentation/de/user/tweaks.itely
rename to Documentation/de/learning/tweaks.itely
index 6c8af962f5..94493d4a3a 100644
--- a/Documentation/de/user/tweaks.itely
+++ b/Documentation/de/learning/tweaks.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/working.itely b/Documentation/de/learning/working.itely
similarity index 99%
rename from Documentation/de/user/working.itely
rename to Documentation/de/learning/working.itely
index fcceded077..4aceba20b9 100644
--- a/Documentation/de/user/working.itely
+++ b/Documentation/de/learning/working.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/macros.itexi
similarity index 77%
rename from Documentation/de/user/macros.itexi
rename to Documentation/de/macros.itexi
index 9d47c007b1..6d19702dfe 100644
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/macros.itexi
@@ -162,50 +162,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@ref{\TEXT\,,,learning-big-page,Handbuch zum Lernen}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Notationsreferenz}
+@ref{\TEXT\,,,notation-big-page,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notationsreferenz}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Anwendungsbenutzung}
+@ref{\TEXT\,,,application-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Schnipsel}
+@ref{\TEXT\,,,snippets-big-page,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Schnipsel}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Referenz der Interna}
+@ref{\TEXT\,,,internals-big-page,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referenz der Interna}
+@ref{\TEXT\,,\DISPLAY\,internals-big-page,Referenz der Interna}
 @end macro
 
 @end ifset
@@ -227,50 +227,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,,learning,Handbuch zum Lernen}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,learning,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notationsreferenz}
+@ref{\TEXT\,,,notation,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notationsreferenz}
+@ref{\TEXT\,,\DISPLAY\,notation,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Anwendungsbenutzung}
+@ref{\TEXT\,,,application,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,application,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
+@ref{\TEXT\,,,snippets,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
+@ref{\TEXT\,,\DISPLAY\,snippets,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
+@ref{\TEXT\,,,internals,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
+@ref{\TEXT\,,\DISPLAY\,internals,Referenz der Interna}
 @end macro
 
 @end ifclear
@@ -304,52 +304,52 @@
 
 @macro rlearning{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
+@ref{\TEXT\,,,learning.de,Handbuch zum Lernen}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,learning.de,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond.de,Notationsreferenz}
+@ref{\TEXT\,,,notation.de,Notationsreferenz}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond.de,Notationsreferenz}
+@ref{\TEXT\,,\DISPLAY\,notation.de,Notationsreferenz}
 @end macro
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-program.de,Anwendungsbenutzung}
+@ref{\TEXT\,,,application.de,Anwendungsbenutzung}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Anwendungsbenutzung}
+@ref{\TEXT\,,\DISPLAY\,application.de,Anwendungsbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
+@ref{\TEXT\,,,snippets,Schnipsel}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
+@ref{\TEXT\,,\DISPLAY\,snippets,Schnipsel}
 @end macro
 
 @macro rinternals{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
+@ref{\TEXT\,,,internals,Referenz der Interna}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
+@ref{\TEXT\,,\DISPLAY\,internals,Referenz der Interna}
 @end macro
 
 @end iftex
diff --git a/Documentation/de/user/lilypond.tely b/Documentation/de/notation.tely
similarity index 93%
rename from Documentation/de/user/lilypond.tely
rename to Documentation/de/notation.tely
index cb7356ea32..d5e8e60693 100644
--- a/Documentation/de/user/lilypond.tely
+++ b/Documentation/de/notation.tely
@@ -66,14 +66,14 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @ifhtml
 @ifclear bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond.de.pdf,PDF} und auf
-@uref{source/Documentation/user/lilypond-big-page.html,einer großen Seite}
+@uref{source/Documentation/notation.de.pdf,PDF} und auf
+@uref{source/Documentation/notation-big-page.de.html,einer großen Seite}
 (auf Englisch) verfügbar.
 @end ifclear
 @ifset bigpage
 Dieses Dokument ist auch als
-@uref{source/Documentation/user/lilypond.de.pdf,PDF} und als
-@uref{source/Documentation/user/lilypond/index.de.html,separate HTML-Seiten mit Index}
+@uref{source/Documentation/notation.de.pdf,PDF} und als
+@uref{source/Documentation/notation/index.de.html,separate HTML-Seiten mit Index}
 verfügbar.
 @end ifset
 @end ifhtml
@@ -230,19 +230,19 @@ Anhänge
 @contents
 
 
-@include notation.itely
-@include specialist.itely
+@include notation/notation.itely
+@include notation/specialist.itely
 
-@include input.itely
-@include spacing.itely
+@include notation/input.itely
+@include notation/spacing.itely
 
-@include changing-defaults.itely
-@include programming-interface.itely
+@include notation/changing-defaults.itely
+@include notation/programming-interface.itely
 
 
-@include literature.itely
-@include notation-appendices.itely
-@include cheatsheet.itely
+@include notation/literature.itely
+@include notation/notation-appendices.itely
+@include notation/cheatsheet.itely
 
 @node LilyPond grammar
 @appendix LilyPond grammar
diff --git a/Documentation/de/notation/GNUmakefile b/Documentation/de/notation/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/de/notation/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/notation/ancient.itely
similarity index 99%
rename from Documentation/de/user/ancient.itely
rename to Documentation/de/notation/ancient.itely
index a809bb1dda..a28e5adff1 100644
--- a/Documentation/de/user/ancient.itely
+++ b/Documentation/de/notation/ancient.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/changing-defaults.itely b/Documentation/de/notation/changing-defaults.itely
similarity index 99%
rename from Documentation/de/user/changing-defaults.itely
rename to Documentation/de/notation/changing-defaults.itely
index db22e96db9..e7620653da 100644
--- a/Documentation/de/user/changing-defaults.itely
+++ b/Documentation/de/notation/changing-defaults.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 5131c3292d30cabdf08839daa02a006e4d3c96c5
 
diff --git a/Documentation/de/user/cheatsheet.itely b/Documentation/de/notation/cheatsheet.itely
similarity index 99%
rename from Documentation/de/user/cheatsheet.itely
rename to Documentation/de/notation/cheatsheet.itely
index 1cc871634f..f765d5290e 100644
--- a/Documentation/de/user/cheatsheet.itely
+++ b/Documentation/de/notation/cheatsheet.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/chords.itely b/Documentation/de/notation/chords.itely
similarity index 99%
rename from Documentation/de/user/chords.itely
rename to Documentation/de/notation/chords.itely
index 4382a0fab7..5809657fed 100644
--- a/Documentation/de/user/chords.itely
+++ b/Documentation/de/notation/chords.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: da96eee19a7529842725d0c374ea356987100f91
 
diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/notation/editorial.itely
similarity index 100%
rename from Documentation/de/user/editorial.itely
rename to Documentation/de/notation/editorial.itely
diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/notation/expressive.itely
similarity index 100%
rename from Documentation/de/user/expressive.itely
rename to Documentation/de/notation/expressive.itely
diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/notation/fretted-strings.itely
similarity index 99%
rename from Documentation/de/user/fretted-strings.itely
rename to Documentation/de/notation/fretted-strings.itely
index 45a8025daf..655b929a4d 100644
--- a/Documentation/de/user/fretted-strings.itely
+++ b/Documentation/de/notation/fretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 5131c3292d30cabdf08839daa02a006e4d3c96c5
 
diff --git a/Documentation/de/user/input.itely b/Documentation/de/notation/input.itely
similarity index 99%
rename from Documentation/de/user/input.itely
rename to Documentation/de/notation/input.itely
index 72edc5f565..770df759b4 100644
--- a/Documentation/de/user/input.itely
+++ b/Documentation/de/notation/input.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 5131c3292d30cabdf08839daa02a006e4d3c96c5
 
diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/notation/keyboards.itely
similarity index 99%
rename from Documentation/de/user/keyboards.itely
rename to Documentation/de/notation/keyboards.itely
index 58a30b2697..6bef778c6f 100644
--- a/Documentation/de/user/keyboards.itely
+++ b/Documentation/de/notation/keyboards.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d415427752fa5fd83b0da189d677481d1c7f3043
 
diff --git a/Documentation/de/user/literature.itely b/Documentation/de/notation/literature.itely
similarity index 98%
rename from Documentation/de/user/literature.itely
rename to Documentation/de/notation/literature.itely
index ef0d2dbb13..acac49b8ae 100644
--- a/Documentation/de/user/literature.itely
+++ b/Documentation/de/notation/literature.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/notation-appendices.itely b/Documentation/de/notation/notation-appendices.itely
similarity index 99%
rename from Documentation/de/user/notation-appendices.itely
rename to Documentation/de/notation/notation-appendices.itely
index 22e302e7d9..52df402d3d 100644
--- a/Documentation/de/user/notation-appendices.itely
+++ b/Documentation/de/notation/notation-appendices.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 6bf3e9149eb97e66b4c813e41dc7625f06c501aa
 
diff --git a/Documentation/de/user/notation.itely b/Documentation/de/notation/notation.itely
similarity index 78%
rename from Documentation/de/user/notation.itely
rename to Documentation/de/notation/notation.itely
index 3f3df7e3f8..d999d71875 100644
--- a/Documentation/de/user/notation.itely
+++ b/Documentation/de/notation/notation.itely
@@ -24,12 +24,12 @@ Dieses Kapitel erklärt, wie die Notation von Musik erstellt wird.
 * Text::               Text zur Partitur hinzufügen.
 @end menu
 
-@include pitches.itely
-@include rhythms.itely
-@include expressive.itely
-@include repeats.itely
-@include simultaneous.itely
-@include staff.itely
-@include editorial.itely
-@include text.itely
+@include notation/pitches.itely
+@include notation/rhythms.itely
+@include notation/expressive.itely
+@include notation/repeats.itely
+@include notation/simultaneous.itely
+@include notation/staff.itely
+@include notation/editorial.itely
+@include notation/text.itely
 
diff --git a/Documentation/de/user/percussion.itely b/Documentation/de/notation/percussion.itely
similarity index 99%
rename from Documentation/de/user/percussion.itely
rename to Documentation/de/notation/percussion.itely
index 64115295ca..cfef79b0d1 100644
--- a/Documentation/de/user/percussion.itely
+++ b/Documentation/de/notation/percussion.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/notation/pitches.itely
similarity index 100%
rename from Documentation/de/user/pitches.itely
rename to Documentation/de/notation/pitches.itely
diff --git a/Documentation/de/user/programming-interface.itely b/Documentation/de/notation/programming-interface.itely
similarity index 99%
rename from Documentation/de/user/programming-interface.itely
rename to Documentation/de/notation/programming-interface.itely
index 06a095f215..2e014e2728 100644
--- a/Documentation/de/user/programming-interface.itely
+++ b/Documentation/de/notation/programming-interface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/repeats.itely b/Documentation/de/notation/repeats.itely
similarity index 100%
rename from Documentation/de/user/repeats.itely
rename to Documentation/de/notation/repeats.itely
diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/notation/rhythms.itely
similarity index 100%
rename from Documentation/de/user/rhythms.itely
rename to Documentation/de/notation/rhythms.itely
diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/notation/simultaneous.itely
similarity index 100%
rename from Documentation/de/user/simultaneous.itely
rename to Documentation/de/notation/simultaneous.itely
diff --git a/Documentation/de/user/spacing.itely b/Documentation/de/notation/spacing.itely
similarity index 99%
rename from Documentation/de/user/spacing.itely
rename to Documentation/de/notation/spacing.itely
index 950ea30ad8..054a3c59c4 100644
--- a/Documentation/de/user/spacing.itely
+++ b/Documentation/de/notation/spacing.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/specialist.itely b/Documentation/de/notation/specialist.itely
similarity index 70%
rename from Documentation/de/user/specialist.itely
rename to Documentation/de/notation/specialist.itely
index 8bd77dfc83..3347be3b7f 100644
--- a/Documentation/de/user/specialist.itely
+++ b/Documentation/de/notation/specialist.itely
@@ -26,12 +26,12 @@ bestimmtes Instrument oder einen Stil eingesetzt wird.
 * World music::
 @end menu
 
-@include vocal.itely
-@include keyboards.itely
-@include unfretted-strings.itely
-@include fretted-strings.itely
-@include percussion.itely
-@include wind.itely
-@include chords.itely
-@include ancient.itely
-@include world.itely
+@include notation/vocal.itely
+@include notation/keyboards.itely
+@include notation/unfretted-strings.itely
+@include notation/fretted-strings.itely
+@include notation/percussion.itely
+@include notation/wind.itely
+@include notation/chords.itely
+@include notation/ancient.itely
+@include notation/world.itely
diff --git a/Documentation/de/user/staff.itely b/Documentation/de/notation/staff.itely
similarity index 100%
rename from Documentation/de/user/staff.itely
rename to Documentation/de/notation/staff.itely
diff --git a/Documentation/de/user/text.itely b/Documentation/de/notation/text.itely
similarity index 99%
rename from Documentation/de/user/text.itely
rename to Documentation/de/notation/text.itely
index 8ae9409fee..3c56e2dbc6 100644
--- a/Documentation/de/user/text.itely
+++ b/Documentation/de/notation/text.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 
diff --git a/Documentation/de/user/unfretted-strings.itely b/Documentation/de/notation/unfretted-strings.itely
similarity index 99%
rename from Documentation/de/user/unfretted-strings.itely
rename to Documentation/de/notation/unfretted-strings.itely
index f3b3ca33cc..17fc3a2066 100644
--- a/Documentation/de/user/unfretted-strings.itely
+++ b/Documentation/de/notation/unfretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/notation/vocal.itely
similarity index 100%
rename from Documentation/de/user/vocal.itely
rename to Documentation/de/notation/vocal.itely
diff --git a/Documentation/de/user/wind.itely b/Documentation/de/notation/wind.itely
similarity index 99%
rename from Documentation/de/user/wind.itely
rename to Documentation/de/notation/wind.itely
index 9ec26a833c..15b8e78b02 100644
--- a/Documentation/de/user/wind.itely
+++ b/Documentation/de/notation/wind.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/de/user/world.itely b/Documentation/de/notation/world.itely
similarity index 99%
rename from Documentation/de/user/world.itely
rename to Documentation/de/notation/world.itely
index f4982e82af..f220b363d9 100644
--- a/Documentation/de/user/world.itely
+++ b/Documentation/de/notation/world.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/input/texidocs/GNUmakefile b/Documentation/de/texidocs/GNUmakefile
similarity index 85%
rename from input/texidocs/GNUmakefile
rename to Documentation/de/texidocs/GNUmakefile
index 6142dd9bd3..0ffa75869c 100644
--- a/input/texidocs/GNUmakefile
+++ b/Documentation/de/texidocs/GNUmakefile
@@ -1,4 +1,4 @@
-depth=../..
+depth=../../..
 
 EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc)
 
diff --git a/Documentation/de/texidocs/accordion-discant-symbols.texidoc b/Documentation/de/texidocs/accordion-discant-symbols.texidoc
new file mode 100644
index 0000000000..5db7097802
--- /dev/null
+++ b/Documentation/de/texidocs/accordion-discant-symbols.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
+  doctitlede = "Symbole für Akkordeon-Diskantregister"
+  texidocde = "
+Diskantregister für Akkordeon können mit @code{\\markup} dargestellt werden.
+Die vertikale Position der einzelnen Elemente werden mit @code{\\raise}
+angepasst.
+"
diff --git a/input/texidocs/adding-ambitus-per-voice.texidoc b/Documentation/de/texidocs/adding-ambitus-per-voice.texidoc
similarity index 50%
rename from input/texidocs/adding-ambitus-per-voice.texidoc
rename to Documentation/de/texidocs/adding-ambitus-per-voice.texidoc
index 30230f361d..4681051376 100644
--- a/input/texidocs/adding-ambitus-per-voice.texidoc
+++ b/Documentation/de/texidocs/adding-ambitus-per-voice.texidoc
@@ -1,10 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  doctitlees = "Añadir un ámbito por voz"
-  texidoces = "
-Se puede añadir un ámbito por cada voz. En este caso, el ámbito se
-debe desplazar manualmente para evitar colisiones.
-
-"
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Ambitus können pro Stimme gesetzt werden. In diesem Fall müssen sie
diff --git a/Documentation/de/texidocs/adding-bar-lines-to-chordnames-context.texidoc b/Documentation/de/texidocs/adding-bar-lines-to-chordnames-context.texidoc
new file mode 100644
index 0000000000..68a0a2d8d5
--- /dev/null
+++ b/Documentation/de/texidocs/adding-bar-lines-to-chordnames-context.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Um Taktstriche in einem @code{ChordNames}-Kontext anzeigen zu lassen, muss der
+@code{Bar_engraver} hinzugefügt werden.
+
+"
+  doctitlede = "Tatkstriche in einen ChordNames-Kontext hinzufügen"
diff --git a/Documentation/de/texidocs/adding-volta-brackets-to-additional-staves.texidoc b/Documentation/de/texidocs/adding-volta-brackets-to-additional-staves.texidoc
new file mode 100644
index 0000000000..fbad5b6075
--- /dev/null
+++ b/Documentation/de/texidocs/adding-volta-brackets-to-additional-staves.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Der @code{Volta_engraver} befindet sich im @code{Score}-Kontext und Klammern
+werden deshalb nur auf dem obersten System dargestellt.  Das kann umgangen
+werden, indem man den @code{Volta_engraver} zu dem @code{Staff}-Kontext
+hinzufügt, in dem die Klammern zusätzlichen vorkommen sollen.  Siehe auch
+das \"Volta multi staff\"-Schnipsel.
+
+"
+  doctitlede = "Volta-Klammern zu zusätzlichen Systemen hinzufügen"
diff --git a/input/texidocs/additional-voices-to-avoid-collisions.texidoc b/Documentation/de/texidocs/additional-voices-to-avoid-collisions.texidoc
similarity index 53%
rename from input/texidocs/additional-voices-to-avoid-collisions.texidoc
rename to Documentation/de/texidocs/additional-voices-to-avoid-collisions.texidoc
index 43a81c8281..0d0105a85e 100644
--- a/input/texidocs/additional-voices-to-avoid-collisions.texidoc
+++ b/Documentation/de/texidocs/additional-voices-to-avoid-collisions.texidoc
@@ -1,13 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Voces adicionales para evitar colisiones"
- texidoces = "
-En ciertos casos de polifonía compleja, se necesitan voces adicionales
-para evitar colisiones entre las notas.  Si se necesitan más de cuatro
-voces paralelas, las voces adicionales se añaden definiendo una
-variable que utiliza la función de Scheme @code{context-spec-music}.
-
-"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Ein einigen Fällen von sehr komplexer polyphoner Musik sind zusätzliche
diff --git a/Documentation/de/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc b/Documentation/de/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
new file mode 100644
index 0000000000..4392368dce
--- /dev/null
+++ b/Documentation/de/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Die @code{shortest-duration-space}-Eigenschaft kann verändert werden, um
+das Aussehen von unbestimmten Glissandi anzupassen.
+
+"
+  doctitlede = "Das Aussehen von unbestimmten Glissandi anpassen"
diff --git a/Documentation/de/texidocs/aligning-bar-numbers.texidoc b/Documentation/de/texidocs/aligning-bar-numbers.texidoc
new file mode 100644
index 0000000000..e5a603ff85
--- /dev/null
+++ b/Documentation/de/texidocs/aligning-bar-numbers.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Taktnummern sind standardmäßig links an ihrem Ursprungsobjet
+ausgerichtet.  Das ist normalerweise die linke Ecke einer Linie oder,
+wenn die Nummern innerhalb einer Zeile gesetzt werden, auf der
+linken Seite eines Taktstrichs.  Die Nummern können auch
+direkt über dem Taktstrich positioniert werden oder rechts vom
+Taktstrich gesetzt werden.
+
+"
+  doctitlede = "Taktnummern ausrichten"
+
+
diff --git a/Documentation/de/texidocs/aligning-marks-with-various-notation-objects.texidoc b/Documentation/de/texidocs/aligning-marks-with-various-notation-objects.texidoc
new file mode 100644
index 0000000000..8a83e94589
--- /dev/null
+++ b/Documentation/de/texidocs/aligning-marks-with-various-notation-objects.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn angegeben, können Textzeichen auch an anderen Objekten als Taktstrichen
+ausgerichtet werden.  Zu diesen Objekten gehören @code{ambitus},
+@code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar},
+@code{left-edge}, @code{key-cancellation}, @code{key-signature} und
+@code{time-signature}.
+
+In diesem Fall werden die Zeichen horizontal über dem Objekt zentriert.
+Diese Ausrichtung kann auch geändert werden, wie die zweite Zeile
+des Beispiels zeigt.  In einer Partitur mit vielen Systemen sollte
+diese Einstellung für alle Systeme gemacht werden.
+
+"
+
+  doctitlede = "Zeichen an verschiedenen Notationsobjekten ausrichten"
diff --git a/Documentation/de/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc b/Documentation/de/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
new file mode 100644
index 0000000000..361ec4e809
--- /dev/null
+++ b/Documentation/de/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Normalerweise werden vertikal orientierte Fingersatzzahlen außerhalb des Systems
+gesetzt.  Das kann aber verändert werden.
+
+"
+  doctitlede = "Fingersatz auch innerhalb des Systems setzen"
diff --git a/input/texidocs/ambitus-with-multiple-voices.texidoc b/Documentation/de/texidocs/ambitus-with-multiple-voices.texidoc
similarity index 52%
rename from input/texidocs/ambitus-with-multiple-voices.texidoc
rename to Documentation/de/texidocs/ambitus-with-multiple-voices.texidoc
index c2193db8d1..06ed479589 100644
--- a/input/texidocs/ambitus-with-multiple-voices.texidoc
+++ b/Documentation/de/texidocs/ambitus-with-multiple-voices.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  doctitlees = "Ámbitos con varias voces"
-  texidoces = "
-La adición del grabador @code{Ambitus_engraver} al contexto de
-@code{Staff} crea un solo ámbito por pentagrama, incluso en el caso de
-pentagramas con varias voces.
-
-"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Indem man den @code{Ambitus_engraver} im @code{Staff}-Kontext
diff --git a/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc b/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
new file mode 100644
index 0000000000..3fe50255d9
--- /dev/null
+++ b/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  
+  texidocde = "
+Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen 
+Chorals. Hier gibt es keine Takte, keine Notenhälse und es werden nur 
+halbe und Viertelnoten verwendet. Zusätzliche Zeichen zeigen die 
+Länge von Pausen an.
+"
+
+ doctitlede = "Vorlage für Alte Notation -- moderne Transkription des gregorianischen Chorals"
diff --git a/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc b/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
new file mode 100644
index 0000000000..8e8be97a96
--- /dev/null
+++ b/Documentation/de/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d 
+  texidocde = "
+Bei der Transkription von Mensuralmusik ist es oft erwünscht, ein 
+Incipit an den Anfang des Stückes zu stellen, damit klar ist, wie 
+Tempo und Schlüssel in der Originalnotation gesetzt waren. Während 
+heutzutage Musiker an Taktlinien gewöhnt sind, um Rhythmen schneller 
+zu erkennen, wurden diese in der Mensuralmusik nicht verwendet. 
+Tatsächlich ändern sich die Rhythmen auch oft alle paar Noten. Als 
+ein Kompromiss werden die Notenlinien nicht auf dem System, sondern 
+zwischen den Systemen geschrieben.
+"
+
+doctitlede = "Vorlage für Alte Notation -- moderne Transkription von Mensuralmusik"
+
diff --git a/Documentation/de/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc b/Documentation/de/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
new file mode 100644
index 0000000000..077b5d5f8c
--- /dev/null
+++ b/Documentation/de/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
@@ -0,0 +1,21 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  doctitlede = "Notenkopfstile basierend auf der Tonleiterstufe erstellen"
+  texidocde = "
+Die @code{shapeNoteStyles}-(NotenFormenStile)-Eigenschaft kann benutzt
+werden, um verschiedene Notenstile für jeden Schritt der Tonleiter
+zu definieren (vorgegeben von der Tonart oder der @qq{tonic}
+(Tonika)-Eigneschaft.  Diese Eigenschaft braucht eine Anzahl von Symbolen,
+welche beliebig sein können (geometrische Ausdrücke wie @code{triangle}
+(Dreieck), @code{cross} (Kreuz) und @code{xcircle} (X-Kreis) sind erlaubt)
+oder basierend auf einer alten amerikanischen Notensatztradition (einige
+lateinische Notenbezeichnungen sind auch erlaubt).
+
+Um alte amerikanische Liederbücher zu imitieren, gibt es einige
+vordefinierte Notenstile wie etwa @code{\\aikenHeads} (im Stil von Aiken)
+oder @code{\\sacredHarpHeads} (im Stil der Sacred Harp-Tradition).
+
+Dieses Beispiel zeigt, wie man unterschiedlich geformte Noten erhält und
+eine Melodie transponieren kann, ohne dass das Verhältnis zwischen den
+harmonischen Funktionen und dem Notenstil verloren geht.
+
+"
diff --git a/Documentation/de/texidocs/arabic-improvisation.texidoc b/Documentation/de/texidocs/arabic-improvisation.texidoc
new file mode 100644
index 0000000000..3fd67535ba
--- /dev/null
+++ b/Documentation/de/texidocs/arabic-improvisation.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Bei Improvisation oder @emph{taqasim}, die zeitlich frei gespielt
+werden, kann die Taktart ausgelassen werden und @code{\cadenzaOn}
+kann eingesetzt werden.  Es kann nötig sein, den Versetzungszeichenstil
+anzupassen, weil sonst die Versetzungszeichen nur einmal ausgegeben
+werden, da keine Taktlinien gesetzt sind.  Hier ein Beispiel, wie
+der Begin einer @emph{hijaz}-Improvisation aussehen könnte:
+
+"
+
+  doctitlede = "Arabische Improvisation"
diff --git a/Documentation/de/texidocs/beam-endings-in-score-context.texidoc b/Documentation/de/texidocs/beam-endings-in-score-context.texidoc
new file mode 100644
index 0000000000..c0b348da2f
--- /dev/null
+++ b/Documentation/de/texidocs/beam-endings-in-score-context.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Balkenenderegeln, die im @code{Score}-Kontext definiert werden, wirken
+sich auf alle Systeme aus, können aber auf @code{Staff}- und
+@code{Voice}-Ebene neu verändert werden:
+
+"
+  doctitlede = "Balkenenden auf Score-Ebene"
+
+
diff --git a/Documentation/de/texidocs/beam-grouping-in-7-8-time.texidoc b/Documentation/de/texidocs/beam-grouping-in-7-8-time.texidoc
new file mode 100644
index 0000000000..41cec9cfb6
--- /dev/null
+++ b/Documentation/de/texidocs/beam-grouping-in-7-8-time.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Es gibt keine automatischen Balkengruppen für 7/8-Takte.  Wenn diese
+Taktart benötigt wird, müssen die Gruppierungen definiert werden.  Um
+beispielsweise alle Noten in 2/8-3/8-2/8 aufzuteilen, müssen Balkenenden
+für 2/8 und 5/8 definiert werden:
+
+"
+  doctitlede = "Balkengruppen für 7/8-Takte"
+  
diff --git a/Documentation/de/texidocs/beams-across-line-breaks.texidoc b/Documentation/de/texidocs/beams-across-line-breaks.texidoc
new file mode 100644
index 0000000000..74aaf74ef2
--- /dev/null
+++ b/Documentation/de/texidocs/beams-across-line-breaks.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
+texidocde = "
+Zeilenumbrüche sind normalerweise während Balken verboten.  Das kann geändert
+werden.
+
+"
+  doctitlede = "Balken über Zeilenumbrüche"
+
+
diff --git a/Documentation/de/texidocs/changing--flageolet-mark-size.texidoc b/Documentation/de/texidocs/changing--flageolet-mark-size.texidoc
new file mode 100644
index 0000000000..40605b2de7
--- /dev/null
+++ b/Documentation/de/texidocs/changing--flageolet-mark-size.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Um den @code{\\flageolet}-Kreis kleiner zu machen, kann diese
+Scheme-Funktion eingesetzt werden.
+
+"
+  doctitlede = "\\flageolet-Zeichen verkleinern"
diff --git a/Documentation/de/texidocs/changing-beam-knee-gap.texidoc b/Documentation/de/texidocs/changing-beam-knee-gap.texidoc
new file mode 100644
index 0000000000..93fb18bd85
--- /dev/null
+++ b/Documentation/de/texidocs/changing-beam-knee-gap.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Balken mit Hälsen in unterschiedliche Richtungen werden automatisch
+erstellt, wenn ein großer Sprung zwischen Tonhöhen gefunden wird.  Dieses
+Verhalten kann durch die @code{auto-knee-gap}-Eigenschaft beeinflusst
+werden.  Ein derartiger Knie-Balken wird erstellt, wenn der Abstand größer
+ist als der Wert von @code{auto-knee-gap} plus der Dicke des Balkens
+(was von der Notendauer und der Neigung des Balkens abhängt).  Der
+Standardwert von @code{auto-knee-gap} ist 5.5 Notensystemabstände.
+
+"
+  doctitlede = "Balken für weit auseinander liegende Noten ändern"
+
+
diff --git a/Documentation/de/texidocs/changing-chord-separator.texidoc b/Documentation/de/texidocs/changing-chord-separator.texidoc
new file mode 100644
index 0000000000..9dd51c40b9
--- /dev/null
+++ b/Documentation/de/texidocs/changing-chord-separator.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Der Trenner zwischen unterschiedlichen Teilen eines Akkordsymbols kann
+beliebeiger Text sein.
+
+"
+  doctitlede = "Akkordsymboltrenner verändern"
diff --git a/Documentation/de/texidocs/changing-form-of-multi-measure-rests.texidoc b/Documentation/de/texidocs/changing-form-of-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..6f1903c6f2
--- /dev/null
+++ b/Documentation/de/texidocs/changing-form-of-multi-measure-rests.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa-
+und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten
+wird eine Line mit der Taktanzahl ausgegeben.  Der vorgegebene Wert von
+zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft
+setzt:
+"
+  doctitlede = "Die Erscheinung von Pausentakten ändern"
+
+
diff --git a/Documentation/de/texidocs/changing-partcombine-texts.texidoc b/Documentation/de/texidocs/changing-partcombine-texts.texidoc
new file mode 100644
index 0000000000..20cf126435
--- /dev/null
+++ b/Documentation/de/texidocs/changing-partcombine-texts.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn Stimmen automatisch kombiniert werden, kann der Text, der für
+Solo- und Unisono-Stellen ausgegeben wird, geändert werden:
+
+"
+  doctitlede = "Partcombine-Text ändern"
diff --git a/Documentation/de/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc b/Documentation/de/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
new file mode 100644
index 0000000000..214d3a50ed
--- /dev/null
+++ b/Documentation/de/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Der Text, der für Crescendo und Decrescendo gestzt wird, kann geändert
+werden, indem man die Eigenschaften @code{crescendoText} und
+@code{decrescendoText} verändert.  Der Stil des Streckers kann auch
+geändert werden, indem die @code{'style}-Eigenschaft des
+@code{DynamicTextSpanner} beeinflusst wird.  Der Standardwert ist
+@code{'hairpin}, ander Möglichkeiten sind @code{'line}, @code{'dashed-line}
+und @code{'dotted-line}.
+"
+  doctitlede = "Text und Strecker-Stile für Dynamik-Texte ändern"
diff --git a/Documentation/de/texidocs/changing-the-breath-mark-symbol.texidoc b/Documentation/de/texidocs/changing-the-breath-mark-symbol.texidoc
new file mode 100644
index 0000000000..865021623f
--- /dev/null
+++ b/Documentation/de/texidocs/changing-the-breath-mark-symbol.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Das Schriftzeichen für das Atemzeichen kann verändert werden, indem
+die Text-Eigenschaft des @code{BreathingSign}-Layoutobjekts mit einer
+beliebigen Textbeschriftung definiert wird.
+
+"
+  doctitlede = "Das Atemzeichen-Symbol verändern"
diff --git a/Documentation/de/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc b/Documentation/de/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
new file mode 100644
index 0000000000..07b67b903b
--- /dev/null
+++ b/Documentation/de/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Versetzungszeichen und Pluszeichen können vor oder nach den Ziffern erscheinen,
+je nach den Einstellungen der @code{figuredBassAlterationDirection} und
+@code{figuredBassPlusDirection}-Eigenschaften.
+
+"
+  doctitlede = "Positionen von Generalbass-Alterationszeichen verändern"
diff --git a/input/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc b/Documentation/de/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
similarity index 53%
rename from input/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
rename to Documentation/de/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
index b877616ec0..fe42ae0a63 100644
--- a/input/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
+++ b/Documentation/de/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Para cambiar el tempo en la salida MIDI sin
-imprimir nada, hacemos invisible la indicación metronómica:
-
-"
-
-  doctitlees = "Cambiar el tempo sin indicación metronómica"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Um das Tempo für die MIDI-Ausgabe zu ändern, ohne eine Tempoangabe in den
diff --git a/Documentation/de/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc b/Documentation/de/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
new file mode 100644
index 0000000000..674e1f63a1
--- /dev/null
+++ b/Documentation/de/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Der @code{\\time}-Befehl verändert die Eigenschaften
+@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
+und @code{measureLength} im @code{Timing}-Kontext, welcher normalerweise
+gleichbedeutend mit @code{Score} ist.  Wenn der Wert von
+@code{timeSignatureFraction} verändert wird, wird die neue
+Taktart ausgegeben, ohne die anderen Eigenschaften zu beeinflussen:
+
+"
+  doctitlede = "Die Taktart verändern ohne die Bebalkung zu beeinflussen"
+
+
diff --git a/Documentation/de/texidocs/changing-the-tuplet-number.texidoc b/Documentation/de/texidocs/changing-the-tuplet-number.texidoc
new file mode 100644
index 0000000000..690613285f
--- /dev/null
+++ b/Documentation/de/texidocs/changing-the-tuplet-number.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Standardmäßig wird nur der Zähler des N-tolen-Bruchs über der Klammer
+dargestellt, wie er dem @code{\\times}-Befehl übergeben wird.
+Man kann aber auch Zähler/Nenner ausgeben lassen, oder die Zahl
+vollständig unterdrücken.
+
+"
+  doctitlede = "Die Zahl der N-tole verändern"
+
+
diff --git a/Documentation/de/texidocs/chord-name-exceptions.texidoc b/Documentation/de/texidocs/chord-name-exceptions.texidoc
new file mode 100644
index 0000000000..2ff7d5676e
--- /dev/null
+++ b/Documentation/de/texidocs/chord-name-exceptions.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Eigenschaft @code{chordNameExceptions} kann benutzt werden, um eine
+Liste an besonderen Notationen für bestimmte Akkorde zu speichern.
+
+"
+  doctitlede = "Akkordsymbolausnahmen"
diff --git a/input/texidocs/chord-name-major7.texidoc b/Documentation/de/texidocs/chord-name-major7.texidoc
similarity index 50%
rename from input/texidocs/chord-name-major7.texidoc
rename to Documentation/de/texidocs/chord-name-major7.texidoc
index 1c9a2873ee..e2027a67b5 100644
--- a/input/texidocs/chord-name-major7.texidoc
+++ b/Documentation/de/texidocs/chord-name-major7.texidoc
@@ -7,11 +7,3 @@ Das Aussehen des großen Septakkords kann mit @code{majorSevenSymbol} verändert
   doctitlede = "Akkordbezeichnung maj7"
 
 
-%% Translation of GIT committish: 3e50373e10750e5bc1f5c69898df3740e6169165
-  texidoces = "
-La presentación del acorde de séptima mayor se
-puede ajustar mediante majorSevenSymbol.
-
-"
-  doctitlees = "Nombre de acorde maj7"
-
diff --git a/input/texidocs/chordchanges-for-fretboards.texidoc b/Documentation/de/texidocs/chordchanges-for-fretboards.texidoc
similarity index 50%
rename from input/texidocs/chordchanges-for-fretboards.texidoc
rename to Documentation/de/texidocs/chordchanges-for-fretboards.texidoc
index 3ae9f4a111..3ea0e2de9d 100644
--- a/input/texidocs/chordchanges-for-fretboards.texidoc
+++ b/Documentation/de/texidocs/chordchanges-for-fretboards.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
-  texidoces = "
-Se puede hacer que los diagramas de posiciones se muestren sólo
-cuando el acorde cambia o al comienzo de una nueva línea.
-
-"
-
-  doctitlees = "Cambios de acorde de posiciones de trastes"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Bunddiagramme können definiert werden, sodass sie nur angezeigt werden,
diff --git a/Documentation/de/texidocs/combining-two-parts-on-the-same-staff.texidoc b/Documentation/de/texidocs/combining-two-parts-on-the-same-staff.texidoc
new file mode 100644
index 0000000000..6bd8d2f0f5
--- /dev/null
+++ b/Documentation/de/texidocs/combining-two-parts-on-the-same-staff.texidoc
@@ -0,0 +1,19 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Funktion, die Stimmen kombiniert (also der @code{\\partcombine}-Befehl)
+ermöglicht die Kombination unterschiedlicher Stimmen auf einem
+System.  Textanweisungen wie \"solo\" or \"a2\" werden automatisch
+hinzugefügt.  Wenn man sie entfernen will, muss man die Eigenschaft
+@code{printPartCombineTexts} auf flasch setzen.  Für Klavierauszüge
+muss natürlich kein \"solo\"/\"a2\" usw. hinzugefügt werdne, man
+sollte sie also ausschalten.  Wenn aber Solo-Stellen in einem
+Klavierauszug oder einer Chorpartitur angezeigt werden, ist es besser,
+normale Polyphonie zu verwenden, weil so die Solostellen angezeigt
+werden, auch wenn der Text des Stimmenkombinierers ausgeschaltet ist.
+
+Der Schnipsel zeigt drei Möglichkeiten, Stimmen auf einem System zu
+kombinieren: Standardpolyphonie, @code{\\partcombine} ohne Text und
+@code{\\partcombine} mit Text.
+
+"
+  doctitlede = "Zwei Stimmen auf einem System kombinieren"
diff --git a/Documentation/de/texidocs/compound-time-signatures.texidoc b/Documentation/de/texidocs/compound-time-signatures.texidoc
new file mode 100644
index 0000000000..64bf4a511e
--- /dev/null
+++ b/Documentation/de/texidocs/compound-time-signatures.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Ungerade Taktarten werden (wie etwa \"5/8\") werden oft als zusammengesetzte
+Taktarten interpretiert (bspw. \"3/8 + 2/8\"), in welchen zwei oder mehr
+Teiltakte unterschieden werden.  LilyPond kann derartige Noten produzieren,
+indem entsprechende Taktarten gesetzt werden und die automatische
+Bebalkung angepasst wird.
+
+"
+  doctitlede = "Zusammengesetzte Taktarten"
+
+
diff --git a/Documentation/de/texidocs/conducting-signs,-measure-grouping-signs.texidoc b/Documentation/de/texidocs/conducting-signs,-measure-grouping-signs.texidoc
new file mode 100644
index 0000000000..dfc670d94b
--- /dev/null
+++ b/Documentation/de/texidocs/conducting-signs,-measure-grouping-signs.texidoc
@@ -0,0 +1,17 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Optionen, mit denen die Balken in einem Takt gruppiert werden, sind
+durch die Scheme-Funktion @code{set-time-signature} erhältlich, die
+drei Argumente braucht:  Die Zahl der Taktschläge, die Länge des
+Schlages und die interne gruppieren von Balken in dem Takt.  Wenn der
+@code{Measure_grouping_engraver} hinzugefügt worden ist, erstellt
+diese Funktion auch @code{MeasureGrouping}-(Taktgruppen)-Zeichen.  Derartige
+Zeichen erleichtern das Lesen von rhythmisch komplexer Musik.  In dem
+Beispiel ist der 9/8-Takt in 2, 2, 2 und 3 aufgeteilt.  Das wird
+der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben:
+@code{'(2 2 2 3)}:
+
+"
+  doctitlede = "Dirigirzeichen, Taktgruppenzeichen"
+
+
diff --git a/input/texidocs/contemporary-glissando.texidoc b/Documentation/de/texidocs/contemporary-glissando.texidoc
similarity index 50%
rename from input/texidocs/contemporary-glissando.texidoc
rename to Documentation/de/texidocs/contemporary-glissando.texidoc
index 0946c1b66e..dbfabd690d 100644
--- a/input/texidocs/contemporary-glissando.texidoc
+++ b/Documentation/de/texidocs/contemporary-glissando.texidoc
@@ -1,11 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se puede tipografiar un gissando contemporáneo sin nota final
-utilizando una nota oculta y temporalización de cadenza.
-
-"
-  doctitlees = "Glissando contemporáneo"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Ein modernes Glissando ohne eine Endnote kann gesetzt werden, indem
diff --git a/Documentation/de/texidocs/controlling-the-placement-of-chord-fingerings.texidoc b/Documentation/de/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
new file mode 100644
index 0000000000..d847197fc5
--- /dev/null
+++ b/Documentation/de/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Position von Fingersatzzahlen kann exakt kontrolliert werden.
+
+"
+  doctitlede = "Position von Fingersatz in Akkorden kontrollieren"
diff --git a/input/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc b/Documentation/de/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
similarity index 50%
rename from input/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
rename to Documentation/de/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
index 6665bc7978..ce3f9d135c 100644
--- a/input/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
+++ b/Documentation/de/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
@@ -1,19 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-El orden vertical que ocupan las inscripciones gráficas está
-controlado con la propiedad @code{'script-priority}. Cuanto más
-bajo es este número, más cerca de la nota se colocará. En este
-ejemplo, el @code{TextScript} (el sostenido) tiene primero la
-prioridad más baja, por lo que se sitúa en la posición más baja en
-el primer ejemplo. En el segundo, el semitrino (el @code{Script})
-es el que la tiene más baja, por lo que se sitúa en la parte
-interior. Cuando dos objetos tienen la misma prioridad, el orden
-en que se introducen determina cuál será el que aparece en primer
-lugar.
-
-"
-  doctitlees = "Controlar la ordenación vertical de las inscripciones"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Die vertikale Anordnung von Beschriftungen wird mit der
diff --git a/Documentation/de/texidocs/creating-a-delayed-turn.texidoc b/Documentation/de/texidocs/creating-a-delayed-turn.texidoc
new file mode 100644
index 0000000000..1ef4a5e72a
--- /dev/null
+++ b/Documentation/de/texidocs/creating-a-delayed-turn.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Einen Doppelschlag mit Vorhalt zu erstellen, wobei die untere Note das
+Vorzeichen benutzt, erfordert einige Einstellungsänderungen.  Die
+@code{outside-staff-priority}-Eigenschaft muss auf falsch (@code{#f})
+gesetzt werden, weil sie sonst über die Eigenschaft
+@code{avoid-slur property} dominieren würde.  Der Wert von @code{halign}
+wird benutzt, um den Doppelschlag horizontal zu positionieren.
+"
+
+  doctitlede = "Einen  Doppelschlag mit Vorhalt erstellen"
diff --git a/Documentation/de/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc b/Documentation/de/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
new file mode 100644
index 0000000000..3f17ab0875
--- /dev/null
+++ b/Documentation/de/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Ein Arpeggio kann zwischen Noten aus unterschidlichen Stimmen auf demselben
+System gezogen werden, wenn der @code{Span_arpeggio_engraver} in den 
+@code{Staff}-Kontext verschoben wird:
+
+"
+  doctitlede = "Arpeggios zwischen unterschiedlichen Stimmen erzeugen"
diff --git a/input/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc b/Documentation/de/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
similarity index 50%
rename from input/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
rename to Documentation/de/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
index d8fa5d4ac1..dfaeae17df 100644
--- a/input/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
+++ b/Documentation/de/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Dentro de un @code{PianoStaff}, es posible hacer que un arpegio
-cruce entre los pentagramas ajustando la propiedad
-@code{PianoStaff.connectArpeggios}.
- 
-"
-  doctitlees = "Crear arpegios que se cruzan entre pentagramas dentro de un sistema de piano"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Arpeggio über mehrere Systeme können in anderen Kontexten als dem
diff --git a/Documentation/de/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc b/Documentation/de/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
new file mode 100644
index 0000000000..f918d3de1c
--- /dev/null
+++ b/Documentation/de/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+ texidocde = "
+In einem Klaviersystem (@code{PianoStaff}) ist es möglich, ein Arpeggio
+zwischen beiden Systemen zu verbinden, indem die
+@code{PianoStaff.connectArpeggios}-Eigenschaft gesetzt wird.
+ 
+
+"
+  doctitlede = "Arpeggio zwischen Systemen in einem Klaviersystem erstellen"
diff --git a/input/texidocs/creating-metronome-marks-in-markup-mode.texidoc b/Documentation/de/texidocs/creating-metronome-marks-in-markup-mode.texidoc
similarity index 51%
rename from input/texidocs/creating-metronome-marks-in-markup-mode.texidoc
rename to Documentation/de/texidocs/creating-metronome-marks-in-markup-mode.texidoc
index 78901d8eba..fff49e15fe 100644
--- a/input/texidocs/creating-metronome-marks-in-markup-mode.texidoc
+++ b/Documentation/de/texidocs/creating-metronome-marks-in-markup-mode.texidoc
@@ -1,11 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se pueden crear indicaciones metronómicas nuevas en modo de
-marcado, pero no cambian el tempo en la salida MIDI.
-
-"
-  doctitlees = "Crear indicaciones metronómicas en modo de marcado"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Neue Metronombezeichnungen können als Textbeschriftung erstellt werden,
diff --git a/Documentation/de/texidocs/customizing-fretboard-fret-diagrams.texidoc b/Documentation/de/texidocs/customizing-fretboard-fret-diagrams.texidoc
new file mode 100644
index 0000000000..d09792b479
--- /dev/null
+++ b/Documentation/de/texidocs/customizing-fretboard-fret-diagrams.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Eigenschaften von Bunddiagrammen können in
+@code{'fret-diagram-details} verändert werden.  Einstellungen mit
+dem @code{\override}-Befehl werden dem @code{FretBoards.FretBoard}-Objekt
+zugewiesen.  Genauso wie @code{Voice} ist auch @code{FretBoards} ein
+Kontext der niedrigsten Ebene, weshalb der Kontext auch in dem Befehl
+weggelassen werden kann.
+
+"
+  doctitlede = "Bunddiagramme anpassen"
diff --git a/Documentation/de/texidocs/customizing-markup-fret-diagrams.texidoc b/Documentation/de/texidocs/customizing-markup-fret-diagrams.texidoc
new file mode 100644
index 0000000000..d481c9a069
--- /dev/null
+++ b/Documentation/de/texidocs/customizing-markup-fret-diagrams.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Bunddiagramme können mit der Eigenschaft @code{'fret-diagram-details}
+angepasst werden.  Bunddiagramme, die als Textbeschriftung eingefügt werden,
+können Veränderungen im @code{Voice.TextScript}-Objekt oder direkt in der
+Beschriftung vorgenommen werden.
+
+"
+  doctitlede = "Anpassung von Beschriftungs-Bunddiagrammen"
diff --git a/Documentation/de/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc b/Documentation/de/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
new file mode 100644
index 0000000000..a8951e7470
--- /dev/null
+++ b/Documentation/de/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Richtung von Hälsen auf der mittleren Linie kann mit der @code{Stem}-Eigenschaft
+@code{neutral-direction} gesetzt werden.
+
+"
+  doctitlede = "Standardrichtung für Hälse auf der Mittellinie"
diff --git a/Documentation/de/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc b/Documentation/de/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
new file mode 100644
index 0000000000..40e318089a
--- /dev/null
+++ b/Documentation/de/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
@@ -0,0 +1,17 @@
+%% Translation of GIT committish: 33f623301a41fcc53efadf96bca1c72834763415
+  texidocde = "
+Vordefinierte Bunddiagramme können für neue Instrumente hinzugefügt werden
+neben denen, die schon für die Gitarre definiert sind.  Dieses Schnipsel
+zeigt, wie man eine neue Saitenstimmung definiert und dann eigene vordefinierte
+Bunddiagramme bestimmt.  Das Beispiel ist für das venezualische Cuatro.
+
+Dieses Schnipsel zeigt auch, wie Fingersatz in die Akkorde eingebunden
+werden kann, um als Referenzpunkt für die Akkordauswahl benutzt werden
+kann.  Dieser Fingersatz wird im Bunddiagramm und in der Tabulatur,
+aber nicht in den Noten angezeigt.
+
+Diese Bunddiagramme sind nicht transponierbar, weil sie Saiteninformationen
+enthalten.  Das soll in der Zukunft verbessert werden.
+
+"
+  doctitlede = "Eigene vordefinierte Bunddiagramme für andere Instrumente erstellen"
diff --git a/Documentation/de/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc b/Documentation/de/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
new file mode 100644
index 0000000000..341f58a42e
--- /dev/null
+++ b/Documentation/de/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn nur ein System einer Systemgruppe vom Typ @code{ChoirStaff} oder
+@code{StaffGroup} angezeigt wird, wird die Klammer zu Beginn normalerweise
+nicht gesetzt.  Das kann verändert werden, indem man die ensprechende
+Eigenschaft veränder.
+
+Bei Systemen wie @code{PianoStaff} und @code{GrandStaff}, die mit einer
+geschweiften Klammer beginne, muss eine andere Eigenschaft verändt werden,
+wie das zweite Beispiel zeigt.
+
+"
+  doctitlede = "Klammer anzeigen, wenn nur ein System gesetzt wird"
diff --git a/Documentation/de/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc b/Documentation/de/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
new file mode 100644
index 0000000000..06223d89be
--- /dev/null
+++ b/Documentation/de/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+ In Werken des fürhen 20. Jahrhundert, angefangen mit Schönberg, Berg
+ und Webern (die zweite Wiener Schule), wird jeder Ton der 
+ Zwölftonleiter als gleichwertig erachtet, ohne hierarchische
+ Ordnung.  Deshalb wird in dieser Musik für jede Note ein Versetzungszeichen
+ ausgegeben, auch für unalterierte Tonhöhen, um das neue Verständnis
+ der Musiktheorie und Musiksprache zu verdeutlichen.
+ 
+ Dieser Schnipsel zeigt, wie derartige Notationsregeln zu erstellen sind.
+ "
+  doctitlede = "Versetzungszeichen für jede Note im Stil der Zwölftonmusik"
diff --git a/Documentation/de/texidocs/engraving-ties-manually.texidoc b/Documentation/de/texidocs/engraving-ties-manually.texidoc
new file mode 100644
index 0000000000..3ef1a3f81b
--- /dev/null
+++ b/Documentation/de/texidocs/engraving-ties-manually.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Überbindungen können manuell gesetzt werden, indem man die
+@code{tie-configuration}-Eigenschaft des @code{TieColumn}-Objekts
+beeinflusst.  Die erste Zahl zeigt den Abstand von der Mitte in
+Notensystemabständen an, die zweite Zahl zeigt die Richtung an (1 = nach oben,
+-1 = nach unten).
+
+"
+  doctitlede = "Bindebögen manuell setzen"
+
+
diff --git a/Documentation/de/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc b/Documentation/de/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
new file mode 100644
index 0000000000..e949ae9164
--- /dev/null
+++ b/Documentation/de/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Eigenschaft @code{tupletSpannerDuration} bestimmt, wie lange jede
+der N-tolen innerhalb der Klammern nach dem @code{\\times}-Befehl
+dauert.  Auf diese Art können etwa viele Triolen nacheinander mit nur
+einem @code{\\times}-Befehl geschrieben werden.
+
+Im Beispiel sind zwei Triolen zu sehen, obwohl @code{\\times} nur
+einmal geschrieben wurde.
+
+Mehr Information über @code{make-moment} gibt es in \"Verwaltung der Zeiteinheiten\". 
+
+"
+  doctitlede = "Mehrere Triolen notieren, aber nur einmal \\times benutzen"
+
+
diff --git a/Documentation/de/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc b/Documentation/de/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..f81cff539a
--- /dev/null
+++ b/Documentation/de/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Dieses Beispiel kombiniert Fingersatz für die linke Hand, Saitennummern
+und Fingersatz für die rechte Hand.
+
+"
+  doctitlede = "Fingersatz, Saitennummern und Fingersatz für die rechte Hand"
diff --git a/Documentation/de/texidocs/flat-flags-and-beam-nibs.texidoc b/Documentation/de/texidocs/flat-flags-and-beam-nibs.texidoc
new file mode 100644
index 0000000000..c637f56ea9
--- /dev/null
+++ b/Documentation/de/texidocs/flat-flags-and-beam-nibs.texidoc
@@ -0,0 +1,30 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Gerade Fähnchen an einzelnen Noten und überstehende Balkenenden bei
+bebalkten Notengruppen sind möglich mit einer Kombination aus
+@code{stemLeftBeamCount}, @code{stemRightBeamCount} und Paaren von
+@code{[]}-Balkenbegrenzungen.
+
+Für gerade Fähnchen, die nach rechts zeigen, kann @code{[]} eingesetzt
+werden und @code{stemLeftBeamCount} auf Null gesetzt werden (wie
+Bsp. 1).
+
+Für gerade Fähnchen, die nach links zeigen, muss @code{stemRightBeamCount}
+eingesetzt werden (Bsp. 2).
+
+Für überstehende Balkenenden nach rechts muss @code{stemRightBeamCount}
+auf einen positiven Wert gesetzt werden, für Balkenenden, die nach links
+zeigen benutzt man @code{stemLeftBeamCount} (Bsp. 3).
+
+Manchmal können einzelne Noten, die von Pausen umgeben sind, auch Balkenenden
+in beide Richtungen tragen.  Das geschieht mit @code{[]}-Klammern (Bsp. 4).
+
+(@code{\\set stemLeftBeamCount} entspricht immer dem Befehl
+@code{\\once \\set}.  Anders gesagt müssen die Einstellungen immer wieder
+wiederholt werden und die Fähnchen des letzten Sechszehntels im letzten
+Beispiel haben nichts mit dem @code{\\set}-Befehl zwei Noten vorher zu tun.)
+
+"
+  doctitlede = "Gerade Fähnchen und überstehende Balkenenden"
+
+
diff --git a/Documentation/de/texidocs/forcing-horizontal-shift-of-notes.texidoc b/Documentation/de/texidocs/forcing-horizontal-shift-of-notes.texidoc
new file mode 100644
index 0000000000..d26ec76d87
--- /dev/null
+++ b/Documentation/de/texidocs/forcing-horizontal-shift-of-notes.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn es zu Zusammenstößen kommt, kann mit folgender Lösung eine andere
+Position manuell eingestellt werden.  Die Einheiten hier sind
+Notenlinienzwischenräume.
+
+"
+  doctitlede = "Horizontale Verschiebung von Noten erzwingen"
diff --git a/Documentation/de/texidocs/grid-lines--changing-their-appearance.texidoc b/Documentation/de/texidocs/grid-lines--changing-their-appearance.texidoc
new file mode 100644
index 0000000000..66e6b54581
--- /dev/null
+++ b/Documentation/de/texidocs/grid-lines--changing-their-appearance.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Erscheinung der Gitternetzlinien kann durch einige Eigenschaften
+geändert werden.
+
+"
+  doctitlede = "Gitternetzlinien: Aussehen verändern"
diff --git a/Documentation/de/texidocs/grouping-beats.texidoc b/Documentation/de/texidocs/grouping-beats.texidoc
new file mode 100644
index 0000000000..8bc9a22fe2
--- /dev/null
+++ b/Documentation/de/texidocs/grouping-beats.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Balkengruppen können mit der @code{beatGrouping}-Eigenschaft geändert
+werden:
+
+"
+  doctitlede = "Notengruppen"
+
+
diff --git a/Documentation/de/texidocs/guitar-strum-rhythms.texidoc b/Documentation/de/texidocs/guitar-strum-rhythms.texidoc
new file mode 100644
index 0000000000..99fae8b903
--- /dev/null
+++ b/Documentation/de/texidocs/guitar-strum-rhythms.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+In Guitarrennotation kann neben Melodie, Akkordbezeichnungen und
+Bunddiagrammen auch der Schlagrhythmus angegeben werden.
+
+"
+  doctitlede = "Schlagrhythmus für Guitarren"
+
+
diff --git a/Documentation/de/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc b/Documentation/de/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
new file mode 100644
index 0000000000..bfe3149a03
--- /dev/null
+++ b/Documentation/de/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Dynamik-Texte (wie cresc. und dim.) werden mit einer gestrichelten Linie
+gesetzt, die ihre Dauer anzeigt.  Diese Linie kann auf foldenge Weise
+unterdrückt werden:
+
+"
+  doctitlede = "Crescendo-Linien von Dynamik-Texten unterdrücken"
diff --git a/Documentation/de/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc b/Documentation/de/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
new file mode 100644
index 0000000000..1e4e008317
--- /dev/null
+++ b/Documentation/de/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Eine Arpeggioklammer kann anzeigen, dass Noten auf zwei unterschiedlichen
+Systemen mit der selben Hand gespielt werden sollen.  Damit das notiert
+werden kann, muss der @code{PianoStaff}-Kontext so eingestellt werden,
+dass er Arpeggios über Systeme hinweg akzeptiert und die Form der Arpeggios
+muss auf eine Klammer eingestellt werden.
+
+(Debussy, Les collines d’Anacapri, T. 65)
+
+"
+  doctitlede = "Akkorde auf zwei Systemen mit Arpeggioklammern anzeigen"
diff --git a/input/texidocs/inserting-a-caesura.texidoc b/Documentation/de/texidocs/inserting-a-caesura.texidoc
similarity index 50%
rename from input/texidocs/inserting-a-caesura.texidoc
rename to Documentation/de/texidocs/inserting-a-caesura.texidoc
index 59b680cb6e..9f1298d225 100644
--- a/input/texidocs/inserting-a-caesura.texidoc
+++ b/Documentation/de/texidocs/inserting-a-caesura.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las marcas de cesura se pueden crear sobreescribiendo la propiedad
-@code{'text} del objeto @code{BreathingSign}.  También está disponible
-una marca de cesura curva.
-
-"
-  doctitlees = "Insertar una cesura"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
  texidocde = "
 Zäsurzeichen können erstellt werden, indem die @code{'text}-Eigenschaft
diff --git a/Documentation/de/texidocs/isolated-percent-repeats.texidoc b/Documentation/de/texidocs/isolated-percent-repeats.texidoc
new file mode 100644
index 0000000000..4601a52c03
--- /dev/null
+++ b/Documentation/de/texidocs/isolated-percent-repeats.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Isolierte Prozentwiederholungen können auch ausgegeben werden.  Das wird
+erreicht, indem man eine Ganztaktpause notiert und ihre Ausgabeform
+ändert:
+
+"
+  doctitlede = "Isolierte Prozentwiederholungen"
diff --git a/Documentation/de/texidocs/jazz-combo-template.texidoc b/Documentation/de/texidocs/jazz-combo-template.texidoc
new file mode 100644
index 0000000000..a9f010c004
--- /dev/null
+++ b/Documentation/de/texidocs/jazz-combo-template.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Hier ist ein ziemlich kompliziertes Beispiel für ein Jazz-Ensemble. Achtung: 
+Alle Instrumente sind in @code{\key c \major} (C-Dur) notiert. Das bezieht sich 
+auf die klingende Musik: LilyPond transponiert die Tonart automatisch, wenn 
+sich die Noten innerhalb eines @code{\transpose}-Abschnitts befinden.
+
+"
+
+  doctitlede = "Vorlage für Jazz-Combo"
diff --git a/Documentation/de/texidocs/makam-example.texidoc b/Documentation/de/texidocs/makam-example.texidoc
new file mode 100644
index 0000000000..fad178fb03
--- /dev/null
+++ b/Documentation/de/texidocs/makam-example.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Makam ist eine türkische Melodie, in der 1/9-Tonabstände
+eingesetzt werden.  Sehen Sie sich die Initialisierungsdatei
+@code{makam.ly} für weiter Information zu Tonhöhenbezeichnungen
+und Alterationen an (siehe
+Handbuch zum Lernen @version{}, 4.6.3 Weitere Information zu
+Hinweisen, wo diese Datei gespeichert ist)."
+  
+  doctitlede = "Makam-Beispiel"
diff --git a/Documentation/de/texidocs/making-slurs-with-complex-dash-structure.texidoc b/Documentation/de/texidocs/making-slurs-with-complex-dash-structure.texidoc
new file mode 100644
index 0000000000..23a3f83b6c
--- /dev/null
+++ b/Documentation/de/texidocs/making-slurs-with-complex-dash-structure.texidoc
@@ -0,0 +1,19 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Legatobögen können mit einem komplizierten Strichelmuster
+gesetzt werden, indem die @code{dash-definition}-Eigenschaft
+definiert wird.  @code{dash-definition} ist eine Liste bestehend
+aus @code{dash-elements}-Elementen.  Ein @code{dash-element} ist
+eine Liste an Parametern, die das Strichverhalten für einen
+Abschnitt des Legatobogens definieren.
+
+Der Bogen wird nach dem Bezierparameter t definiert, welcher
+von 0 am linken Ende des Bogens zu 1 am rechten Ende des Bogens
+reicht.  @code{dash-element} ist eine Liste @code{(start-t stop-t dash-Unterbrechung dash-Abschnitt)}.  Die Region des Bogens von @code{start-t}
+bis @code{stop-t} hat eine Unterbrechung von @code{dash-Unterbrechung}
+von jedem @code{dash-Abschnitt}-Schwarzabschnitt.  @code{dash-Abschnitt} ist in Notenlinienzwischenräumen definiert.
+@code{dash-Abschnitt} ist auf 1 für einen durchgehenden Bogen
+gesetzt.
+"
+  doctitlede = "Legatobögen mit kompliziertem Strichelmuster
+  definieren"
diff --git a/input/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc b/Documentation/de/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
similarity index 51%
rename from input/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
rename to Documentation/de/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
index cebc9425b6..1fe7f063aa 100644
--- a/input/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
+++ b/Documentation/de/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
@@ -1,14 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se puede engrosar una línea del pentagrama con fines pedagógicos
-(p.ej. la tercera línea o la de la clave de Sol).  Esto se puede
-conseguir añadiendo más líneas muy cerca de la línea que se quiere
-destacar, utilizando la propiedad @code{line-positions} del objeto
-@code{StaffSymbol}.
-
-"
-  doctitlees = "Hacer unas líneas del pentagrama más gruesas que las otras"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Für den pädagogischen Einsatz kann eine Linie des Notensystems dicker
diff --git a/Documentation/de/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc b/Documentation/de/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
new file mode 100644
index 0000000000..90b8958e2c
--- /dev/null
+++ b/Documentation/de/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Das Mensurstiche-Layout, in welchem die Taktlinien nicht auf den Systemen,
+sondern zwischen den Systemen gesetzt werden, kann mit einer @code{StaffGroup}
+anstelle von @code{ChoirStaff} erreicht werden.  Die Taktlinien auf den
+Systemen werden mit der the @code{transparent}-Eigenschaft ausgelöscht.
+
+"
+  doctitlede = "Mensurstriche-Layout (Taktstriche zwischen den Systemen"
diff --git a/Documentation/de/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc b/Documentation/de/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
new file mode 100644
index 0000000000..5269cac714
--- /dev/null
+++ b/Documentation/de/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+ texidocde = "
+Die Abkürzungen sind in der Datei @samp{ly/script-init.ly} definiert, wo
+den Variablen @code{dashHat}, @code{dashPlus}, @code{dashDash},
+@code{dashBar}, @code{dashLarger}, @code{dashDot} und
+@code{dashUnderscore} Standardwerte zugewiesen werden.  Diese Standardwerte
+können verändert werden.  Um zum Beispiel die Abkürzung
+@code{-+} (@code{dashPlus}) mit dem Triller anstatt mit dem +-Symbol zu
+assoziieren, muss der Wert @code{trill} der Variable
+@code{dashPlus} zugewiesen werden:
+
+"
+  doctitlede = "Die Standardwerte der Abkürzungen von Artikulationen verändern"
diff --git a/Documentation/de/texidocs/multi-measure-rest-markup.texidoc b/Documentation/de/texidocs/multi-measure-rest-markup.texidoc
new file mode 100644
index 0000000000..663ab6d821
--- /dev/null
+++ b/Documentation/de/texidocs/multi-measure-rest-markup.texidoc
@@ -0,0 +1,17 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "Textbeschriftungen, die an Mehrtaktpausen gehängt wird,
+wird über oder unter der Pause zentriert.  Lange Beschriftungen
+lassen den Takt nicht breiter werden.  Um eine Mehrtaktpause einer
+Beschriftung anzupassen, muss eine unsichtbare Pause mit der
+Beschriftung direkt vor der Mehrtkatpause eingesetzt werden.
+
+Man sollte beachten, dass unsichtbare Pausen automatische Taktstriche
+nach sich ziehen.  Text, der an eine unsichtbare Pause gehänt wird,
+ist links ausgerichtet an der Position, wo die Pause erscheinen
+würde.  Wenn aber die Länge des Taktes durch die Länge des Textes
+bestimmt wird, sieht es so aus, als ob der Text zentriert gesetzt
+ist."
+
+  doctitlede = "Textbeschriftung und Mehrtaktpausen"
+
+
diff --git a/input/texidocs/nesting-staves.texidoc b/Documentation/de/texidocs/nesting-staves.texidoc
similarity index 50%
rename from input/texidocs/nesting-staves.texidoc
rename to Documentation/de/texidocs/nesting-staves.texidoc
index 1728e437cd..cd999689ad 100644
--- a/input/texidocs/nesting-staves.texidoc
+++ b/Documentation/de/texidocs/nesting-staves.texidoc
@@ -1,21 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se puede utilizar la propiedad
-@code{systemStartDelimiterHierarchy} para crear grupos de
-pentagramas anidados de forma más compleja. La instrucción
-@code{\\set StaffGroup.systemStartDelimiterHierarchy} toma una
-lista alfabética del número de pentagramas producidos. Se puede
-proporcionar antes de cada pentagrama un delimitador de comienzo
-de sistema. Se debe encerrar entre corchetes y admite tantos
-pentagramas como encierren las llaves. Se pueden omitir los
-elementos de la lista, pero el primer corchete siempre abarca
-todos los pentagramas. Las posibilidades son
-@code{SystemStartBar}, @code{SystemStartBracket},
-@code{SystemStartBrace} y @code{SystemStartSquare}.
-
-"
-  doctitlees = "Anidado de grupos de pentagramas"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Die Eigenschaft @code{systemStartDelimiterHierarchy} kann eingesetzt
diff --git a/Documentation/de/texidocs/non-default-tuplet-numbers.texidoc b/Documentation/de/texidocs/non-default-tuplet-numbers.texidoc
new file mode 100644
index 0000000000..43022ab18c
--- /dev/null
+++ b/Documentation/de/texidocs/non-default-tuplet-numbers.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+LilyPond stellt auch Formatierungsfunktionen zur Verfügung, mit denen
+N-tolennummern gesetzt werden können, die sich von dem eigentlichen Bruch
+unterscheiden.  Auch ein Notenwert kann zu Nenner oder Zähler des Bruchs
+hinzugefügt werden.
+"
+  doctitlede = "Nicht-standard-N-tolennummern"
+
diff --git a/Documentation/de/texidocs/non-traditional-key-signatures.texidoc b/Documentation/de/texidocs/non-traditional-key-signatures.texidoc
new file mode 100644
index 0000000000..dc0459979c
--- /dev/null
+++ b/Documentation/de/texidocs/non-traditional-key-signatures.texidoc
@@ -0,0 +1,22 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  doctitlede = "Untypische Tonarten"
+  texidocde = "
+Der üblicherweise benutzte @code{\\key}-Befehl setzt die
+@code{keySignature}-Eigenschaft im @code{Staff}-Kontext.
+
+Um untypische Tonartenvorzeichen zu erstellen, muss man diese Eigenschaft
+direkt setzen.  Das Format für den Befehl ist eine Liste: @code{ \\set
+Staff.keySignature = #`(((Oktave . Schritt) . Alteration) ((Oktave
+. Schritt) . Alteration) ...)} wobei für jedes Element in der Liste
+@code{Oktave} die Oktave angibt (0@tie{}ist die Oktave vom
+eingestrichenen@tie{}C bis zum eingestrichenen@tie{}H), @code{Schritt} gibt
+die Note innerhalb der Oktave an (0@tie{}heißt@tie{}C und
+6@tie{}heißt@tie{}H), und @code{Alteration} ist @code{,SHARP ,FLAT
+,DOUBLE-SHARP} usw.  (Beachte das beginnende Komma.)
+
+Alternativ kann auch jedes Element der Liste mit dem allgemeineren Format
+@code{(Schritt . Alteration)} gesetzt werden, wobei dann die Einstellungen
+für alle Oktaven gelten.
+
+Hier ein Beispiel einer möglichen Tonart für eine Ganztonleiter:
+"
diff --git a/input/texidocs/ottava-text.texidoc b/Documentation/de/texidocs/ottava-text.texidoc
similarity index 50%
rename from input/texidocs/ottava-text.texidoc
rename to Documentation/de/texidocs/ottava-text.texidoc
index 43916c2281..ca9293cab9 100644
--- a/input/texidocs/ottava-text.texidoc
+++ b/Documentation/de/texidocs/ottava-text.texidoc
@@ -1,15 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Internamente, @code{\\ottava} establece las propiedades
-@code{ottavation} (por ejemplo, a @code{\"8va\"} o a
-@code{\"8vb\"}) y @code{middleCPosition}.  Para sobreescribir el
-texto del corchete, ajuste @code{ottavation} después de invocar la
-instrucción @code{\\ottava}.
-
-"
-
-  doctitlees = "Texto de octava alta y baja"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Intern setzt die @code{set-octavation}-Funktion die Eigenschaften
diff --git a/Documentation/de/texidocs/percent-repeat-count-visibility.texidoc b/Documentation/de/texidocs/percent-repeat-count-visibility.texidoc
new file mode 100644
index 0000000000..0614e14f47
--- /dev/null
+++ b/Documentation/de/texidocs/percent-repeat-count-visibility.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Prozentwiederholungszähler können in regelmäßigen Intervallen angezeigt
+werden, indem man die Eigenschaft @code{repeatCountVisibility} beeinflusst.
+"
+  doctitlede = "Sichtbarkeit von Prozent-Wiederholungen"
diff --git a/Documentation/de/texidocs/percent-repeat-counter.texidoc b/Documentation/de/texidocs/percent-repeat-counter.texidoc
new file mode 100644
index 0000000000..42efdee05d
--- /dev/null
+++ b/Documentation/de/texidocs/percent-repeat-counter.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Ganztaktwiederholungen mit mehr als zwei Wiederholungen erhalten einen
+Zähler, wenn man die entsprechende Eigenschaft einsetzt:
+
+"
+  doctitlede = "Prozent-Wiederholungen zählen"
diff --git a/Documentation/de/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc b/Documentation/de/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
new file mode 100644
index 0000000000..b71382002b
--- /dev/null
+++ b/Documentation/de/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Dieses künstliche Beispiel zeigt, wie sowohl automatische als auch
+manuelle Zeilenumbrüche innerhalb einer N-tole mit Balken erlaubt
+werden können.  Diese unregelmäßige Bebalkung muss allerdings manuell
+gesetzt werden.
+
+"
+  doctitlede = "Zeilenumbrüche bei N-tolen mit Balken erlauben"
+
+
diff --git a/Documentation/de/texidocs/piano-template-simple.texidoc b/Documentation/de/texidocs/piano-template-simple.texidoc
new file mode 100644
index 0000000000..d6bcb36ab1
--- /dev/null
+++ b/Documentation/de/texidocs/piano-template-simple.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Hier ein einfaches Klaviersystem.
+
+"
+  doctitlede = "Vorlage für einfache Klaviernotation"
diff --git a/Documentation/de/texidocs/piano-template-with-centered-dynamics.texidoc b/Documentation/de/texidocs/piano-template-with-centered-dynamics.texidoc
new file mode 100644
index 0000000000..4284d263bf
--- /dev/null
+++ b/Documentation/de/texidocs/piano-template-with-centered-dynamics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+In der meisten Klaviernotation werden die Dynamikzeichen zwischen 
+den beiden Systemen zentriert. Für LilyPond muss man die Einstellungen 
+etwas anpassen, aber Sie können ja das angepasste Beispiel von hier 
+kopieren.
+"
+
diff --git a/Documentation/de/texidocs/piano-template-with-centered-lyrics.texidoc b/Documentation/de/texidocs/piano-template-with-centered-lyrics.texidoc
new file mode 100644
index 0000000000..e69e76fa1e
--- /dev/null
+++ b/Documentation/de/texidocs/piano-template-with-centered-lyrics.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Anstatt ein eigenes System für Melodie und Text zu schreiben, können 
+Sie den Text auch zwischen die beiden Klaviersysteme schreiben
+(und damit das zusätzliche System für die Gesangstimme auslassen).
+"
+
diff --git a/Documentation/de/texidocs/piano-template-with-melody-and-lyrics.texidoc b/Documentation/de/texidocs/piano-template-with-melody-and-lyrics.texidoc
new file mode 100644
index 0000000000..5593bfd6c0
--- /dev/null
+++ b/Documentation/de/texidocs/piano-template-with-melody-and-lyrics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Das nächste Beispiel ist typisch für ein Lied: Im oberen System die 
+Melodie mit Text, darunter Klavierbegleitung.
+"
+
+  doctitlede = "Vorlage für Klavier und Gesangsstimme"
+
diff --git a/Documentation/de/texidocs/placement-of-right-hand-fingerings.texidoc b/Documentation/de/texidocs/placement-of-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..a5d6ece521
--- /dev/null
+++ b/Documentation/de/texidocs/placement-of-right-hand-fingerings.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Man kann die Positionierung von Fingersatz der rechten Hand besser
+kontrollieren, wenn eine bestimmte Eigenschaft gesetzt wird, wie
+das folgende Beispiel zeigt:
+
+"
+  doctitlede = "Positionierung von Fingersatz der rechten Hand"
diff --git a/Documentation/de/texidocs/polyphony-in-tablature.texidoc b/Documentation/de/texidocs/polyphony-in-tablature.texidoc
new file mode 100644
index 0000000000..21aa1b6a33
--- /dev/null
+++ b/Documentation/de/texidocs/polyphony-in-tablature.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Polyphonie kann in einer Tabulatur (@code{TabStaff}) genauso wie in einem
+normalen Notensystem erstellt werden.
+
+"
+  doctitlede = "Polyphonie in einer Tabulatur"
diff --git a/Documentation/de/texidocs/positioning-grace-notes-with-floating-space.texidoc b/Documentation/de/texidocs/positioning-grace-notes-with-floating-space.texidoc
new file mode 100644
index 0000000000..cacbaab695
--- /dev/null
+++ b/Documentation/de/texidocs/positioning-grace-notes-with-floating-space.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn man die Eigenschaft @code{'strict-grace-spacing} aktiviert,
+werden die Verzierungsnoten \"fließend\" gemacht, d.h. sie sind
+von den normalen Noten los gekoppelt: Zuerst werden die normalen
+Noten platziert, dann erst die Verzierungen links von der
+Hauptnote gesetzt.
+
+"
+  doctitlede = "Positionierung von Verzierungen mit verschiebbarem Platz"
+
+
diff --git a/Documentation/de/texidocs/positioning-multi-measure-rests.texidoc b/Documentation/de/texidocs/positioning-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..a203dbff5b
--- /dev/null
+++ b/Documentation/de/texidocs/positioning-multi-measure-rests.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die
+vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an
+eine Tonhöhe anhängt.  In polyphoner Notation wird aber dennoch die
+Position der Pausen von geraden und ungeraden Stimmen voneinander
+unterschieden.  Die Position von Ganztaktpausen kann wie folgt verändert
+werden:
+ "
+  doctitlede = "Positionierung von Ganztaktpausen"
+
+
diff --git a/Documentation/de/texidocs/positioning-text-markups-inside-slurs.texidoc b/Documentation/de/texidocs/positioning-text-markups-inside-slurs.texidoc
new file mode 100644
index 0000000000..6c57e63078
--- /dev/null
+++ b/Documentation/de/texidocs/positioning-text-markups-inside-slurs.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Textbeschriftung kann innerhalb von Bögen gesetzt werden, wenn die
+@code{outside-staff-priority}-Eigenschaft auf falsch gesetzt wird.
+
+"
+  doctitlede = "Textbeschriftung innerhalb von Bögen positionieren"
diff --git a/Documentation/de/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc b/Documentation/de/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
new file mode 100644
index 0000000000..546dbc17fb
--- /dev/null
+++ b/Documentation/de/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  doctitlede = "Verhindern, dass zusätzliche Auflösungszeichen automatisch
+hinzugefügt werden"
+
+texidocde = "Den tranditionellen Notensatzregeln zufolge wird ein
+Auflösungszeichen immer dann vor einem Kreuz oder B gesetzt, wenn
+ein vorheriges Versetzungszeichen der gleichen Note aufgehoben werden
+soll.  Um dieses Verhalten zu ändern, muss die Eigenschaft
+@code{extraNatural} im @code{Staff}-Kontext auf \"false\" gesetzt werden.
+"
diff --git a/Documentation/de/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc b/Documentation/de/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
new file mode 100644
index 0000000000..4fd1dbbd3b
--- /dev/null
+++ b/Documentation/de/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+doctitlede = "Auflösungzeichen nicht setzen, wenn die Tonart wechselt"
+
+texidocde = "
+Wenn die Tonart wechselt, werden automatisch Auflösungszeichen ausgegeben,
+um Versetzungszeichen der vorherigen Tonart aufzulösen.  Das kann
+verhindert werden, indem die @code{printKeyCancellation}-Eigenschaft
+im @code{Staff}-Kontext auf \"false\" gesetzt wird.
+"
diff --git a/Documentation/de/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc b/Documentation/de/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
new file mode 100644
index 0000000000..18dbee6632
--- /dev/null
+++ b/Documentation/de/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Ein @code{|:}-Taktstrich kann auch zu Beginn eines Stückes ausgegeben werden, indem
+man die entsprechende Eigenschaft verändert:
+
+"
+  doctitlede = "Ein Wiederholungszeichen zu Beginn eines Stückes ausgeben"
diff --git a/Documentation/de/texidocs/printing-bar-numbers-at-regular-intervals.texidoc b/Documentation/de/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
new file mode 100644
index 0000000000..d407d4a945
--- /dev/null
+++ b/Documentation/de/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Taktnummern können in regelmäßigen Intervallen gesetzt werden, indem
+man die Eigenschaft @code{barNumberVisibility} definiert.  In diesem
+Beispiel werden die Taktnummern jeden zweiten Takt gesetzt, außer
+am Ende einer Zeile.
+
+"
+  doctitlede = "Setzen der Taktnummern in regelmäßigen Intevallen"
+
+
diff --git a/Documentation/de/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc b/Documentation/de/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
new file mode 100644
index 0000000000..b7cdbfca74
--- /dev/null
+++ b/Documentation/de/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Taktnummern können auch in Boxen oder Kreisen gesetzt werden.
+
+"
+  doctitlede = "Setzen von Taktnummern in Kästen oder Kreisen"
+
+
diff --git a/input/texidocs/printing-hairpins-using-al-niente-notation.texidoc b/Documentation/de/texidocs/printing-hairpins-using-al-niente-notation.texidoc
similarity index 50%
rename from input/texidocs/printing-hairpins-using-al-niente-notation.texidoc
rename to Documentation/de/texidocs/printing-hairpins-using-al-niente-notation.texidoc
index 2d0e4e50f0..5b4df37d2e 100644
--- a/input/texidocs/printing-hairpins-using-al-niente-notation.texidoc
+++ b/Documentation/de/texidocs/printing-hairpins-using-al-niente-notation.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se pueden imprimir reguladores con un círculo en la punta
-(notación «al niente») estableciendo la propiedad
-@code{circled-tip} del objeto @code{Hairpin} al valor @code{#t}.
-
-"
-  doctitlees = "Impresión de reguladores utilizando la notación «al niente»"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
  texidocde = "
  Crescendo-Klammern können mit einem kleinen Kreis vor der Spitze
diff --git a/input/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc b/Documentation/de/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
similarity index 50%
rename from input/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
rename to Documentation/de/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
index 2353706113..30926dabc7 100644
--- a/input/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
+++ b/Documentation/de/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
@@ -1,17 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las marcas se pueden imprimir al final de la línea actual, en vez de
-al comienzo de la línea siguiente.  Esto es útil principalmente cuando
-se tiene que añadir una marca al final de la partitura (donde no hay
-línea siguiente).
-
-En tales casos, el extremo derecho de la marca se tiene que alinear
-con la última línea divisoria, como muestra la segunda línea de este
-ejemplo.
-
-"
-  doctitlees = "Imprimir marcas al final de la línea o de la partitura"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Zeichen können auch am Ende der aktuellen Zeile ausgegeben werden, anstatt
diff --git a/Documentation/de/texidocs/printing-marks-on-every-staff.texidoc b/Documentation/de/texidocs/printing-marks-on-every-staff.texidoc
new file mode 100644
index 0000000000..03361edbcc
--- /dev/null
+++ b/Documentation/de/texidocs/printing-marks-on-every-staff.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Normalerweise werden Textzeichen nur über dem obersten Notensystem gesetzt.  Sie
+können aber auch über jedem System ausgegeben werden.
+
+"
+  doctitlede = "Zeichen über jedem System ausgeben"
diff --git a/Documentation/de/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc b/Documentation/de/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
new file mode 100644
index 0000000000..c55a397d69
--- /dev/null
+++ b/Documentation/de/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Normalerweise werden Metronom- und Übungszeichen über dem Notensystem ausgegeben.
+Um sie unter das System zu setzen, muss die @code{direction}-Eigenschaft
+von @code{MetronomeMark} oder @code{RehearsalMark} entsprechend verändert werden.
+
+"
+  doctitlede = "Metronom- und Übungszeichen unter das System setzen"
diff --git a/Documentation/de/texidocs/printing-the-bar-number-for-the-first-measure.texidoc b/Documentation/de/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
new file mode 100644
index 0000000000..ad300c4a1b
--- /dev/null
+++ b/Documentation/de/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Standardmäßig wird die erste Taktzahl einer Paritur nicht gesetzt,
+wenn sie weniger oder gleich '1' ist.  Indem man @code{barNumberVisibility}
+auf @code{all-bar-numbers-visible} setzt, kann eine beliebige
+Taktzahl für den ersten und die folgenden Takte gesetzt werden.
+Eine leere Taktlinie muss jedoch vor der ersten Note eingefügt
+werden, damit das funktioniert.
+
+"
+  doctitlede = "Setzen der Taktnummer für den ersten Takt"
+
+
diff --git a/Documentation/de/texidocs/quoting-another-voice-with-transposition.texidoc b/Documentation/de/texidocs/quoting-another-voice-with-transposition.texidoc
new file mode 100644
index 0000000000..4431c3249b
--- /dev/null
+++ b/Documentation/de/texidocs/quoting-another-voice-with-transposition.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Zitate berücksichtigen sowohl die Transposition der Quelle als auch
+des Zielinstruments.  In diesem Beispiel spielen alle Instrumente
+klingendes C, das Zielinstrument ist in F.  Die Noten für das
+Zielinstrument können mit @code{\\transpose} transponiert werden,
+in diesem Fall werden alle Noten (auch die zitierten) transponiert.
+
+"
+  doctitlede = "Eine Stimme mit Transposition zitieren"
diff --git a/Documentation/de/texidocs/quoting-another-voice.texidoc b/Documentation/de/texidocs/quoting-another-voice.texidoc
new file mode 100644
index 0000000000..eda4a27cdd
--- /dev/null
+++ b/Documentation/de/texidocs/quoting-another-voice.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die @code{quotedEventTypes}-Eigenschaft bestimmt die
+Typen an Musikereignissen, die zitiert werden.  Die
+Standardeinstellung ist @code{(note-event rest-event)}, womit
+nur Noten und Pausen der zitierten Stimme für den
+@code{\\quoteDuring}-Ausdruck übernommen werden.  Im
+Beispiel hier wird die 16-Pause nicht übernommen, weil
+sich @code{rest-event} nicht in @code{quotedEventTypes} befindet.
+
+"
+
+  doctitlede = "Eine andere Stimme zitieren"
diff --git a/Documentation/de/texidocs/redefining-grace-note-global-defaults.texidoc b/Documentation/de/texidocs/redefining-grace-note-global-defaults.texidoc
new file mode 100644
index 0000000000..45da82a80f
--- /dev/null
+++ b/Documentation/de/texidocs/redefining-grace-note-global-defaults.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die globalen Standardeinstellungen für Verzierungsnoten werden in
+den Variablen@code{startGraceMusic}, @code{stopGraceMusic},
+@code{startAcciaccaturaMusic}, @code{stopAcciaccaturaMusic},
+@code{startAppoggiaturaMusic} und @code{stopAppoggiaturaMusic}
+gespeichert, die in der Datei @code{ly/grace-init.ly} definiert
+sind.  Wenn man sie umdefiniert, können andere Effekte erreicht
+werden.
+
+"
+  doctitlede = "Globale Umdefinition von Verzierungsnoten"
+
+
diff --git a/Documentation/de/texidocs/removing-bar-numbers-from-a-score.texidoc b/Documentation/de/texidocs/removing-bar-numbers-from-a-score.texidoc
new file mode 100644
index 0000000000..5e75502ebc
--- /dev/null
+++ b/Documentation/de/texidocs/removing-bar-numbers-from-a-score.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d 
+  texidocde = "
+Taktnummern können vollkommen aus den Noten entfernt werden, indem
+man den @code{Bar_number_engraver} aus dem @code{Score}-Kontext
+entfernt.
+
+"
+  doctitlede = "Entfernung von Taktnummern in einer Partitur"
+
+
diff --git a/Documentation/de/texidocs/removing-the-first-empty-line.texidoc b/Documentation/de/texidocs/removing-the-first-empty-line.texidoc
new file mode 100644
index 0000000000..6d7400ea3a
--- /dev/null
+++ b/Documentation/de/texidocs/removing-the-first-empty-line.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Ein leeres Notensystem kann auch aus der ersten Zeile einer Partitur
+entfernt werden, indem die Eigenschaft @code{remove-first} der
+@code{VerticalAxisGroup}-Eigenschaft eingesetzt wird.  Das kann
+man global in einer @code{\\layout}-Umgebung oder lokal in dem
+bestimmten Notensystem machen, das entfernt werden soll.  In letzterem
+Fall muss man den Kontext angeben.
+
+Das untere Notensystem der zweiten Systemgruppe wird nicht entfernt,
+weil in die Einstellungen in dem Schnipsel nur für das eine Notensystem
+gültig sind.
+
+"
+  doctitlede = "Die erste leere Notenzeile auch entfernen"
diff --git a/Documentation/de/texidocs/rest-styles.texidoc b/Documentation/de/texidocs/rest-styles.texidoc
new file mode 100644
index 0000000000..1b0f5e629a
--- /dev/null
+++ b/Documentation/de/texidocs/rest-styles.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+  doctitlede = "Pausenstile"
+  texidocde = "
+Pausen können in verschiedenen Stilen dargestellt werden.
+"
+
+
diff --git a/Documentation/de/texidocs/reverting-default-beam-endings.texidoc b/Documentation/de/texidocs/reverting-default-beam-endings.texidoc
new file mode 100644
index 0000000000..6615b1d5c0
--- /dev/null
+++ b/Documentation/de/texidocs/reverting-default-beam-endings.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Um Balken im 12/8-Takt als @code{3-4-3-2} zu gruppieren, muss man zuerst die
+Standardwerte für die Balken im 12/8-Takt rückgängig machen und dann die neuen
+Werte setzen:
+
+"
+  doctitlede = "Standard-Balkenwerte rückgängig machen"
+
+
diff --git a/Documentation/de/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc b/Documentation/de/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
new file mode 100644
index 0000000000..b09b2f2617
--- /dev/null
+++ b/Documentation/de/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Wenn die Note, an welcher eine Crescendo-Klammer endet, die erste Note
+eines Taktes ist, wird die Klammer an der vorhergehenden Tatklinie
+beendet.  Dieses Verhalten kann auch mit der Eigenschaft
+@code{'to-barline} geändert werden:
+"
+  doctitlede = "Das Verhalten von Crescendo-Klammern an Taktlinien beeinflussen"
diff --git a/input/texidocs/setting-the-minimum-length-of-hairpins.texidoc b/Documentation/de/texidocs/setting-the-minimum-length-of-hairpins.texidoc
similarity index 52%
rename from input/texidocs/setting-the-minimum-length-of-hairpins.texidoc
rename to Documentation/de/texidocs/setting-the-minimum-length-of-hairpins.texidoc
index 4facf1a792..705ecb3a66 100644
--- a/input/texidocs/setting-the-minimum-length-of-hairpins.texidoc
+++ b/Documentation/de/texidocs/setting-the-minimum-length-of-hairpins.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Si los reguladores son demasiado cortos, se pueden alargar
-modificando la propiedad @code{minimum-length} del objeto
-@code{Hairpin}.
-
-"
-  doctitlees = "Ajustar la longitud mínima de los reguladores"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Wenn Crescendo-Klammern zu kurz sind, können sie verlängert werden, indem
diff --git a/Documentation/de/texidocs/shortening-volta-brackets.texidoc b/Documentation/de/texidocs/shortening-volta-brackets.texidoc
new file mode 100644
index 0000000000..636142378c
--- /dev/null
+++ b/Documentation/de/texidocs/shortening-volta-brackets.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Volta-Klammern werden normalerweise über alle Noten der Klammer gezogen, aber
+es ist möglich sie zu verkürzen.  Hierzu muss
+@code{voltaSpannerDuration} definiert werden, in dem Beispiel etwa als
+3/4, sodass die Klammer nur einen Takt dauert. 
+
+"
+  doctitlede = "Volta-Klammern verkürzen"
diff --git a/input/texidocs/showing-chords-at-changes.texidoc b/Documentation/de/texidocs/showing-chords-at-changes.texidoc
similarity index 50%
rename from input/texidocs/showing-chords-at-changes.texidoc
rename to Documentation/de/texidocs/showing-chords-at-changes.texidoc
index c92f71b869..1b77cf08cc 100644
--- a/input/texidocs/showing-chords-at-changes.texidoc
+++ b/Documentation/de/texidocs/showing-chords-at-changes.texidoc
@@ -1,11 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se pueden imprimir los acordes exclusivamente al comienzo de las
-líneas y cuando cambia el acorde.
-
-"
-  doctitlees = "Imprimir los acordes cuando se produce un cambio"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Akkordsymbole können so eingestellt werden, dass sie nur zu Beginn der Zeile
diff --git a/Documentation/de/texidocs/simple-lead-sheet.texidoc b/Documentation/de/texidocs/simple-lead-sheet.texidoc
new file mode 100644
index 0000000000..08901dc213
--- /dev/null
+++ b/Documentation/de/texidocs/simple-lead-sheet.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+ texidocde = "
+Ein Liedblatt besteht aus Akkordbezeichnungen, einer Melodie und dem Liedtext:
+
+"
+  doctitlede = "Ein einfaches Liedblatt"
diff --git a/Documentation/de/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc b/Documentation/de/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
new file mode 100644
index 0000000000..7202b198ef
--- /dev/null
+++ b/Documentation/de/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Mit diesem Beispiel können Sie einen Song mit Melodie, 
+Text und Akkorden schreiben.
+"
+
+  doctitlede = "Vorlage für eine Notenzeile mit Noten, Text und Akkorden"
+
diff --git a/Documentation/de/texidocs/single-staff-template-with-notes-and-chords.texidoc b/Documentation/de/texidocs/single-staff-template-with-notes-and-chords.texidoc
new file mode 100644
index 0000000000..9fb9d324a3
--- /dev/null
+++ b/Documentation/de/texidocs/single-staff-template-with-notes-and-chords.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wollen Sie ein Liedblatt mit Melodie und Akkorden schreiben?  Hier ist 
+das richtige Beispiel für Sie!
+"
+
+  doctitlede = "Vorlage für eine Notenzeile mit Akkorden"
+
diff --git a/Documentation/de/texidocs/single-staff-template-with-notes-and-lyrics.texidoc b/Documentation/de/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
new file mode 100644
index 0000000000..92022d2051
--- /dev/null
+++ b/Documentation/de/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Das nächste Beispiel zeigt eine einfache Melodie mit Text. Kopieren 
+Sie es in Ihre Datei, fügen Sie Noten und Text hinzu und übersetzen 
+Sie es mit LilyPond. In dem Beispiel wird die automatische 
+Balkenverbindung ausgeschaltet (mit dem Befehl @code{\autoBeamOff}), 
+wie es für Vokalmusik üblich ist. 
+Wenn Sie die Balken wieder einschalten wollen, müssen Sie die 
+entsprechende Zeile entweder ändern oder auskommentieren.
+"
+
+  doctitlede = "Vorlage für ein Notensystem mit Noten und Gesangstext"
+
diff --git a/Documentation/de/texidocs/single-staff-template-with-only-notes.texidoc b/Documentation/de/texidocs/single-staff-template-with-only-notes.texidoc
new file mode 100644
index 0000000000..71d9cf658e
--- /dev/null
+++ b/Documentation/de/texidocs/single-staff-template-with-only-notes.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
+  texidocde = "
+Das erste Beispiel zeigt ein Notensystem mit Noten, passend für ein 
+Soloinstrument oder ein Melodiefragment. Kopieren Sie es und fügen 
+Sie es in Ihre Datei ein, schreiben Sie die Noten hinzu, und Sie haben 
+eine vollständige Notationsdatei.
+"
+
+  doctitlede = "Vorlage für ein Notensystem"
+
diff --git a/Documentation/de/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc b/Documentation/de/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
new file mode 100644
index 0000000000..1f2f5ebd07
--- /dev/null
+++ b/Documentation/de/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  doctitlede = "Bartók-Pizzicato"
+  texidocde = "
+Das Bartók-Pizzicato @q{ist eine besondere Form des Pizzicato, bei dem der
+Spieler die Saite auf das Griffbrett aufschlagen lässt, sodass zusätzlich
+zum angeschlagenen Ton ein scharfes, knallendes Geräusch ertönt}
+(Wikipedia).  Es wird dargestellt als kleiner Kreis mit einer vertikalen
+Linie, die vom Kreiszentrum aus nach oben weist und ein Stück außerhalb des
+Kreises endet.  Lilypond hat keinen eigenen Glyphen für dieses Symbol; es
+ist aber einfach, direkt eine Definition in die Eingabedatei einzufügen.
+"
diff --git a/Documentation/de/texidocs/specifying-context-with-beatgrouping.texidoc b/Documentation/de/texidocs/specifying-context-with-beatgrouping.texidoc
new file mode 100644
index 0000000000..3ab6c33193
--- /dev/null
+++ b/Documentation/de/texidocs/specifying-context-with-beatgrouping.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Wenn der Kontext angegeben wird, kann die Auswirkung von @code{beatGrouping}
+auf den angegebenen Kontext beschränkt werden und die Werte, die in Kontexten
+auf höhrer Ebene angegeben wurden, können verändert werden.  Der
+@code{\\set}-Befehl muss @emph{nach} den @code{\\time}-Befehl geschrieben
+werden:
+"
+  doctitlede = "Den Kontext für beatGrouping angeben"
+
+
diff --git a/Documentation/de/texidocs/stand-alone-two-column-markup.texidoc b/Documentation/de/texidocs/stand-alone-two-column-markup.texidoc
new file mode 100644
index 0000000000..63efa6e6e6
--- /dev/null
+++ b/Documentation/de/texidocs/stand-alone-two-column-markup.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Isolierter Text kann in mehreren Spalten mit @code{\\markup}-Befehlen
+angeordnet werden:
+
+"
+  doctitlede = "Isolierter Text in zwei Spalten"
diff --git a/Documentation/de/texidocs/stem-and-beam-behavior-in-tablature.texidoc b/Documentation/de/texidocs/stem-and-beam-behavior-in-tablature.texidoc
new file mode 100644
index 0000000000..01b8aeb79e
--- /dev/null
+++ b/Documentation/de/texidocs/stem-and-beam-behavior-in-tablature.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Richtung von Hälsen wird in Tabulaturen genauso wie in normaler Notation
+eingestellt.  Balken können horizontal eingestellt werden, wie das Beispiel
+zeigt.
+
+"
+  doctitlede = "Hals- und Balkenverhalten in einer Tabulatur"
diff --git a/Documentation/de/texidocs/string-quartet-template-simple.texidoc b/Documentation/de/texidocs/string-quartet-template-simple.texidoc
new file mode 100644
index 0000000000..449122ec1d
--- /dev/null
+++ b/Documentation/de/texidocs/string-quartet-template-simple.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Dieses Beispiel demonstriert die Partitur für ein Streichquartett. Hier 
+wird auch eine @qq{@code{\global}}-Variable für Taktart und 
+Vorzeichen benutzt.
+"
+
+  doctitlede = "Vorlage für Streichquartett (einfach)"
+
diff --git a/Documentation/de/texidocs/string-quartet-template-with-separate-parts.texidoc b/Documentation/de/texidocs/string-quartet-template-with-separate-parts.texidoc
new file mode 100644
index 0000000000..a09d78de06
--- /dev/null
+++ b/Documentation/de/texidocs/string-quartet-template-with-separate-parts.texidoc
@@ -0,0 +1,19 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Mit diesem Beispiel können Sie ein schönes Streichquartett notieren, 
+aber wie gehen Sie vor, wenn Sie Stimmen brauchen? Das Beispiel 
+oben hat gezeigt, wie Sie mit Variablen einzelne Abschnitte getrennt 
+voneinander notieren können. Im nächsten Beispiel wird nun 
+gezeigt, wie Sie mit diesen Variablen einzelne Stimmen erstellen.
+
+Sie müssen das Beispiel in einzelne Dateien aufteilen; die Dateinamen
+sind in den Kommentaren am Anfang jeder Datei enthalten.  @code{piece.ly}
+enthält die Noten. Die anderen Dateien -- @code{score.ly},
+@code{vn1.ly}, @code{vn2.ly}, @code{vla.ly} und
+@code{vlc.ly} -- erstellen daraus die entsprechenden Stimmen bzw. die 
+Partitur (@code{score.ly}). Mit @code{\tag} wird den Stimmen ein Name 
+zugewiesen, auf den zurückgegriffen werden kann.
+"
+
+  doctitlede = "Vorlage für Streichquartett mit einzelnen Stimmen"
+  
diff --git a/Documentation/de/texidocs/sub-dividing-beams.texidoc b/Documentation/de/texidocs/sub-dividing-beams.texidoc
new file mode 100644
index 0000000000..2a1f666699
--- /dev/null
+++ b/Documentation/de/texidocs/sub-dividing-beams.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Balken von aufeinanderfolgenden Sechszehnteln (oder kürzeren Notenwerten)
+werden standardmäßig nicht unterteilt.  Dieses Verhalten kann verändert
+werden, sodass die Balken in Untergruppen aufgeteilt werden, indem man
+die Eigenschaft @code{subdivideBeams} verändert.  Man muss die Unterteilungsintervalle
+als Notenbruch mit der @code{make-moment}-Funktion für @code{beatLength} angeben,
+damit die Balken unterbrochen wird und nur ein Balken durchgezogen bleibt.  Der
+Standardwert für @code{beatLength} ist 1 / Zähler des aktuellen Taktes.
+
+"
+  doctitlede = "Balken in Untergruppen teilen"
+
+
diff --git a/input/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc b/Documentation/de/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
similarity index 50%
rename from input/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
rename to Documentation/de/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
index e2a9132b56..176ba2b426 100644
--- a/input/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
+++ b/Documentation/de/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
@@ -1,34 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-doctitlees = "Transportar música con el menor número de alteraciones"
-texidoces = "
-Este ejemplo utiliza código de Scheme para forzar las
-modificaciones enarmónicas de las notas, y así tener el menor
-número de alteraciones accidentales. En este caso se aplican las
-siguientes reglas:
-
-@itemize
-@item
-Se quitan las dobles alteraciones
-
-@item
-Si sostenido -> Do
-
-@item
-Mi sistenido -> Fa
-
-@item
-Do bemol -> Si
-
-@item
-Fa bemol -> Mi
-
-@end itemize
-
-De esta forma se selecciona el mayor número de notas enarmónicas
-naturales.
-
-"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   doctitlede = "Noten mit minimaler Anzahl an Versetzungszeichen transponieren."
   texidocde = "Dieses Beispiel benutzt Scheme-Code, um enharmonische
diff --git a/input/texidocs/tweaking-clef-properties.texidoc b/Documentation/de/texidocs/tweaking-clef-properties.texidoc
similarity index 51%
rename from input/texidocs/tweaking-clef-properties.texidoc
rename to Documentation/de/texidocs/tweaking-clef-properties.texidoc
index ca17eeb62b..cc785e4b5f 100644
--- a/input/texidocs/tweaking-clef-properties.texidoc
+++ b/Documentation/de/texidocs/tweaking-clef-properties.texidoc
@@ -1,38 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  doctitlees = "Trucaje de las propiedades de clave"
-  texidoces = "
-La instrucción @code{\\clef \"treble_8\"} equivale a un ajuste de
-@code{clefGlyph}, @code{clefPosition} (que controla la posición
-vertical de la clave), @code{middleCPosition} y
-@code{clefOctavation}.  Se imprime una clave cada vez que se
-modifica cualquiera de las propiedades excepto
-@code{middleCPosition}.
-
-Observe que la modificación del glifo, la posición de la clave o
-su octavación, no cambian 'per se' la posición de las siguientes
-notas del pentagrama: para hacer esto también se debe especificar
-la posición del Do central.  Los parámetros posicionales están en
-relación con la tercera línea del pentagrama, los números
-positivos desplazan hacia arriba, contando una unidad por cada
-línea y espacio.  El valor de @code{clefOctavation} se
-establecería normalmente a 7, -7, 15 or -15, pero son válidos
-otros valores.
-
-Cuando se produce un cambio de clave en el salto de línea se
-imprime la clave nueva tanto al final de la línea anterior como al
-principio de la nueva, de forma predeterminada.  Si no se necesita
-la clave de advertencia al final de la línea anterior, se puede
-quitar estableciendo el valor de la propiedad
-@code{explicitClefVisibility} de @code{Staff}, a
-@code{end-of-line-invisible}.  El comportamiento predeterminado se
-puede recuperar con @code{\\unset Staff.explicitClefVisibility}.
-
-Los siguientes ejemplos muestran las posibilidades cuando se
-ajustan estas propiedades manualmente.  En la primera línea, los
-cambios manuales preservan el posicionamiento relativo estándar de
-las claves y las notas, pero no lo hacen en la segunda línea.
-"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   doctitlede = "Eigenschaften des Schlüssels optimieren"
   texidocde = "
diff --git a/Documentation/de/texidocs/tweaking-grace-layout-within-music.texidoc b/Documentation/de/texidocs/tweaking-grace-layout-within-music.texidoc
new file mode 100644
index 0000000000..6ecdcd7a66
--- /dev/null
+++ b/Documentation/de/texidocs/tweaking-grace-layout-within-music.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Das Layout von Verzierungsausdrücken kann in der Musik verändert
+werden mit den Funktionen @code{add-grace-property} und
+@code{remove-grace-property}.  Das folgende Beispiel definiert
+die Richtung von Hälsen (Stem) für diese Verzierung, sodass die
+Hälse nicht immer nach unten zeigen, und ändert den Standardnotenkopf
+in ein Kreuz.
+"
+  doctitlede = "Veränderung des Layouts von Verzierungen innerhalb der Noten"
+
+
diff --git a/input/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc b/Documentation/de/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
similarity index 51%
rename from input/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
rename to Documentation/de/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
index 791a0fee9a..bd0c1ea72e 100644
--- a/input/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
+++ b/Documentation/de/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
@@ -1,12 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se puede usar el delimitador de comienzo de un sistema
-@code{SystemStartSquare} estableciéndolo explícitamente dentro de
-un contexto @code{StaffGroup} o @code{ChoirStaffGroup}.
-
-"
-  doctitlees = "Uso del corchete recto al comienzo de un grupo de pentagramas"
-
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
   texidocde = "
 Die Klammer zu Beginn von Systemgruppen kann auch in eine eckige Klammer
diff --git a/Documentation/de/texidocs/using-beatlength-and-beatgrouping.texidoc b/Documentation/de/texidocs/using-beatlength-and-beatgrouping.texidoc
new file mode 100644
index 0000000000..c0bdfd35e2
--- /dev/null
+++ b/Documentation/de/texidocs/using-beatlength-and-beatgrouping.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Die Eigenschaft @code{measureLength} bestimmt, wo Taktstriche eingefügt
+werden sollen und, zusammen mit @code{beatLength} und
+@code{beatGrouping}, wie automtische Balken für Notenlängen und
+Taktarten, für die keine definierten Regeln gefunden werden, gesetzt
+werden sollen.  Dieses Beispiel zeigt verschiedene Möglichkeiten,
+die Balken zu kontrollieren, indem man diese Eigenschaften
+beeinflusst.  Die Erklärungen werden als Kommentare im Quellcode
+gegeben.
+"
+  doctitlede = "beatLength und beatGrouping benutzen"
+
diff --git a/input/texidocs/using-double-slurs-for-legato-chords.texidoc b/Documentation/de/texidocs/using-double-slurs-for-legato-chords.texidoc
similarity index 50%
rename from input/texidocs/using-double-slurs-for-legato-chords.texidoc
rename to Documentation/de/texidocs/using-double-slurs-for-legato-chords.texidoc
index 7b67a98a65..6f225c2341 100644
--- a/input/texidocs/using-double-slurs-for-legato-chords.texidoc
+++ b/Documentation/de/texidocs/using-double-slurs-for-legato-chords.texidoc
@@ -1,11 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Algunos compositores escriben dos ligaduras cuando quieren acordes
-legato.  Esto se puede conseguir estableciendo @code{doubleSlurs}.
-
-"
-  doctitlees = "Utilizar ligaduras dobles para acordes legato"
-  
 %% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
 texidocde = "
 Einige Komponisten schreiben doppelte Bögen, wenn Legato-Akkorde notiert
diff --git a/Documentation/de/texidocs/using-ties-with-arpeggios.texidoc b/Documentation/de/texidocs/using-ties-with-arpeggios.texidoc
new file mode 100644
index 0000000000..bc559a21bc
--- /dev/null
+++ b/Documentation/de/texidocs/using-ties-with-arpeggios.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+ texidocde = "
+ Überbindungen werden teilweise benutzt, um Arpeggios zu notieren.  In
+ diesem Fall stehen die übergebundenen Noten nicht unbedingt hintereinander.
+Das Verhalten kann erreicht werden, indem die @code{tieWaitForNote}-Eigenschaft
+auf @code{#t} gesetzt wird.  Diese Funktion ist auch sinnvoll, um etwa
+ein Tremolo mit einem Akkord zu überbinden, kann aber prinzipiell auch
+für normale Überbindungen eingesetzt werden
+"
+  doctitlede = "Überbingungen für Arpeggio genutzen"
+
+
diff --git a/Documentation/de/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc b/Documentation/de/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
new file mode 100644
index 0000000000..7af455f36a
--- /dev/null
+++ b/Documentation/de/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+texidocde = "
+Indem man die @code{'Y-extent}-Eigenschaft auf einen passenden Wert setzt,
+können alle @code{DynamicLineSpanner}-Objekte (Crescendo-Klammern und
+Dynamik-Texte)  (hairpins and dynamic texts) unabhängig von ihrer
+wirklichen Ausdehnung an einem gemeinsamen Referenzpunkt ausgerichtet werden.
+Auf diese Weise ist jedes Element vertikal ausgerichtet und der Notensatz
+sieht ansprechender aus.
+
+Die gleiche Idee wird benutzt, um Textbeschriftungen an ihrer
+Grundlinie auszurichten.
+
+"
+  doctitlede = "Vertikale Ausrichtung von Dynamik und Textbeschriftung beeinflussen"
diff --git a/Documentation/de/texidocs/vertically-aligning-ossias-and-lyrics.texidoc b/Documentation/de/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
new file mode 100644
index 0000000000..c594ad269a
--- /dev/null
+++ b/Documentation/de/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Dieser Schnipsel zeigt, wie man die Kontexteigenschaften
+@code{alignBelowContext} und @code{alignAboveContext} benutzen kann, um
+die Positionierung von Gesangstext und Ossia-Abschnitten zu kontrollieren.
+
+"
+  doctitlede = "Gesangstext und Ossia vertikal ausrichten"
diff --git a/Documentation/de/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc b/Documentation/de/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
new file mode 100644
index 0000000000..225c241bfe
--- /dev/null
+++ b/Documentation/de/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+In diesem Beispiel wird ein automatischer Klavierauszug zu der 
+Chorpartitur hinzugefügt. Das zeigt eine der Stärken von LilyPond
+-- man kann eine Variable mehr als einmal benutzen. Wenn Sie 
+irgendeine Änderung an einer Chorstimme vornehmen, (etwa 
+tenorMusic), verändert sich auch der Klavierauszug entsprechend.
+"
+
diff --git a/Documentation/de/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc b/Documentation/de/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
new file mode 100644
index 0000000000..6bd1ddf690
--- /dev/null
+++ b/Documentation/de/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+In diesem Beispiel werden die Texte mit den Befehlen 
+@code{alignAboveContext} und @code{alignBelowContext}
+über und unter dem System angeordnet.
+"
+
+  doctitlede = "Vorlage für Vokalensemble mit dem Gesangstext über und unter dem System"
+
diff --git a/Documentation/de/texidocs/vocal-ensemble-template.texidoc b/Documentation/de/texidocs/vocal-ensemble-template.texidoc
new file mode 100644
index 0000000000..875be30bf1
--- /dev/null
+++ b/Documentation/de/texidocs/vocal-ensemble-template.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
+  texidocde = "
+Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren 
+Stücken ist es oft sinnvoll, eine allgemeine Variable zu bestimmen, 
+die in allen Stimmen eingefügt wird. Taktart und Vorzeichen etwa 
+sind fast immer gleich in allen Stimmen.
+"
+
+  doctitlede = "Vorlage für Vokalensemble"
+
diff --git a/Documentation/de/texidocs/volta-below-chords.texidoc b/Documentation/de/texidocs/volta-below-chords.texidoc
new file mode 100644
index 0000000000..e119a5f301
--- /dev/null
+++ b/Documentation/de/texidocs/volta-below-chords.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+  texidocde = "
+Indem man den @code{Volta_engraver} zu dem entsprechenden Notensystem
+hinzufügt, können Wiederholungsklammern unterhalb der Akkorde gesetzt
+werden.
+
+"
+  doctitlede = "Wiederholungs-(Volta-)Klammern unterhalb der Akkordsymbole"
diff --git a/Documentation/de/user/GNUmakefile b/Documentation/de/user/GNUmakefile
deleted file mode 100644
index 50042f40cb..0000000000
--- a/Documentation/de/user/GNUmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ISOLANG = de
-depth = ../../..
-LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-include $(depth)/make/stepmake.make
diff --git a/Documentation/de/user/compile.itely b/Documentation/de/user/compile.itely
deleted file mode 100644
index 332877c3e8..0000000000
--- a/Documentation/de/user/compile.itely
+++ /dev/null
@@ -1,91 +0,0 @@
-@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*-
-@c This file is part of lilypond-program.tely
-@ignore
-    Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-
-    When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
-@end ignore
-
-
-@node Compiling from source
-@section Compiling from source
-
-@untranslated
-
-
-@menu
-* Downloading source code::
-* Requirements::
-* Building LilyPond::
-* Building documentation::
-* Testing LilyPond::
-* Problems::
-@end menu
-
-@node Downloading source code
-@subsection Downloading source code
-
-@untranslated
-
-
-@node Requirements
-@subsection Requirements
-
-@untranslated
-
-
-@unnumberedsubsubsec Compilation
-@unnumberedsubsubsec Running requirements
-@unnumberedsubsubsec Requirements for building documentation
-@node Building LilyPond
-@subsection Building LilyPond
-
-@untranslated
-
-
-@unnumberedsubsubsec Compiling
-@unnumberedsubsubsec Compiling for multiple platforms
-@unnumberedsubsubsec Compiling outside the source tree
-@unnumberedsubsubsec Useful @command{make} variables
-@node Building documentation
-@subsection Building documentation
-
-@untranslated
-
-
-@menu
-* Commands for building documentation::
-* Building documentation without compiling LilyPond::
-@end menu
-
-@node Commands for building documentation
-@unnumberedsubsubsec Commands for building documentation
-
-@untranslated
-
-
-@node Building documentation without compiling LilyPond
-@unnumberedsubsubsec Building documentation without compiling LilyPond
-
-@untranslated
-
-
-@node Testing LilyPond
-@subsection Testing LilyPond
-
-@untranslated
-
-
-@node Problems
-@subsection Problems
-
-@untranslated
-
-
-@unnumberedsubsubsec Bison 1.875
-@unnumberedsubsubsec Solaris
-@unnumberedsubsubsec FreeBSD
-@unnumberedsubsubsec International fonts
-
-@c -- SKELETON FILE --
diff --git a/Documentation/user/dedication.itely b/Documentation/dedication.itely
similarity index 91%
rename from Documentation/user/dedication.itely
rename to Documentation/dedication.itely
index cc0b4598e5..5367155d2e 100644
--- a/Documentation/user/dedication.itely
+++ b/Documentation/dedication.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/devel/index.html.in b/Documentation/devel.html.in
similarity index 79%
rename from Documentation/devel/index.html.in
rename to Documentation/devel.html.in
index 5e11693593..9e8ee7816c 100644
--- a/Documentation/devel/index.html.in
+++ b/Documentation/devel.html.in
@@ -32,10 +32,10 @@
       <tr>
 	<td>
 	  <br>
-	  <a class="title" href="contrib-guide/index.html">Contributors'
+	  <a class="title" href="contributor.html">Contributors'
 	    Guide</a>
-	  (in <a class="title" href="contrib-guide-big-page.html">one
-	    big page</a>,	in <a class="title" href="contrib-guide.pdf">PDF</a>)
+	  (in <a class="title" href="contributor-big-page.html">one
+	    big page</a>,	in <a class="title" href="contributor.pdf">PDF</a>)
 	  <br>(how to participate in development)
 	</td>
       <tr>
@@ -47,21 +47,21 @@
           <td class="left-column">
 	  <ul>
       <li><a class="title"
-	  href="../../input/regression/collated-files.html">Regression
+	  href="../input/regression/collated-files.html">Regression
 	  tests</a> (~ 5 Mb, in <a class="title"
-	  href="../../input/regression/collated-files.pdf">PDF</a>)
+	  href="../input/regression/collated-files.pdf">PDF</a>)
         <br>(general tests)</li>
       <li><a class="title"
-	  href="../../input/regression/musicxml/collated-files.html">MusicXML regression
+	  href="../input/regression/musicxml/collated-files.html">MusicXML regression
 	  tests</a> (in <a class="title"
-	  href="../../input/regression/musicxml/collated-files.pdf">PDF</a>)
+	  href="../input/regression/musicxml/collated-files.pdf">PDF</a>)
         <br>(musicxml2ly tests)</li>
           </ul></td>
 	  <td class="right-column">
           <ul>
       <li><a class="title" href="http://lilypond.org/test">Regression tests results</a>
       <br>(for comparison between releases)</li>
-      <li><a class="title" href="../bibliography/index.html">Bibliography</a>
+      <li><a class="title" href="bibliography/index.html">Bibliography</a>
       <br>(on background information)</li>
           </ul></td>
         </tr>
@@ -86,7 +86,7 @@ and <a class="title" href="http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=blob_p
      </tbody>
 </table>
 
-<p><a href="../index.html">Go back</a> to the Documentation index.</a></p>
+<p><a href="index.html">Go back</a> to the Documentation index.</a></p>
 
 </body>
 </html>
diff --git a/Documentation/devel/GNUmakefile b/Documentation/devel/GNUmakefile
deleted file mode 100644
index dd4b822e25..0000000000
--- a/Documentation/devel/GNUmakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-depth = ../..
-
-XREF_MAP_FLAGS = --split section -I $(abs-src-dir)
-
-STEPMAKE_TEMPLATES = documentation tex texinfo topdocs
-LOCALSTEPMAKE_TEMPLATES = ly
-
-# DOCUMENTATION_INCLUDES = -I $(top-src-dir)/Documentation/user
-
-include $(depth)/make/stepmake.make
-
-HTML_PAGE_NAMES = index
-OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
-
-
-MASTER_TEXI_FILES = contrib-guide.texi
-PDF_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%.pdf)
-HTML_FILES = $(MASTER_TEXI_FILES:%.texi=$(outdir)/%/index.html) \
-  $(MASTER_TEXI_FILES:%.texi=$(outdir)/%-big-page.html)
-source-links = $(outdir)/source $(MASTER_TEXI_FILES:%.texi=$(outdir)/%/source)
-
-default: local-doc
-
-$(outdir)/source:
-	@rm -f $(@)
-	ln -sf $(depth) $(@)
-
-$(outdir)/%/source:
-	@rm -f $(@)
-	mkdir -p $(dir $@)
-	ln -sf $(depth)/.. $(@)
-
-ifeq ($(out),www)
-local-WWW-1: $(PDF_FILES)
-
-local-WWW-2: $(HTML_FILES) $(OUT_HTML_FILES) $(source-links)
-endif
-
-$(PDF_FILES) $(HTML_FILES): $(ITEXI_FILES)
diff --git a/Documentation/es/GNUmakefile b/Documentation/es/GNUmakefile
index ed20093b3d..809ac364e5 100644
--- a/Documentation/es/GNUmakefile
+++ b/Documentation/es/GNUmakefile
@@ -1,7 +1,7 @@
 ISOLANG = es
 depth = ../..
-SUBDIRS = topdocs user
+SUBDIRS = application learning notation texidocs
 STEPMAKE_TEMPLATES = documentation
-LOCALSTEPMAKE_TEMPLATES = doc-i18n-root
+LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 
 include $(depth)/make/stepmake.make
diff --git a/Documentation/es/user/lilypond-program.tely b/Documentation/es/application.tely
similarity index 92%
rename from Documentation/es/user/lilypond-program.tely
rename to Documentation/es/application.tely
index 81c53d7f56..a5c83dd0bd 100644
--- a/Documentation/es/user/lilypond-program.tely
+++ b/Documentation/es/application.tely
@@ -35,13 +35,13 @@
 @ifhtml
 @ifclear bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond-program.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond-program-big-page.es.html,una sola página}.
+@uref{source/Documentation/application.es.pdf,PDF} y como
+@uref{source/Documentation/application-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond-program.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond-program/index.es.html,un documento HTML normal de muchas páginas}.
+@uref{source/Documentation/application.es.pdf,PDF} y como
+@uref{source/Documentation/application/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
 @end ifhtml
 
@@ -186,11 +186,11 @@ Apéndices
 
 @contents
 
-@include install.itely
-@include setup.itely
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
+@include application/install.itely
+@include application/setup.itely
+@include application/running.itely
+@include application/lilypond-book.itely
+@include application/converters.itely
 
 @include fdl.itexi
 
diff --git a/Documentation/es/application/GNUmakefile b/Documentation/es/application/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/es/application/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/es/user/converters.itely b/Documentation/es/application/converters.itely
similarity index 99%
rename from Documentation/es/user/converters.itely
rename to Documentation/es/application/converters.itely
index b08dd151d0..f3a250bcee 100644
--- a/Documentation/es/user/converters.itely
+++ b/Documentation/es/application/converters.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/install.itely b/Documentation/es/application/install.itely
similarity index 96%
rename from Documentation/es/user/install.itely
rename to Documentation/es/application/install.itely
index 7160bd8ae5..673b617c2f 100644
--- a/Documentation/es/user/install.itely
+++ b/Documentation/es/application/install.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 9bf6dcaf6ca27f7141ec825bb3569de8a5090dbb
 
@@ -64,7 +64,6 @@ Si tiene MacOS 10.3 o 10.4 y quiere usar guiones de Python como
 @command{convert-ly} y @command{lilypond-book}, consulte @ref{Setup
 for MacOS X,,,lilypond-program,Application Usage}.
 
-@ignore
 Es posible compilar LilyPond directamente del código fuente. Ello
 requiere poder leer en inglés, motivo por el que esta sección se deja
 sin traducir.  Si verdaderamente quiere compilar LilyPond, consulte
@@ -76,7 +75,6 @@ sin traducir.  Si verdaderamente quiere compilar LilyPond, consulte
 @c Please translate the following line (but not the .html file name)
 la @uref{Compiling-from-source.html,documentación en inglés}.
 @end ifhtml
-@end ignore
 
 @c TRANSLATORS:
 @c   Please **do not** translate the file included below.  Users
@@ -86,6 +84,3 @@ la @uref{Compiling-from-source.html,documentación en inglés}.
 @c   on the -devel list.   -gp
 @c Instead, please uncomment and translate the paragraph above,
 @c and remove all stuff (menu, nodes, contents) below this line.
-
-
-@include compile.itely
diff --git a/Documentation/es/user/lilypond-book.itely b/Documentation/es/application/lilypond-book.itely
similarity index 99%
rename from Documentation/es/user/lilypond-book.itely
rename to Documentation/es/application/lilypond-book.itely
index a67e5c2bd2..bef7156d0c 100644
--- a/Documentation/es/user/lilypond-book.itely
+++ b/Documentation/es/application/lilypond-book.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/running.itely b/Documentation/es/application/running.itely
similarity index 99%
rename from Documentation/es/user/running.itely
rename to Documentation/es/application/running.itely
index 9582a13ba6..bf981784e7 100644
--- a/Documentation/es/user/running.itely
+++ b/Documentation/es/application/running.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/setup.itely b/Documentation/es/application/setup.itely
similarity index 99%
rename from Documentation/es/user/setup.itely
rename to Documentation/es/application/setup.itely
index b21e59cf69..063edd604e 100644
--- a/Documentation/es/user/setup.itely
+++ b/Documentation/es/application/setup.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 5a5db8a01f4617ca0924120494562d9ed88b2869
 
diff --git a/Documentation/es/topdocs/NEWS.tely b/Documentation/es/changes.tely
similarity index 99%
rename from Documentation/es/topdocs/NEWS.tely
rename to Documentation/es/changes.tely
index 9a57a73ea7..9db0a028a9 100644
--- a/Documentation/es/topdocs/NEWS.tely
+++ b/Documentation/es/changes.tely
@@ -5,8 +5,7 @@
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
-@setfilename NEWS.info
-@settitle NEWS
+@setfilename lilypond-changes.info
 
 @ifhtml
 @macro inputfileref{DIR,NAME}
diff --git a/Documentation/es/user/dedication.itely b/Documentation/es/dedication.itely
similarity index 91%
rename from Documentation/es/user/dedication.itely
rename to Documentation/es/dedication.itely
index 95ac2e4af6..a48839d75e 100644
--- a/Documentation/es/user/dedication.itely
+++ b/Documentation/es/dedication.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/index.html.in b/Documentation/es/index.html.in
index d70eb33780..1ffc06f999 100644
--- a/Documentation/es/index.html.in
+++ b/Documentation/es/index.html.in
@@ -34,22 +34,22 @@
           <td class="left-column">
 	  <ul>
 	     <li>
-	       <a class="title" href="user/lilypond-learning/index.es.html">Manual de aprendizaje</a><br>
-	       (también en <a class="title" href="user/lilypond-learning-big-page.es.html">una sola
-	       página</a> ~ 1.5 Mb, o en <a class="title" href="user/lilypond-learning.es.pdf">PDF</a>)<br>
+	       <a class="title" href="learning/index.es.html">Manual de aprendizaje</a><br>
+	       (también en <a class="title" href="learning-big-page.es.html">una sola
+	       página</a> ~ 1.5 Mb, o en <a class="title" href="learning.es.pdf">PDF</a>)<br>
              (comience por aquí)</li>
 
 	     <li>
-              <a class="title" href="user/music-glossary/index.html">Glosario musical</a> multilingüe<br>
-	      (también en <a class="title" href="user/music-glossary-big-page.html">una sola página</a> ~ 500 Kb,
-              o en <a class="title" href="user/music-glossary.pdf">PDF</a>)<br>
+              <a class="title" href="music-glossary/index.html">Glosario musical</a> multilingüe<br>
+	      (también en <a class="title" href="music-glossary-big-page.html">una sola página</a> ~ 500 Kb,
+              o en <a class="title" href="music-glossary.pdf">PDF</a>)<br>
               (para usuarios de habla no inglesa)</li>
 	  </ul>
 	  </td>
 	  <td class="right-column">
 	  <ul>
             <li>
-	      <a class="title" href="topdocs/NEWS.es.html">Noticias</a><br>
+	      <a class="title" href="changes.es.html">Noticias</a><br>
               (cambios producidos desde el último<br>lanzamiento importante)</li>
 	    <li>
 	      <a class="title" href="../examples.html">Ejemplos</a><br>
@@ -62,28 +62,28 @@
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-               <a class="title" href="user/lilypond/index.es.html">Referencia de la notación</a><br>
-               (también en <a class="title" href="user/lilypond-big-page.es.html">una sola página</a> ~ 4 Mb,
-	       o en <a class="title" href="user/lilypond.es.pdf">PDF</a>)<br>
+               <a class="title" href="notation/index.es.html">Referencia de la notación</a><br>
+               (también en <a class="title" href="notation-big-page.es.html">una sola página</a> ~ 4 Mb,
+	       o en <a class="title" href="notation.es.pdf">PDF</a>)<br>
                (escribir música con LilyPond)</li>
 	    <li>
-	      <a class="title" href="user/lilypond-internals/index.html">Referencia de funcionamiento interno</a>
+	      <a class="title" href="internals/index.html">Referencia de funcionamiento interno</a>
 	      [en inglés]<br>
-	      (también en <a class="title" href="user/lilypond-internals-big-page.html">una sola página</a> ~ 1 Mb, o en <a class="title" href="user/lilypond-internals.pdf">PDF</a>)<br>
+	      (también en <a class="title" href="internals-big-page.html">una sola página</a> ~ 1 Mb, o en <a class="title" href="internals.pdf">PDF</a>)<br>
               (definiciones para hacer trucos)</li>
 	  </ul>
 	</td>
 	<td valign="baseline" class="right-column">
 	  <ul>
             <li>
-	      <a class="title" href="user/lilypond-program/index.es.html">Utilización del programa</a><br>
-	      (también en <a class="title" href="user/lilypond-program-big-page.es.html">una sola página</a>,
-	      o en <a class="title" href="user/lilypond-program.es.pdf">PDF</a>)<br>
+	      <a class="title" href="application/index.es.html">Utilización del programa</a><br>
+	      (también en <a class="title" href="application-big-page.es.html">una sola página</a>,
+	      o en <a class="title" href="application.es.pdf">PDF</a>)<br>
               (cómo instalar y ejecutar el programa)</li>
 	    <li>
-	      <a class="title" href="../input/lsr/lilypond-snippets/index.html">Fragmentos de código</a> [en inglés]<br>
-	      (también en <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">una sola página</a> ~ 2 Mb,
-	      o en <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)<br>
+	      <a class="title" href="snippets/index.html">Fragmentos de código</a> [en inglés]<br>
+	      (también en <a class="title" href="snippets-big-page.html">una sola página</a> ~ 2 Mb,
+	      o en <a class="title" href="snippets.pdf">PDF</a>)<br>
               (Trucos breves, consejos y ejemplos)</li>
 	  </ul>
 	</td>
@@ -93,7 +93,7 @@
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-	      <a class="title" href="devel/index.html">Recursos para desarrolladores</a><br>
+	      <a class="title" href="devel.html">Recursos para desarrolladores</a><br>
               (documentos de interés para desarrolladores y colaboradores)</li>
 	  </ul>
 	  </td>
diff --git a/Documentation/es/user/lilypond-learning.tely b/Documentation/es/learning.tely
similarity index 91%
rename from Documentation/es/user/lilypond-learning.tely
rename to Documentation/es/learning.tely
index c570e2f545..4e07b23204 100644
--- a/Documentation/es/user/lilypond-learning.tely
+++ b/Documentation/es/learning.tely
@@ -33,13 +33,13 @@
 @ifhtml
 @ifclear bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond-learning.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond-learning-big-page.es.html,una sola página}.
+@uref{source/Documentation/learning.es.pdf,PDF} y como
+@uref{source/Documentation/learning-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond-learning.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond-learning/index.es.html,un documento HTML normal de muchas páginas}.
+@uref{source/Documentation/learning.es.pdf,PDF} y como
+@uref{source/Documentation/learning/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
 @end ifhtml
 
@@ -188,15 +188,15 @@ Apéndices
 @contents
 
 
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include fundamental.itely
-@include tweaks.itely
-@include working.itely
+@include learning/preface.itely
+@include learning/introduction.itely
+@include learning/tutorial.itely
+@include learning/fundamental.itely
+@include learning/tweaks.itely
+@include learning/working.itely
 
-@include templates.itely
-@include scheme-tutorial.itely
+@include learning/templates.itely
+@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index
diff --git a/Documentation/es/learning/GNUmakefile b/Documentation/es/learning/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/es/learning/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/es/user/fundamental.itely b/Documentation/es/learning/fundamental.itely
similarity index 99%
rename from Documentation/es/user/fundamental.itely
rename to Documentation/es/learning/fundamental.itely
index 96f0bf8c45..e1dd1cb42a 100644
--- a/Documentation/es/user/fundamental.itely
+++ b/Documentation/es/learning/fundamental.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/learning/introduction.itely
similarity index 99%
rename from Documentation/es/user/introduction.itely
rename to Documentation/es/learning/introduction.itely
index a6a4ced8e0..9ffdfd0386 100644
--- a/Documentation/es/user/introduction.itely
+++ b/Documentation/es/learning/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/preface.itely b/Documentation/es/learning/preface.itely
similarity index 98%
rename from Documentation/es/user/preface.itely
rename to Documentation/es/learning/preface.itely
index 838ee659f3..b38805c4f9 100644
--- a/Documentation/es/user/preface.itely
+++ b/Documentation/es/learning/preface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/scheme-tutorial.itely b/Documentation/es/learning/scheme-tutorial.itely
similarity index 99%
rename from Documentation/es/user/scheme-tutorial.itely
rename to Documentation/es/learning/scheme-tutorial.itely
index b08ece054f..b827e9b778 100644
--- a/Documentation/es/user/scheme-tutorial.itely
+++ b/Documentation/es/learning/scheme-tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/templates.itely b/Documentation/es/learning/templates.itely
similarity index 99%
rename from Documentation/es/user/templates.itely
rename to Documentation/es/learning/templates.itely
index 17d39f770d..d7d145f26b 100644
--- a/Documentation/es/user/templates.itely
+++ b/Documentation/es/learning/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/learning/tutorial.itely
similarity index 99%
rename from Documentation/es/user/tutorial.itely
rename to Documentation/es/learning/tutorial.itely
index 269e0eac44..2735d522ce 100644
--- a/Documentation/es/user/tutorial.itely
+++ b/Documentation/es/learning/tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/learning/tweaks.itely
similarity index 99%
rename from Documentation/es/user/tweaks.itely
rename to Documentation/es/learning/tweaks.itely
index 55874258b9..8f01352222 100644
--- a/Documentation/es/user/tweaks.itely
+++ b/Documentation/es/learning/tweaks.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/working.itely b/Documentation/es/learning/working.itely
similarity index 99%
rename from Documentation/es/user/working.itely
rename to Documentation/es/learning/working.itely
index d1e2582d26..3ee45b8dc6 100644
--- a/Documentation/es/user/working.itely
+++ b/Documentation/es/learning/working.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/macros.itexi
similarity index 73%
rename from Documentation/es/user/macros.itexi
rename to Documentation/es/macros.itexi
index 3c40e02653..be120a0b8b 100644
--- a/Documentation/es/user/macros.itexi
+++ b/Documentation/es/macros.itexi
@@ -142,50 +142,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Manual de Aprendizaje}
+@ref{\TEXT\,,,learning-big-page,Manual de Aprendizaje}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manual de Aprendizaje}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Manual de Aprendizaje}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Referencia de la Notación}
+@ref{\TEXT\,,,notation-big-page,Referencia de la Notación}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Referencia de la Notación}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Referencia de la Notación}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Utilización del Programa}
+@ref{\TEXT\,,,application-big-page,Utilización del Programa}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Utilización del Programa}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Utilización del Programa}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Fragmentos de código}
+@ref{\TEXT\,,,snippets-big-page,Fragmentos de código}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Fragmentos de código}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Fragmentos de código}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,internals-big-page,Referencia de Funcionamiento Interno}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,\DISPLAY\,internals-big-page,Referencia de Funcionamiento Interno}
 @end macro
 
 @end ifset
@@ -207,50 +207,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje}
+@ref{\TEXT\,,,learning,Manual de Aprendizaje}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manual de Aprendizaje}
+@ref{\TEXT\,,\DISPLAY\,learning,Manual de Aprendizaje}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Referencia de la Notación}
+@ref{\TEXT\,,,notation,Referencia de la Notación}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Referencia de la Notación}
+@ref{\TEXT\,,\DISPLAY\,notation,Referencia de la Notación}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Utilización del Programa}
+@ref{\TEXT\,,,application,Utilización del Programa}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Utilización del Programa}
+@ref{\TEXT\,,\DISPLAY\,application,Utilización del Programa}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
+@ref{\TEXT\,,,snippets,Fragmentos de código}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código}
+@ref{\TEXT\,,\DISPLAY\,snippets,Fragmentos de código}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,internals,Referencia de Funcionamiento Interno}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,\DISPLAY\,internals,Referencia de Funcionamiento Interno}
 @end macro
 
 @end ifclear
@@ -284,52 +284,52 @@
 
 @macro rlearning{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje}
+@ref{\TEXT\,,,learning.es,Manual de Aprendizaje}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning.es,Manual de Aprendizaje}
+@ref{\TEXT\,,\DISPLAY\,learning.es,Manual de Aprendizaje}
 @end macro
 
 @macro ruser{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond.es,Referencia de la Notación}
+@ref{\TEXT\,,,notation.es,Referencia de la Notación}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond.es,Referencia de la Notación}
+@ref{\TEXT\,,\DISPLAY\,notation.es,Referencia de la Notación}
 @end macro
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-program.es,Utilización del Programa}
+@ref{\TEXT\,,,application.es,Utilización del Programa}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program.es,Utilización del Programa}
+@ref{\TEXT\,,\DISPLAY\,application.es,Utilización del Programa}
 @end macro
 
 @macro rlsr{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
+@ref{\TEXT\,,,snippets,Fragmentos de código}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código}
+@ref{\TEXT\,,\DISPLAY\,snippets,Fragmentos de código}
 @end macro
 
 @macro rinternals{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,internals,Referencia de Funcionamiento Interno}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,\DISPLAY\,internals,Referencia de Funcionamiento Interno}
 @end macro
 
 @end iftex
diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/notation.tely
similarity index 93%
rename from Documentation/es/user/lilypond.tely
rename to Documentation/es/notation.tely
index 741de8385a..f072b97035 100644
--- a/Documentation/es/user/lilypond.tely
+++ b/Documentation/es/notation.tely
@@ -72,13 +72,13 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @ifhtml
 @ifclear bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond-big-page.es.html,una sola página}.
+@uref{source/Documentation/notation.es.pdf,PDF} y como
+@uref{source/Documentation/notation-big-page.es.html,una sola página}.
 @end ifclear
 @ifset bigpage
 Este documento también está disponible en formato
-@uref{source/Documentation/user/lilypond.es.pdf,PDF} y como
-@uref{source/Documentation/user/lilypond/index.es.html,un documento HTML normal de muchas páginas}.
+@uref{source/Documentation/notation.es.pdf,PDF} y como
+@uref{source/Documentation/notation/index.es.html,un documento HTML normal de muchas páginas}.
 @end ifset
 @end ifhtml
 
@@ -231,18 +231,18 @@ Apéndices
 @contents
 
 
-@include notation.itely
-@include specialist.itely
+@include notation/notation.itely
+@include notation/specialist.itely
 
-@include input.itely
-@include spacing.itely
+@include notation/input.itely
+@include notation/spacing.itely
 
-@include changing-defaults.itely
-@include programming-interface.itely
+@include notation/changing-defaults.itely
+@include notation/programming-interface.itely
 
-@include literature.itely
-@include notation-appendices.itely
-@include cheatsheet.itely
+@include notation/literature.itely
+@include notation/notation-appendices.itely
+@include notation/cheatsheet.itely
 
 @node LilyPond grammar
 @appendix LilyPond grammar
@@ -250,6 +250,7 @@ Apéndices
 Este apéndice contiene una descripción de la gramática del lenguaje de
 LilyPond, tal y como el analizador sintáctico la proporciona como
 salida.
+
 @verbatiminclude ly-grammar.txt
 
 @include fdl.itexi
diff --git a/Documentation/es/notation/GNUmakefile b/Documentation/es/notation/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/es/notation/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/es/user/ancient.itely b/Documentation/es/notation/ancient.itely
similarity index 99%
rename from Documentation/es/user/ancient.itely
rename to Documentation/es/notation/ancient.itely
index 00303bdd7d..0f2fa93e8c 100644
--- a/Documentation/es/user/ancient.itely
+++ b/Documentation/es/notation/ancient.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/notation/changing-defaults.itely
similarity index 99%
rename from Documentation/es/user/changing-defaults.itely
rename to Documentation/es/notation/changing-defaults.itely
index 6bf25de6c2..1858692de6 100644
--- a/Documentation/es/user/changing-defaults.itely
+++ b/Documentation/es/notation/changing-defaults.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
 Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/cheatsheet.itely b/Documentation/es/notation/cheatsheet.itely
similarity index 99%
rename from Documentation/es/user/cheatsheet.itely
rename to Documentation/es/notation/cheatsheet.itely
index c0b662cf43..5ce84821a1 100644
--- a/Documentation/es/user/cheatsheet.itely
+++ b/Documentation/es/notation/cheatsheet.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/chords.itely b/Documentation/es/notation/chords.itely
similarity index 99%
rename from Documentation/es/user/chords.itely
rename to Documentation/es/notation/chords.itely
index ea27913b31..087027aef9 100644
--- a/Documentation/es/user/chords.itely
+++ b/Documentation/es/notation/chords.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
 
diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/notation/editorial.itely
similarity index 100%
rename from Documentation/es/user/editorial.itely
rename to Documentation/es/notation/editorial.itely
diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/notation/expressive.itely
similarity index 100%
rename from Documentation/es/user/expressive.itely
rename to Documentation/es/notation/expressive.itely
diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely
similarity index 99%
rename from Documentation/es/user/fretted-strings.itely
rename to Documentation/es/notation/fretted-strings.itely
index 2b220facde..5196cef4ae 100644
--- a/Documentation/es/user/fretted-strings.itely
+++ b/Documentation/es/notation/fretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 9318dde7b34435a3fdb2e1a7e0ddcf0f86e936ae
 
diff --git a/Documentation/es/user/input.itely b/Documentation/es/notation/input.itely
similarity index 99%
rename from Documentation/es/user/input.itely
rename to Documentation/es/notation/input.itely
index c298493a24..10c9cb161f 100644
--- a/Documentation/es/user/input.itely
+++ b/Documentation/es/notation/input.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 46e1b0a15ecf324b3272645224f3a2b3068dce73
 
diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/notation/keyboards.itely
similarity index 99%
rename from Documentation/es/user/keyboards.itely
rename to Documentation/es/notation/keyboards.itely
index ee7db137d2..861d66a8ec 100644
--- a/Documentation/es/user/keyboards.itely
+++ b/Documentation/es/notation/keyboards.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/literature.itely b/Documentation/es/notation/literature.itely
similarity index 98%
rename from Documentation/es/user/literature.itely
rename to Documentation/es/notation/literature.itely
index bfed834bf9..e64bcc86a9 100644
--- a/Documentation/es/user/literature.itely
+++ b/Documentation/es/notation/literature.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/notation-appendices.itely b/Documentation/es/notation/notation-appendices.itely
similarity index 99%
rename from Documentation/es/user/notation-appendices.itely
rename to Documentation/es/notation/notation-appendices.itely
index 5814a0d97d..4ee2665814 100644
--- a/Documentation/es/user/notation-appendices.itely
+++ b/Documentation/es/notation/notation-appendices.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 45945bd973aa9161b10e3f517902afb7ef4b4a56
 
diff --git a/Documentation/es/user/notation.itely b/Documentation/es/notation/notation.itely
similarity index 77%
rename from Documentation/es/user/notation.itely
rename to Documentation/es/notation/notation.itely
index ce26345cca..aa4c8d256d 100644
--- a/Documentation/es/user/notation.itely
+++ b/Documentation/es/notation/notation.itely
@@ -24,12 +24,12 @@ Este capítulo explica cómo crear notación musical.
 * Text::               Añadir texto a las partituras.
 @end menu
 
-@include pitches.itely
-@include rhythms.itely
-@include expressive.itely
-@include repeats.itely
-@include simultaneous.itely
-@include staff.itely
-@include editorial.itely
-@include text.itely
+@include notation/pitches.itely
+@include notation/rhythms.itely
+@include notation/expressive.itely
+@include notation/repeats.itely
+@include notation/simultaneous.itely
+@include notation/staff.itely
+@include notation/editorial.itely
+@include notation/text.itely
 
diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/notation/percussion.itely
similarity index 99%
rename from Documentation/es/user/percussion.itely
rename to Documentation/es/notation/percussion.itely
index 846b6d4d09..4ea2b58700 100644
--- a/Documentation/es/user/percussion.itely
+++ b/Documentation/es/notation/percussion.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/notation/pitches.itely
similarity index 100%
rename from Documentation/es/user/pitches.itely
rename to Documentation/es/notation/pitches.itely
diff --git a/Documentation/es/user/programming-interface.itely b/Documentation/es/notation/programming-interface.itely
similarity index 99%
rename from Documentation/es/user/programming-interface.itely
rename to Documentation/es/notation/programming-interface.itely
index 77a379abb1..68c5b54048 100644
--- a/Documentation/es/user/programming-interface.itely
+++ b/Documentation/es/notation/programming-interface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/repeats.itely b/Documentation/es/notation/repeats.itely
similarity index 100%
rename from Documentation/es/user/repeats.itely
rename to Documentation/es/notation/repeats.itely
diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/notation/rhythms.itely
similarity index 100%
rename from Documentation/es/user/rhythms.itely
rename to Documentation/es/notation/rhythms.itely
diff --git a/Documentation/es/user/simultaneous.itely b/Documentation/es/notation/simultaneous.itely
similarity index 100%
rename from Documentation/es/user/simultaneous.itely
rename to Documentation/es/notation/simultaneous.itely
diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/notation/spacing.itely
similarity index 99%
rename from Documentation/es/user/spacing.itely
rename to Documentation/es/notation/spacing.itely
index 4c6fe0cb4d..c41cc304e6 100644
--- a/Documentation/es/user/spacing.itely
+++ b/Documentation/es/notation/spacing.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/specialist.itely b/Documentation/es/notation/specialist.itely
similarity index 70%
rename from Documentation/es/user/specialist.itely
rename to Documentation/es/notation/specialist.itely
index 23dfb3118a..31f983060e 100644
--- a/Documentation/es/user/specialist.itely
+++ b/Documentation/es/notation/specialist.itely
@@ -26,12 +26,12 @@ un tipo específico o dentro de estilos específicos.
 * World music::
 @end menu
 
-@include vocal.itely
-@include keyboards.itely
-@include unfretted-strings.itely
-@include fretted-strings.itely
-@include percussion.itely
-@include wind.itely
-@include chords.itely
-@include ancient.itely
-@include world.itely
+@include notation/vocal.itely
+@include notation/keyboards.itely
+@include notation/unfretted-strings.itely
+@include notation/fretted-strings.itely
+@include notation/percussion.itely
+@include notation/wind.itely
+@include notation/chords.itely
+@include notation/ancient.itely
+@include notation/world.itely
diff --git a/Documentation/es/user/staff.itely b/Documentation/es/notation/staff.itely
similarity index 100%
rename from Documentation/es/user/staff.itely
rename to Documentation/es/notation/staff.itely
diff --git a/Documentation/es/user/text.itely b/Documentation/es/notation/text.itely
similarity index 100%
rename from Documentation/es/user/text.itely
rename to Documentation/es/notation/text.itely
diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/notation/unfretted-strings.itely
similarity index 99%
rename from Documentation/es/user/unfretted-strings.itely
rename to Documentation/es/notation/unfretted-strings.itely
index ca45c5d426..235c6e4a0d 100644
--- a/Documentation/es/user/unfretted-strings.itely
+++ b/Documentation/es/notation/unfretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/notation/vocal.itely
similarity index 99%
rename from Documentation/es/user/vocal.itely
rename to Documentation/es/notation/vocal.itely
index d2b1032b1f..41143f7e3c 100644
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/notation/vocal.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
 
diff --git a/Documentation/es/user/wind.itely b/Documentation/es/notation/wind.itely
similarity index 99%
rename from Documentation/es/user/wind.itely
rename to Documentation/es/notation/wind.itely
index 572f4cb622..20a3086a46 100644
--- a/Documentation/es/user/wind.itely
+++ b/Documentation/es/notation/wind.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/user/world.itely b/Documentation/es/notation/world.itely
similarity index 99%
rename from Documentation/es/user/world.itely
rename to Documentation/es/notation/world.itely
index 81fff3a708..f8be2989ae 100644
--- a/Documentation/es/user/world.itely
+++ b/Documentation/es/notation/world.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 41ef91786a08102d9b9a839f6a2f40cec263d723
 
diff --git a/Documentation/es/texidocs/GNUmakefile b/Documentation/es/texidocs/GNUmakefile
new file mode 100644
index 0000000000..0ffa75869c
--- /dev/null
+++ b/Documentation/es/texidocs/GNUmakefile
@@ -0,0 +1,5 @@
+depth=../../..
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc)
+
+include $(depth)/make/stepmake.make
diff --git a/input/texidocs/accordion-discant-symbols.texidoc b/Documentation/es/texidocs/accordion-discant-symbols.texidoc
similarity index 51%
rename from input/texidocs/accordion-discant-symbols.texidoc
rename to Documentation/es/texidocs/accordion-discant-symbols.texidoc
index 1383c8c186..88e64c1376 100644
--- a/input/texidocs/accordion-discant-symbols.texidoc
+++ b/Documentation/es/texidocs/accordion-discant-symbols.texidoc
@@ -7,10 +7,3 @@ símbolos modificando los argumentos de @code{\\raise}.
 "
   doctitlees = "Símbolos de acordeón discanto"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
-  doctitlede = "Symbole für Akkordeon-Diskantregister"
-  texidocde = "
-Diskantregister für Akkordeon können mit @code{\\markup} dargestellt werden.
-Die vertikale Position der einzelnen Elemente werden mit @code{\\raise}
-angepasst.
-"
diff --git a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc b/Documentation/es/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
similarity index 83%
rename from input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
rename to Documentation/es/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
index d66db434b5..efaf3af3ce 100644
--- a/input/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
+++ b/Documentation/es/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
@@ -15,5 +15,3 @@ truco se aplique a toda la partitura.
 "
   doctitlees = "Añadir un bajo cifrado encima o debajo de las notas"
   
-%% Translation of GIT committish: 7eb450e8e6c935410b8f3212cb53e5a731f4f33f
-  doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes"
diff --git a/Documentation/es/texidocs/adding-ambitus-per-voice.texidoc b/Documentation/es/texidocs/adding-ambitus-per-voice.texidoc
new file mode 100644
index 0000000000..963ef134e5
--- /dev/null
+++ b/Documentation/es/texidocs/adding-ambitus-per-voice.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  doctitlees = "Añadir un ámbito por voz"
+  texidoces = "
+Se puede añadir un ámbito por cada voz. En este caso, el ámbito se
+debe desplazar manualmente para evitar colisiones.
+
+"
diff --git a/input/texidocs/adding-an-extra-staff-at-a-line-break.texidoc b/Documentation/es/texidocs/adding-an-extra-staff-at-a-line-break.texidoc
similarity index 100%
rename from input/texidocs/adding-an-extra-staff-at-a-line-break.texidoc
rename to Documentation/es/texidocs/adding-an-extra-staff-at-a-line-break.texidoc
diff --git a/input/texidocs/adding-an-extra-staff.texidoc b/Documentation/es/texidocs/adding-an-extra-staff.texidoc
similarity index 100%
rename from input/texidocs/adding-an-extra-staff.texidoc
rename to Documentation/es/texidocs/adding-an-extra-staff.texidoc
diff --git a/input/texidocs/adding-bar-lines-to-chordnames-context.texidoc b/Documentation/es/texidocs/adding-bar-lines-to-chordnames-context.texidoc
similarity index 54%
rename from input/texidocs/adding-bar-lines-to-chordnames-context.texidoc
rename to Documentation/es/texidocs/adding-bar-lines-to-chordnames-context.texidoc
index 02ac2e850d..a91623df21 100644
--- a/input/texidocs/adding-bar-lines-to-chordnames-context.texidoc
+++ b/Documentation/es/texidocs/adding-bar-lines-to-chordnames-context.texidoc
@@ -7,10 +7,3 @@ los nombres de acorde @code{ChordNames}, incluya el grabador
 "
   doctitlees = "Añadir barras de compás al contexto de nombres de acorde (ChordNames)"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Um Taktstriche in einem @code{ChordNames}-Kontext anzeigen zu lassen, muss der
-@code{Bar_engraver} hinzugefügt werden.
-
-"
-  doctitlede = "Tatkstriche in einen ChordNames-Kontext hinzufügen"
diff --git a/input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc b/Documentation/es/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc
similarity index 100%
rename from input/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc
rename to Documentation/es/texidocs/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.texidoc
diff --git a/Documentation/es/texidocs/adding-drum-parts.texidoc b/Documentation/es/texidocs/adding-drum-parts.texidoc
new file mode 100644
index 0000000000..73d302c223
--- /dev/null
+++ b/Documentation/es/texidocs/adding-drum-parts.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Mediante la utilización de las potentes herramientas preconfiguradas
+como la función @code{\\drummode} y el contexto @code{DrumStaff}, la
+introducción de partes para percusión es muy fácil: las percusiones se
+sitúan en sus propias posiciones de pentagrama (con una clave
+especial) y tienen las cabezas correspondientes al instrumento.  Es
+posible añadir un símbolo adicional a la percusión o reducir el número
+de líneas.
+
+"
+  doctitlees = "Escritura de partes de percusión"
+
diff --git a/input/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc b/Documentation/es/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc
similarity index 100%
rename from input/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc
rename to Documentation/es/texidocs/adding-parentheses-around-an-expressive-mark-or-chordal-note.texidoc
diff --git a/Documentation/es/texidocs/adding-the-current-date-to-a-score.texidoc b/Documentation/es/texidocs/adding-the-current-date-to-a-score.texidoc
new file mode 100644
index 0000000000..82c1307eb9
--- /dev/null
+++ b/Documentation/es/texidocs/adding-the-current-date-to-a-score.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Con algo de código de Scheme, se puede añadir fácilmente la fecha
+actual a una partitura.
+"
+  doctitlees = "Añadir la fecha actual a una partitura"
+  
diff --git a/input/texidocs/adding-volta-brackets-to-additional-staves.texidoc b/Documentation/es/texidocs/adding-volta-brackets-to-additional-staves.texidoc
similarity index 53%
rename from input/texidocs/adding-volta-brackets-to-additional-staves.texidoc
rename to Documentation/es/texidocs/adding-volta-brackets-to-additional-staves.texidoc
index d3a1780afd..a97fd6e583 100644
--- a/input/texidocs/adding-volta-brackets-to-additional-staves.texidoc
+++ b/Documentation/es/texidocs/adding-volta-brackets-to-additional-staves.texidoc
@@ -10,13 +10,3 @@ también el fragmento de código \"Volta multi staff\".
 "
   doctitlees = "Añadir corchetes de primera y segunda vez a más pentagramas"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Der @code{Volta_engraver} befindet sich im @code{Score}-Kontext und Klammern
-werden deshalb nur auf dem obersten System dargestellt.  Das kann umgangen
-werden, indem man den @code{Volta_engraver} zu dem @code{Staff}-Kontext
-hinzufügt, in dem die Klammern zusätzlichen vorkommen sollen.  Siehe auch
-das \"Volta multi staff\"-Schnipsel.
-
-"
-  doctitlede = "Volta-Klammern zu zusätzlichen Systemen hinzufügen"
diff --git a/Documentation/es/texidocs/additional-voices-to-avoid-collisions.texidoc b/Documentation/es/texidocs/additional-voices-to-avoid-collisions.texidoc
new file mode 100644
index 0000000000..548d105cb3
--- /dev/null
+++ b/Documentation/es/texidocs/additional-voices-to-avoid-collisions.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Voces adicionales para evitar colisiones"
+ texidoces = "
+En ciertos casos de polifonía compleja, se necesitan voces adicionales
+para evitar colisiones entre las notas.  Si se necesitan más de cuatro
+voces paralelas, las voces adicionales se añaden definiendo una
+variable que utiliza la función de Scheme @code{context-spec-music}.
+
+"
+
diff --git a/input/texidocs/adjusting-lyrics-vertical-spacing.texidoc b/Documentation/es/texidocs/adjusting-lyrics-vertical-spacing.texidoc
similarity index 51%
rename from input/texidocs/adjusting-lyrics-vertical-spacing.texidoc
rename to Documentation/es/texidocs/adjusting-lyrics-vertical-spacing.texidoc
index 960e3a16a2..2fd25d7e5f 100644
--- a/input/texidocs/adjusting-lyrics-vertical-spacing.texidoc
+++ b/Documentation/es/texidocs/adjusting-lyrics-vertical-spacing.texidoc
@@ -6,11 +6,3 @@ letra más cerca del pentagrama.
 "
   doctitlees = "Ajuste del especiado vertical de la letra"
 
-%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
-  texidocfr = "
-Cet extrait illustre la manière de rapprocher la ligne de paroles 
-de la portée.
-
-"
-  doctitlefr = "Ajustement de l'espacement vertical des paroles"
-
diff --git a/input/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc b/Documentation/es/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
similarity index 53%
rename from input/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
rename to Documentation/es/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
index 703b77846d..1f2de762c1 100644
--- a/input/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
+++ b/Documentation/es/texidocs/adjusting-the-shape-of-falls-and-doits.texidoc
@@ -7,10 +7,3 @@ caídas y subidas de tono («falls» y «doits»).
 "
   doctitlees = "Ajustar la forma de las subidas y caídas de tono"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Die @code{shortest-duration-space}-Eigenschaft kann verändert werden, um
-das Aussehen von unbestimmten Glissandi anzupassen.
-
-"
-  doctitlede = "Das Aussehen von unbestimmten Glissandi anpassen"
diff --git a/input/texidocs/aligning-and-centering-instrument-names.texidoc b/Documentation/es/texidocs/aligning-and-centering-instrument-names.texidoc
similarity index 100%
rename from input/texidocs/aligning-and-centering-instrument-names.texidoc
rename to Documentation/es/texidocs/aligning-and-centering-instrument-names.texidoc
diff --git a/Documentation/es/texidocs/aligning-bar-numbers.texidoc b/Documentation/es/texidocs/aligning-bar-numbers.texidoc
new file mode 100644
index 0000000000..8c3c62e40e
--- /dev/null
+++ b/Documentation/es/texidocs/aligning-bar-numbers.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Los números de compás se alinean de forma predeterminada por la
+derecha con su objeto padre. Éste es por lo general el borde
+izquierdo de una línea o, si los números se imprimen dentro de la
+línea, el lado izquierdo de una línea divisoria.  Los números
+también se pueden situar directamente sobre la barra de compás o
+alineados por la izquierda con ella.
+
+"
+
+  doctitlees = "Alineación de los números de compás"
+
diff --git a/input/texidocs/aligning-marks-with-various-notation-objects.texidoc b/Documentation/es/texidocs/aligning-marks-with-various-notation-objects.texidoc
similarity index 50%
rename from input/texidocs/aligning-marks-with-various-notation-objects.texidoc
rename to Documentation/es/texidocs/aligning-marks-with-various-notation-objects.texidoc
index 595ae1f9ef..503e4056fe 100644
--- a/input/texidocs/aligning-marks-with-various-notation-objects.texidoc
+++ b/Documentation/es/texidocs/aligning-marks-with-various-notation-objects.texidoc
@@ -14,19 +14,3 @@ debe hacer este ajuste para todos los pentagramas).
 "
   doctitlees = "Alinear marcas con varios objetos de notación"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn angegeben, können Textzeichen auch an anderen Objekten als Taktstrichen
-ausgerichtet werden.  Zu diesen Objekten gehören @code{ambitus},
-@code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar},
-@code{left-edge}, @code{key-cancellation}, @code{key-signature} und
-@code{time-signature}.
-
-In diesem Fall werden die Zeichen horizontal über dem Objekt zentriert.
-Diese Ausrichtung kann auch geändert werden, wie die zweite Zeile
-des Beispiels zeigt.  In einer Partitur mit vielen Systemen sollte
-diese Einstellung für alle Systeme gemacht werden.
-
-"
-
-  doctitlede = "Zeichen an verschiedenen Notationsobjekten ausrichten"
diff --git a/Documentation/es/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc b/Documentation/es/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
new file mode 100644
index 0000000000..016797d08e
--- /dev/null
+++ b/Documentation/es/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las cifras de digitación orientadas verticalmente se colocan de
+forma predeterminada fuera del pentagrama.  Sin embargo, este
+comportamiento se puede cancelar.
+
+"
+  doctitlees = "Permitir que las digitaciones se impriman dentro del pentagrama"
+
diff --git a/Documentation/es/texidocs/ambitus-with-multiple-voices.texidoc b/Documentation/es/texidocs/ambitus-with-multiple-voices.texidoc
new file mode 100644
index 0000000000..5c71c7d0e3
--- /dev/null
+++ b/Documentation/es/texidocs/ambitus-with-multiple-voices.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  doctitlees = "Ámbitos con varias voces"
+  texidoces = "
+La adición del grabador @code{Ambitus_engraver} al contexto de
+@code{Staff} crea un solo ámbito por pentagrama, incluso en el caso de
+pentagramas con varias voces.
+
+"
+
diff --git a/input/texidocs/analysis-brackets-above-the-staff.texidoc b/Documentation/es/texidocs/analysis-brackets-above-the-staff.texidoc
similarity index 100%
rename from input/texidocs/analysis-brackets-above-the-staff.texidoc
rename to Documentation/es/texidocs/analysis-brackets-above-the-staff.texidoc
diff --git a/input/texidocs/ancient-fonts.texidoc b/Documentation/es/texidocs/ancient-fonts.texidoc
similarity index 52%
rename from input/texidocs/ancient-fonts.texidoc
rename to Documentation/es/texidocs/ancient-fonts.texidoc
index 00a7a2efc9..28a3f1e277 100644
--- a/input/texidocs/ancient-fonts.texidoc
+++ b/Documentation/es/texidocs/ancient-fonts.texidoc
@@ -7,10 +7,3 @@ antigua.
 
   doctitlees = "Tipografía de música antigua"
 
-%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
-  texidocfr ="
-Voici comment graver la plupart, sinon tous les symboles que
-LilyPond prend en charge en matière de musique ancienne.
-
-"
-  doctitlefr = "Gravure de musique ancienne"
diff --git a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc b/Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
similarity index 51%
rename from input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
rename to Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
index 3d89bd50e4..19fcae5894 100644
--- a/input/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
+++ b/Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-gregorian-music.texidoc
@@ -8,13 +8,3 @@ especiales que indican silencios de distintas longitudes.
 "
 
   doctitlees = "Plantilla para notación de música antigua (transcripción moderna de canto gregoriano)"
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  
-  texidocde = "
-Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen 
-Chorals. Hier gibt es keine Takte, keine Notenhälse und es werden nur 
-halbe und Viertelnoten verwendet. Zusätzliche Zeichen zeigen die 
-Länge von Pausen an.
-"
-
- doctitlede = "Vorlage für Alte Notation -- moderne Transkription des gregorianischen Chorals"
diff --git a/Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc b/Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
new file mode 100644
index 0000000000..9c5eb3766b
--- /dev/null
+++ b/Documentation/es/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Al transcribir música mensural, es útil un «incipit» al compienzo
+de la pieza para indicar la tonalidad y el tempo
+originales. Aunque los músicos actuales están acostumbrados a las
+barras de compás para reconocer con más facilidad los patrones
+rítmicos, durante el período de la música mensural aún no se
+habíen inventado las líneas divisorias; de hecho, la medida solía
+cambiar a cada pocas notas. Como compromiso, a menudo las líneas
+divisorias se imprimen entre los pentagramas en vez de hacerlo
+encima de ellos.
+
+"
+  doctitlees = "Plantilla de notación de música antigua (transcripción moderna de música mensural)"
+  
diff --git a/input/texidocs/ancient-time-signatures.texidoc b/Documentation/es/texidocs/ancient-time-signatures.texidoc
similarity index 100%
rename from input/texidocs/ancient-time-signatures.texidoc
rename to Documentation/es/texidocs/ancient-time-signatures.texidoc
diff --git a/input/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc b/Documentation/es/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
similarity index 50%
rename from input/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
rename to Documentation/es/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
index 6612c9f57b..e3a1e21064 100644
--- a/input/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
+++ b/Documentation/es/texidocs/applying-note-head-styles-depending-on-the-step-of-the-scale.texidoc
@@ -22,24 +22,3 @@ nota.
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  doctitlede = "Notenkopfstile basierend auf der Tonleiterstufe erstellen"
-  texidocde = "
-Die @code{shapeNoteStyles}-(NotenFormenStile)-Eigenschaft kann benutzt
-werden, um verschiedene Notenstile für jeden Schritt der Tonleiter
-zu definieren (vorgegeben von der Tonart oder der @qq{tonic}
-(Tonika)-Eigneschaft.  Diese Eigenschaft braucht eine Anzahl von Symbolen,
-welche beliebig sein können (geometrische Ausdrücke wie @code{triangle}
-(Dreieck), @code{cross} (Kreuz) und @code{xcircle} (X-Kreis) sind erlaubt)
-oder basierend auf einer alten amerikanischen Notensatztradition (einige
-lateinische Notenbezeichnungen sind auch erlaubt).
-
-Um alte amerikanische Liederbücher zu imitieren, gibt es einige
-vordefinierte Notenstile wie etwa @code{\\aikenHeads} (im Stil von Aiken)
-oder @code{\\sacredHarpHeads} (im Stil der Sacred Harp-Tradition).
-
-Dieses Beispiel zeigt, wie man unterschiedlich geformte Noten erhält und
-eine Melodie transponieren kann, ohne dass das Verhältnis zwischen den
-harmonischen Funktionen und dem Notenstil verloren geht.
-
-"
diff --git a/input/texidocs/arabic-improvisation.texidoc b/Documentation/es/texidocs/arabic-improvisation.texidoc
similarity index 50%
rename from input/texidocs/arabic-improvisation.texidoc
rename to Documentation/es/texidocs/arabic-improvisation.texidoc
index b5b5b007aa..fb8593f339 100644
--- a/input/texidocs/arabic-improvisation.texidoc
+++ b/Documentation/es/texidocs/arabic-improvisation.texidoc
@@ -10,15 +10,3 @@ cómo podría ser el comienzo de una improvisación @emph{hijaz}:
 "
 doctitlees = "Improvisación de música árabe"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Bei Improvisation oder @emph{taqasim}, die zeitlich frei gespielt
-werden, kann die Taktart ausgelassen werden und @code{\cadenzaOn}
-kann eingesetzt werden.  Es kann nötig sein, den Versetzungszeichenstil
-anzupassen, weil sonst die Versetzungszeichen nur einmal ausgegeben
-werden, da keine Taktlinien gesetzt sind.  Hier ein Beispiel, wie
-der Begin einer @emph{hijaz}-Improvisation aussehen könnte:
-
-"
-
-  doctitlede = "Arabische Improvisation"
diff --git a/input/texidocs/automatic-beam-subdivisions.texidoc b/Documentation/es/texidocs/automatic-beam-subdivisions.texidoc
similarity index 100%
rename from input/texidocs/automatic-beam-subdivisions.texidoc
rename to Documentation/es/texidocs/automatic-beam-subdivisions.texidoc
diff --git a/Documentation/es/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc b/Documentation/es/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
new file mode 100644
index 0000000000..ba84a80659
--- /dev/null
+++ b/Documentation/es/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+En un compás sencillo como 2/2 ó 4/4, las corcheas se barran de forma
+predeterminada como dos grupos de cuatro.
+
+Utilizando un macro que seobreescribe el comportamiento automático del
+barrado, este fragmento de código cambia el barrado a pulsos de negra.
+
+"
+  doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2"
+
diff --git a/Documentation/es/texidocs/beam-endings-in-score-context.texidoc b/Documentation/es/texidocs/beam-endings-in-score-context.texidoc
new file mode 100644
index 0000000000..3dfcaf898e
--- /dev/null
+++ b/Documentation/es/texidocs/beam-endings-in-score-context.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las reglas de final de barra especificadas en el contexto
+@code{Score} se aplican a todos los pentagramas, pero se pueden
+modificar tanto en los niveles de @code{Staff} como de
+@code{Voice}:
+
+"
+  doctitlees = "Finales de barra en el contexto Score"
+
diff --git a/Documentation/es/texidocs/beam-grouping-in-7-8-time.texidoc b/Documentation/es/texidocs/beam-grouping-in-7-8-time.texidoc
new file mode 100644
index 0000000000..861431b743
--- /dev/null
+++ b/Documentation/es/texidocs/beam-grouping-in-7-8-time.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+No está especificada ninguna agrupación predeterminada automática
+de las barras para el compás de 7/8, de forma que si se requieren
+barras automáticas se debe especificar la forma de agrupamiento.
+Por ejemplo, para agrupar todas las barras en la forma 2-3-2 en el
+compás de 7/8, especificamos los finales de barra en 2/8 y 5/8:
+
+"
+  doctitlees = "Agrupamiento de las barras en el compás de 7/8"
+  
diff --git a/Documentation/es/texidocs/beams-across-line-breaks.texidoc b/Documentation/es/texidocs/beams-across-line-breaks.texidoc
new file mode 100644
index 0000000000..9652930809
--- /dev/null
+++ b/Documentation/es/texidocs/beams-across-line-breaks.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Normalmente están prohibidos los saltos de línea si las barras
+atraviesan las líneas divisorias.  Se puede cambiar este
+comportamiento como se muestra aquí:
+
+"
+  doctitle = "Barras que atraviesan saltos de línea"
+  
diff --git a/input/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc b/Documentation/es/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc
similarity index 100%
rename from input/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc
rename to Documentation/es/texidocs/blanking-staff-lines-using-the--whiteout-command.texidoc
diff --git a/input/texidocs/broken-crescendo-hairpin.texidoc b/Documentation/es/texidocs/broken-crescendo-hairpin.texidoc
similarity index 100%
rename from input/texidocs/broken-crescendo-hairpin.texidoc
rename to Documentation/es/texidocs/broken-crescendo-hairpin.texidoc
diff --git a/input/texidocs/caesura-railtracks-with-fermata.texidoc b/Documentation/es/texidocs/caesura-railtracks-with-fermata.texidoc
similarity index 100%
rename from input/texidocs/caesura-railtracks-with-fermata.texidoc
rename to Documentation/es/texidocs/caesura-railtracks-with-fermata.texidoc
diff --git a/input/texidocs/center-text-below-hairpin-dynamics.texidoc b/Documentation/es/texidocs/center-text-below-hairpin-dynamics.texidoc
similarity index 100%
rename from input/texidocs/center-text-below-hairpin-dynamics.texidoc
rename to Documentation/es/texidocs/center-text-below-hairpin-dynamics.texidoc
diff --git a/Documentation/es/texidocs/changing--flageolet-mark-size.texidoc b/Documentation/es/texidocs/changing--flageolet-mark-size.texidoc
new file mode 100644
index 0000000000..ecbd584fe5
--- /dev/null
+++ b/Documentation/es/texidocs/changing--flageolet-mark-size.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Para hacer más pequeño el círculo de @code{\\flageolet} (armónico)
+utilice la siguiente función de Scheme.
+
+"
+  doctitlees = "Cambiar el tamaño de la marca de \\flageolet"
+
diff --git a/input/texidocs/changing-a-single-notes-size-in-a-chord.texidoc b/Documentation/es/texidocs/changing-a-single-notes-size-in-a-chord.texidoc
similarity index 100%
rename from input/texidocs/changing-a-single-notes-size-in-a-chord.texidoc
rename to Documentation/es/texidocs/changing-a-single-notes-size-in-a-chord.texidoc
diff --git a/Documentation/es/texidocs/changing-beam-knee-gap.texidoc b/Documentation/es/texidocs/changing-beam-knee-gap.texidoc
new file mode 100644
index 0000000000..97d66bebd2
--- /dev/null
+++ b/Documentation/es/texidocs/changing-beam-knee-gap.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se insertan automáticamente barras en ángulo cuando se detecta un
+intervalo muy grande entre las notas.  Se puede hacer un ajuste
+fino de este comportamiento a través de la propiedad
+@code{auto-knee-gap}.  Se traza una barra doblada si el salto es
+mayor que el valor de @code{auto-knee-gap} más el ancho del objeto
+barra (que depende de la duración de las notas y de la inclinación
+de la barra).  De forma predeterminada @code{auto-knee-gap} está
+establecido a 5.5 espacios de pentagrama.
+
+"
+  doctitlees = "Cambiar el salto de las barras en ángulo"
+  
diff --git a/input/texidocs/changing-chord-separator.texidoc b/Documentation/es/texidocs/changing-chord-separator.texidoc
similarity index 54%
rename from input/texidocs/changing-chord-separator.texidoc
rename to Documentation/es/texidocs/changing-chord-separator.texidoc
index ad604d4536..4e28d2e3f5 100644
--- a/input/texidocs/changing-chord-separator.texidoc
+++ b/Documentation/es/texidocs/changing-chord-separator.texidoc
@@ -6,10 +6,3 @@ nombre de un acorde para que sea cualquier elemento de marcado.
 "
   doctitlees = "Modificación del separador de acordes"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Der Trenner zwischen unterschiedlichen Teilen eines Akkordsymbols kann
-beliebeiger Text sein.
-
-"
-  doctitlede = "Akkordsymboltrenner verändern"
diff --git a/Documentation/es/texidocs/changing-form-of-multi-measure-rests.texidoc b/Documentation/es/texidocs/changing-form-of-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..38db1473d9
--- /dev/null
+++ b/Documentation/es/texidocs/changing-form-of-multi-measure-rests.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Cambiar la forma de los silencios multicompás"
+ texidoces = "
+Si hay diez compases de silencio o menos, se imprime en el pentagrama
+una serie de silencios de breve y longa (conocidos en alemán como
+\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se
+muestra una barra normal.  Este número predeterminado de diez se
+puede cambiar sobreescribiendo la propiedad @code{expand-limit}:
+
+"
+
diff --git a/input/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc b/Documentation/es/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc
similarity index 100%
rename from input/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc
rename to Documentation/es/texidocs/changing-midi-output-to-one-channel-per-voice.texidoc
diff --git a/input/texidocs/changing-partcombine-texts.texidoc b/Documentation/es/texidocs/changing-partcombine-texts.texidoc
similarity index 52%
rename from input/texidocs/changing-partcombine-texts.texidoc
rename to Documentation/es/texidocs/changing-partcombine-texts.texidoc
index 243576fce9..c3bb260233 100644
--- a/input/texidocs/changing-partcombine-texts.texidoc
+++ b/Documentation/es/texidocs/changing-partcombine-texts.texidoc
@@ -7,10 +7,3 @@ y de unísono:
 "
   doctitlees = "Cambiar los textos de partcombine"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn Stimmen automatisch kombiniert werden, kann der Text, der für
-Solo- und Unisono-Stellen ausgegeben wird, geändert werden:
-
-"
-  doctitlede = "Partcombine-Text ändern"
diff --git a/input/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc b/Documentation/es/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
similarity index 54%
rename from input/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
rename to Documentation/es/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
index aa63ed0ecf..c327b65fca 100644
--- a/input/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
+++ b/Documentation/es/texidocs/changing-text-and-spanner-styles-for-text-dynamics.texidoc
@@ -13,14 +13,3 @@ valores posibles se encuentran @code{'line} (línea),
 "
   doctitlees = "Cambiar el texto y los estilos de objeto de extensión para las indicaciones dinámicas textuales"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Der Text, der für Crescendo und Decrescendo gestzt wird, kann geändert
-werden, indem man die Eigenschaften @code{crescendoText} und
-@code{decrescendoText} verändert.  Der Stil des Streckers kann auch
-geändert werden, indem die @code{'style}-Eigenschaft des
-@code{DynamicTextSpanner} beeinflusst wird.  Der Standardwert ist
-@code{'hairpin}, ander Möglichkeiten sind @code{'line}, @code{'dashed-line}
-und @code{'dotted-line}.
-"
-  doctitlede = "Text und Strecker-Stile für Dynamik-Texte ändern"
diff --git a/input/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc b/Documentation/es/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc
similarity index 100%
rename from input/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc
rename to Documentation/es/texidocs/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.texidoc
diff --git a/input/texidocs/changing-the-breath-mark-symbol.texidoc b/Documentation/es/texidocs/changing-the-breath-mark-symbol.texidoc
similarity index 50%
rename from input/texidocs/changing-the-breath-mark-symbol.texidoc
rename to Documentation/es/texidocs/changing-the-breath-mark-symbol.texidoc
index df860158b0..501d634bfc 100644
--- a/input/texidocs/changing-the-breath-mark-symbol.texidoc
+++ b/Documentation/es/texidocs/changing-the-breath-mark-symbol.texidoc
@@ -7,11 +7,3 @@ sobreescribiendo la propiedad de texto del objeto de presentación
 "
   doctitlees = "Cambiar el símbolo de la marca de respiración"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Das Schriftzeichen für das Atemzeichen kann verändert werden, indem
-die Text-Eigenschaft des @code{BreathingSign}-Layoutobjekts mit einer
-beliebigen Textbeschriftung definiert wird.
-
-"
-  doctitlede = "Das Atemzeichen-Symbol verändern"
diff --git a/input/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc b/Documentation/es/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc
similarity index 100%
rename from input/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc
rename to Documentation/es/texidocs/changing-the-chord-names-to-german-or-semi-german-notation.texidoc
diff --git a/input/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc b/Documentation/es/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
similarity index 50%
rename from input/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
rename to Documentation/es/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
index 326f17b6cd..7ae9ff2e06 100644
--- a/input/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
+++ b/Documentation/es/texidocs/changing-the-positions-of-figured-bass-alterations.texidoc
@@ -8,11 +8,3 @@ después de los números, según el valor de las propiedades
 "
   doctitlees = "Cambiar las posiciones de las alteraciones del bajo cifrado"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Versetzungszeichen und Pluszeichen können vor oder nach den Ziffern erscheinen,
-je nach den Einstellungen der @code{figuredBassAlterationDirection} und
-@code{figuredBassPlusDirection}-Eigenschaften.
-
-"
-  doctitlede = "Positionen von Generalbass-Alterationszeichen verändern"
diff --git a/Documentation/es/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc b/Documentation/es/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
new file mode 100644
index 0000000000..8bac423d28
--- /dev/null
+++ b/Documentation/es/texidocs/changing-the-tempo-without-a-metronome-mark.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Para cambiar el tempo en la salida MIDI sin
+imprimir nada, hacemos invisible la indicación metronómica:
+
+"
+
+  doctitlees = "Cambiar el tempo sin indicación metronómica"
+
diff --git a/Documentation/es/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc b/Documentation/es/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
new file mode 100644
index 0000000000..aad3762163
--- /dev/null
+++ b/Documentation/es/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+La instrucción @code{\time} establece las propiedades
+@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping} y
+@code{measureLength} en el contexto @code{Timing}, que normalmente
+tiene el alias @code{Score}.  La modificación del valor de
+@code{timeSignatureFraction} hace que se imprima la nueva indicación
+de compás sin que cambie ninguna de las demás propiedades:
+
+"
+  doctitlees = "Cambio de compás sin afectar al barrado"
+
+
diff --git a/Documentation/es/texidocs/changing-the-tuplet-number.texidoc b/Documentation/es/texidocs/changing-the-tuplet-number.texidoc
new file mode 100644
index 0000000000..8b8c502c96
--- /dev/null
+++ b/Documentation/es/texidocs/changing-the-tuplet-number.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Cambiar el número del grupo especial"
+ texidoces = "
+
+De forma predeterminada sólo se imprime el numerador del grupo
+especial sobre el corchete de grupo, es decir, el denominador del
+argumento de la instrucción @code{\\times}. De forma alternativa, se
+puede imprimr un quebrado en la forma numerador:denominador del número
+del grupo, o eliminar el número.
+
+"
+
diff --git a/input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc b/Documentation/es/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc
similarity index 100%
rename from input/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc
rename to Documentation/es/texidocs/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.texidoc
diff --git a/input/texidocs/chant-or-psalms-notation.texidoc b/Documentation/es/texidocs/chant-or-psalms-notation.texidoc
similarity index 100%
rename from input/texidocs/chant-or-psalms-notation.texidoc
rename to Documentation/es/texidocs/chant-or-psalms-notation.texidoc
diff --git a/input/texidocs/chord-name-exceptions.texidoc b/Documentation/es/texidocs/chord-name-exceptions.texidoc
similarity index 50%
rename from input/texidocs/chord-name-exceptions.texidoc
rename to Documentation/es/texidocs/chord-name-exceptions.texidoc
index c1fb53c7d4..e453043050 100644
--- a/input/texidocs/chord-name-exceptions.texidoc
+++ b/Documentation/es/texidocs/chord-name-exceptions.texidoc
@@ -7,10 +7,3 @@ específicos.
 "
   doctitlees = "Excepciones para los nombres de acorde"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Eigenschaft @code{chordNameExceptions} kann benutzt werden, um eine
-Liste an besonderen Notationen für bestimmte Akkorde zu speichern.
-
-"
-  doctitlede = "Akkordsymbolausnahmen"
diff --git a/Documentation/es/texidocs/chord-name-major7.texidoc b/Documentation/es/texidocs/chord-name-major7.texidoc
new file mode 100644
index 0000000000..6559288264
--- /dev/null
+++ b/Documentation/es/texidocs/chord-name-major7.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 3e50373e10750e5bc1f5c69898df3740e6169165
+  texidoces = "
+La presentación del acorde de séptima mayor se
+puede ajustar mediante majorSevenSymbol.
+
+"
+  doctitlees = "Nombre de acorde maj7"
+
diff --git a/Documentation/es/texidocs/chordchanges-for-fretboards.texidoc b/Documentation/es/texidocs/chordchanges-for-fretboards.texidoc
new file mode 100644
index 0000000000..273439eff9
--- /dev/null
+++ b/Documentation/es/texidocs/chordchanges-for-fretboards.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
+  texidoces = "
+Se puede hacer que los diagramas de posiciones se muestren sólo
+cuando el acorde cambia o al comienzo de una nueva línea.
+
+"
+
+  doctitlees = "Cambios de acorde de posiciones de trastes"
+
diff --git a/input/texidocs/clusters.texidoc b/Documentation/es/texidocs/clusters.texidoc
similarity index 100%
rename from input/texidocs/clusters.texidoc
rename to Documentation/es/texidocs/clusters.texidoc
diff --git a/input/texidocs/combining-dynamics-with-markup-texts.texidoc b/Documentation/es/texidocs/combining-dynamics-with-markup-texts.texidoc
similarity index 100%
rename from input/texidocs/combining-dynamics-with-markup-texts.texidoc
rename to Documentation/es/texidocs/combining-dynamics-with-markup-texts.texidoc
diff --git a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc b/Documentation/es/texidocs/combining-two-parts-on-the-same-staff.texidoc
similarity index 50%
rename from input/texidocs/combining-two-parts-on-the-same-staff.texidoc
rename to Documentation/es/texidocs/combining-two-parts-on-the-same-staff.texidoc
index 417c7f3c99..7d1b7edecc 100644
--- a/input/texidocs/combining-two-parts-on-the-same-staff.texidoc
+++ b/Documentation/es/texidocs/combining-two-parts-on-the-same-staff.texidoc
@@ -20,22 +20,3 @@ textos.
 "
   doctitlees = "Combinar dos partes sobre el mismo pentagrama"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Funktion, die Stimmen kombiniert (also der @code{\\partcombine}-Befehl)
-ermöglicht die Kombination unterschiedlicher Stimmen auf einem
-System.  Textanweisungen wie \"solo\" or \"a2\" werden automatisch
-hinzugefügt.  Wenn man sie entfernen will, muss man die Eigenschaft
-@code{printPartCombineTexts} auf flasch setzen.  Für Klavierauszüge
-muss natürlich kein \"solo\"/\"a2\" usw. hinzugefügt werdne, man
-sollte sie also ausschalten.  Wenn aber Solo-Stellen in einem
-Klavierauszug oder einer Chorpartitur angezeigt werden, ist es besser,
-normale Polyphonie zu verwenden, weil so die Solostellen angezeigt
-werden, auch wenn der Text des Stimmenkombinierers ausgeschaltet ist.
-
-Der Schnipsel zeigt drei Möglichkeiten, Stimmen auf einem System zu
-kombinieren: Standardpolyphonie, @code{\\partcombine} ohne Text und
-@code{\\partcombine} mit Text.
-
-"
-  doctitlede = "Zwei Stimmen auf einem System kombinieren"
diff --git a/Documentation/es/texidocs/compound-time-signatures.texidoc b/Documentation/es/texidocs/compound-time-signatures.texidoc
new file mode 100644
index 0000000000..fd5e906890
--- /dev/null
+++ b/Documentation/es/texidocs/compound-time-signatures.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Indicaciones de compases compuestos"
+ texidoces = "
+Las indicaciones de compás poco frecuentes como \"5/8\" se pueden
+ejecutar como compases compuestos (p.ej. \"3/8 + 2/8\"), que combinan
+dos o más metros diferentes. LilyPond puede hacer la música de este
+tipo fácil de leer e interpretar, imprimiendo explícitamente las
+indicaciones de compás compuesto y adaptando el comportamiento
+automático de las barras (también se pueden añadir indicaciones
+gráficas de la agrupación de compases; véase el fragmento de código
+apropiado en la base de datos).
+
+"
+
diff --git a/Documentation/es/texidocs/conducting-signs,-measure-grouping-signs.texidoc b/Documentation/es/texidocs/conducting-signs,-measure-grouping-signs.texidoc
new file mode 100644
index 0000000000..54921a06cf
--- /dev/null
+++ b/Documentation/es/texidocs/conducting-signs,-measure-grouping-signs.texidoc
@@ -0,0 +1,17 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las opciones para agrupar los pulsos de un compás están a nuestra
+disposición a través de la función de Scheme
+@code{set-time-signature}, que acepta tres argumentos: el número
+de pulsos, la longitud del pulso, y la agrupación interna de los
+pulsos dentro del compás.  Si se incluye el grabador
+@code{Measure_grouping_engraver}, la función crea también símbolos
+de agrupación @code{MeasureGrouping}.  Dichos símbolos facilitan
+la lectura de la música moderna de cierta complejidad rítmica.  En
+el ejemplo, el compás de 9/8 se subdivide en 2, 2, 2 y 3.  Esto se
+pasa a la función @code{set-time-signature} como tercer argumento:
+@code{'(2 2 2 3)}:
+
+"
+doctitlees = "Símbolos de dirección, símbolos de agrupación de compás"
+
diff --git a/Documentation/es/texidocs/contemporary-glissando.texidoc b/Documentation/es/texidocs/contemporary-glissando.texidoc
new file mode 100644
index 0000000000..ec86a12811
--- /dev/null
+++ b/Documentation/es/texidocs/contemporary-glissando.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se puede tipografiar un gissando contemporáneo sin nota final
+utilizando una nota oculta y temporalización de cadenza.
+
+"
+  doctitlees = "Glissando contemporáneo"
+  
diff --git a/Documentation/es/texidocs/controlling-the-placement-of-chord-fingerings.texidoc b/Documentation/es/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
new file mode 100644
index 0000000000..0195cf1d78
--- /dev/null
+++ b/Documentation/es/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se puede controlar con precisión la colocación de los números de digitación.
+
+"
+  doctitlees = "Controlar la colocación de las digitaciones de acordes"
+
+
diff --git a/Documentation/es/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc b/Documentation/es/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
new file mode 100644
index 0000000000..d72357abae
--- /dev/null
+++ b/Documentation/es/texidocs/controlling-the-vertical-ordering-of-scripts.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+El orden vertical que ocupan las inscripciones gráficas está
+controlado con la propiedad @code{'script-priority}. Cuanto más
+bajo es este número, más cerca de la nota se colocará. En este
+ejemplo, el @code{TextScript} (el sostenido) tiene primero la
+prioridad más baja, por lo que se sitúa en la posición más baja en
+el primer ejemplo. En el segundo, el semitrino (el @code{Script})
+es el que la tiene más baja, por lo que se sitúa en la parte
+interior. Cuando dos objetos tienen la misma prioridad, el orden
+en que se introducen determina cuál será el que aparece en primer
+lugar.
+
+"
+  doctitlees = "Controlar la ordenación vertical de las inscripciones"
+  
diff --git a/input/texidocs/creating-a-delayed-turn.texidoc b/Documentation/es/texidocs/creating-a-delayed-turn.texidoc
similarity index 51%
rename from input/texidocs/creating-a-delayed-turn.texidoc
rename to Documentation/es/texidocs/creating-a-delayed-turn.texidoc
index dcbdf96b4d..47cca25d84 100644
--- a/input/texidocs/creating-a-delayed-turn.texidoc
+++ b/Documentation/es/texidocs/creating-a-delayed-turn.texidoc
@@ -13,14 +13,3 @@ grupeto horizontalmente.
 doctitlees = "Crear un grupeto de anticipación"
 
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Einen Doppelschlag mit Vorhalt zu erstellen, wobei die untere Note das
-Vorzeichen benutzt, erfordert einige Einstellungsänderungen.  Die
-@code{outside-staff-priority}-Eigenschaft muss auf falsch (@code{#f})
-gesetzt werden, weil sie sonst über die Eigenschaft
-@code{avoid-slur property} dominieren würde.  Der Wert von @code{halign}
-wird benutzt, um den Doppelschlag horizontal zu positionieren.
-"
-
-  doctitlede = "Einen  Doppelschlag mit Vorhalt erstellen"
diff --git a/input/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc b/Documentation/es/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc
similarity index 100%
rename from input/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc
rename to Documentation/es/texidocs/creating-a-sequence-of-notes-on-various-pitches.texidoc
diff --git a/input/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc b/Documentation/es/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
similarity index 50%
rename from input/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
rename to Documentation/es/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
index ddd1e82466..bfde9fb9cb 100644
--- a/input/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
+++ b/Documentation/es/texidocs/creating-arpeggios-across-notes-in-different-voices.texidoc
@@ -8,11 +8,3 @@ voces que están sobre el mismo pentagrama si el grabador
 "
   doctitlees = "Crear arpegios entre notas de voces distintas"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Ein Arpeggio kann zwischen Noten aus unterschidlichen Stimmen auf demselben
-System gezogen werden, wenn der @code{Span_arpeggio_engraver} in den 
-@code{Staff}-Kontext verschoben wird:
-
-"
-  doctitlede = "Arpeggios zwischen unterschiedlichen Stimmen erzeugen"
diff --git a/input/texidocs/creating-blank-staves.texidoc b/Documentation/es/texidocs/creating-blank-staves.texidoc
similarity index 100%
rename from input/texidocs/creating-blank-staves.texidoc
rename to Documentation/es/texidocs/creating-blank-staves.texidoc
diff --git a/Documentation/es/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc b/Documentation/es/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
new file mode 100644
index 0000000000..42f5afc923
--- /dev/null
+++ b/Documentation/es/texidocs/creating-cross-staff-arpeggios-in-a-piano-staff.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Dentro de un @code{PianoStaff}, es posible hacer que un arpegio
+cruce entre los pentagramas ajustando la propiedad
+@code{PianoStaff.connectArpeggios}.
+ 
+"
+  doctitlees = "Crear arpegios que se cruzan entre pentagramas dentro de un sistema de piano"
+  
diff --git a/input/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc b/Documentation/es/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
similarity index 52%
rename from input/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
rename to Documentation/es/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
index ce2abb883c..57d1b7e79b 100644
--- a/input/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
+++ b/Documentation/es/texidocs/creating-cross-staff-arpeggios-in-other-contexts.texidoc
@@ -7,12 +7,3 @@ contextos distintos a @code{PianoStaff} si se incluye el grabador
 "
   doctitlees = "Creación de arpegios que se cruzan entre pentagramas dentro de otros contextos"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
- texidocde = "
-In einem Klaviersystem (@code{PianoStaff}) ist es möglich, ein Arpeggio
-zwischen beiden Systemen zu verbinden, indem die
-@code{PianoStaff.connectArpeggios}-Eigenschaft gesetzt wird.
- 
-
-"
-  doctitlede = "Arpeggio zwischen Systemen in einem Klaviersystem erstellen"
diff --git a/Documentation/es/texidocs/creating-metronome-marks-in-markup-mode.texidoc b/Documentation/es/texidocs/creating-metronome-marks-in-markup-mode.texidoc
new file mode 100644
index 0000000000..2d2523a3a1
--- /dev/null
+++ b/Documentation/es/texidocs/creating-metronome-marks-in-markup-mode.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se pueden crear indicaciones metronómicas nuevas en modo de
+marcado, pero no cambian el tempo en la salida MIDI.
+
+"
+  doctitlees = "Crear indicaciones metronómicas en modo de marcado"
+
diff --git a/input/texidocs/creating-real-parenthesized-dynamics.texidoc b/Documentation/es/texidocs/creating-real-parenthesized-dynamics.texidoc
similarity index 100%
rename from input/texidocs/creating-real-parenthesized-dynamics.texidoc
rename to Documentation/es/texidocs/creating-real-parenthesized-dynamics.texidoc
diff --git a/input/texidocs/creating-simultaneous-rehearsal-marks.texidoc b/Documentation/es/texidocs/creating-simultaneous-rehearsal-marks.texidoc
similarity index 100%
rename from input/texidocs/creating-simultaneous-rehearsal-marks.texidoc
rename to Documentation/es/texidocs/creating-simultaneous-rehearsal-marks.texidoc
diff --git a/input/texidocs/creating-slurs-across-voices.texidoc b/Documentation/es/texidocs/creating-slurs-across-voices.texidoc
similarity index 100%
rename from input/texidocs/creating-slurs-across-voices.texidoc
rename to Documentation/es/texidocs/creating-slurs-across-voices.texidoc
diff --git a/input/texidocs/creating-text-spanners.texidoc b/Documentation/es/texidocs/creating-text-spanners.texidoc
similarity index 100%
rename from input/texidocs/creating-text-spanners.texidoc
rename to Documentation/es/texidocs/creating-text-spanners.texidoc
diff --git a/input/texidocs/custodes.texidoc b/Documentation/es/texidocs/custodes.texidoc
similarity index 100%
rename from input/texidocs/custodes.texidoc
rename to Documentation/es/texidocs/custodes.texidoc
diff --git a/input/texidocs/customizing-fretboard-fret-diagrams.texidoc b/Documentation/es/texidocs/customizing-fretboard-fret-diagrams.texidoc
similarity index 53%
rename from input/texidocs/customizing-fretboard-fret-diagrams.texidoc
rename to Documentation/es/texidocs/customizing-fretboard-fret-diagrams.texidoc
index 71a0438cdf..776209ec95 100644
--- a/input/texidocs/customizing-fretboard-fret-diagrams.texidoc
+++ b/Documentation/es/texidocs/customizing-fretboard-fret-diagrams.texidoc
@@ -11,14 +11,3 @@ sobreescritura de propiedades.
 "
   doctitlees = "Personalizar los diagramas de posiciones"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Eigenschaften von Bunddiagrammen können in
-@code{'fret-diagram-details} verändert werden.  Einstellungen mit
-dem @code{\override}-Befehl werden dem @code{FretBoards.FretBoard}-Objekt
-zugewiesen.  Genauso wie @code{Voice} ist auch @code{FretBoards} ein
-Kontext der niedrigsten Ebene, weshalb der Kontext auch in dem Befehl
-weggelassen werden kann.
-
-"
-  doctitlede = "Bunddiagramme anpassen"
diff --git a/Documentation/es/texidocs/customizing-markup-fret-diagrams.texidoc b/Documentation/es/texidocs/customizing-markup-fret-diagrams.texidoc
new file mode 100644
index 0000000000..36c30e7fee
--- /dev/null
+++ b/Documentation/es/texidocs/customizing-markup-fret-diagrams.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se pueden establecer las propiedades de los diagramas de
+posiciones a través de @code{'fret-diagram-details}.  Para los
+diagramas de posiciones de marcado, se pueden aplicar overrides
+(sobreescrituras) al objeto @code{Voice.TextScript} o directamente al elemento de marcado.
+
+"
+ doctitlees = "Personalizar diagramas de posiciones de marcado"
+
diff --git a/input/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc b/Documentation/es/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
similarity index 55%
rename from input/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
rename to Documentation/es/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
index a84847a821..71a1a08c58 100644
--- a/input/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
+++ b/Documentation/es/texidocs/default-direction-of-stems-on-the-center-line-of-the-staff.texidoc
@@ -7,10 +7,3 @@ del pentagrama está determinada por la propiedad
 "
   doctitlees = "Dirección predeterminada de las plicas sobre la tercera línea del pentagrama"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Richtung von Hälsen auf der mittleren Linie kann mit der @code{Stem}-Eigenschaft
-@code{neutral-direction} gesetzt werden.
-
-"
-  doctitlede = "Standardrichtung für Hälse auf der Mittellinie"
diff --git a/Documentation/es/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc b/Documentation/es/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
new file mode 100644
index 0000000000..6022aff410
--- /dev/null
+++ b/Documentation/es/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
@@ -0,0 +1,19 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Se pueden añadir diagramas de posiciones predefinidas para
+instrumentos nuevos además de los estándar que se usan para la
+guitarra.  Este archivo muestra cómo se hace, definiendo una afinación
+nueva y unas cuantas posiciones para el cuatro venezolano.
+
+Este archivo también muestra cómo se pueden incluir las digitaciones
+en los acordes que se usan como puntos de referencia para la búsqueda
+de acordes en la tabla, y mostrarse en el diagrama de posiciones y la
+tablatura @code{TabStaff}, pero no en la música.
+
+Estas posiciones no se pueden transportar porque contienen información
+de las cuerdas.  Hay planes para corregir esto en un futuro.
+
+"
+  doctitlees = "Definición de posiciones predefinidas para otros instrumentos"
+
diff --git a/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc b/Documentation/es/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
similarity index 53%
rename from input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
rename to Documentation/es/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
index 319a526af0..9f881cf0fc 100644
--- a/input/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
+++ b/Documentation/es/texidocs/display-bracket-with-only-one-staff-in-a-system.texidoc
@@ -14,16 +14,3 @@ distinta, como se ve en el segundo sistema del ejemplo.
   doctitlees = "Mostrar corchete o llave en grupos de un solo pentagrama"
 
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn nur ein System einer Systemgruppe vom Typ @code{ChoirStaff} oder
-@code{StaffGroup} angezeigt wird, wird die Klammer zu Beginn normalerweise
-nicht gesetzt.  Das kann verändert werden, indem man die ensprechende
-Eigenschaft veränder.
-
-Bei Systemen wie @code{PianoStaff} und @code{GrandStaff}, die mit einer
-geschweiften Klammer beginne, muss eine andere Eigenschaft verändt werden,
-wie das zweite Beispiel zeigt.
-
-"
-  doctitlede = "Klammer anzeigen, wenn nur ein System gesetzt wird"
diff --git a/input/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc b/Documentation/es/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
similarity index 51%
rename from input/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
rename to Documentation/es/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
index 9a053c1f71..1a72b5a171 100644
--- a/input/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
+++ b/Documentation/es/texidocs/dodecaphonic-style-accidentals-for-each-note-including-naturals.texidoc
@@ -13,15 +13,3 @@ notación.
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
- In Werken des fürhen 20. Jahrhundert, angefangen mit Schönberg, Berg
- und Webern (die zweite Wiener Schule), wird jeder Ton der 
- Zwölftonleiter als gleichwertig erachtet, ohne hierarchische
- Ordnung.  Deshalb wird in dieser Musik für jede Note ein Versetzungszeichen
- ausgegeben, auch für unalterierte Tonhöhen, um das neue Verständnis
- der Musiktheorie und Musiksprache zu verdeutlichen.
- 
- Dieser Schnipsel zeigt, wie derartige Notationsregeln zu erstellen sind.
- "
-  doctitlede = "Versetzungszeichen für jede Note im Stil der Zwölftonmusik"
diff --git a/input/texidocs/embedding-native-postscript-in-a--markup-block.texidoc b/Documentation/es/texidocs/embedding-native-postscript-in-a--markup-block.texidoc
similarity index 100%
rename from input/texidocs/embedding-native-postscript-in-a--markup-block.texidoc
rename to Documentation/es/texidocs/embedding-native-postscript-in-a--markup-block.texidoc
diff --git a/input/texidocs/engravers-one-by-one.texidoc b/Documentation/es/texidocs/engravers-one-by-one.texidoc
similarity index 100%
rename from input/texidocs/engravers-one-by-one.texidoc
rename to Documentation/es/texidocs/engravers-one-by-one.texidoc
diff --git a/Documentation/es/texidocs/engraving-ties-manually.texidoc b/Documentation/es/texidocs/engraving-ties-manually.texidoc
new file mode 100644
index 0000000000..23c1ec9fee
--- /dev/null
+++ b/Documentation/es/texidocs/engraving-ties-manually.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Grabado manual de las ligaduras"
+ texidoces = "
+Se pueden grabar a mano las ligaduras modificando la propiedad
+@code{tie-configuration} del objeto @code{TieColumn}. El primer número
+indica la distancia a partir de la tercera línea del pentagrama en
+espacios de pentagrama, y el segundo número indica la dirección (1 =
+hacia arriba, -1 = hacia abajo).
+
+"
+
diff --git a/Documentation/es/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc b/Documentation/es/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
new file mode 100644
index 0000000000..883e8eca2c
--- /dev/null
+++ b/Documentation/es/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
@@ -0,0 +1,18 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Escribir varios grupos especiales usando una sola instrucción \\times"
+ texidoces = "
+La propiedad @code{tupletSpannerDuration} establece cuánto debe durar
+cada grupo de valoración especial contenido dentro del corchete que
+aparece después de @code{\\times}.  Así, se pueden escribir muchos
+tresillos seguidos dentro de una sola expresión @code{\\times},
+ahorrando trabajo de teclado.
+
+En el ejemplo se muestran dos tresillos, aunque se ha escrito
+@code{\\times} una sola vez.
+
+
+Para ver más inforamción sobre @code{make-moment}, véase
+\"Administración del tiempo\".
+
+"
+
diff --git a/Documentation/es/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc b/Documentation/es/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..5fab391c3e
--- /dev/null
+++ b/Documentation/es/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+En este ejemplo se combinan las digitaciones de la mano izquierda,
+indicaciones del número de cuerda y digitaciones de la mano
+derecha.
+
+"
+  doctitlees = "Digitaciones, indicación del número de cuerda y digitaciones de mano derecha"
+
diff --git a/Documentation/es/texidocs/flat-flags-and-beam-nibs.texidoc b/Documentation/es/texidocs/flat-flags-and-beam-nibs.texidoc
new file mode 100644
index 0000000000..6ed43f1d59
--- /dev/null
+++ b/Documentation/es/texidocs/flat-flags-and-beam-nibs.texidoc
@@ -0,0 +1,35 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+ Son posibles tanto los corchetes rectos sobre notas sueltas como
+extremos de barra sueltos en figuras unidas, con una combinación de
+@code{stemLeftBeamCount}, @code{stemRightBeamCount} e indicadores de
+barra @code{[ ]} emparejados.
+
+Para corchetes rectos que apunten a la derecha sobre notas sueltas,
+use indicadores de barra emparejados @code{[]} y establezca
+@code{stemLeftBeamCount} a cero (véase el ejemplo 1).
+
+Para corchetes rectos que apunten a la izquierda, establezca en su
+lugar @code{stemRightBeamCount} (ejemplo 2).
+
+Para extremos sueltos que apunten a la derecha al final de un conjunto
+de notas unidas, establezca @code{stemRightBeamCount} a un valor
+positivo.  Y para extremos sueltos que apunten a la izquierda al
+principio de un conjunto de notas unidas, establezca
+@code{stemLeftBeamCount} en su lugar (ejemplo 3).
+
+A veces, para una nota suelta rodeada de silencios tiene sentido que
+lleve los dos extremos sueltos del corchete plano, apuntando a derecha
+e izquierda.  Hágalo solamente con indicadores de barra emparejados
+@code{[ ]} (ejemplo 4).
+
+(Observe que @code{\\set stemLeftBeamCount} siempre equivale a
+@code{\\once \\set}.  En otras palabras, los ajustes de la cantidad de
+barras no se recuerdan, y por ello el par de corchetes planos
+aplicados a la nota Do semicorchea @code{c'16[]} del último ejemplo
+no tiene nada que ver con el @code{\\set} de dos notas por detrás.)
+
+"
+  doctitlees = "Corchetes rectos y extremos de barra sueltos"
+
+
diff --git a/input/texidocs/forcing-horizontal-shift-of-notes.texidoc b/Documentation/es/texidocs/forcing-horizontal-shift-of-notes.texidoc
similarity index 53%
rename from input/texidocs/forcing-horizontal-shift-of-notes.texidoc
rename to Documentation/es/texidocs/forcing-horizontal-shift-of-notes.texidoc
index 63a0a50340..0d84e44259 100644
--- a/input/texidocs/forcing-horizontal-shift-of-notes.texidoc
+++ b/Documentation/es/texidocs/forcing-horizontal-shift-of-notes.texidoc
@@ -9,11 +9,3 @@ texidoces = "
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn es zu Zusammenstößen kommt, kann mit folgender Lösung eine andere
-Position manuell eingestellt werden.  Die Einheiten hier sind
-Notenlinienzwischenräume.
-
-"
-  doctitlede = "Horizontale Verschiebung von Noten erzwingen"
diff --git a/input/texidocs/generating-random-notes.texidoc b/Documentation/es/texidocs/generating-random-notes.texidoc
similarity index 100%
rename from input/texidocs/generating-random-notes.texidoc
rename to Documentation/es/texidocs/generating-random-notes.texidoc
diff --git a/input/texidocs/grid-lines--changing-their-appearance.texidoc b/Documentation/es/texidocs/grid-lines--changing-their-appearance.texidoc
similarity index 51%
rename from input/texidocs/grid-lines--changing-their-appearance.texidoc
rename to Documentation/es/texidocs/grid-lines--changing-their-appearance.texidoc
index ed181b7a37..7fc5ace0ed 100644
--- a/input/texidocs/grid-lines--changing-their-appearance.texidoc
+++ b/Documentation/es/texidocs/grid-lines--changing-their-appearance.texidoc
@@ -6,10 +6,3 @@ sobreescribiendo algunas de sus propiedades.
 "
   doctitlees = "Líneas de rejilla: modificar su aspecto"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Erscheinung der Gitternetzlinien kann durch einige Eigenschaften
-geändert werden.
-
-"
-  doctitlede = "Gitternetzlinien: Aussehen verändern"
diff --git a/input/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc b/Documentation/es/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc
similarity index 100%
rename from input/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc
rename to Documentation/es/texidocs/grid-lines--emphasizing-rhythms-and-notes-synchronization.texidoc
diff --git a/Documentation/es/texidocs/grouping-beats.texidoc b/Documentation/es/texidocs/grouping-beats.texidoc
new file mode 100644
index 0000000000..9496a5e3c0
--- /dev/null
+++ b/Documentation/es/texidocs/grouping-beats.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Los patrones de barrado se pueden alterar con la propiedad
+@code{beatGrouping}:
+
+"
+  doctitlees = "Agrupar los pulsos"
+  
diff --git a/Documentation/es/texidocs/guitar-strum-rhythms.texidoc b/Documentation/es/texidocs/guitar-strum-rhythms.texidoc
new file mode 100644
index 0000000000..ea478c8cac
--- /dev/null
+++ b/Documentation/es/texidocs/guitar-strum-rhythms.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Para la música de guitarra, es posible mostrar los ritmos de rasgueo,
+además de las notas de la melodía, acordes y diagramas de posiciones.
+
+"
+  doctitlees = "Ritmos rasgueados de guitarra"
+
diff --git a/input/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc b/Documentation/es/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
similarity index 53%
rename from input/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
rename to Documentation/es/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
index 1e707264b5..8d163560ce 100644
--- a/input/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
+++ b/Documentation/es/texidocs/hiding-the-extender-line-for-text-dynamics.texidoc
@@ -7,11 +7,3 @@ Esta línea se puede suprimir de la siguiente manera:
 "
   doctitlees = "Ocultar la línea de extensión de las expresiones textuales de dinámica"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Dynamik-Texte (wie cresc. und dim.) werden mit einer gestrichelten Linie
-gesetzt, die ihre Dauer anzeigt.  Diese Linie kann auf foldenge Weise
-unterdrückt werden:
-
-"
-  doctitlede = "Crescendo-Linien von Dynamik-Texten unterdrücken"
diff --git a/input/texidocs/incipit.texidoc b/Documentation/es/texidocs/incipit.texidoc
similarity index 100%
rename from input/texidocs/incipit.texidoc
rename to Documentation/es/texidocs/incipit.texidoc
diff --git a/input/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc b/Documentation/es/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
similarity index 50%
rename from input/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
rename to Documentation/es/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
index ac9b399f9b..4cbc8ef47b 100644
--- a/input/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
+++ b/Documentation/es/texidocs/indicating-cross-staff-chords-with-arpeggio-bracket.texidoc
@@ -11,15 +11,3 @@ configurar a la forma de corchete en el contexto de @code{PianoStaff}.
 "
   doctitlees = "Indicar acordes de pentagrama cruzado con corchetes de arpegio"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Eine Arpeggioklammer kann anzeigen, dass Noten auf zwei unterschiedlichen
-Systemen mit der selben Hand gespielt werden sollen.  Damit das notiert
-werden kann, muss der @code{PianoStaff}-Kontext so eingestellt werden,
-dass er Arpeggios über Systeme hinweg akzeptiert und die Form der Arpeggios
-muss auf eine Klammer eingestellt werden.
-
-(Debussy, Les collines d’Anacapri, T. 65)
-
-"
-  doctitlede = "Akkorde auf zwei Systemen mit Arpeggioklammern anzeigen"
diff --git a/Documentation/es/texidocs/inserting-a-caesura.texidoc b/Documentation/es/texidocs/inserting-a-caesura.texidoc
new file mode 100644
index 0000000000..3ad3e552bc
--- /dev/null
+++ b/Documentation/es/texidocs/inserting-a-caesura.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las marcas de cesura se pueden crear sobreescribiendo la propiedad
+@code{'text} del objeto @code{BreathingSign}.  También está disponible
+una marca de cesura curva.
+
+"
+  doctitlees = "Insertar una cesura"
+  
diff --git a/input/texidocs/isolated-percent-repeats.texidoc b/Documentation/es/texidocs/isolated-percent-repeats.texidoc
similarity index 50%
rename from input/texidocs/isolated-percent-repeats.texidoc
rename to Documentation/es/texidocs/isolated-percent-repeats.texidoc
index ad428d1b0b..1eb57a1992 100644
--- a/input/texidocs/isolated-percent-repeats.texidoc
+++ b/Documentation/es/texidocs/isolated-percent-repeats.texidoc
@@ -7,11 +7,3 @@ impresión distinta:
 "
   doctitlees = "Símbolos de porcentaje sueltos"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Isolierte Prozentwiederholungen können auch ausgegeben werden.  Das wird
-erreicht, indem man eine Ganztaktpause notiert und ihre Ausgabeform
-ändert:
-
-"
-  doctitlede = "Isolierte Prozentwiederholungen"
diff --git a/input/texidocs/jazz-combo-template.texidoc b/Documentation/es/texidocs/jazz-combo-template.texidoc
similarity index 50%
rename from input/texidocs/jazz-combo-template.texidoc
rename to Documentation/es/texidocs/jazz-combo-template.texidoc
index 190423cce4..9290646ddc 100644
--- a/input/texidocs/jazz-combo-template.texidoc
+++ b/Documentation/es/texidocs/jazz-combo-template.texidoc
@@ -9,13 +9,3 @@ dentro de una sección @code{\\transpose}.
 "
   doctitlees = "Plantilla para combo de jazz"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Hier ist ein ziemlich kompliziertes Beispiel für ein Jazz-Ensemble. Achtung: 
-Alle Instrumente sind in @code{\key c \major} (C-Dur) notiert. Das bezieht sich 
-auf die klingende Musik: LilyPond transponiert die Tonart automatisch, wenn 
-sich die Noten innerhalb eines @code{\transpose}-Abschnitts befinden.
-
-"
-
-  doctitlede = "Vorlage für Jazz-Combo"
diff --git a/input/texidocs/line-arrows.texidoc b/Documentation/es/texidocs/line-arrows.texidoc
similarity index 100%
rename from input/texidocs/line-arrows.texidoc
rename to Documentation/es/texidocs/line-arrows.texidoc
diff --git a/input/texidocs/lyrics-alignment.texidoc b/Documentation/es/texidocs/lyrics-alignment.texidoc
similarity index 100%
rename from input/texidocs/lyrics-alignment.texidoc
rename to Documentation/es/texidocs/lyrics-alignment.texidoc
diff --git a/input/texidocs/makam-example.texidoc b/Documentation/es/texidocs/makam-example.texidoc
similarity index 51%
rename from input/texidocs/makam-example.texidoc
rename to Documentation/es/texidocs/makam-example.texidoc
index 000e11607d..c35ce7f7d9 100644
--- a/input/texidocs/makam-example.texidoc
+++ b/Documentation/es/texidocs/makam-example.texidoc
@@ -11,13 +11,3 @@ nombres de las notas y las alteraciones.
   doctitlees = "Ejemplo de «Makam»"
 
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Makam ist eine türkische Melodie, in der 1/9-Tonabstände
-eingesetzt werden.  Sehen Sie sich die Initialisierungsdatei
-@code{makam.ly} für weiter Information zu Tonhöhenbezeichnungen
-und Alterationen an (siehe
-Handbuch zum Lernen @version{}, 4.6.3 Weitere Information zu
-Hinweisen, wo diese Datei gespeichert ist)."
-  
-  doctitlede = "Makam-Beispiel"
diff --git a/input/texidocs/making-slurs-with-complex-dash-structure.texidoc b/Documentation/es/texidocs/making-slurs-with-complex-dash-structure.texidoc
similarity index 53%
rename from input/texidocs/making-slurs-with-complex-dash-structure.texidoc
rename to Documentation/es/texidocs/making-slurs-with-complex-dash-structure.texidoc
index c2ea25a7d4..4deef397f3 100644
--- a/input/texidocs/making-slurs-with-complex-dash-structure.texidoc
+++ b/Documentation/es/texidocs/making-slurs-with-complex-dash-structure.texidoc
@@ -26,22 +26,3 @@ de 1 para una ligadura continua.
   doctitlees = "Hacer ligaduras de expresión con estructura compleja de discontinuidad"
 
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Legatobögen können mit einem komplizierten Strichelmuster
-gesetzt werden, indem die @code{dash-definition}-Eigenschaft
-definiert wird.  @code{dash-definition} ist eine Liste bestehend
-aus @code{dash-elements}-Elementen.  Ein @code{dash-element} ist
-eine Liste an Parametern, die das Strichverhalten für einen
-Abschnitt des Legatobogens definieren.
-
-Der Bogen wird nach dem Bezierparameter t definiert, welcher
-von 0 am linken Ende des Bogens zu 1 am rechten Ende des Bogens
-reicht.  @code{dash-element} ist eine Liste @code{(start-t stop-t dash-Unterbrechung dash-Abschnitt)}.  Die Region des Bogens von @code{start-t}
-bis @code{stop-t} hat eine Unterbrechung von @code{dash-Unterbrechung}
-von jedem @code{dash-Abschnitt}-Schwarzabschnitt.  @code{dash-Abschnitt} ist in Notenlinienzwischenräumen definiert.
-@code{dash-Abschnitt} ist auf 1 für einen durchgehenden Bogen
-gesetzt.
-"
-  doctitlede = "Legatobögen mit kompliziertem Strichelmuster
-  definieren"
diff --git a/Documentation/es/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc b/Documentation/es/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
new file mode 100644
index 0000000000..05f0d5aa60
--- /dev/null
+++ b/Documentation/es/texidocs/making-some-staff-lines-thicker-than-the-others.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se puede engrosar una línea del pentagrama con fines pedagógicos
+(p.ej. la tercera línea o la de la clave de Sol).  Esto se puede
+conseguir añadiendo más líneas muy cerca de la línea que se quiere
+destacar, utilizando la propiedad @code{line-positions} del objeto
+@code{StaffSymbol}.
+
+"
+  doctitlees = "Hacer unas líneas del pentagrama más gruesas que las otras"
+
diff --git a/input/texidocs/measure-counter.texidoc b/Documentation/es/texidocs/measure-counter.texidoc
similarity index 100%
rename from input/texidocs/measure-counter.texidoc
rename to Documentation/es/texidocs/measure-counter.texidoc
diff --git a/input/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc b/Documentation/es/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
similarity index 50%
rename from input/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
rename to Documentation/es/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
index fe74750b8d..6686e77779 100644
--- a/input/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
+++ b/Documentation/es/texidocs/mensurstriche-layout-bar-lines-between-the-staves.texidoc
@@ -10,12 +10,3 @@ propiedad @code{transparent}.
 
   doctitlees = "Disposición Mensurstriche (líneas divisorias entre pentagramas)"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Das Mensurstiche-Layout, in welchem die Taktlinien nicht auf den Systemen,
-sondern zwischen den Systemen gesetzt werden, kann mit einer @code{StaffGroup}
-anstelle von @code{ChoirStaff} erreicht werden.  Die Taktlinien auf den
-Systemen werden mit der the @code{transparent}-Eigenschaft ausgelöscht.
-
-"
-  doctitlede = "Mensurstriche-Layout (Taktstriche zwischen den Systemen"
diff --git a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc b/Documentation/es/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
similarity index 52%
rename from input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
rename to Documentation/es/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
index b6a68ff874..8b8c20aa1d 100644
--- a/input/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
+++ b/Documentation/es/texidocs/modifying-default-values-for-articulation-shorthand-notation.texidoc
@@ -13,16 +13,3 @@ semitrino en lugar del símbolo predeterminado +, asigne el valor
 "
   doctitlees = "Modificar los valores predeterminados para la notación abreviada de las articulaciones"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
- texidocde = "
-Die Abkürzungen sind in der Datei @samp{ly/script-init.ly} definiert, wo
-den Variablen @code{dashHat}, @code{dashPlus}, @code{dashDash},
-@code{dashBar}, @code{dashLarger}, @code{dashDot} und
-@code{dashUnderscore} Standardwerte zugewiesen werden.  Diese Standardwerte
-können verändert werden.  Um zum Beispiel die Abkürzung
-@code{-+} (@code{dashPlus}) mit dem Triller anstatt mit dem +-Symbol zu
-assoziieren, muss der Wert @code{trill} der Variable
-@code{dashPlus} zugewiesen werden:
-
-"
-  doctitlede = "Die Standardwerte der Abkürzungen von Artikulationen verändern"
diff --git a/Documentation/es/texidocs/multi-measure-rest-markup.texidoc b/Documentation/es/texidocs/multi-measure-rest-markup.texidoc
new file mode 100644
index 0000000000..101a8f2092
--- /dev/null
+++ b/Documentation/es/texidocs/multi-measure-rest-markup.texidoc
@@ -0,0 +1,19 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+texidoces = "
+Los elementos de marcado aplicados a un silencio multicompás se
+centran encima o debajo de éste.  Los elementos de marcado extensos
+que se adjuntan a silencios multicompás no producen la expansión del
+compás.  Para expandir un silencio multicompás de forma que quepa todo
+el marcado, utilice un silencio de separación con un marcado aplicado
+antes del silencio multicompás.
+
+Observe que el silencio separador produce la inserción de un compás.
+El texto aplicado a un siencio sparador de esta forma se alinea por la
+izquierda a la posición en que la nota estaría situada dentro del
+compás, pero si la longitud del compás está determinada por la
+longitud del texto, éste aparecerá centrado.
+
+"
+
+doctitlees = "Marcado de silencios multicompás"
+
diff --git a/Documentation/es/texidocs/nesting-staves.texidoc b/Documentation/es/texidocs/nesting-staves.texidoc
new file mode 100644
index 0000000000..b139573b00
--- /dev/null
+++ b/Documentation/es/texidocs/nesting-staves.texidoc
@@ -0,0 +1,18 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se puede utilizar la propiedad
+@code{systemStartDelimiterHierarchy} para crear grupos de
+pentagramas anidados de forma más compleja. La instrucción
+@code{\\set StaffGroup.systemStartDelimiterHierarchy} toma una
+lista alfabética del número de pentagramas producidos. Se puede
+proporcionar antes de cada pentagrama un delimitador de comienzo
+de sistema. Se debe encerrar entre corchetes y admite tantos
+pentagramas como encierren las llaves. Se pueden omitir los
+elementos de la lista, pero el primer corchete siempre abarca
+todos los pentagramas. Las posibilidades son
+@code{SystemStartBar}, @code{SystemStartBracket},
+@code{SystemStartBrace} y @code{SystemStartSquare}.
+
+"
+  doctitlees = "Anidado de grupos de pentagramas"
+
diff --git a/Documentation/es/texidocs/non-default-tuplet-numbers.texidoc b/Documentation/es/texidocs/non-default-tuplet-numbers.texidoc
new file mode 100644
index 0000000000..c0b733e505
--- /dev/null
+++ b/Documentation/es/texidocs/non-default-tuplet-numbers.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
+  texidoces = "
+LilyPond también proporciona funciones de formato para imprimir
+números de grupo especial diferentes a la propia fracción, así
+como para añadir una figura al número o a la fracción de la
+agrupación.
+
+"
+
+  doctitlees = "Números de agrupación especial distintos a los predeterminados"
+
diff --git a/input/texidocs/non-traditional-key-signatures.texidoc b/Documentation/es/texidocs/non-traditional-key-signatures.texidoc
similarity index 51%
rename from input/texidocs/non-traditional-key-signatures.texidoc
rename to Documentation/es/texidocs/non-traditional-key-signatures.texidoc
index 6f0ec93840..8c57b38a4d 100644
--- a/input/texidocs/non-traditional-key-signatures.texidoc
+++ b/Documentation/es/texidocs/non-traditional-key-signatures.texidoc
@@ -26,25 +26,3 @@ He aquí un ejemplo de una posible armadura para generar una escala
 exátona:
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  doctitlede = "Untypische Tonarten"
-  texidocde = "
-Der üblicherweise benutzte @code{\\key}-Befehl setzt die
-@code{keySignature}-Eigenschaft im @code{Staff}-Kontext.
-
-Um untypische Tonartenvorzeichen zu erstellen, muss man diese Eigenschaft
-direkt setzen.  Das Format für den Befehl ist eine Liste: @code{ \\set
-Staff.keySignature = #`(((Oktave . Schritt) . Alteration) ((Oktave
-. Schritt) . Alteration) ...)} wobei für jedes Element in der Liste
-@code{Oktave} die Oktave angibt (0@tie{}ist die Oktave vom
-eingestrichenen@tie{}C bis zum eingestrichenen@tie{}H), @code{Schritt} gibt
-die Note innerhalb der Oktave an (0@tie{}heißt@tie{}C und
-6@tie{}heißt@tie{}H), und @code{Alteration} ist @code{,SHARP ,FLAT
-,DOUBLE-SHARP} usw.  (Beachte das beginnende Komma.)
-
-Alternativ kann auch jedes Element der Liste mit dem allgemeineren Format
-@code{(Schritt . Alteration)} gesetzt werden, wobei dann die Einstellungen
-für alle Oktaven gelten.
-
-Hier ein Beispiel einer möglichen Tonart für eine Ganztonleiter:
-"
diff --git a/input/texidocs/orchestra,-choir-and-piano-template.texidoc b/Documentation/es/texidocs/orchestra,-choir-and-piano-template.texidoc
similarity index 100%
rename from input/texidocs/orchestra,-choir-and-piano-template.texidoc
rename to Documentation/es/texidocs/orchestra,-choir-and-piano-template.texidoc
diff --git a/Documentation/es/texidocs/ottava-text.texidoc b/Documentation/es/texidocs/ottava-text.texidoc
new file mode 100644
index 0000000000..9f61fbc964
--- /dev/null
+++ b/Documentation/es/texidocs/ottava-text.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Internamente, @code{\\ottava} establece las propiedades
+@code{ottavation} (por ejemplo, a @code{\"8va\"} o a
+@code{\"8vb\"}) y @code{middleCPosition}.  Para sobreescribir el
+texto del corchete, ajuste @code{ottavation} después de invocar la
+instrucción @code{\\ottava}.
+
+"
+
+  doctitlees = "Texto de octava alta y baja"
+  
diff --git a/input/texidocs/percent-repeat-count-visibility.texidoc b/Documentation/es/texidocs/percent-repeat-count-visibility.texidoc
similarity index 53%
rename from input/texidocs/percent-repeat-count-visibility.texidoc
rename to Documentation/es/texidocs/percent-repeat-count-visibility.texidoc
index 34f9c34b7d..57af922d73 100644
--- a/input/texidocs/percent-repeat-count-visibility.texidoc
+++ b/Documentation/es/texidocs/percent-repeat-count-visibility.texidoc
@@ -7,9 +7,3 @@ la propiedad de contexto @code{repeatCountVisibility}.
 "
   doctitlees = "Visibilidad del contador de repeticiones de tipo porcentaje"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Prozentwiederholungszähler können in regelmäßigen Intervallen angezeigt
-werden, indem man die Eigenschaft @code{repeatCountVisibility} beeinflusst.
-"
-  doctitlede = "Sichtbarkeit von Prozent-Wiederholungen"
diff --git a/input/texidocs/percent-repeat-counter.texidoc b/Documentation/es/texidocs/percent-repeat-counter.texidoc
similarity index 51%
rename from input/texidocs/percent-repeat-counter.texidoc
rename to Documentation/es/texidocs/percent-repeat-counter.texidoc
index 200118b10f..173eb774f0 100644
--- a/input/texidocs/percent-repeat-counter.texidoc
+++ b/Documentation/es/texidocs/percent-repeat-counter.texidoc
@@ -7,10 +7,3 @@ ve en este ejemplo:
 "
   doctitlees = "Percent repeat counter"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Ganztaktwiederholungen mit mehr als zwei Wiederholungen erhalten einen
-Zähler, wenn man die entsprechende Eigenschaft einsetzt:
-
-"
-  doctitlede = "Prozent-Wiederholungen zählen"
diff --git a/Documentation/es/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc b/Documentation/es/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
new file mode 100644
index 0000000000..f72afd5908
--- /dev/null
+++ b/Documentation/es/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Permitir saltos de línea dentro de grupos especiales con barra"
+ texidoces = "
+Este ejemplo artificial muestra cómo se pueden permitir tanto los
+saltos de línea manuales como los automáticos dentro de un grupo de
+valoración especial unido por una barra.  Observe que estos grupos
+sincopados se deben barrar manualmente.
+
+"
+
diff --git a/input/texidocs/piano-template-simple.texidoc b/Documentation/es/texidocs/piano-template-simple.texidoc
similarity index 54%
rename from input/texidocs/piano-template-simple.texidoc
rename to Documentation/es/texidocs/piano-template-simple.texidoc
index 3126075d6b..10d9c97f8b 100644
--- a/input/texidocs/piano-template-simple.texidoc
+++ b/Documentation/es/texidocs/piano-template-simple.texidoc
@@ -6,9 +6,3 @@ notas.
 "
   doctitlees = "Plantilla de piano (sencilla)"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Hier ein einfaches Klaviersystem.
-
-"
-  doctitlede = "Vorlage für einfache Klaviernotation"
diff --git a/Documentation/es/texidocs/piano-template-with-centered-dynamics.texidoc b/Documentation/es/texidocs/piano-template-with-centered-dynamics.texidoc
new file mode 100644
index 0000000000..724e7d33d9
--- /dev/null
+++ b/Documentation/es/texidocs/piano-template-with-centered-dynamics.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Muchas partituras de piano tienen las indicaciones dinámicas
+centradas entre los dos pentagramas.  Esto requiere un poco de
+trucaje, pero puesto que la plantilla está aquí mismo, no tenemos
+que hacer este trucaje por nuestra cuenta.
+
+"
+  doctitlees = "Plantilla de piano con matices centrados"
+
diff --git a/Documentation/es/texidocs/piano-template-with-centered-lyrics.texidoc b/Documentation/es/texidocs/piano-template-with-centered-lyrics.texidoc
new file mode 100644
index 0000000000..25fb9939b6
--- /dev/null
+++ b/Documentation/es/texidocs/piano-template-with-centered-lyrics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+En lugar de tener un pentagrama dedicado a la melodía y la letra, ésta
+se puede centrar entre los pentagramas de un sistema de piano.
+
+"
+  doctitlees = "Plantilla de piano con letra centrada"
+  
diff --git a/Documentation/es/texidocs/piano-template-with-melody-and-lyrics.texidoc b/Documentation/es/texidocs/piano-template-with-melody-and-lyrics.texidoc
new file mode 100644
index 0000000000..314c87df17
--- /dev/null
+++ b/Documentation/es/texidocs/piano-template-with-melody-and-lyrics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+He aquí el típico formato dde una canción: un pentagrama con la
+melodía y la letra, y el acompañamiento de piano por debajo.
+
+"
+  doctitlees = "Plantilla de piano con melodía y letra"
+  
diff --git a/Documentation/es/texidocs/placement-of-right-hand-fingerings.texidoc b/Documentation/es/texidocs/placement-of-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..659894d588
--- /dev/null
+++ b/Documentation/es/texidocs/placement-of-right-hand-fingerings.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Es posible ejercer un mayor control sobre la colocación de las
+digitaciones de la mano derecha estableciendo el valor de una
+propiedad específica, como se muestra en el ejemplo siguiente.
+
+"
+  doctitlees = "Posicionamiento de digitaciones de mano derecha"
+
diff --git a/Documentation/es/texidocs/polyphony-in-tablature.texidoc b/Documentation/es/texidocs/polyphony-in-tablature.texidoc
new file mode 100644
index 0000000000..a8a8ab0dfe
--- /dev/null
+++ b/Documentation/es/texidocs/polyphony-in-tablature.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+La polifonía se crea de la misma forma en un @code{TabStaff} que
+en una pauta normal.
+
+"
+  doctitlees = "Polifonía en tablaturas"
+
diff --git a/Documentation/es/texidocs/positioning-grace-notes-with-floating-space.texidoc b/Documentation/es/texidocs/positioning-grace-notes-with-floating-space.texidoc
new file mode 100644
index 0000000000..7aecc3255b
--- /dev/null
+++ b/Documentation/es/texidocs/positioning-grace-notes-with-floating-space.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Al establecer la propiedad @code{'strict-grace-spacing} hacemos
+que las columnas musicales para las notas de adorno sean
+'flotantes', es decir, desacopladas de las notas que no son de
+adorno: primero se aplica el espaciado de las notas normales, y
+luego se ponen las columnas musicales de las notas de adorno a la
+izquierda de las columnas musicales de las notas principales.
+
+"
+
+  doctitlees = "Posicionamiento de las notas de adorno con espacio flotante"
+
+
diff --git a/Documentation/es/texidocs/positioning-multi-measure-rests.texidoc b/Documentation/es/texidocs/positioning-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..bf8333c89f
--- /dev/null
+++ b/Documentation/es/texidocs/positioning-multi-measure-rests.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Posicionar los silencios multicompás"
+ texidoces = "
+A diferencia de los silencios normales, no existe una instrucción
+predefinida para modificar la posición predeterminada de un
+símbolo de silencio multicompás sobre el pentagrama, adjuntándolo
+a una nota, independientemente de cuál sea su forma.  Sin embargo,
+en la música polifónica los silencios multicompás de las voces de
+numeración par e impar están separados verticalmente.  La
+colocación de los silencios multicompás se puede controlar como se
+ve a continuación:
+
+"
diff --git a/input/texidocs/positioning-text-markups-inside-slurs.texidoc b/Documentation/es/texidocs/positioning-text-markups-inside-slurs.texidoc
similarity index 54%
rename from input/texidocs/positioning-text-markups-inside-slurs.texidoc
rename to Documentation/es/texidocs/positioning-text-markups-inside-slurs.texidoc
index cde0d0a0d3..2042265e4b 100644
--- a/input/texidocs/positioning-text-markups-inside-slurs.texidoc
+++ b/Documentation/es/texidocs/positioning-text-markups-inside-slurs.texidoc
@@ -8,10 +8,3 @@ impriman por dentro de las ligaduras de expresión.
 "
   doctitlees = "Situar los elementos de marcado de texto por dentro de las ligaduras"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Textbeschriftung kann innerhalb von Bögen gesetzt werden, wenn die
-@code{outside-staff-priority}-Eigenschaft auf falsch gesetzt wird.
-
-"
-  doctitlede = "Textbeschriftung innerhalb von Bögen positionieren"
diff --git a/Documentation/es/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc b/Documentation/es/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
new file mode 100644
index 0000000000..99eb91d173
--- /dev/null
+++ b/Documentation/es/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+doctitlees = "Evitar que se añadan becuadros adicionales automáticamente"
+
+texidoces = "
+Según las reglas estándar de composición
+tipográfica, se imprime un becuadro antes de un sostenido o un
+bemol cuando se tiene que cancelar una alteración anterior en la
+misma nota.  Para modificar este comportamiento, establezca el
+valor de la propiedad @code{extraNatural} a @code{##f} (falso)
+dentro del contexto de @code{Staff}.
+
+"
+
diff --git a/input/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc b/Documentation/es/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
similarity index 50%
rename from input/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
rename to Documentation/es/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
index 28a1f1fddb..4e525896be 100644
--- a/input/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
+++ b/Documentation/es/texidocs/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.texidoc
@@ -8,12 +8,3 @@ propiedad @code{printKeyCancellation} del contexto @code{Staff}.
 
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-doctitlede = "Auflösungzeichen nicht setzen, wenn die Tonart wechselt"
-
-texidocde = "
-Wenn die Tonart wechselt, werden automatisch Auflösungszeichen ausgegeben,
-um Versetzungszeichen der vorherigen Tonart aufzulösen.  Das kann
-verhindert werden, indem die @code{printKeyCancellation}-Eigenschaft
-im @code{Staff}-Kontext auf \"false\" gesetzt wird.
-"
diff --git a/input/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc b/Documentation/es/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
similarity index 50%
rename from input/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
rename to Documentation/es/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
index 1fef776d4f..82138c8809 100644
--- a/input/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
+++ b/Documentation/es/texidocs/printing-a-repeat-sign-at-the-beginning-of-a-piece.texidoc
@@ -6,10 +6,3 @@ principio de la pieza, sobreescribiendo la propiedad correspondiente:
 "
   doctitlees = "Imprimir puntos de repetición al prinicpio de la pieza"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Ein @code{|:}-Taktstrich kann auch zu Beginn eines Stückes ausgegeben werden, indem
-man die entsprechende Eigenschaft verändert:
-
-"
-  doctitlede = "Ein Wiederholungszeichen zu Beginn eines Stückes ausgeben"
diff --git a/Documentation/es/texidocs/printing-bar-numbers-at-regular-intervals.texidoc b/Documentation/es/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
new file mode 100644
index 0000000000..8ec3e39b73
--- /dev/null
+++ b/Documentation/es/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Se pueden imprimir los números de compás a intervalos regulares
+mediante el establecimiento de la propiedad
+@code{barNumberVisibility}.  Aquí los números de compás se
+imprimen a cada dos compases excepto al final de la línea.
+
+"
+
+  doctitlees = "Imprimir números de compás a intervalos regulares"
+
+
diff --git a/Documentation/es/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc b/Documentation/es/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
new file mode 100644
index 0000000000..3de6deb232
--- /dev/null
+++ b/Documentation/es/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Los números de compás también se pueden imprimir dentro de rectángulos o de circunferencias.
+
+"
+  doctitlees = "Imprimir números de compás dentro de rectángulos o circunferencias"
+
+
diff --git a/Documentation/es/texidocs/printing-hairpins-using-al-niente-notation.texidoc b/Documentation/es/texidocs/printing-hairpins-using-al-niente-notation.texidoc
new file mode 100644
index 0000000000..e452d10de4
--- /dev/null
+++ b/Documentation/es/texidocs/printing-hairpins-using-al-niente-notation.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se pueden imprimir reguladores con un círculo en la punta
+(notación «al niente») estableciendo la propiedad
+@code{circled-tip} del objeto @code{Hairpin} al valor @code{#t}.
+
+"
+  doctitlees = "Impresión de reguladores utilizando la notación «al niente»"
+  
diff --git a/Documentation/es/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc b/Documentation/es/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
new file mode 100644
index 0000000000..a03a88a47f
--- /dev/null
+++ b/Documentation/es/texidocs/printing-marks-at-the-end-of-a-line-or-a-score.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las marcas se pueden imprimir al final de la línea actual, en vez de
+al comienzo de la línea siguiente.  Esto es útil principalmente cuando
+se tiene que añadir una marca al final de la partitura (donde no hay
+línea siguiente).
+
+En tales casos, el extremo derecho de la marca se tiene que alinear
+con la última línea divisoria, como muestra la segunda línea de este
+ejemplo.
+
+"
+  doctitlees = "Imprimir marcas al final de la línea o de la partitura"
+
diff --git a/input/texidocs/printing-marks-on-every-staff.texidoc b/Documentation/es/texidocs/printing-marks-on-every-staff.texidoc
similarity index 51%
rename from input/texidocs/printing-marks-on-every-staff.texidoc
rename to Documentation/es/texidocs/printing-marks-on-every-staff.texidoc
index 94cf4d665c..685ac29fa7 100644
--- a/input/texidocs/printing-marks-on-every-staff.texidoc
+++ b/Documentation/es/texidocs/printing-marks-on-every-staff.texidoc
@@ -7,10 +7,3 @@ cualquiera.
 "
   doctitlees = "Imprimir marcas en cualquier pentagrama"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Normalerweise werden Textzeichen nur über dem obersten Notensystem gesetzt.  Sie
-können aber auch über jedem System ausgegeben werden.
-
-"
-  doctitlede = "Zeichen über jedem System ausgeben"
diff --git a/input/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc b/Documentation/es/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
similarity index 53%
rename from input/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
rename to Documentation/es/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
index 0a871c16d3..83d8984361 100644
--- a/input/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
+++ b/Documentation/es/texidocs/printing-metronome-and-rehearsal-marks-below-the-staff.texidoc
@@ -11,11 +11,3 @@ adecuadamente la propiedad @code{direction} de
   doctitlees = "Impresión de indicaciones metronómicas y letras de ensayo debajo del pentagrama"
 
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Normalerweise werden Metronom- und Übungszeichen über dem Notensystem ausgegeben.
-Um sie unter das System zu setzen, muss die @code{direction}-Eigenschaft
-von @code{MetronomeMark} oder @code{RehearsalMark} entsprechend verändert werden.
-
-"
-  doctitlede = "Metronom- und Übungszeichen unter das System setzen"
diff --git a/Documentation/es/texidocs/printing-the-bar-number-for-the-first-measure.texidoc b/Documentation/es/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
new file mode 100644
index 0000000000..f4ecd7dfa2
--- /dev/null
+++ b/Documentation/es/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+De forma predeterminada se suprime el número del primer compás de
+una partitura si es menor o igual a `1'.  Al establecer el valor
+de @code{barNumberVisibility} a @code{all-bar-numbers-visible}, se
+puede imprimir cualquier número de compás para el primer compás y
+todos los siguientes.  Observe que, para que esto funcione, se
+debe insertar una líinea divisoria vacía antes de la primera nota.
+
+"
+
+  doctitlees = "Imprimir el número de compás en el primer compás"
+
+
diff --git a/input/texidocs/quoting-another-voice-with-transposition.texidoc b/Documentation/es/texidocs/quoting-another-voice-with-transposition.texidoc
similarity index 51%
rename from input/texidocs/quoting-another-voice-with-transposition.texidoc
rename to Documentation/es/texidocs/quoting-another-voice-with-transposition.texidoc
index 5291e57b4a..5f3055a8c4 100644
--- a/input/texidocs/quoting-another-voice-with-transposition.texidoc
+++ b/Documentation/es/texidocs/quoting-another-voice-with-transposition.texidoc
@@ -11,13 +11,3 @@ se transportan todas las notas (incluidas las citadas).
 
 doctitlees = "Citar otra voz con transposición"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Zitate berücksichtigen sowohl die Transposition der Quelle als auch
-des Zielinstruments.  In diesem Beispiel spielen alle Instrumente
-klingendes C, das Zielinstrument ist in F.  Die Noten für das
-Zielinstrument können mit @code{\\transpose} transponiert werden,
-in diesem Fall werden alle Noten (auch die zitierten) transponiert.
-
-"
-  doctitlede = "Eine Stimme mit Transposition zitieren"
diff --git a/input/texidocs/quoting-another-voice.texidoc b/Documentation/es/texidocs/quoting-another-voice.texidoc
similarity index 50%
rename from input/texidocs/quoting-another-voice.texidoc
rename to Documentation/es/texidocs/quoting-another-voice.texidoc
index 865ec4fea0..41c3409350 100644
--- a/input/texidocs/quoting-another-voice.texidoc
+++ b/Documentation/es/texidocs/quoting-another-voice.texidoc
@@ -11,16 +11,3 @@ el fragmento citado porque @code{rest-event} no está dentro de los
 "
   doctitlees = "Citar otra voz"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die @code{quotedEventTypes}-Eigenschaft bestimmt die
-Typen an Musikereignissen, die zitiert werden.  Die
-Standardeinstellung ist @code{(note-event rest-event)}, womit
-nur Noten und Pausen der zitierten Stimme für den
-@code{\\quoteDuring}-Ausdruck übernommen werden.  Im
-Beispiel hier wird die 16-Pause nicht übernommen, weil
-sich @code{rest-event} nicht in @code{quotedEventTypes} befindet.
-
-"
-
-  doctitlede = "Eine andere Stimme zitieren"
diff --git a/Documentation/es/texidocs/redefining-grace-note-global-defaults.texidoc b/Documentation/es/texidocs/redefining-grace-note-global-defaults.texidoc
new file mode 100644
index 0000000000..8213ec7552
--- /dev/null
+++ b/Documentation/es/texidocs/redefining-grace-note-global-defaults.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Los valores predeterminados para las notas de adorno están
+almacenados en los identificadores @code{startGraceMusic},
+@code{stopGraceMusic}, @code{startAcciaccaturaMusic},
+@code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic} y
+@code{stopAppoggiaturaMusic}, que están definidos en el archivo
+@code{ly/grace-init.ly}.  Redefiniéndolos se pueden obtener otros
+efectos.
+
+"
+
+  doctitlees = "Redefinición de los valores globales predeterminados para notas de adorno"
+
+
diff --git a/Documentation/es/texidocs/removing-bar-numbers-from-a-score.texidoc b/Documentation/es/texidocs/removing-bar-numbers-from-a-score.texidoc
new file mode 100644
index 0000000000..6f6941bb9f
--- /dev/null
+++ b/Documentation/es/texidocs/removing-bar-numbers-from-a-score.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+Se pueden eliminar completamente los números de compás quitando el
+grabador @code{Bar_number_engraver} del contexto de @code{Score}.
+
+"
+
+  doctitlees = "Suprimir los números de compás de toda la partitura"
+
+
diff --git a/input/texidocs/removing-the-first-empty-line.texidoc b/Documentation/es/texidocs/removing-the-first-empty-line.texidoc
similarity index 51%
rename from input/texidocs/removing-the-first-empty-line.texidoc
rename to Documentation/es/texidocs/removing-the-first-empty-line.texidoc
index 2de8f812c2..509df4fdbe 100644
--- a/input/texidocs/removing-the-first-empty-line.texidoc
+++ b/Documentation/es/texidocs/removing-the-first-empty-line.texidoc
@@ -15,18 +15,3 @@ escribe.
 "
   doctitlees = "Quitar la primera línea vacía"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Ein leeres Notensystem kann auch aus der ersten Zeile einer Partitur
-entfernt werden, indem die Eigenschaft @code{remove-first} der
-@code{VerticalAxisGroup}-Eigenschaft eingesetzt wird.  Das kann
-man global in einer @code{\\layout}-Umgebung oder lokal in dem
-bestimmten Notensystem machen, das entfernt werden soll.  In letzterem
-Fall muss man den Kontext angeben.
-
-Das untere Notensystem der zweiten Systemgruppe wird nicht entfernt,
-weil in die Einstellungen in dem Schnipsel nur für das eine Notensystem
-gültig sind.
-
-"
-  doctitlede = "Die erste leere Notenzeile auch entfernen"
diff --git a/Documentation/es/texidocs/rest-styles.texidoc b/Documentation/es/texidocs/rest-styles.texidoc
new file mode 100644
index 0000000000..4f76d9847a
--- /dev/null
+++ b/Documentation/es/texidocs/rest-styles.texidoc
@@ -0,0 +1,5 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  doctitlees = "Estilos de silencios"
+  texidoces = "
+Los silencios se pueden imprimir en distintos estilos.
+"
diff --git a/Documentation/es/texidocs/reverting-default-beam-endings.texidoc b/Documentation/es/texidocs/reverting-default-beam-endings.texidoc
new file mode 100644
index 0000000000..a2842f078e
--- /dev/null
+++ b/Documentation/es/texidocs/reverting-default-beam-endings.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Para tipografiar las barras agrupadas en la forma @code{3-4-3-2}
+en 12/8, en primer lugar tenemos que sobreescribir los finales de
+barra predeterminados en 12/8, y después preparar los finales de
+barra nuevos:
+
+"
+  doctitlees = "Alteración de los finales de barra predeterminados"
+
+
diff --git a/input/texidocs/script-chart.texidoc b/Documentation/es/texidocs/script-chart.texidoc
similarity index 100%
rename from input/texidocs/script-chart.texidoc
rename to Documentation/es/texidocs/script-chart.texidoc
diff --git a/input/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc b/Documentation/es/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
similarity index 51%
rename from input/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
rename to Documentation/es/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
index 21264c9f4e..18bad9dfc6 100644
--- a/input/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
+++ b/Documentation/es/texidocs/setting-hairpin-behavior-at-bar-lines.texidoc
@@ -8,11 +8,3 @@ sobreescribiendo la propiedad @code{'to-barline}.
 "
   doctitlees = "Establecer el comportamiento de los reguladores en las barras de compás"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Wenn die Note, an welcher eine Crescendo-Klammer endet, die erste Note
-eines Taktes ist, wird die Klammer an der vorhergehenden Tatklinie
-beendet.  Dieses Verhalten kann auch mit der Eigenschaft
-@code{'to-barline} geändert werden:
-"
-  doctitlede = "Das Verhalten von Crescendo-Klammern an Taktlinien beeinflussen"
diff --git a/Documentation/es/texidocs/setting-the-minimum-length-of-hairpins.texidoc b/Documentation/es/texidocs/setting-the-minimum-length-of-hairpins.texidoc
new file mode 100644
index 0000000000..dc2ce0e708
--- /dev/null
+++ b/Documentation/es/texidocs/setting-the-minimum-length-of-hairpins.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Si los reguladores son demasiado cortos, se pueden alargar
+modificando la propiedad @code{minimum-length} del objeto
+@code{Hairpin}.
+
+"
+  doctitlees = "Ajustar la longitud mínima de los reguladores"
+
diff --git a/input/texidocs/shortening-volta-brackets.texidoc b/Documentation/es/texidocs/shortening-volta-brackets.texidoc
similarity index 54%
rename from input/texidocs/shortening-volta-brackets.texidoc
rename to Documentation/es/texidocs/shortening-volta-brackets.texidoc
index e5e5414d2c..3bf57a60c0 100644
--- a/input/texidocs/shortening-volta-brackets.texidoc
+++ b/Documentation/es/texidocs/shortening-volta-brackets.texidoc
@@ -9,12 +9,3 @@ sólo dura un compás, que corresponde a una duración de 3/4.
 "
   doctitlees = "Shortening volta brackets"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Volta-Klammern werden normalerweise über alle Noten der Klammer gezogen, aber
-es ist möglich sie zu verkürzen.  Hierzu muss
-@code{voltaSpannerDuration} definiert werden, in dem Beispiel etwa als
-3/4, sodass die Klammer nur einen Takt dauert. 
-
-"
-  doctitlede = "Volta-Klammern verkürzen"
diff --git a/Documentation/es/texidocs/showing-chords-at-changes.texidoc b/Documentation/es/texidocs/showing-chords-at-changes.texidoc
new file mode 100644
index 0000000000..75a6c8bda3
--- /dev/null
+++ b/Documentation/es/texidocs/showing-chords-at-changes.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se pueden imprimir los acordes exclusivamente al comienzo de las
+líneas y cuando cambia el acorde.
+
+"
+  doctitlees = "Imprimir los acordes cuando se produce un cambio"
+
diff --git a/input/texidocs/simple-lead-sheet.texidoc b/Documentation/es/texidocs/simple-lead-sheet.texidoc
similarity index 56%
rename from input/texidocs/simple-lead-sheet.texidoc
rename to Documentation/es/texidocs/simple-lead-sheet.texidoc
index c0a8038721..95f2a87eb1 100644
--- a/input/texidocs/simple-lead-sheet.texidoc
+++ b/Documentation/es/texidocs/simple-lead-sheet.texidoc
@@ -6,9 +6,3 @@ obtenemos una hoja guía de acordes o «lead sheet»:
 "
   doctitlees = "Hoja guía de acordes o «lead sheet» sencilla"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
- texidocde = "
-Ein Liedblatt besteht aus Akkordbezeichnungen, einer Melodie und dem Liedtext:
-
-"
-  doctitlede = "Ein einfaches Liedblatt"
diff --git a/Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc b/Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
new file mode 100644
index 0000000000..e3396a1735
--- /dev/null
+++ b/Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta plantilla facilita la preparación de una canción con melodía,
+letra y acordes.
+
+"
+  doctitlees = "Plantilla de pentagrama único con música, letra y acordes"
+  
diff --git a/input/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc b/Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc
similarity index 100%
rename from input/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc
rename to Documentation/es/texidocs/single-staff-template-with-notes,-lyrics,-chords-and-frets.texidoc
diff --git a/Documentation/es/texidocs/single-staff-template-with-notes-and-chords.texidoc b/Documentation/es/texidocs/single-staff-template-with-notes-and-chords.texidoc
new file mode 100644
index 0000000000..335047e7e3
--- /dev/null
+++ b/Documentation/es/texidocs/single-staff-template-with-notes-and-chords.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+¿Quiere preparar una hoja guía de acordes (o «lead sheet») con
+melodía y acordes?  ¡No busque más!
+
+"
+
+doctitlees = "Plantilla de pentagrama único con música y acordes"
+
diff --git a/Documentation/es/texidocs/single-staff-template-with-notes-and-lyrics.texidoc b/Documentation/es/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
new file mode 100644
index 0000000000..2e9e35ea9f
--- /dev/null
+++ b/Documentation/es/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta pequeña plantilla muestra una melodía sencilla con letra. Córtela
+y péguela, escriba las notas y luego la letra. Este ejemplo desactiva
+el barrado automático, que es lo más frecuente en las partes vocales
+antiguas. Para usar el barrado automático modifique o marque como un
+comentario la línea correspondiente.
+
+"
+  doctitlees = "Plantilla de pentagrama único don notas y letra"
+
diff --git a/Documentation/es/texidocs/single-staff-template-with-only-notes.texidoc b/Documentation/es/texidocs/single-staff-template-with-only-notes.texidoc
new file mode 100644
index 0000000000..89c9857117
--- /dev/null
+++ b/Documentation/es/texidocs/single-staff-template-with-only-notes.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta plantilla simple prepara un pentagrama con notas, adecuado para
+un instrumento solista o un fragmento melódico. Córtelo y péguelo en
+un archivo, escriba las notas y ¡ya está!
+
+"
+  doctitlees = "Plantilla de un solo pentagrama, con notas únicamente"
+
diff --git a/input/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc b/Documentation/es/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
similarity index 50%
rename from input/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
rename to Documentation/es/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
index e5f3852fbe..c57dc85fa0 100644
--- a/input/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
+++ b/Documentation/es/texidocs/snap-pizzicato-markup-bartok-pizzicato.texidoc
@@ -10,14 +10,3 @@ instrucción predefinida para crear esta marca, es fácil hacer la definición
 y colocarla directamente en el archivo de lilypond.
 "
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  doctitlede = "Bartók-Pizzicato"
-  texidocde = "
-Das Bartók-Pizzicato @q{ist eine besondere Form des Pizzicato, bei dem der
-Spieler die Saite auf das Griffbrett aufschlagen lässt, sodass zusätzlich
-zum angeschlagenen Ton ein scharfes, knallendes Geräusch ertönt}
-(Wikipedia).  Es wird dargestellt als kleiner Kreis mit einer vertikalen
-Linie, die vom Kreiszentrum aus nach oben weist und ein Stück außerhalb des
-Kreises endet.  Lilypond hat keinen eigenen Glyphen für dieses Symbol; es
-ist aber einfach, direkt eine Definition in die Eingabedatei einzufügen.
-"
diff --git a/Documentation/es/texidocs/specifying-context-with-beatgrouping.texidoc b/Documentation/es/texidocs/specifying-context-with-beatgrouping.texidoc
new file mode 100644
index 0000000000..3013014872
--- /dev/null
+++ b/Documentation/es/texidocs/specifying-context-with-beatgrouping.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Mediante la especificación del contexto, el efecto de
+@code{beatGrouping} puede limitarse al contexto especificado, y
+sobreescribirse los valores establecidos en contextos de niveles
+más altos.  Las instruccionees @code{\\set} se deben situar
+@emph{después} de todas las instrucciones @code{\\time}:
+
+
+"
+  doctitlees = "Especificar el contexto con beatGrouping"
+
diff --git a/input/texidocs/stand-alone-two-column-markup.texidoc b/Documentation/es/texidocs/stand-alone-two-column-markup.texidoc
similarity index 54%
rename from input/texidocs/stand-alone-two-column-markup.texidoc
rename to Documentation/es/texidocs/stand-alone-two-column-markup.texidoc
index e82d429216..e7cbf95ebd 100644
--- a/input/texidocs/stand-alone-two-column-markup.texidoc
+++ b/Documentation/es/texidocs/stand-alone-two-column-markup.texidoc
@@ -6,10 +6,3 @@ utilizando instrucciones @code{\\markup}:
 "
   doctitlees = "Elemento de marcado de texto independiente en dos columnas"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Isolierter Text kann in mehreren Spalten mit @code{\\markup}-Befehlen
-angeordnet werden:
-
-"
-  doctitlede = "Isolierter Text in zwei Spalten"
diff --git a/Documentation/es/texidocs/stem-and-beam-behavior-in-tablature.texidoc b/Documentation/es/texidocs/stem-and-beam-behavior-in-tablature.texidoc
new file mode 100644
index 0000000000..4b78145209
--- /dev/null
+++ b/Documentation/es/texidocs/stem-and-beam-behavior-in-tablature.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+La dirección de las plicas se contola de la misma forma en la
+tablatura que en la notación tradicional. Las barras se pueden
+poner horizontales, como se muestra en este ejemplo.
+
+"
+  doctitlees = "Comportamiento de las plicas y las barras de corchea en tablaturas"
+
diff --git a/Documentation/es/texidocs/string-quartet-template-simple.texidoc b/Documentation/es/texidocs/string-quartet-template-simple.texidoc
new file mode 100644
index 0000000000..c7cba8d5e0
--- /dev/null
+++ b/Documentation/es/texidocs/string-quartet-template-simple.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta plantilla muestra un cuarteto de cuerda normal. También utiliza
+una sección @code{\\global} para el compás y la armadura
+
+"
+  doctitlees = "Plantilla de cuarteto de cuerda (sencilla)"
+
diff --git a/Documentation/es/texidocs/string-quartet-template-with-separate-parts.texidoc b/Documentation/es/texidocs/string-quartet-template-with-separate-parts.texidoc
new file mode 100644
index 0000000000..b228d3032b
--- /dev/null
+++ b/Documentation/es/texidocs/string-quartet-template-with-separate-parts.texidoc
@@ -0,0 +1,21 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+El fragmento de código \"Plantilla de cuarteto de cuerda\" produce un
+resultado satisfactorio para el cuarteto, pero ¿y si tenemos que
+imprimir las particellas? Esta nueva plantilla muestra cómo usar la
+funcionalidad @code{\\tag} (etiqueta) para dividir fácilmente una
+pieza en particellas indicviduales.
+
+Tenemos que dividir esta plantilla en archivos independientes; los
+nombres de archivo están dentro de los comentarios al principio de
+cada archivo. @code{piece.ly} contiene todas las definiciones de
+música. Los otros archivos (@code{score.ly}, @code{vn1.ly},
+@code{vn2.ly}, @code{vla.ly} y @code{vlc.ly}) producen la particella
+correspondiente.
+
+¡No olvide quitar los comentarios que hemos especificado cuando use
+los archivos independientes!
+
+"
+  doctitlees = "Plantilla de cuarteto de cuerda con particellas independientes"
+  
diff --git a/Documentation/es/texidocs/sub-dividing-beams.texidoc b/Documentation/es/texidocs/sub-dividing-beams.texidoc
new file mode 100644
index 0000000000..c9971559c9
--- /dev/null
+++ b/Documentation/es/texidocs/sub-dividing-beams.texidoc
@@ -0,0 +1,20 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Las barras de semicorcheas (o notas más breves) seguidas no se
+subdividen de forma predeterminada.  Esto es: las tres (o más)
+barras se prolongan, sin dividirse, sobre grupos completos de
+notas.  Este comportamiento se puede modificar para que las barras
+se subdividan en subgrupos mediante el establecimiento de la
+propiedad @code{subdivideBeams}.  Cuando está establecida, las
+diversas barras se subdividen a intervalos definidos por el valor
+actual de la longitud del pulso @code{beatLength} reduciendo las
+barras múltiples a una sola entre los subgrupos.  Observe que el
+valor predeterminado de @code{beatLength} es de una unidad sobre
+el denominador del compás en curso, si no está establecido
+explícitamente.  Se debe establecer al valor de una fracción que
+da la duración el subgrupo de barras utilizando la función
+@code{make-moment}, como se muestra aquí:
+
+"
+  doctitlees = "Subdivisión de las barras de semicorchea"
+
diff --git a/input/texidocs/transcription-of-ancient-music-with-incipit.texidoc b/Documentation/es/texidocs/transcription-of-ancient-music-with-incipit.texidoc
similarity index 100%
rename from input/texidocs/transcription-of-ancient-music-with-incipit.texidoc
rename to Documentation/es/texidocs/transcription-of-ancient-music-with-incipit.texidoc
diff --git a/Documentation/es/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc b/Documentation/es/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
new file mode 100644
index 0000000000..e404497db1
--- /dev/null
+++ b/Documentation/es/texidocs/transposing-pitches-with-minimum-accidentals-smart-transpose.texidoc
@@ -0,0 +1,31 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+doctitlees = "Transportar música con el menor número de alteraciones"
+texidoces = "
+Este ejemplo utiliza código de Scheme para forzar las
+modificaciones enarmónicas de las notas, y así tener el menor
+número de alteraciones accidentales. En este caso se aplican las
+siguientes reglas:
+
+@itemize
+@item
+Se quitan las dobles alteraciones
+
+@item
+Si sostenido -> Do
+
+@item
+Mi sistenido -> Fa
+
+@item
+Do bemol -> Si
+
+@item
+Fa bemol -> Mi
+
+@end itemize
+
+De esta forma se selecciona el mayor número de notas enarmónicas
+naturales.
+
+"
+
diff --git a/Documentation/es/texidocs/tweaking-clef-properties.texidoc b/Documentation/es/texidocs/tweaking-clef-properties.texidoc
new file mode 100644
index 0000000000..e40606158a
--- /dev/null
+++ b/Documentation/es/texidocs/tweaking-clef-properties.texidoc
@@ -0,0 +1,35 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  doctitlees = "Trucaje de las propiedades de clave"
+  texidoces = "
+La instrucción @code{\\clef \"treble_8\"} equivale a un ajuste de
+@code{clefGlyph}, @code{clefPosition} (que controla la posición
+vertical de la clave), @code{middleCPosition} y
+@code{clefOctavation}.  Se imprime una clave cada vez que se
+modifica cualquiera de las propiedades excepto
+@code{middleCPosition}.
+
+Observe que la modificación del glifo, la posición de la clave o
+su octavación, no cambian 'per se' la posición de las siguientes
+notas del pentagrama: para hacer esto también se debe especificar
+la posición del Do central.  Los parámetros posicionales están en
+relación con la tercera línea del pentagrama, los números
+positivos desplazan hacia arriba, contando una unidad por cada
+línea y espacio.  El valor de @code{clefOctavation} se
+establecería normalmente a 7, -7, 15 or -15, pero son válidos
+otros valores.
+
+Cuando se produce un cambio de clave en el salto de línea se
+imprime la clave nueva tanto al final de la línea anterior como al
+principio de la nueva, de forma predeterminada.  Si no se necesita
+la clave de advertencia al final de la línea anterior, se puede
+quitar estableciendo el valor de la propiedad
+@code{explicitClefVisibility} de @code{Staff}, a
+@code{end-of-line-invisible}.  El comportamiento predeterminado se
+puede recuperar con @code{\\unset Staff.explicitClefVisibility}.
+
+Los siguientes ejemplos muestran las posibilidades cuando se
+ajustan estas propiedades manualmente.  En la primera línea, los
+cambios manuales preservan el posicionamiento relativo estándar de
+las claves y las notas, pero no lo hacen en la segunda línea.
+"
+  
diff --git a/Documentation/es/texidocs/tweaking-grace-layout-within-music.texidoc b/Documentation/es/texidocs/tweaking-grace-layout-within-music.texidoc
new file mode 100644
index 0000000000..e29e570866
--- /dev/null
+++ b/Documentation/es/texidocs/tweaking-grace-layout-within-music.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+
+La disposición de las expresiones de adorno se puede cambiar a lo
+largo de toda la música usando las funciones
+@code{add-grace-property} y @code{remove-grace-property}.  El
+ejemplo siguiente borra la definición de la dirección de la plica
+para esta nota de adorno, de manera que las plicas no siemmpre
+apuntan hacia arriba, y cambia la forma predeterminada de las
+cabezas a aspas.
+
+"
+
+  doctitlees = "Trucar la disposición de las notas de adorno dentro de la música"
+
+
diff --git a/Documentation/es/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc b/Documentation/es/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
new file mode 100644
index 0000000000..ecc0910679
--- /dev/null
+++ b/Documentation/es/texidocs/use-square-bracket-at-the-start-of-a-staff-group.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Se puede usar el delimitador de comienzo de un sistema
+@code{SystemStartSquare} estableciéndolo explícitamente dentro de
+un contexto @code{StaffGroup} o @code{ChoirStaffGroup}.
+
+"
+  doctitlees = "Uso del corchete recto al comienzo de un grupo de pentagramas"
+
diff --git a/Documentation/es/texidocs/using-beatlength-and-beatgrouping.texidoc b/Documentation/es/texidocs/using-beatlength-and-beatgrouping.texidoc
new file mode 100644
index 0000000000..1e31d7da47
--- /dev/null
+++ b/Documentation/es/texidocs/using-beatlength-and-beatgrouping.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+La propiedad @code{measureLength} determina dónde se deben insertar
+líneas divisorias y, con @code{beatLength} y @code{beatGrouping}, cómo
+se deben generar las barras autoomáticas para las duraciones de barra
+y compases para los que no hay ninguna regla definida para los finales
+de barra. Este ejemplo muestra distintas dormas de controlar el
+barrado mediante el establecimiento de estas propiedades. Las
+explicaciones están en forma de comentarios dentro del código.
+
+"
+  doctitlees = "Utilización de beatLength y beatGrouping"
+
diff --git a/Documentation/es/texidocs/using-double-slurs-for-legato-chords.texidoc b/Documentation/es/texidocs/using-double-slurs-for-legato-chords.texidoc
new file mode 100644
index 0000000000..b7b0167f24
--- /dev/null
+++ b/Documentation/es/texidocs/using-double-slurs-for-legato-chords.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Algunos compositores escriben dos ligaduras cuando quieren acordes
+legato.  Esto se puede conseguir estableciendo @code{doubleSlurs}.
+
+"
+  doctitlees = "Utilizar ligaduras dobles para acordes legato"
+  
diff --git a/input/texidocs/using-grace-note-slashes-with-normal-heads.texidoc b/Documentation/es/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
similarity index 50%
rename from input/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
rename to Documentation/es/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
index cf12ffb537..ebb1432a43 100644
--- a/input/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
+++ b/Documentation/es/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
@@ -9,11 +9,3 @@ acciaccaturas, en otras situaciones.
   doctitlees = "Utilizar la barra que tacha las notas de adorno con notas normales"
 
 
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Le trait que l'on trouve sur les hampes des acciaccatures peut
-être appliqué dans d'autres situations.
-
-"
-
-  doctitlefr = "Utilisation de hampe barrée pour une note normale"
diff --git a/Documentation/es/texidocs/using-ties-with-arpeggios.texidoc b/Documentation/es/texidocs/using-ties-with-arpeggios.texidoc
new file mode 100644
index 0000000000..0d764b869a
--- /dev/null
+++ b/Documentation/es/texidocs/using-ties-with-arpeggios.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+ doctitlees = "Uso de ligaduras en los arpegios"
+ texidoces = "
+En ocasiones se usan ligaduras de unión para escribir los arpegios.
+En este caso, las dos notas ligadas no tienen que ser consecutivas.
+Esto se puede conseguir estableciendo la propiedad
+@code{tieWaitForNote} al valor @code{#t}.  La misma funcionalidad
+es de utilidad, por ejemplo, para ligar un trémolo a un acorde, pero
+en principio también se puede usar para notas normales consecutivas.
+
+"
+
diff --git a/input/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc b/Documentation/es/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
similarity index 50%
rename from input/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
rename to Documentation/es/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
index 59d3b2dfbf..21c8085f9f 100644
--- a/input/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
+++ b/Documentation/es/texidocs/vertically-aligned-dynamics-and-textscripts.texidoc
@@ -13,17 +13,3 @@ largo de su línea de base.
 "
   doctitlees = "Indicaciones dinámicas y textuales alineadas verticalmente"
   
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Indem man die @code{'Y-extent}-Eigenschaft auf einen passenden Wert setzt,
-können alle @code{DynamicLineSpanner}-Objekte (Crescendo-Klammern und
-Dynamik-Texte)  (hairpins and dynamic texts) unabhängig von ihrer
-wirklichen Ausdehnung an einem gemeinsamen Referenzpunkt ausgerichtet werden.
-Auf diese Weise ist jedes Element vertikal ausgerichtet und der Notensatz
-sieht ansprechender aus.
-
-Die gleiche Idee wird benutzt, um Textbeschriftungen an ihrer
-Grundlinie auszurichten.
-
-"
-  doctitlede = "Vertikale Ausrichtung von Dynamik und Textbeschriftung beeinflussen"
diff --git a/input/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc b/Documentation/es/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc
similarity index 100%
rename from input/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc
rename to Documentation/es/texidocs/vertically-aligning-dynamics-across-multiple-notes.texidoc
diff --git a/input/texidocs/vertically-aligning-ossias-and-lyrics.texidoc b/Documentation/es/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
similarity index 50%
rename from input/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
rename to Documentation/es/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
index de1ad06530..f3225992a0 100644
--- a/input/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
+++ b/Documentation/es/texidocs/vertically-aligning-ossias-and-lyrics.texidoc
@@ -7,11 +7,3 @@ controlar la posición de la letra y los compases de ossia.
 "
   doctitlees = "Alineación vertical de la letra y los compases de ossia"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Dieser Schnipsel zeigt, wie man die Kontexteigenschaften
-@code{alignBelowContext} und @code{alignAboveContext} benutzen kann, um
-die Positionierung von Gesangstext und Ossia-Abschnitten zu kontrollieren.
-
-"
-  doctitlede = "Gesangstext und Ossia vertikal ausrichten"
diff --git a/Documentation/es/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc b/Documentation/es/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
new file mode 100644
index 0000000000..194011d243
--- /dev/null
+++ b/Documentation/es/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta plantilla añade una reducción de piano automática a la partitura
+vocal SATB estándar que se mostró en la \"Plantilla de conjunto
+vocal\". Esto presenta uno de los puntos fuertes de LilyPond: podemos
+usar una definición de música más de una vez. Si se hace cualquier
+cambio en las notas de la parte vocal (digamos @code{tenorMusic}),
+entonces los cambios se aplicarán también a la reducción de piano.
+
+"
+  doctitlees = "Plantilla de conjunto vocal con reducción de piano automática"
+  
diff --git a/Documentation/es/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc b/Documentation/es/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
new file mode 100644
index 0000000000..d6bbe43038
--- /dev/null
+++ b/Documentation/es/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+Esta plantilla es, básicamente, la misma que la sencilla plantilla
+\"Conjunto vocal\", excepto que aquí todas las líneas de letra se
+colocan utilizando @code{alignAboveContext} y
+@code{alignBelowContext}.
+
+"
+  doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
+  
diff --git a/Documentation/es/texidocs/vocal-ensemble-template.texidoc b/Documentation/es/texidocs/vocal-ensemble-template.texidoc
new file mode 100644
index 0000000000..563123266c
--- /dev/null
+++ b/Documentation/es/texidocs/vocal-ensemble-template.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+  texidoces = "
+He aquí una partitura vocal estándar para cuatro voces SATB. Con
+grupos mayores, suele ser útil incluir una sección que aparezca en
+todas las partes.  Por ejemplo, el compás y la armadura casi siempre
+son los mismos para todas. Como en la plantilla \"Himno\", las cuatro
+voces se reagrupan en sólo dos pentagramas.
+
+"
+  doctitlees = "Plantilla de conjunto vocal"
+
diff --git a/input/texidocs/volta-below-chords.texidoc b/Documentation/es/texidocs/volta-below-chords.texidoc
similarity index 50%
rename from input/texidocs/volta-below-chords.texidoc
rename to Documentation/es/texidocs/volta-below-chords.texidoc
index 83af64fc3e..42ceb2b5dc 100644
--- a/input/texidocs/volta-below-chords.texidoc
+++ b/Documentation/es/texidocs/volta-below-chords.texidoc
@@ -8,11 +8,3 @@ segunda vez debajo de los acordes.
   doctitlees = "Corchetes de primera y segunda vez debajo de los acordes"
 
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Indem man den @code{Volta_engraver} zu dem entsprechenden Notensystem
-hinzufügt, können Wiederholungsklammern unterhalb der Akkorde gesetzt
-werden.
-
-"
-  doctitlede = "Wiederholungs-(Volta-)Klammern unterhalb der Akkordsymbole"
diff --git a/Documentation/es/topdocs/GNUmakefile b/Documentation/es/topdocs/GNUmakefile
deleted file mode 100644
index ac7500444d..0000000000
--- a/Documentation/es/topdocs/GNUmakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-depth = ../../..
-
-ISOLANG=es
-
-STEPMAKE_TEPLATES=documentation tex topdocs
-LOCALSTEPMAKE_TEMPLATES=lilypond ly doc-i18n-topdocs
-
-include $(depth)/make/stepmake.make
diff --git a/Documentation/es/user/GNUmakefile b/Documentation/es/user/GNUmakefile
deleted file mode 100644
index 4a3d585310..0000000000
--- a/Documentation/es/user/GNUmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ISOLANG = es
-depth = ../../..
-LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-include $(depth)/make/stepmake.make
diff --git a/Documentation/user/fdl.itexi b/Documentation/fdl.itexi
similarity index 100%
rename from Documentation/user/fdl.itexi
rename to Documentation/fdl.itexi
diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile
index ad17d7e4cc..ec7606bfd2 100644
--- a/Documentation/fr/GNUmakefile
+++ b/Documentation/fr/GNUmakefile
@@ -1,7 +1,7 @@
 ISOLANG = fr
 depth = ../..
-SUBDIRS = user
+SUBDIRS = application learning notation texidocs
 STEPMAKE_TEMPLATES = documentation
-LOCALSTEPMAKE_TEMPLATES = doc-i18n-root
+LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 
 include $(depth)/make/stepmake.make
diff --git a/Documentation/fr/user/lilypond-program.tely b/Documentation/fr/application.tely
similarity index 91%
rename from Documentation/fr/user/lilypond-program.tely
rename to Documentation/fr/application.tely
index edd4081cc8..b1c3ec0735 100644
--- a/Documentation/fr/user/lilypond-program.tely
+++ b/Documentation/fr/application.tely
@@ -33,14 +33,14 @@
 @ifhtml
 @ifclear bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond-program.fr.pdf,format PDF},
+@uref{source/Documentation/application.fr.pdf,format PDF},
 et en une seule
-@uref{source/Documentation/user/lilypond-program-big-page.fr.html,grande page}.
+@uref{source/Documentation/application-big-page.fr.html,grande page}.
 @end ifclear
 @ifset bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond-program.fr.pdf,format PDF},
-et en @uref{source/Documentation/user/lilypond-program/index.fr.html,pages HTML
+@uref{source/Documentation/application.fr.pdf,format PDF},
+et en @uref{source/Documentation/application/index.fr.html,pages HTML
 séparées}.
 @end ifset
 @end ifhtml
@@ -164,11 +164,11 @@ Annexes
 @contents
 
 
-@include install.itely
-@include setup.itely
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
+@include application/install.itely
+@include application/setup.itely
+@include application/running.itely
+@include application/lilypond-book.itely
+@include application/converters.itely
 
 @include fdl.itexi
 
diff --git a/Documentation/fr/application/GNUmakefile b/Documentation/fr/application/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/fr/application/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/fr/user/converters.itely b/Documentation/fr/application/converters.itely
similarity index 99%
rename from Documentation/fr/user/converters.itely
rename to Documentation/fr/application/converters.itely
index 58fa6f00fd..524e0e9aa2 100644
--- a/Documentation/fr/user/converters.itely
+++ b/Documentation/fr/application/converters.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: e2070eadd7d3d7a87450aab195a48945ee0b144a
 
diff --git a/Documentation/fr/user/install.itely b/Documentation/fr/application/install.itely
similarity index 98%
rename from Documentation/fr/user/install.itely
rename to Documentation/fr/application/install.itely
index 9c194308bf..69973a688e 100644
--- a/Documentation/fr/user/install.itely
+++ b/Documentation/fr/application/install.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: db53c05f11bea8831733b1fdf7ebe32cb1f491f4
 
diff --git a/Documentation/fr/user/lilypond-book.itely b/Documentation/fr/application/lilypond-book.itely
similarity index 98%
rename from Documentation/fr/user/lilypond-book.itely
rename to Documentation/fr/application/lilypond-book.itely
index e25a3c965f..29d5d5283e 100644
--- a/Documentation/fr/user/lilypond-book.itely
+++ b/Documentation/fr/application/lilypond-book.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
 
diff --git a/Documentation/fr/user/running.itely b/Documentation/fr/application/running.itely
similarity index 96%
rename from Documentation/fr/user/running.itely
rename to Documentation/fr/application/running.itely
index 7547dc4188..3bc0f7b684 100644
--- a/Documentation/fr/user/running.itely
+++ b/Documentation/fr/application/running.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
 
diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/application/setup.itely
similarity index 99%
rename from Documentation/fr/user/setup.itely
rename to Documentation/fr/application/setup.itely
index ae0e93be75..bb4ff5a435 100644
--- a/Documentation/fr/user/setup.itely
+++ b/Documentation/fr/application/setup.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: e2070eadd7d3d7a87450aab195a48945ee0b144a
 
diff --git a/Documentation/fr/user/dedication.itely b/Documentation/fr/dedication.itely
similarity index 92%
rename from Documentation/fr/user/dedication.itely
rename to Documentation/fr/dedication.itely
index d1bda51268..15a76811e2 100644
--- a/Documentation/fr/user/dedication.itely
+++ b/Documentation/fr/dedication.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d56aa8181857c5feabf303ae88e716eba069f0a9
 
diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in
index da2d55073c..3d88ff3857 100644
--- a/Documentation/fr/index.html.in
+++ b/Documentation/fr/index.html.in
@@ -35,21 +35,21 @@
 	  <ul>
 	    <li>
 	      <a class="title"
-		 href="user/lilypond-learning/index.fr.html">Manuel d'initiation</a>
-	      (partiellement traduit,<br>aussi en <a class="title" href="user/lilypond-learning-big-page.fr.html">page
+		 href="learning/index.fr.html">Manuel d'initiation</a>
+	      (partiellement traduit,<br>aussi en <a class="title" href="learning-big-page.fr.html">page
 	      unique</a> ~ 1,5 Mo, ou
-	      <a class="title" href="user/lilypond-learning.fr.pdf">au format PDF</a>)
+	      <a class="title" href="learning.fr.pdf">au format PDF</a>)
               <br>&mdash; commencer ici</li>
-	    <li><a class="title" href="user/music-glossary/index.html">Glossaire</a>
+	    <li><a class="title" href="music-glossary/index.html">Glossaire</a>
 	      multilingue<br>(aussi en
-	      <a class="title" href="user/music-glossary-big-page.html">page unique</a>
-	      ~ 500 ko, ou <a class="title" href="user/music-glossary.pdf">au format PDF</a>)
+	      <a class="title" href="music-glossary-big-page.html">page unique</a>
+	      ~ 500 ko, ou <a class="title" href="music-glossary.pdf">au format PDF</a>)
               <br>&mdash; vocabulaire théorique de la musique</li>
 	  </ul>
 	  </td>
 	  <td class="right-column">
 	  <ul>
-            <li><a class="title" href="topdocs/NEWS.html">Nouveautés</a>
+            <li><a class="title" href="changes.html">Nouveautés</a>
             <br>&mdash; changements depuis la version majeure précédente</li>
 	    <li><a class="title" href="../examples.html">Exemples</a>
             <br>&mdash; quelques exemples</li>
@@ -60,30 +60,30 @@
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-	      <a class="title" href="user/lilypond/index.fr.html">Manuel de notation</a>
+	      <a class="title" href="notation/index.fr.html">Manuel de notation</a>
 	      (partiellement traduit,<br>aussi en <a class="title"
-				href="user/lilypond-big-page.fr.html">page unique</a> ~ 4 Mo, ou
-	        <a class="title" href="user/lilypond.fr.pdf">au format PDF</a>)
+				href="notation-big-page.fr.html">page unique</a> ~ 4 Mo, ou
+	        <a class="title" href="notation.fr.pdf">au format PDF</a>)
                 <br>&mdash; gravure de musique avec LilyPond</li>
 	    <li>
-	      <a  class="title" href="user/lilypond-internals/index.html">Référence des propriétés internes</a>
-	      <br>(en anglais, aussi en <a class="title" href="user/lilypond-internals-big-page.html">page
+	      <a  class="title" href="internals/index.html">Référence des propriétés internes</a>
+	      <br>(en anglais, aussi en <a class="title" href="internals-big-page.html">page
 		unique</a> ~ 1 Mo, <a class="title"
-		href="user/lilypond-internals.pdf">au format PDF</a>)
+		href="internals.pdf">au format PDF</a>)
               <br>&mdash; définitions pour les retouches</li>
 	  </ul>
 	  </td>
 	  <td valign="baseline" class="right-column">
 	  <ul>
             <li>
-	    <a class="title" href="user/lilypond-program/index.fr.html">Utilisation des programmes</a>
+	    <a class="title" href="application/index.fr.html">Utilisation des programmes</a>
 (partiellement traduit,<br>aussi en <a class="title"
-		href="user/lilypond-program-big-page.fr.html">page unique</a>, ou
-	    <a class="title" href="user/lilypond-program.fr.pdf">au format PDF</a>)
+		href="application-big-page.fr.html">page unique</a>, ou
+	    <a class="title" href="application.fr.pdf">au format PDF</a>)
             <br>&mdash; installation et exécution des programmes</li>
-	    <li><a class="title" href="../input/lsr/lilypond-snippets/index.html">Exemples de code</a>
-(en anglais, aussi en <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">page unique</a> ~ 2 Mo,
-au format <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
+	    <li><a class="title" href="snippets/index.html">Exemples de code</a>
+(en anglais, aussi en <a class="title" href="snippets-big-page.html">page unique</a> ~ 2 Mo,
+au format <a class="title" href="snippets.pdf">PDF</a>)
             <br>&mdash; petits trucs, astuces et exemples</li>
 	  </ul>
 	  </td>
@@ -91,7 +91,7 @@ au format <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
        <ul>
-            <li><a class="title"  href="devel/index.html">Ressources de développement</a>
+            <li><a class="title"  href="devel.html">Ressources de développement</a>
             <br>&mdash; documentation pour les développeurs et contributeurs</li>
        </ul>
     </td><td class="right-column">
diff --git a/Documentation/fr/user/lilypond-learning.tely b/Documentation/fr/learning.tely
similarity index 91%
rename from Documentation/fr/user/lilypond-learning.tely
rename to Documentation/fr/learning.tely
index 0acb5e735e..4250721ce5 100644
--- a/Documentation/fr/user/lilypond-learning.tely
+++ b/Documentation/fr/learning.tely
@@ -35,14 +35,14 @@
 @ifhtml
 @ifclear bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond-learning.fr.pdf,format PDF},
+@uref{source/Documentation/learning.fr.pdf,format PDF},
 et en une seule
-@uref{source/Documentation/user/lilypond-learning-big-page.fr.html,grande page}.
+@uref{source/Documentation/learning-big-page.fr.html,grande page}.
 @end ifclear
 @ifset bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond-learning.fr.pdf,format PDF},
-et en @uref{source/Documentation/user/lilypond-learning/index.fr.html,pages HTML
+@uref{source/Documentation/learning.fr.pdf,format PDF},
+et en @uref{source/Documentation/learning/index.fr.html,pages HTML
 séparées}.
 @end ifset
 @end ifhtml
@@ -193,15 +193,15 @@ Annexes
 @contents
 
 
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include fundamental.itely
-@include tweaks.itely
-@include working.itely
+@include learning/preface.itely
+@include learning/introduction.itely
+@include learning/tutorial.itely
+@include learning/fundamental.itely
+@include learning/tweaks.itely
+@include learning/working.itely
 
-@include templates.itely
-@include scheme-tutorial.itely
+@include learning/templates.itely
+@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index
diff --git a/Documentation/fr/learning/GNUmakefile b/Documentation/fr/learning/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/fr/learning/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/learning/fundamental.itely
similarity index 99%
rename from Documentation/fr/user/fundamental.itely
rename to Documentation/fr/learning/fundamental.itely
index 47eca98f52..6036a96b8c 100644
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/learning/fundamental.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: db53c05f11bea8831733b1fdf7ebe32cb1f491f4
 
diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/learning/introduction.itely
similarity index 99%
rename from Documentation/fr/user/introduction.itely
rename to Documentation/fr/learning/introduction.itely
index e6be0be6fc..264aa632a8 100644
--- a/Documentation/fr/user/introduction.itely
+++ b/Documentation/fr/learning/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-kearning.tely
+
 @ignore
     Translation of GIT committish: db53c05f11bea8831733b1fdf7ebe32cb1f491f4
 
diff --git a/Documentation/fr/user/preface.itely b/Documentation/fr/learning/preface.itely
similarity index 98%
rename from Documentation/fr/user/preface.itely
rename to Documentation/fr/learning/preface.itely
index fa3c3e5d73..9a26801c4e 100644
--- a/Documentation/fr/user/preface.itely
+++ b/Documentation/fr/learning/preface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 65dd8bb120476562eb0104c6969d72d8b105ac8f
 
diff --git a/Documentation/fr/user/scheme-tutorial.itely b/Documentation/fr/learning/scheme-tutorial.itely
similarity index 91%
rename from Documentation/fr/user/scheme-tutorial.itely
rename to Documentation/fr/learning/scheme-tutorial.itely
index aae9ec71c3..fc86fd773b 100644
--- a/Documentation/fr/user/scheme-tutorial.itely
+++ b/Documentation/fr/learning/scheme-tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
 
diff --git a/Documentation/fr/user/templates.itely b/Documentation/fr/learning/templates.itely
similarity index 97%
rename from Documentation/fr/user/templates.itely
rename to Documentation/fr/learning/templates.itely
index 7fc8a1268a..3d61cfaf27 100644
--- a/Documentation/fr/user/templates.itely
+++ b/Documentation/fr/learning/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: dd7767dcac679762a47fb629fd8e516d9ac954b4
 
diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/learning/tutorial.itely
similarity index 99%
rename from Documentation/fr/user/tutorial.itely
rename to Documentation/fr/learning/tutorial.itely
index 52c6a0b606..0020058a5f 100644
--- a/Documentation/fr/user/tutorial.itely
+++ b/Documentation/fr/learning/tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
    Translation of GIT committish: f413550b658b43fbea690fc060f872bce6bbc885
 
diff --git a/Documentation/fr/user/tweaks.itely b/Documentation/fr/learning/tweaks.itely
similarity index 99%
rename from Documentation/fr/user/tweaks.itely
rename to Documentation/fr/learning/tweaks.itely
index 2f4df59bc6..910088b786 100644
--- a/Documentation/fr/user/tweaks.itely
+++ b/Documentation/fr/learning/tweaks.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
 	Translation of GIT committish: 90a367b11c50bd1fe242656715f807d1445225d7
 
diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/learning/working.itely
similarity index 99%
rename from Documentation/fr/user/working.itely
rename to Documentation/fr/learning/working.itely
index 763724d3c9..82a0b49aa1 100644
--- a/Documentation/fr/user/working.itely
+++ b/Documentation/fr/learning/working.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
    Translation of GIT committish: 148e80b8992a7fb9d59ec439c00b79decbbe3bad
 
diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/macros.itexi
similarity index 74%
rename from Documentation/fr/user/macros.itexi
rename to Documentation/fr/macros.itexi
index 1e4e7c7408..0be4552ecb 100644
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -158,51 +158,51 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
+@ref{\TEXT\,,,learning-big-page,Manuel d'initiation}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manuel d'initiation}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Manuel d'initiation}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Manuel de notation}
+@ref{\TEXT\,,,notation-big-page,Manuel de notation}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,application-big-page,Manuel d'utilisation du programme}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Manuel d'utilisation du programme}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Manuel d'utilisation du programme}
 @end macro
 
 @macro rlsr{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@ref{\TEXT\,,,snippets-big-page,Exemples de code}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Exemples de code}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Exemples de code}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
+@ref{\TEXT\,,,internals-big-page,Référence des propriétés internes}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
+@ref{\TEXT\,,,internals-big-page,Référence des propriétés internes}
 @end macro
 
 @end ifset
@@ -224,51 +224,51 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,,learning,Manuel d'initiation}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,\DISPLAY\,learning,Manuel d'initiation}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,,notation,Manuel de notation}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,notation,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,application,Manuel d'utilisation du programme}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,\DISPLAY\,application,Manuel d'utilisation du programme}
 @end macro
 
 @macro rlsr{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,,snippets,Exemples de code}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,\DISPLAY\,snippets,Exemples de code}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,internals,Référence des propriétés internes}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,internals,Référence des propriétés internes}
 @end macro
 
 @end ifclear
@@ -302,52 +302,52 @@
 
 @macro rlearning{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
+@ref{\TEXT\,,,learning.fr,Manuel d'initiation}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation}
+@ref{\TEXT\,,\DISPLAY\,learning.fr,Manuel d'initiation}
 @end macro
 
 @macro ruser{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
+@ref{\TEXT\,,,notation.fr,Manuel de notation}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,notation.fr,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,application.fr,Manuel d'utilisation du programme}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme}
+@ref{\TEXT\,,\DISPLAY\,application.fr,Manuel d'utilisation du programme}
 @end macro
 
 @macro rlsr{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,,snippets,Exemples de code}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,\DISPLAY\,snippets,Exemples de code}
 @end macro
 
 @macro rinternals{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,internals,Référence des propriétés internes}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,internals,Référence des propriétés internes}
 @end macro
 
 @end iftex
diff --git a/Documentation/fr/user/lilypond.tely b/Documentation/fr/notation.tely
similarity index 90%
rename from Documentation/fr/user/lilypond.tely
rename to Documentation/fr/notation.tely
index 6d20b1f6a7..6bc4f60b47 100644
--- a/Documentation/fr/user/lilypond.tely
+++ b/Documentation/fr/notation.tely
@@ -36,14 +36,14 @@
 @ifhtml
 @ifclear bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond.fr.pdf,format PDF},
+@uref{source/Documentation/notation.fr.pdf,format PDF},
 et en une seule
-@uref{source/Documentation/user/lilypond-big-page.fr.html,grande page}.
+@uref{source/Documentation/notation-big-page.fr.html,grande page}.
 @end ifclear
 @ifset bigpage
 Ce document est également disponible au
-@uref{source/Documentation/user/lilypond.fr.pdf,format PDF},
-et en @uref{source/Documentation/user/lilypond/index.fr.html,pages HTML
+@uref{source/Documentation/notation.fr.pdf,format PDF},
+et en @uref{source/Documentation/notation/index.fr.html,pages HTML
 séparées}.
 @end ifset
 @end ifhtml
@@ -172,19 +172,19 @@ Annexes
 @contents
 
 
-@include notation.itely
-@include specialist.itely
+@include notation/notation.itely
+@include notation/specialist.itely
 
-@include input.itely
-@include spacing.itely
+@include notation/input.itely
+@include notation/spacing.itely
 
-@include changing-defaults.itely
-@include programming-interface.itely
+@include notation/changing-defaults.itely
+@include notation/programming-interface.itely
 
 
-@include literature.itely
-@include notation-appendices.itely
-@include cheatsheet.itely
+@include notation/literature.itely
+@include notation/notation-appendices.itely
+@include notation/cheatsheet.itely
 @include fdl.itexi
 
 @node LilyPond command index
diff --git a/Documentation/fr/notation/GNUmakefile b/Documentation/fr/notation/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/fr/notation/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/fr/user/ancient.itely b/Documentation/fr/notation/ancient.itely
similarity index 99%
rename from Documentation/fr/user/ancient.itely
rename to Documentation/fr/notation/ancient.itely
index bb89e3dfdb..7dd7e5bce6 100644
--- a/Documentation/fr/user/ancient.itely
+++ b/Documentation/fr/notation/ancient.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: bdf8540b74167817eab96ed3d13b35477217f9fe
 
diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/notation/changing-defaults.itely
similarity index 99%
rename from Documentation/fr/user/changing-defaults.itely
rename to Documentation/fr/notation/changing-defaults.itely
index 3134ce3c61..191327aa2a 100644
--- a/Documentation/fr/user/changing-defaults.itely
+++ b/Documentation/fr/notation/changing-defaults.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb
 
diff --git a/Documentation/fr/user/cheatsheet.itely b/Documentation/fr/notation/cheatsheet.itely
similarity index 99%
rename from Documentation/fr/user/cheatsheet.itely
rename to Documentation/fr/notation/cheatsheet.itely
index 15ab67b2a2..aa1e756c6a 100644
--- a/Documentation/fr/user/cheatsheet.itely
+++ b/Documentation/fr/notation/cheatsheet.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 65dd8bb120476562eb0104c6969d72d8b105ac8f
 
diff --git a/Documentation/fr/user/chords.itely b/Documentation/fr/notation/chords.itely
similarity index 99%
rename from Documentation/fr/user/chords.itely
rename to Documentation/fr/notation/chords.itely
index 9033a3a785..3b7cb926d8 100644
--- a/Documentation/fr/user/chords.itely
+++ b/Documentation/fr/notation/chords.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: bdf8540b74167817eab96ed3d13b35477217f9fe
 
diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/notation/editorial.itely
similarity index 100%
rename from Documentation/fr/user/editorial.itely
rename to Documentation/fr/notation/editorial.itely
diff --git a/Documentation/fr/user/expressive.itely b/Documentation/fr/notation/expressive.itely
similarity index 100%
rename from Documentation/fr/user/expressive.itely
rename to Documentation/fr/notation/expressive.itely
diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/notation/fretted-strings.itely
similarity index 99%
rename from Documentation/fr/user/fretted-strings.itely
rename to Documentation/fr/notation/fretted-strings.itely
index efd072c0a6..086bb07711 100644
--- a/Documentation/fr/user/fretted-strings.itely
+++ b/Documentation/fr/notation/fretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
 
diff --git a/Documentation/fr/user/input.itely b/Documentation/fr/notation/input.itely
similarity index 99%
rename from Documentation/fr/user/input.itely
rename to Documentation/fr/notation/input.itely
index cd57700c3d..c78e8154f7 100644
--- a/Documentation/fr/user/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: d9b4bfc69674eb4ed7b8c6eaa0b646f00eae6c8d
 
diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/notation/keyboards.itely
similarity index 99%
rename from Documentation/fr/user/keyboards.itely
rename to Documentation/fr/notation/keyboards.itely
index a1dbec32d8..9b7ac8726f 100644
--- a/Documentation/fr/user/keyboards.itely
+++ b/Documentation/fr/notation/keyboards.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 15ef26d4cde4d2d170e88a13867169d4e75026ae
 
diff --git a/Documentation/fr/user/literature.itely b/Documentation/fr/notation/literature.itely
similarity index 90%
rename from Documentation/fr/user/literature.itely
rename to Documentation/fr/notation/literature.itely
index 835d73faf4..8ec561d8bc 100644
--- a/Documentation/fr/user/literature.itely
+++ b/Documentation/fr/notation/literature.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
 
diff --git a/Documentation/fr/user/notation-appendices.itely b/Documentation/fr/notation/notation-appendices.itely
similarity index 98%
rename from Documentation/fr/user/notation-appendices.itely
rename to Documentation/fr/notation/notation-appendices.itely
index be3d9adb1e..d443b9ec3f 100644
--- a/Documentation/fr/user/notation-appendices.itely
+++ b/Documentation/fr/notation/notation-appendices.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
 
diff --git a/Documentation/fr/user/notation.itely b/Documentation/fr/notation/notation.itely
similarity index 77%
rename from Documentation/fr/user/notation.itely
rename to Documentation/fr/notation/notation.itely
index 6cb983e447..530b6c8477 100644
--- a/Documentation/fr/user/notation.itely
+++ b/Documentation/fr/notation/notation.itely
@@ -24,12 +24,12 @@ Ce chapitre explique comment créer la notation musicale standard.
 * Text::               ajout de texte à la partition.
 @end menu
 
-@include pitches.itely
-@include rhythms.itely
-@include expressive.itely
-@include repeats.itely
-@include simultaneous.itely
-@include staff.itely
-@include editorial.itely
-@include text.itely
+@include notation/pitches.itely
+@include notation/rhythms.itely
+@include notation/expressive.itely
+@include notation/repeats.itely
+@include notation/simultaneous.itely
+@include notation/staff.itely
+@include notation/editorial.itely
+@include notation/text.itely
 
diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/notation/percussion.itely
similarity index 99%
rename from Documentation/fr/user/percussion.itely
rename to Documentation/fr/notation/percussion.itely
index 4e3d1220ae..1845a3b630 100644
--- a/Documentation/fr/user/percussion.itely
+++ b/Documentation/fr/notation/percussion.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: bdf8540b74167817eab96ed3d13b35477217f9fe
 
diff --git a/Documentation/fr/user/pitches.itely b/Documentation/fr/notation/pitches.itely
similarity index 100%
rename from Documentation/fr/user/pitches.itely
rename to Documentation/fr/notation/pitches.itely
diff --git a/Documentation/fr/user/programming-interface.itely b/Documentation/fr/notation/programming-interface.itely
similarity index 99%
rename from Documentation/fr/user/programming-interface.itely
rename to Documentation/fr/notation/programming-interface.itely
index c11bfb4244..d1a4865ac4 100644
--- a/Documentation/fr/user/programming-interface.itely
+++ b/Documentation/fr/notation/programming-interface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 76de7e168dbc9ffc7671d99663c5ce50dae42abb
 
diff --git a/Documentation/fr/user/repeats.itely b/Documentation/fr/notation/repeats.itely
similarity index 100%
rename from Documentation/fr/user/repeats.itely
rename to Documentation/fr/notation/repeats.itely
diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/notation/rhythms.itely
similarity index 100%
rename from Documentation/fr/user/rhythms.itely
rename to Documentation/fr/notation/rhythms.itely
diff --git a/Documentation/fr/user/simultaneous.itely b/Documentation/fr/notation/simultaneous.itely
similarity index 100%
rename from Documentation/fr/user/simultaneous.itely
rename to Documentation/fr/notation/simultaneous.itely
diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/notation/spacing.itely
similarity index 99%
rename from Documentation/fr/user/spacing.itely
rename to Documentation/fr/notation/spacing.itely
index 23a85a5e8a..d9cb71c9d4 100644
--- a/Documentation/fr/user/spacing.itely
+++ b/Documentation/fr/notation/spacing.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 964d024dd4f022ba7cd66adc13c0169035d4c4e5
 
diff --git a/Documentation/fr/user/specialist.itely b/Documentation/fr/notation/specialist.itely
similarity index 69%
rename from Documentation/fr/user/specialist.itely
rename to Documentation/fr/notation/specialist.itely
index d4e7647283..f005a2d15f 100644
--- a/Documentation/fr/user/specialist.itely
+++ b/Documentation/fr/notation/specialist.itely
@@ -26,12 +26,12 @@ spécifique à certains intruments ou certaines époques.
 * World music::
 @end menu
 
-@include vocal.itely
-@include keyboards.itely
-@include unfretted-strings.itely
-@include fretted-strings.itely
-@include percussion.itely
-@include wind.itely
-@include chords.itely
-@include ancient.itely
-@include world.itely
+@include notation/vocal.itely
+@include notation/keyboards.itely
+@include notation/unfretted-strings.itely
+@include notation/fretted-strings.itely
+@include notation/percussion.itely
+@include notation/wind.itely
+@include notation/chords.itely
+@include notation/ancient.itely
+@include notation/world.itely
diff --git a/Documentation/fr/user/staff.itely b/Documentation/fr/notation/staff.itely
similarity index 100%
rename from Documentation/fr/user/staff.itely
rename to Documentation/fr/notation/staff.itely
diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/notation/text.itely
similarity index 100%
rename from Documentation/fr/user/text.itely
rename to Documentation/fr/notation/text.itely
diff --git a/Documentation/fr/user/unfretted-strings.itely b/Documentation/fr/notation/unfretted-strings.itely
similarity index 99%
rename from Documentation/fr/user/unfretted-strings.itely
rename to Documentation/fr/notation/unfretted-strings.itely
index ed94098017..d8890ae8df 100644
--- a/Documentation/fr/user/unfretted-strings.itely
+++ b/Documentation/fr/notation/unfretted-strings.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
 
diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/notation/vocal.itely
similarity index 99%
rename from Documentation/fr/user/vocal.itely
rename to Documentation/fr/notation/vocal.itely
index 1e843d60d3..76b83a585d 100644
--- a/Documentation/fr/user/vocal.itely
+++ b/Documentation/fr/notation/vocal.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: bdf8540b74167817eab96ed3d13b35477217f9fe
 
diff --git a/Documentation/fr/user/wind.itely b/Documentation/fr/notation/wind.itely
similarity index 99%
rename from Documentation/fr/user/wind.itely
rename to Documentation/fr/notation/wind.itely
index f3b4f8047f..a480a2c407 100644
--- a/Documentation/fr/user/wind.itely
+++ b/Documentation/fr/notation/wind.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: a6b100669bfc3847b3a03029d6a46ee9b1609e73
 
diff --git a/Documentation/fr/user/world.itely b/Documentation/fr/notation/world.itely
similarity index 96%
rename from Documentation/fr/user/world.itely
rename to Documentation/fr/notation/world.itely
index c0f41d4d25..fc43ca0121 100644
--- a/Documentation/fr/user/world.itely
+++ b/Documentation/fr/notation/world.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 4a527608c5ff2ce31e596495d00dce181dc1b9ea
 
diff --git a/Documentation/fr/texidocs/GNUmakefile b/Documentation/fr/texidocs/GNUmakefile
new file mode 100644
index 0000000000..0ffa75869c
--- /dev/null
+++ b/Documentation/fr/texidocs/GNUmakefile
@@ -0,0 +1,5 @@
+depth=../../..
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc)
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/fr/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc b/Documentation/fr/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
new file mode 100644
index 0000000000..8ae5be82b1
--- /dev/null
+++ b/Documentation/fr/texidocs/adding-a-figured-bass-above-or-below-the-notes.texidoc
@@ -0,0 +1,2 @@
+%% Translation of GIT committish: 7eb450e8e6c935410b8f3212cb53e5a731f4f33f
+  doctitlefr = "Ajout d'une basse chiffrée au-dessus ou au-dessous des notes"
diff --git a/input/texidocs/adding-drum-parts.texidoc b/Documentation/fr/texidocs/adding-drum-parts.texidoc
similarity index 52%
rename from input/texidocs/adding-drum-parts.texidoc
rename to Documentation/fr/texidocs/adding-drum-parts.texidoc
index acbe084ecf..a748b708cc 100644
--- a/input/texidocs/adding-drum-parts.texidoc
+++ b/Documentation/fr/texidocs/adding-drum-parts.texidoc
@@ -1,16 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Mediante la utilización de las potentes herramientas preconfiguradas
-como la función @code{\\drummode} y el contexto @code{DrumStaff}, la
-introducción de partes para percusión es muy fácil: las percusiones se
-sitúan en sus propias posiciones de pentagrama (con una clave
-especial) y tienen las cabezas correspondientes al instrumento.  Es
-posible añadir un símbolo adicional a la percusión o reducir el número
-de líneas.
-
-"
-  doctitlees = "Escritura de partes de percusión"
-
 %% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
   texidocfr = "
 Grâce à la puissance des outils préconfigurés tels que la fonction
diff --git a/input/texidocs/adding-fingerings-to-tablatures.texidoc b/Documentation/fr/texidocs/adding-fingerings-to-tablatures.texidoc
similarity index 100%
rename from input/texidocs/adding-fingerings-to-tablatures.texidoc
rename to Documentation/fr/texidocs/adding-fingerings-to-tablatures.texidoc
diff --git a/input/texidocs/adding-the-current-date-to-a-score.texidoc b/Documentation/fr/texidocs/adding-the-current-date-to-a-score.texidoc
similarity index 50%
rename from input/texidocs/adding-the-current-date-to-a-score.texidoc
rename to Documentation/fr/texidocs/adding-the-current-date-to-a-score.texidoc
index 9383795840..925595dd0a 100644
--- a/input/texidocs/adding-the-current-date-to-a-score.texidoc
+++ b/Documentation/fr/texidocs/adding-the-current-date-to-a-score.texidoc
@@ -1,10 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Con algo de código de Scheme, se puede añadir fácilmente la fecha
-actual a una partitura.
-"
-  doctitlees = "Añadir la fecha actual a una partitura"
-  
 %% Translation of GIT committish: 7eb450e8e6c935410b8f3212cb53e5a731f4f33f
   texidocfr = "
 Avec un peu de code Scheme, voici comment ajouter facilement
diff --git a/Documentation/fr/texidocs/adjusting-lyrics-vertical-spacing.texidoc b/Documentation/fr/texidocs/adjusting-lyrics-vertical-spacing.texidoc
new file mode 100644
index 0000000000..5675767b90
--- /dev/null
+++ b/Documentation/fr/texidocs/adjusting-lyrics-vertical-spacing.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
+  texidocfr = "
+Cet extrait illustre la manière de rapprocher la ligne de paroles 
+de la portée.
+
+"
+  doctitlefr = "Ajustement de l'espacement vertical des paroles"
+
diff --git a/Documentation/fr/texidocs/aligning-bar-numbers.texidoc b/Documentation/fr/texidocs/aligning-bar-numbers.texidoc
new file mode 100644
index 0000000000..d4cc8579d6
--- /dev/null
+++ b/Documentation/fr/texidocs/aligning-bar-numbers.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Les numéros de mesure s'alignent en principe sur la droite de l'objet 
+dont ils dépendent.  C'est normalement le coin gauche de la portée ou, 
+en cours de ligne, à gauche de la barre.  Vous pouvez toutefois les 
+centrer par rapport à la barre ou les afficher à droite de la barre.
+
+"
+  doctitlefr = "Alignement des numéros de mesure"
diff --git a/Documentation/fr/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc b/Documentation/fr/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
new file mode 100644
index 0000000000..6c7fe6a7b1
--- /dev/null
+++ b/Documentation/fr/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+  texidocfr = "
+L'empilement des indications de doigté se fait par défaut à l'extérieur de la portée.  Néanmoins, il est possible d'annuler ce comportement.
+
+"
+  doctitlefr = "Impression des doigtés à l'intérieur de la portée"
+
diff --git a/Documentation/fr/texidocs/ancient-fonts.texidoc b/Documentation/fr/texidocs/ancient-fonts.texidoc
new file mode 100644
index 0000000000..c004570377
--- /dev/null
+++ b/Documentation/fr/texidocs/ancient-fonts.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
+  texidocfr ="
+Voici comment graver la plupart, sinon tous les symboles que
+LilyPond prend en charge en matière de musique ancienne.
+
+"
+  doctitlefr = "Gravure de musique ancienne"
diff --git a/Documentation/fr/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc b/Documentation/fr/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
new file mode 100644
index 0000000000..68e7372f78
--- /dev/null
+++ b/Documentation/fr/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
+  texidocfr = "
+Lorsque l'on transcrit de la musique mensurale, il est d'usage 
+d'indiquer en début de partition,  par un « incipit », les tonalité 
+et tempo originaux.  De nos jours, les musiciens ont l'habitude de 
+voir des barres de mesure qui les aide à appréhender la structure 
+rythmique.  Ces barres n'existaient pas du temps où ces œuvres ont 
+été écrites ; en fait, la métrique évoluait au fil de la pièce.  Un 
+compromis consiste à imprimer des barres de mesure entre les portées 
+plutôt que sur la portée elle-même.
+
+"
+  doctitlefr = "Exemples de notation ancienne -- transcription moderne de musique mensurale"
diff --git a/input/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc b/Documentation/fr/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
similarity index 50%
rename from input/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
rename to Documentation/fr/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
index 9a08031448..de2fc11420 100644
--- a/input/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
+++ b/Documentation/fr/texidocs/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.texidoc
@@ -1,14 +1,3 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-En un compás sencillo como 2/2 ó 4/4, las corcheas se barran de forma
-predeterminada como dos grupos de cuatro.
-
-Utilizando un macro que seobreescribe el comportamiento automático del
-barrado, este fragmento de código cambia el barrado a pulsos de negra.
-
-"
-  doctitlees = "Barras automáticas de dos en dos en los compases de 4/4 o de 2/2"
-
 %% Translation of GIT committish: 1154b407d42f303a024598296ad36ab6c93e2b5a
   texidocfr = "
 Dans une métrique simple comme 4/4 ou 2/2, les croches sont ligaturées
diff --git a/Documentation/fr/texidocs/beam-endings-in-score-context.texidoc b/Documentation/fr/texidocs/beam-endings-in-score-context.texidoc
new file mode 100644
index 0000000000..97e6c92ec5
--- /dev/null
+++ b/Documentation/fr/texidocs/beam-endings-in-score-context.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Les règles de ligatures définies au niveau du contexte @code{Score}
+s'appliqueront à toutes les portées.  Il est toutefois possible de
+moduler au niveau @code{Staff} ou @code{Voice} :
+
+"
+  doctitlefr = "Définition de règles de ligature pour la partition"
diff --git a/Documentation/fr/texidocs/beam-grouping-in-7-8-time.texidoc b/Documentation/fr/texidocs/beam-grouping-in-7-8-time.texidoc
new file mode 100644
index 0000000000..d011e8d04a
--- /dev/null
+++ b/Documentation/fr/texidocs/beam-grouping-in-7-8-time.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: bee31293920d834cd3698f00ddcc2402c3164619
+texidocfr = "
+Aucune règle de ligature automatique n'est disponible pour une mesure à
+7/8.  Il faudra donc, en pareil cas, définir vous-même les règles de
+regroupement.  Pour, par exemple, ligaturer sur la base de 2/8-3/8-2/8,
+il faudra donc définir les terminaisons de 2/8 et 5/8 :
+
+"
+  doctitlefr = "Règle de ligature dans une mesure à 7/8"
diff --git a/Documentation/fr/texidocs/beams-across-line-breaks.texidoc b/Documentation/fr/texidocs/beams-across-line-breaks.texidoc
new file mode 100644
index 0000000000..19415fe494
--- /dev/null
+++ b/Documentation/fr/texidocs/beams-across-line-breaks.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  
+  texidocfr = "
+Il est normalement impensable qu'un saut de ligne tombe au milieu d'une
+ligature.  LilyPond permet néanmoins de l'obtenir.
+
+"
+  doctitlefr = "Ligature au moment d'un saut de ligne"
diff --git a/Documentation/fr/texidocs/changing--flageolet-mark-size.texidoc b/Documentation/fr/texidocs/changing--flageolet-mark-size.texidoc
new file mode 100644
index 0000000000..9475697151
--- /dev/null
+++ b/Documentation/fr/texidocs/changing--flageolet-mark-size.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 0099693675b95c7ec6664d7277f22411a14e9c1b
+
+  texidocfr = "
+Il est possible de rapetisser le cercle d'un @code{\\flageolet} grâce 
+à une fonction Scheme. 
+
+"
+  doctitlefr = "Modifier la taille d'un \\flageolet"
+
diff --git a/Documentation/fr/texidocs/changing-beam-knee-gap.texidoc b/Documentation/fr/texidocs/changing-beam-knee-gap.texidoc
new file mode 100644
index 0000000000..94cb7f4cbf
--- /dev/null
+++ b/Documentation/fr/texidocs/changing-beam-knee-gap.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+LilyPond insère automatiquement des ligatures coudées --- certaines
+hampes vers le haut, d'autres vers le bas --- lorsqu'il détecte un
+intervalle important entre des têtes de notes. Ce comportement peut être
+changé par l'intermédiaire de l'objet @code{auto-knee-gap} --- défini
+par défaut à @samp{5,5} espace, plus la largeur et la pente de la
+ligature en question.
+
+"
+  doctitlefr = "Ligature et directions de hampe inversées"
diff --git a/Documentation/fr/texidocs/changing-form-of-multi-measure-rests.texidoc b/Documentation/fr/texidocs/changing-form-of-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..06259f8490
--- /dev/null
+++ b/Documentation/fr/texidocs/changing-form-of-multi-measure-rests.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+texidocfr = "
+Dans le cas où ce silence dure moins de dix mesures, LilyPond imprime sur
+la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en
+allemand -- et qui sont une simple suite de rectangles.  La propriété
+@code{expand-limit} permet d'obtenir un silence unique :
+
+"
+  doctitlefr = "Modifier l'apparence d'un silence multi-mesures"
diff --git a/Documentation/fr/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc b/Documentation/fr/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
new file mode 100644
index 0000000000..fd8ad3f415
--- /dev/null
+++ b/Documentation/fr/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+La commande @code{\\time} gère les propriétés
+@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
+et @code{measureLength} dans le contexte @code{Timing}, normallement
+rattaché à @code{Score}.  Le fait de modifier la valeur de
+@code{timeSignatureFraction} aura pour effet de changer l'apparence du
+symbole affiché sans pour autant affecter les autres propriétés de la
+métrique :
+
+"
+  doctitlefr = "Changement de métrique sans affecter les règles de ligature"
diff --git a/Documentation/fr/texidocs/changing-the-tuplet-number.texidoc b/Documentation/fr/texidocs/changing-the-tuplet-number.texidoc
new file mode 100644
index 0000000000..333121448f
--- /dev/null
+++ b/Documentation/fr/texidocs/changing-the-tuplet-number.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+L'apparence du chiffre est déterminée par la propriété @code{text} dans
+@code{TupletNumber}.  La valeur par défaut imprime seulement le
+dénominateur, mais si elle est définie par la fonction
+@code{tuplet-number::calc-fraction-text}, la fraction entière
+@var{num}:@var{den} sera imprimée à la place.
+
+"
+  doctitlefr = "Modifier l'apparence du chiffre de nolet"
diff --git a/Documentation/fr/texidocs/compound-time-signatures.texidoc b/Documentation/fr/texidocs/compound-time-signatures.texidoc
new file mode 100644
index 0000000000..1e99711736
--- /dev/null
+++ b/Documentation/fr/texidocs/compound-time-signatures.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Des métriques telles que @qq{5/8} peuvent s'interpréter sous une forme
+décomposée --- @qq{3/8 + 2/8} par exemple --- qui combine plusieurs
+métriques.  LilyPond est capable de rendre ce type de notation, plus
+  facile à lire et à interpréter, en imprimant cette métrique composite
+  et en adaptant les règles de ligature automatique en conséquence.
+
+"
+  doctitlefr = "Métrique décomposée"
diff --git a/Documentation/fr/texidocs/conducting-signs,-measure-grouping-signs.texidoc b/Documentation/fr/texidocs/conducting-signs,-measure-grouping-signs.texidoc
new file mode 100644
index 0000000000..79cbf194f1
--- /dev/null
+++ b/Documentation/fr/texidocs/conducting-signs,-measure-grouping-signs.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+Il existe des options qui permettent de grouper les ligatures au sein
+d'une mesure, grâce à la fonction Scheme @code{set-time-signature}.
+Celle-ci prend trois arguments : le nombre de pulsations, la durée de la
+pulsation et le regroupement des pulsations dans la mesure.  Si l'on
+fait appel au @code{Measure_grouping_engraver}, la fonction 
+@code{set-time-signature} créera aussi des symboles
+@code{MeasureGrouping}.  Ces symboles aident à la lecture des œuvres
+modernes à la rythmique complexe.  Dans l'exemple qui suit, la mesure à
+9/8 est divisée en 2, 2, 2 et 3.  Ceci est fourni en tant que troisième
+argument à @code{set-time-signature} : @code{'(2 2 2 3)}.
+
+"
+  doctitlefr = "Signes de direction, signes de sous-groupe"
diff --git a/Documentation/fr/texidocs/controlling-the-placement-of-chord-fingerings.texidoc b/Documentation/fr/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
new file mode 100644
index 0000000000..b5c3b792c7
--- /dev/null
+++ b/Documentation/fr/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Le positionnement des doigtés peut être contrôlé de manière très précise.
+
+"
+  doctitlefr = "Conrôle du positionnement des doigtés"
+
diff --git a/Documentation/fr/texidocs/customizing-markup-fret-diagrams.texidoc b/Documentation/fr/texidocs/customizing-markup-fret-diagrams.texidoc
new file mode 100644
index 0000000000..84e5e1c1e7
--- /dev/null
+++ b/Documentation/fr/texidocs/customizing-markup-fret-diagrams.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Les propriétés d'un diagramme de fret sont modifiables grâce au 
+@code{'fret-diagram-details}.  Lorsqu'ils sont générés sous forme 
+de @code{\markup}, rien n'empêche de les modifier en jouant sur les 
+réglages de l'objet @code{Voice.TextScript} ou bien directement sur 
+le @qq{markup}.
+
+"
+  doctitlefr = "Personnalisation des diagrammes de fret"
+
diff --git a/Documentation/fr/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc b/Documentation/fr/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
new file mode 100644
index 0000000000..7011f6624b
--- /dev/null
+++ b/Documentation/fr/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
@@ -0,0 +1,18 @@
+%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+  texidocfr = "
+La liste des diagrammes standards prédéfinis pour la guitare peut être
+ augmentée d'autres définitions spécifiques à d'autres instruments.  
+Voici comment définir un nouvel accordage ainsi que quelques diagrammes 
+prédéfinis pour le @qq{cuatro vénézuélien}.
+
+Cet exemple illustre aussi la manière d'ajouter des doigtés aux 
+accords ; ils serviront de référence pour la boucle d'accord et seront 
+indiqués dans les diagrammes et le @code{TabStaff}, mais pas dans la musique. 
+
+Ces diagrammes ne peuvent pas être transposés, dans la mesure où ils 
+contiennent des informations sur les cordes.  Ceci est amené à évoluer.
+
+"
+  doctitlefr = "Création de diagrammes de fret prédéfinis pour d'autres instruments"
+
diff --git a/Documentation/fr/texidocs/engraving-ties-manually.texidoc b/Documentation/fr/texidocs/engraving-ties-manually.texidoc
new file mode 100644
index 0000000000..a9ace43a43
--- /dev/null
+++ b/Documentation/fr/texidocs/engraving-ties-manually.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Il est possible de graver manuellement les liaisons de tenue, en
+modifiant la propriété @code{tie-configuration}.  Pour chaque paire, le
+premier nombre indique la distance à la portée, en espaces de portée, et
+le second la direction (1 pour haut, @minus{}1 pour bas).
+
+"
+  doctitlefr = "Dessin à main levée de liaisons de tenue"
diff --git a/Documentation/fr/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc b/Documentation/fr/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
new file mode 100644
index 0000000000..e1ee0a8f92
--- /dev/null
+++ b/Documentation/fr/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
@@ -0,0 +1,13 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+La propriété @code{tupletSpannerDuration} spécifie la longueur voulue de
+chaque crochet.  Avec elle, vous pouvez faire plusieurs nolets en ne
+tapant @code{\\times} qu'une fois, ce qui évite une longue saisie.  
+
+Dans l'exemple suivant, deux triolets sont imprimés avec une seule fonction
+@code{\\times}.
+
+Pour plus d'information sur @code{make-moment}, voir @ref{Time administration}.
+
+"
+  doctitlefr = "Plusieurs triolets avec une seule commande \\times"
diff --git a/Documentation/fr/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc b/Documentation/fr/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..9e0543eceb
--- /dev/null
+++ b/Documentation/fr/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+L'exemple suivant illustre comment combiner des doigtés pour la main 
+gauche, des indications de corrde et des doigtés pour la main droite.
+
+"
+  doctitlefr = "Doigtés, indications de cordeet doigtés main droite"
+
diff --git a/Documentation/fr/texidocs/flat-flags-and-beam-nibs.texidoc b/Documentation/fr/texidocs/flat-flags-and-beam-nibs.texidoc
new file mode 100644
index 0000000000..7c3d49ce83
--- /dev/null
+++ b/Documentation/fr/texidocs/flat-flags-and-beam-nibs.texidoc
@@ -0,0 +1,30 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+En combinant @code{stemLeftBeamCount}, @code{stemRightBeamCount} et des 
+paires de @code{[]}, vous pourrez obtenir des crochets rectilignes et 
+des ligatures qui débordent à leurs extrémités.
+
+Pour des crochets rectilignes à droite sur des notes isolées, il suffit 
+d'ajouter une paire d'indicateurs de ligature @code{[]} et de déterminer 
+@code{stemLeftBeamCount} à zéro, comme dans l'exemple 1.
+
+Pour des crochets rectiligne à gauche, c'est @code{stemRightBeamCount} 
+qu'il faudra déterminer (exemple 2).
+
+Pour que les barres de ligature débordent sur la droite, 
+@code{stemRightBeamCount} doit avoir une valeur positive ; pour un 
+débrodement à gauche, c'est sur @code{stemLeftBeamCount} qu'il faut 
+jouer.  Tout ceci est illustré par l'exemple 3.
+
+Il est parfois judicieux, lorsqu'une note est encadrée de silences, de 
+l'affubler de crochets rectilignes de part et d'autre. L'exemple 4 
+montre qu'il suffit d'adjoindre à cette note un @code{[]}.
+
+(Notez bien que @code{\\set stemLeftBeamCount} sera toujours synonyme de 
+@code{\\once \\set}.  Autrement dit, la détermination des ligatures
+n'est pas @qq{permanente} ; c'est la raison pour laquelle les crochets
+du @code{c'16[]} isolé du dernier exemple n'ont rien à voir avec le 
+@code{\\set} indiqué deux notes auparavant.)
+
+"
+  doctitlefr = "Crochet rectiligne et débordement de ligature"
diff --git a/Documentation/fr/texidocs/grouping-beats.texidoc b/Documentation/fr/texidocs/grouping-beats.texidoc
new file mode 100644
index 0000000000..0cdd0cbebe
--- /dev/null
+++ b/Documentation/fr/texidocs/grouping-beats.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+La manière de gérer les ligatures est influencée par la propriété 
+@code{beatGrouping} :
+
+"
+  doctitlefr = "Regroupement selon la pulsation"
diff --git a/Documentation/fr/texidocs/guitar-strum-rhythms.texidoc b/Documentation/fr/texidocs/guitar-strum-rhythms.texidoc
new file mode 100644
index 0000000000..e3d66776dc
--- /dev/null
+++ b/Documentation/fr/texidocs/guitar-strum-rhythms.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: fa7695ea860d7ab2db86581dd5f8bc4f413f6705
+  texidocfr = "
+En matière de notation pour guitare, il arrive que soient indiqués les
+@qq{coups de gratte} en plus de la mélodie, grilles d'accords et
+diagrammes de tablature.
+
+"
+  doctitlefr = "Rythmique et guitare"
diff --git a/Documentation/fr/texidocs/multi-measure-rest-markup.texidoc b/Documentation/fr/texidocs/multi-measure-rest-markup.texidoc
new file mode 100644
index 0000000000..9e9c8f1896
--- /dev/null
+++ b/Documentation/fr/texidocs/multi-measure-rest-markup.texidoc
@@ -0,0 +1,15 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Lorsque du texte est attaché à un silence multi-mesures, il sera centré
+dans la mesure, au-dessus ou en dessous de la portée.  Afin d'étirer la
+mesure dans le cas ou ce texte est relativement long, il suffit
+d'insérer un silence invisible auquel on attache le texte en question,
+avant le silence multi-mesures.
+
+Rappelez-vous qu'un silence invisible génère une barre de mesure.  Le
+texte attaché à ce silence invisible sera alors aligné sur la gauche de
+là où serait positionnée la note.  Cependant, si la taille de la mesure
+est déterminée par la longueur du texte, il apparaîtra comme centré.
+
+"
+  doctitlefr = "Ajout de texte à un silence multi-mesures"
diff --git a/Documentation/fr/texidocs/non-default-tuplet-numbers.texidoc b/Documentation/fr/texidocs/non-default-tuplet-numbers.texidoc
new file mode 100644
index 0000000000..5543f0bc04
--- /dev/null
+++ b/Documentation/fr/texidocs/non-default-tuplet-numbers.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: fa7695ea860d7ab2db86581dd5f8bc4f413f6705
+  texidocfr = "
+LilyPond sait aussi gérer des nolets dont le chiffrage imprimé ne
+correspond pas exactement à la fraction de mesure à laquelle ils se
+réfèrent, tout comme ceux auxquels une valeur de note vient en complément
+au chiffre.
+"
+  doctitlefr = "Nolets au chiffrage inhabituel"
diff --git a/Documentation/fr/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc b/Documentation/fr/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
new file mode 100644
index 0000000000..9004b9d315
--- /dev/null
+++ b/Documentation/fr/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Cet exemple peu académique démontre comment il est possible d'insérer un saut 
+de ligne dans un nolet portant une ligature.  Ces ligatures doivent toutefois
+être explicites.
+
+"
+  doctitlefr = "Saut de ligne au milieu d'un nolet avec ligature"
diff --git a/Documentation/fr/texidocs/placement-of-right-hand-fingerings.texidoc b/Documentation/fr/texidocs/placement-of-right-hand-fingerings.texidoc
new file mode 100644
index 0000000000..b818bc5939
--- /dev/null
+++ b/Documentation/fr/texidocs/placement-of-right-hand-fingerings.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Vous disposez d'une propriété spécifique qui permet de contrôler plus 
+finement le positionnement des doigtés main droite, comme l'indique 
+l'exemple suivant.
+
+"
+  doctitlefr = "Positionnement des doigtés main droite"
+
diff --git a/Documentation/fr/texidocs/polyphony-in-tablature.texidoc b/Documentation/fr/texidocs/polyphony-in-tablature.texidoc
new file mode 100644
index 0000000000..6019418ab7
--- /dev/null
+++ b/Documentation/fr/texidocs/polyphony-in-tablature.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
+
+  texidocfr = "
+Une section polyphonique s'obtient dans un @code{TabStaff} de la
+même manière que dans une portée normale.
+
+"
+  doctitlefr = "Polyphonie en mode tablature"
+
diff --git a/Documentation/fr/texidocs/positioning-grace-notes-with-floating-space.texidoc b/Documentation/fr/texidocs/positioning-grace-notes-with-floating-space.texidoc
new file mode 100644
index 0000000000..b1c28bd143
--- /dev/null
+++ b/Documentation/fr/texidocs/positioning-grace-notes-with-floating-space.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Lorsque vous activez la propriété @code{'strict-grace-spacing},
+l'espacement des notes d'ornement se fera de manière @qq{élastique}.
+Autrement dit, elles seront décollées de leur note de rattachement :
+LilyPond commence par espacer les notes normales, puis les ornements
+sont placés à la gauche de leur note de rattachement.
+
+"
+  doctitlefr = "Positionnement des notes d'ornement avec espace flottant"
diff --git a/Documentation/fr/texidocs/positioning-multi-measure-rests.texidoc b/Documentation/fr/texidocs/positioning-multi-measure-rests.texidoc
new file mode 100644
index 0000000000..f0cc542157
--- /dev/null
+++ b/Documentation/fr/texidocs/positioning-multi-measure-rests.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Si l'on peut positionner verticalement un silence simple en le
+rattachant à une note, il n'en va pas de même pour un silence
+multi-mesures.  Néanmoins, et uniquement dans le cadre de musique
+polyphonique, les silences multi-mesures sont positionnés différemment
+selon qu'ils appartiennent à une voix au numéro pair ou impair.  Le
+positionnement des silences multi-mesures peut se contrôler ainsi :
+"
+  doctitlefr = "Positionnement des silences multi-mesures"
diff --git a/Documentation/fr/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc b/Documentation/fr/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
new file mode 100644
index 0000000000..c1ed4d9590
--- /dev/null
+++ b/Documentation/fr/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 203ab4a7388f36b9c89c66671498dbaefccbf86e
+  texidocfr = "
+En accord avec les règles standards de l'écriture musicale, on grave
+un bécarre avant un dièse ou un bémol si on a besoin d'annuler une
+altération précédente.  Pour modifier ce comportement, assignez la propriété
+@code{extraNatural} du contexte @code{Staff} à la valeur @code{##f} (faux).
+"
+
diff --git a/Documentation/fr/texidocs/printing-bar-numbers-at-regular-intervals.texidoc b/Documentation/fr/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
new file mode 100644
index 0000000000..de02ea8cad
--- /dev/null
+++ b/Documentation/fr/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Vous pouvez imprimer un numéro de mesure à intervalle régulier plutôt
+qu'en tête de chaque ligne seulement, en recourrant à la propriété
+@code{barNumberVisibility}.  Voici comment afficher le numéro toutes les 
+deux mesures sauf en fin de ligne.
+
+"
+  doctitlefr = "Imprimer les numéros de mesure à intervalle régulier"
diff --git a/Documentation/fr/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc b/Documentation/fr/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
new file mode 100644
index 0000000000..e3463e34b0
--- /dev/null
+++ b/Documentation/fr/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Les numéros de mesures peuvent être encadrés ou entourés d'un cercle.
+
+"
+  doctitlefr = "Inscrire le numéro de mesure dans un cadre ou un cercle"
diff --git a/Documentation/fr/texidocs/printing-the-bar-number-for-the-first-measure.texidoc b/Documentation/fr/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
new file mode 100644
index 0000000000..806d81929b
--- /dev/null
+++ b/Documentation/fr/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
@@ -0,0 +1,12 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Par défaut, LilyPond n'affiche pas le premier numéro de mesure s'il est 
+inférieur à 2. Le fait de définir @code{barNumberVisibility} à  
+@code{all-bar-numbers-visible} vous permettra d'imprimer n'importe quel 
+numéro pour la première mesure.  À noter que l'impression d'un numéro 
+de mesure ne peut intervenir que s'il y a une barre.  Aussi, pour 
+pouvoir le faire au début d'un morceau, devrez-vous ajouter une barre 
+vide avant la première note. 
+
+"
+  doctitlefr = "Afficher le numéro de la première mesure"
diff --git a/Documentation/fr/texidocs/redefining-grace-note-global-defaults.texidoc b/Documentation/fr/texidocs/redefining-grace-note-global-defaults.texidoc
new file mode 100644
index 0000000000..ee704b7b72
--- /dev/null
+++ b/Documentation/fr/texidocs/redefining-grace-note-global-defaults.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Vous pouvez modifier les valeurs des variables @code{startGraceMusic}, 
+@code{stopGraceMusic}, @code{startAcciaccaturaMusic}, 
+@code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic}, et 
+@code{stopAppoggiaturaMusic} afin d'en personnaliser les effets.  Pour 
+plus de détails, voir le fichier @code{ly/grace-init.ly}. 
+
+"
+  doctitlefr = "Redéfinition des réglages de mise en forme par défaut des notes d'ornement"
diff --git a/Documentation/fr/texidocs/removing-bar-numbers-from-a-score.texidoc b/Documentation/fr/texidocs/removing-bar-numbers-from-a-score.texidoc
new file mode 100644
index 0000000000..4b9756b50f
--- /dev/null
+++ b/Documentation/fr/texidocs/removing-bar-numbers-from-a-score.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Désactiver le graveur concerné --- @code{Bar_number_engraver} --- 
+donnera une partition  --- contexte @code{Score} --- sans numéros de 
+mesure.
+
+"
+  doctitlefr = "Supprimer les numéros de mesure d'une partition"
+
diff --git a/Documentation/fr/texidocs/rest-styles.texidoc b/Documentation/fr/texidocs/rest-styles.texidoc
new file mode 100644
index 0000000000..d2a2cd2240
--- /dev/null
+++ b/Documentation/fr/texidocs/rest-styles.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Les silences peuvent être gravés selon différents styles.
+
+"
+  doctitlefr = "Styles de silences"
diff --git a/Documentation/fr/texidocs/reverting-default-beam-endings.texidoc b/Documentation/fr/texidocs/reverting-default-beam-endings.texidoc
new file mode 100644
index 0000000000..df6ac11df3
--- /dev/null
+++ b/Documentation/fr/texidocs/reverting-default-beam-endings.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: bee31293920d834cd3698f00ddcc2402c3164619
+  texidocfr = "
+Pour obtenir des ligatures en groupes de @code{3-4-3-2} croches, dans
+une mesure à 12/8, il faudra préalablement annuler les réglages par
+défaut relatifs à 12/8, puis ajouter nos propres règles :
+
+"
+  doctitlefr = "Annulation des règles de ligature par défaut"
diff --git a/Documentation/fr/texidocs/specifying-context-with-beatgrouping.texidoc b/Documentation/fr/texidocs/specifying-context-with-beatgrouping.texidoc
new file mode 100644
index 0000000000..b114d724f7
--- /dev/null
+++ b/Documentation/fr/texidocs/specifying-context-with-beatgrouping.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+Le fait de spécifier un contexte à @code{beatGrouping} permet d'en 
+limiter les effets.  Par voie de conséquence, il sera possible
+d'outrepasser les règles définies à un niveau supérieur.  La commande
+@code{\\set} destinée à en modifier les valeurs doit se placer après la 
+commande @code{\\time} :
+
+"
+  doctitlefr = "Spécification du contexte auquel s'appliquera beatGrouping"
diff --git a/Documentation/fr/texidocs/stem-and-beam-behavior-in-tablature.texidoc b/Documentation/fr/texidocs/stem-and-beam-behavior-in-tablature.texidoc
new file mode 100644
index 0000000000..97fd4b69e0
--- /dev/null
+++ b/Documentation/fr/texidocs/stem-and-beam-behavior-in-tablature.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: cd4950757ab1ab6c89805b0b7c978bfca034f940
+
+  texidocfr = "
+La direction des hampes se gère dans les tablatures tout comme en 
+notation traditionnelle.  Les ligatures peuvent être mises à l'horizontale 
+comme le montre cet exemple.
+
+"
+  doctitlefr = "Hampes et ligatures en mode tablature"
+
diff --git a/Documentation/fr/texidocs/sub-dividing-beams.texidoc b/Documentation/fr/texidocs/sub-dividing-beams.texidoc
new file mode 100644
index 0000000000..ddb22df0df
--- /dev/null
+++ b/Documentation/fr/texidocs/sub-dividing-beams.texidoc
@@ -0,0 +1,16 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+Les ligatures d'une succession de notes de durée inférieure à la croche
+ne sont pas subdivisées par défaut.  Autrement dit, tous les traits de
+ligature seront continus.  Ce comportement peut être modifié afin de
+diviser la ligature en sous-groupes grâce à la propriété
+@code{subdivideBeams}.  Lorsqu'elle est activée, les ligatures seront
+subdivisées selon un intervalle défini par @code{beatLength} ; il n'y
+aura alors plus qu'un seul trait de ligature entre chaque sous-groupe.  
+Par défaut, @code{beatLength} fixe la valeur de référence à une noire.
+Il faudra donc lui fournir, à l'aide de la fonction @code{make-moment},
+une fraction correspondant au sous-groupe désiré, comme dans l'exemple
+suivant. 
+
+"
+  doctitlefr = "Subdivision des ligatures"
diff --git a/Documentation/fr/texidocs/tweaking-grace-layout-within-music.texidoc b/Documentation/fr/texidocs/tweaking-grace-layout-within-music.texidoc
new file mode 100644
index 0000000000..b46bc1a583
--- /dev/null
+++ b/Documentation/fr/texidocs/tweaking-grace-layout-within-music.texidoc
@@ -0,0 +1,11 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Il est possible de changer globalement la mise en forme des petites 
+notes dans un morceau, au moyen de la fonction 
+@code{add-grace-property}.  Ici, par exemple, on ôte la définition de 
+l'orientation des objets @code{Stem} pour toutes les petites notes, 
+afin que les hampes ne soient pas toujours orientées vers le haut, et on 
+leur préfère des têtes en forme de croix.
+
+"
+  doctitlefr = "Mise en forme des notes d'ornement"
diff --git a/Documentation/fr/texidocs/using-beatlength-and-beatgrouping.texidoc b/Documentation/fr/texidocs/using-beatlength-and-beatgrouping.texidoc
new file mode 100644
index 0000000000..48908fe2d4
--- /dev/null
+++ b/Documentation/fr/texidocs/using-beatlength-and-beatgrouping.texidoc
@@ -0,0 +1,10 @@
+%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+  texidocfr = "
+La propriété @code{measureLength} détermine la pulsation et, combinée à
+@code{beatLength} et @code{beatGrouping}, comment générer les ligatures
+automatiques selon les durées et la métrique lorsqu'aucune règle n'a été
+définie.  L'exemple commenté qui suit indique différentes façons de
+contrôler les ligatures à l'aide de ces propriétés. 
+
+"
+  doctitlefr = "Utilisation conjointe de beatLength et beatGrouping"
diff --git a/Documentation/fr/texidocs/using-grace-note-slashes-with-normal-heads.texidoc b/Documentation/fr/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
new file mode 100644
index 0000000000..f0dcb13b3f
--- /dev/null
+++ b/Documentation/fr/texidocs/using-grace-note-slashes-with-normal-heads.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
+  texidocfr = "
+Le trait que l'on trouve sur les hampes des acciaccatures peut
+être appliqué dans d'autres situations.
+
+"
+
+  doctitlefr = "Utilisation de hampe barrée pour une note normale"
diff --git a/input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc b/Documentation/fr/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
similarity index 100%
rename from input/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
rename to Documentation/fr/texidocs/using-postscript-to-generate-special-note-head-shapes.texidoc
diff --git a/Documentation/fr/texidocs/using-ties-with-arpeggios.texidoc b/Documentation/fr/texidocs/using-ties-with-arpeggios.texidoc
new file mode 100644
index 0000000000..05a20504a8
--- /dev/null
+++ b/Documentation/fr/texidocs/using-ties-with-arpeggios.texidoc
@@ -0,0 +1,9 @@
+%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
+  texidocfr = "
+Les liaisons de tenue servent parfois à rendre un accord arpégé. Dans
+ce cas, les notes liées ne sont pas toutes consécutives. Il faut alors
+assigner à la propriété @code{tieWaitForNote} la valeur @code{#t}
+(@emph{true} pour @qq{vrai}).  Cette même méthode peut servir, par
+exemple, à lier un trémolo à un accord.
+"
+  doctitlefr = "Liaison de tenue et arpège"
diff --git a/Documentation/fr/user/GNUmakefile b/Documentation/fr/user/GNUmakefile
deleted file mode 100644
index a7defa6c44..0000000000
--- a/Documentation/fr/user/GNUmakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ISOLANG = fr
-depth = ../../..
-LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-include $(depth)/make/stepmake.make
diff --git a/Documentation/user/henle-flat-bw.png b/Documentation/henle-flat-bw.png
similarity index 100%
rename from Documentation/user/henle-flat-bw.png
rename to Documentation/henle-flat-bw.png
diff --git a/Documentation/user/henle-flat-gray.png b/Documentation/henle-flat-gray.png
similarity index 100%
rename from Documentation/user/henle-flat-gray.png
rename to Documentation/henle-flat-gray.png
diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 9836f53491..0834c38490 100644
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -34,15 +34,15 @@
 	  <ul>
 	    <li>
 	    <a class="title"
-href="user/lilypond-learning/index.html">Learning Manual</a>
-(in <a class="title" href="user/lilypond-learning-big-page.html">one big page</a> ~ 1.5 MB,
-in <a class="title" href="user/lilypond-learning.pdf">PDF</a>)
+href="learning/index.html">Learning Manual</a>
+(in <a class="title" href="learning-big-page.html">one big page</a> ~ 1.5 MB,
+in <a class="title" href="learning.pdf">PDF</a>)
               <br>(start here)</li>
 
 	   <li><a class="title"
-href="user/music-glossary/index.html">Music Glossary</a>
-(in <a class="title" href="user/music-glossary-big-page.html">one big page</a> ~ 500 kB,
-in <a class="title" href="user/music-glossary.pdf">PDF</a>)
+href="music-glossary/index.html">Music Glossary</a>
+(in <a class="title" href="music-glossary-big-page.html">one big page</a> ~ 500 kB,
+in <a class="title" href="music-glossary.pdf">PDF</a>)
 
      <br>(for non-English users)</li>
 	</ul>
@@ -63,17 +63,17 @@ in <a class="title" href="user/music-glossary.pdf">PDF</a>)
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-<a class="title" href="user/lilypond/index.html">Notation
+<a class="title" href="notation/index.html">Notation
 Reference</a>
-(in <a class="title" href="user/lilypond-big-page.html">one big page</a> ~ 4 MB,
-in <a class="title" href="user/lilypond.pdf">PDF</a>)
+(in <a class="title" href="notation-big-page.html">one big page</a> ~ 4 MB,
+in <a class="title" href="notation.pdf">PDF</a>)
      <br>(writing music in LilyPond)</li>
 
        <li>
  <a  class="title"
-href="user/lilypond-internals/index.html">Internals Reference</a>
- (in <a class="title" href="user/lilypond-internals-big-page.html">one big page</a> ~ 1 MB,
-  in <a class="title" href="user/lilypond-internals.pdf">PDF</a>)
+href="internals/index.html">Internals Reference</a>
+ (in <a class="title" href="internals-big-page.html">one big page</a> ~ 1 MB,
+  in <a class="title" href="internals.pdf">PDF</a>)
      <br>(definitions for tweaking)</li>
 
   </ul>
@@ -82,14 +82,14 @@ href="user/lilypond-internals/index.html">Internals Reference</a>
 	  <ul>
               <li>
 	    <a class="title"
-href="user/lilypond-program/index.html">Application Usage</a>
-(in <a class="title" href="user/lilypond-program-big-page.html">one big page</a>,
-in <a class="title" href="user/lilypond-program.pdf">PDF</a>)
+href="application/index.html">Application Usage</a>
+(in <a class="title" href="application-big-page.html">one big page</a>,
+in <a class="title" href="application.pdf">PDF</a>)
             <br>(how to install and run the program)</li>
 
-<li><a class="title"href="../input/lsr/lilypond-snippets/index.html">Snippets List</a>
-(in <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">one big page</a> ~ 2MB,
-in <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
+<li><a class="title"href="snippets/index.html">Snippets List</a>
+(in <a class="title" href="snippets-big-page.html">one big page</a> ~ 2MB,
+in <a class="title" href="snippets.pdf">PDF</a>)
      <br>(Short tricks, tips, and examples)</li>
 
 	</ul>
@@ -98,7 +98,7 @@ in <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
         <tr>
           <td valign="baseline" class="left-column">
 	<ul>
-            <li><a class="title"  href="devel/index.html">Developers resources</a>
+            <li><a class="title"  href="devel.html">Developers resources</a>
               <br>(documentation for developers and contributors)</li>
 	</ul>
     </td><td class="right-column">
diff --git a/Documentation/ja/GNUmakefile b/Documentation/ja/GNUmakefile
index 9f7f4377ac..d0a75fa12a 100644
--- a/Documentation/ja/GNUmakefile
+++ b/Documentation/ja/GNUmakefile
@@ -1,7 +1,7 @@
 ISOLANG = ja
 depth = ../..
-SUBDIRS = user
+SUBDIRS = application learning texidocs
 STEPMAKE_TEMPLATES = documentation
-LOCALSTEPMAKE_TEMPLATES = doc-i18n-root
+LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 
 include $(depth)/make/stepmake.make
diff --git a/Documentation/ja/user/lilypond-program.tely b/Documentation/ja/application.tely
similarity index 92%
rename from Documentation/ja/user/lilypond-program.tely
rename to Documentation/ja/application.tely
index 9c3cd466d4..9db4f58f6d 100644
--- a/Documentation/ja/user/lilypond-program.tely
+++ b/Documentation/ja/application.tely
@@ -33,13 +33,13 @@
 
 @ifhtml
 @ifclear bigpage
-このドキュメントは @uref{source/Documentation/user/lilypond-program.ja.pdf,PDF 
-形式} と @uref{source/Documentation/user/lilypond-program-big-page.ja.html,
+このドキュメントは @uref{source/Documentation/application.pdf,PDF 
+形式} と @uref{source/Documentation/application-big-page.ja.html,
 大きな 1 ページ形式} でも利用可能です。
 @end ifclear
 @ifset bigpage
-このドキュメントは @uref{source/Documentation/user/lilypond-program.ja.pdf,PDF 
-形式} と @uref{source/Documentation/user/lilypond-program/index.ja.html,
+このドキュメントは @uref{source/Documentation/application.pdf,PDF 
+形式} と @uref{source/Documentation/application/index.ja.html,
 複数のページにインデックス化された形式} でも利用可能です。
 @end ifset
 @end ifhtml
@@ -164,11 +164,11 @@ Free Documentation License''.
 @contents
 
 
-@include install.itely
-@include setup.itely
-@include running.itely
-@include lilypond-book.itely
-@include converters.itely
+@include application/install.itely
+@include application/setup.itely
+@include application/running.itely
+@include application/lilypond-book.itely
+@include application/converters.itely
 
 @include fdl.itexi
 
diff --git a/Documentation/ja/application/GNUmakefile b/Documentation/ja/application/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/ja/application/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/ja/user/converters.itely b/Documentation/ja/application/converters.itely
similarity index 96%
rename from Documentation/ja/user/converters.itely
rename to Documentation/ja/application/converters.itely
index 61164fd8a4..9c73606a12 100644
--- a/Documentation/ja/user/converters.itely
+++ b/Documentation/ja/application/converters.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/install.itely b/Documentation/ja/application/install.itely
similarity index 98%
rename from Documentation/ja/user/install.itely
rename to Documentation/ja/application/install.itely
index 404d50e99f..0bd9a4aadd 100644
--- a/Documentation/ja/user/install.itely
+++ b/Documentation/ja/application/install.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/lilypond-book.itely b/Documentation/ja/application/lilypond-book.itely
similarity index 99%
rename from Documentation/ja/user/lilypond-book.itely
rename to Documentation/ja/application/lilypond-book.itely
index e82f3f4a27..eabdd57c3b 100644
--- a/Documentation/ja/user/lilypond-book.itely
+++ b/Documentation/ja/application/lilypond-book.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/running.itely b/Documentation/ja/application/running.itely
similarity index 99%
rename from Documentation/ja/user/running.itely
rename to Documentation/ja/application/running.itely
index 309cf9e455..668657267b 100644
--- a/Documentation/ja/user/running.itely
+++ b/Documentation/ja/application/running.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/setup.itely b/Documentation/ja/application/setup.itely
similarity index 99%
rename from Documentation/ja/user/setup.itely
rename to Documentation/ja/application/setup.itely
index 7177223dcb..247a66dc07 100644
--- a/Documentation/ja/user/setup.itely
+++ b/Documentation/ja/application/setup.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-program.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/dedication.itely b/Documentation/ja/dedication.itely
similarity index 94%
rename from Documentation/ja/user/dedication.itely
rename to Documentation/ja/dedication.itely
index 4afde93686..e389b781d4 100644
--- a/Documentation/ja/user/dedication.itely
+++ b/Documentation/ja/dedication.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/index.html.in b/Documentation/ja/index.html.in
index 5ec032dd04..85aebda112 100644
--- a/Documentation/ja/index.html.in
+++ b/Documentation/ja/index.html.in
@@ -34,23 +34,23 @@
 	  <ul>
 	    <li>
 	    <a class="title"
-href="user/lilypond-learning/index.ja.html">学習マニュアル</a>
-(<a class="title" href="user/lilypond-learning-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1.5 MB)<!--,
-<a class="title" href="user/lilypond-learning.ja.pdf">PDF</a> 形式)
+href="learning/index.ja.html">学習マニュアル</a>
+(<a class="title" href="learning-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1.5 MB)<!--,
+<a class="title" href="learning.ja.pdf">PDF</a> 形式)
 -->
               <br>(ここから始めてください)</li>
 
 	   <li><a class="title"
-href="user/music-glossary/index.html">音楽用語集</a>
-(<a class="title" href="user/music-glossary-big-page.html">大きな 1 ページ</a> 形式 ~ 500 kB),
-<a class="title" href="user/music-glossary.pdf">PDF</a> 形式)
+href="music-glossary/index.html">音楽用語集</a>
+(<a class="title" href="music-glossary-big-page.html">大きな 1 ページ</a> 形式 ~ 500 kB),
+<a class="title" href="music-glossary.pdf">PDF</a> 形式)
      <br>(非英語圏のユーザ向け)</li>
 	</ul>
 	  </td>
 	  <td class="right-column">
 	  <ul>
 	          <li>
-	    <a class="title" href="topdocs/NEWS.html">News</a>
+	    <a class="title" href="changes.html">News</a>
             <br>(前回のメジャー リリースからの変更点)</li>
 
 <li><a class="title" href="../examples.html">Examples</a>
@@ -63,17 +63,17 @@ href="user/music-glossary/index.html">音楽用語集</a>
           <td valign="baseline" class="left-column">
 	  <ul>
 	    <li>
-<a class="title" href="user/lilypond/index.ja.html">表記リファレンス</a>
-(<a class="title" href="user/lilypond-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 4 MB)<!--,
-<a class="title" href="user/lilypond.ja.pdf">PDF</a> 形式)
+<a class="title" href="lilypond/index.ja.html">表記リファレンス</a>
+(<a class="title" href="big-page.ja.html">大きな 1 ページ</a> 形式 ~ 4 MB)<!--,
+<a class="title" href="lilypond.ja.pdf">PDF</a> 形式)
 -->
      <br>(音楽を LilyPond で記述する)</li>
 
        <li>
  <a  class="title"
-href="user/lilypond-internals/index.ja.html">内部リファレンス</a>
- (<a class="title" href="user/lilypond-internals-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1 MB)<!--,
-  <a class="title" href="user/lilypond-internals.ja.pdf">PDF</a> 形式)
+href="internals/index.ja.html">内部リファレンス</a>
+ (<a class="title" href="internals-big-page.ja.html">大きな 1 ページ</a> 形式 ~ 1 MB)<!--,
+  <a class="title" href="internals.ja.pdf">PDF</a> 形式)
 -->
      <br>(調整のための定義)</li>
 
@@ -83,16 +83,15 @@ href="user/lilypond-internals/index.ja.html">内部リファレンス</a>
 	  <ul>
               <li>
 	    <a class="title"
-href="user/lilypond-program/index.ja.html">アプリケーションの使用方法</a>
-(<a class="title" href="user/lilypond-program-big-page.ja.html">大きな 1 ページ</a> 形式)<!--,
-<a class="title" href="user/lilypond-program.ja.pdf">PDF</a> 形式)
+href="application/index.ja.html">アプリケーションの使用方法</a>
+(<a class="title" href="application-big-page.ja.html">大きな 1 ページ</a> 形式)<!--,
+<a class="title" href="application.ja.pdf">PDF</a> 形式)
 -->
             <br>(プログラムをインストールして実行する方法)</li>
 
-<li><a class="title"href="../input/lsr/lilypond-snippets/index.html">断片集</a>
-(<a class="title" href="../input/lsr/lilypond-snippets-big-page.html">大きな 1 ページ</a> 形式 ~ 2MB)<!--,
-<a class="title" href="user/lilypond-snippets.pdf">PDF</a> 形式)
--->
+<li><a class="title"href="snippets/index.html">断片集</a>
+(<a class="title" href="snippets-big-page.html">大きな 1 ページ</a> 形式 ~ 2MB),
+<a class="title" href="snippets.pdf">PDF</a> 形式)
      <br>(Short tricks, tips, and examples)</li>
 
 	</ul>
diff --git a/Documentation/ja/user/lilypond-learning.tely b/Documentation/ja/learning.tely
similarity index 91%
rename from Documentation/ja/user/lilypond-learning.tely
rename to Documentation/ja/learning.tely
index 7cb213a9f5..d4ea2c6449 100644
--- a/Documentation/ja/user/lilypond-learning.tely
+++ b/Documentation/ja/learning.tely
@@ -34,22 +34,20 @@
 
 @ifhtml
 @ifclear bigpage
-このドキュメントは @uref{source/Documentation/user/lilypond-learning.ja.pdf,PDF 
-形式} と @uref{source/Documentation/user/lilypond-learning-big-page.ja.html,
+このドキュメントは @uref{source/Documentation/learning.pdf,PDF 
+形式} と @uref{source/Documentation/learning-big-page.ja.html,
 大きな 1 ページ形式} でも利用可能です。
 @end ifclear
 @ifset bigpage
-このドキュメントは @uref{source/Documentation/user/lilypond-learning.ja.pdf,PDF 
-形式} と @uref{source/Documentation/user/lilypond-learning/index.ja.html,複数@c
+このドキュメントは @uref{source/Documentation/learning.pdf,PDF 
+形式} と @uref{source/Documentation/learning/index.ja.html,複数@c
 のページにインデックス化された形式} でも利用可能です。
 @end ifset
 @end ifhtml
 
-@c urg, makeinfo 4.9.91 French translation is funky
 @c 日本語の場合の makeinfo ？？？
 @iftex
 @documentlanguage ja
-@c @frenchspacing on
 @end iftex
 
 @c  This produces the unified index
@@ -189,15 +187,15 @@ documentation} を参照してください。
 @contents
 
 
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include fundamental.itely
-@include tweaks.itely
-@include working.itely
+@include learning/preface.itely
+@include learning/introduction.itely
+@include learning/tutorial.itely
+@include learning/fundamental.itely
+@include learning/tweaks.itely
+@include learning/working.itely
 
-@include templates.itely
-@include scheme-tutorial.itely
+@include learning/templates.itely
+@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index
diff --git a/Documentation/ja/learning/GNUmakefile b/Documentation/ja/learning/GNUmakefile
new file mode 100644
index 0000000000..425cc1d8e2
--- /dev/null
+++ b/Documentation/ja/learning/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/ja/user/fundamental.itely b/Documentation/ja/learning/fundamental.itely
similarity index 99%
rename from Documentation/ja/user/fundamental.itely
rename to Documentation/ja/learning/fundamental.itely
index f91389c767..f9d744f323 100644
--- a/Documentation/ja/user/fundamental.itely
+++ b/Documentation/ja/learning/fundamental.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/introduction.itely b/Documentation/ja/learning/introduction.itely
similarity index 99%
rename from Documentation/ja/user/introduction.itely
rename to Documentation/ja/learning/introduction.itely
index ab262e60dd..6b41b3581c 100644
--- a/Documentation/ja/user/introduction.itely
+++ b/Documentation/ja/learning/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/preface.itely b/Documentation/ja/learning/preface.itely
similarity index 98%
rename from Documentation/ja/user/preface.itely
rename to Documentation/ja/learning/preface.itely
index b1ab52b858..0f55a00c59 100644
--- a/Documentation/ja/user/preface.itely
+++ b/Documentation/ja/learning/preface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/scheme-tutorial.itely b/Documentation/ja/learning/scheme-tutorial.itely
similarity index 91%
rename from Documentation/ja/user/scheme-tutorial.itely
rename to Documentation/ja/learning/scheme-tutorial.itely
index aaef2106a2..2569b2ec85 100644
--- a/Documentation/ja/user/scheme-tutorial.itely
+++ b/Documentation/ja/learning/scheme-tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/templates.itely b/Documentation/ja/learning/templates.itely
similarity index 99%
rename from Documentation/ja/user/templates.itely
rename to Documentation/ja/learning/templates.itely
index 5919a46465..cb9b5c25d9 100644
--- a/Documentation/ja/user/templates.itely
+++ b/Documentation/ja/learning/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/tutorial.itely b/Documentation/ja/learning/tutorial.itely
similarity index 99%
rename from Documentation/ja/user/tutorial.itely
rename to Documentation/ja/learning/tutorial.itely
index d0365d31da..51bc91ebf4 100644
--- a/Documentation/ja/user/tutorial.itely
+++ b/Documentation/ja/learning/tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/tweaks.itely b/Documentation/ja/learning/tweaks.itely
similarity index 99%
rename from Documentation/ja/user/tweaks.itely
rename to Documentation/ja/learning/tweaks.itely
index fcb8a2cd8c..5b007512cf 100644
--- a/Documentation/ja/user/tweaks.itely
+++ b/Documentation/ja/learning/tweaks.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/working.itely b/Documentation/ja/learning/working.itely
similarity index 99%
rename from Documentation/ja/user/working.itely
rename to Documentation/ja/learning/working.itely
index 8287810cb7..c678917dbb 100644
--- a/Documentation/ja/user/working.itely
+++ b/Documentation/ja/learning/working.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
 
diff --git a/Documentation/ja/user/macros.itexi b/Documentation/ja/macros.itexi
similarity index 72%
rename from Documentation/ja/user/macros.itexi
rename to Documentation/ja/macros.itexi
index f755bafe6e..f7b1f42c97 100644
--- a/Documentation/ja/user/macros.itexi
+++ b/Documentation/ja/macros.itexi
@@ -143,50 +143,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,,learning-big-page,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,,notation-big-page,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,,application-big-page,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,,snippets-big-page,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,,internals-big-page,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals-big-page,Internals Reference}
 @end macro
 
 @end ifset
@@ -208,50 +208,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,learning,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@ref{\TEXT\,,,snippets,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,,internals,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
 @end macro
 
 @end ifclear
@@ -274,45 +274,45 @@
 @end macro
 
 @macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,learning,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@ref{\TEXT\,,,snippets,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,,internals,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
 @end macro
 
 @end iftex
diff --git a/Documentation/ja/texidocs/GNUmakefile b/Documentation/ja/texidocs/GNUmakefile
new file mode 100644
index 0000000000..0ffa75869c
--- /dev/null
+++ b/Documentation/ja/texidocs/GNUmakefile
@@ -0,0 +1,5 @@
+depth=../../..
+
+EXTRA_DIST_FILES=$(call src-wildcard,*.texidoc)
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/ja/texidocs/piano-template-with-centered-dynamics.texidoc b/Documentation/ja/texidocs/piano-template-with-centered-dynamics.texidoc
new file mode 100644
index 0000000000..24704c6298
--- /dev/null
+++ b/Documentation/ja/texidocs/piano-template-with-centered-dynamics.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+多くのピアノ譜は、強弱記号を 2 つの譜の間に置きます。これを実現するにはちょっ@c
+とした調整が必要ですが、そのテンプレートがここにあるので、あなた自身が調整を行@c
+う必要はありません。
+"
diff --git a/Documentation/ja/texidocs/piano-template-with-centered-lyrics.texidoc b/Documentation/ja/texidocs/piano-template-with-centered-lyrics.texidoc
new file mode 100644
index 0000000000..0ac466c814
--- /dev/null
+++ b/Documentation/ja/texidocs/piano-template-with-centered-lyrics.texidoc
@@ -0,0 +1,4 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+旋律と歌詞のための譜表を持つ代わりに、歌詞をピアノ譜の 2 つの譜の間に置くことができます。
+"
diff --git a/Documentation/ja/texidocs/piano-template-with-melody-and-lyrics.texidoc b/Documentation/ja/texidocs/piano-template-with-melody-and-lyrics.texidoc
new file mode 100644
index 0000000000..a383031082
--- /dev/null
+++ b/Documentation/ja/texidocs/piano-template-with-melody-and-lyrics.texidoc
@@ -0,0 +1,4 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+これは一般的な歌曲のフォーマットです: 旋律と歌詞を持つ譜表と、その下にピアノ伴奏譜があります。
+"
diff --git a/Documentation/ja/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc b/Documentation/ja/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
new file mode 100644
index 0000000000..936b736146
--- /dev/null
+++ b/Documentation/ja/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
@@ -0,0 +1,4 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+これは旋律、単語、コードを持つ歌曲の楽譜のためのテンプレートです。
+"
diff --git a/Documentation/ja/texidocs/single-staff-template-with-notes-and-chords.texidoc b/Documentation/ja/texidocs/single-staff-template-with-notes-and-chords.texidoc
new file mode 100644
index 0000000000..50ec63b0eb
--- /dev/null
+++ b/Documentation/ja/texidocs/single-staff-template-with-notes-and-chords.texidoc
@@ -0,0 +1,4 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+旋律とコードを持つリード譜を欲しくはありませんか？他を見る必要はありません！
+"
diff --git a/Documentation/ja/texidocs/single-staff-template-with-notes-and-lyrics.texidoc b/Documentation/ja/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
new file mode 100644
index 0000000000..ce9fadc65e
--- /dev/null
+++ b/Documentation/ja/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
@@ -0,0 +1,8 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+この小さなテンプレートは歌詞を持つ簡単な旋律を表しています。カット＆ペーストして、音符@c
+を付け加えて、それから歌詞の単語を付け加えてください。この例は自動ビームを off にして@c
+います。これはボーカル パートでは一般的なことです。自動ビームを使用するには、対応する@c
+行を変更するか、コメント アウトしてください。
+"
+
diff --git a/Documentation/ja/texidocs/single-staff-template-with-only-notes.texidoc b/Documentation/ja/texidocs/single-staff-template-with-only-notes.texidoc
new file mode 100644
index 0000000000..aba4fe36c1
--- /dev/null
+++ b/Documentation/ja/texidocs/single-staff-template-with-only-notes.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+これは音符を持つ譜表を提供するとても簡単なテンプレートであり、ソロの楽器や旋律に適しています。@c
+これをファイルにカット＆ペーストして、音符を付け加えれば完了です！
+"
+
diff --git a/Documentation/ja/texidocs/string-quartet-template-simple.texidoc b/Documentation/ja/texidocs/string-quartet-template-simple.texidoc
new file mode 100644
index 0000000000..ca2e60ca4e
--- /dev/null
+++ b/Documentation/ja/texidocs/string-quartet-template-simple.texidoc
@@ -0,0 +1,5 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+これは簡単な弦楽四重奏のためのテンプレートです。これは拍子記号と調号のために 
+@code{@bs{}global} セクションを使っています。
+"
diff --git a/Documentation/ja/texidocs/string-quartet-template-with-separate-parts.texidoc b/Documentation/ja/texidocs/string-quartet-template-with-separate-parts.texidoc
new file mode 100644
index 0000000000..b8acda1ced
--- /dev/null
+++ b/Documentation/ja/texidocs/string-quartet-template-with-separate-parts.texidoc
@@ -0,0 +1,14 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+\"弦楽四重奏テンプレート\" は適切な弦楽四重奏の楽譜を作り出しますが、個々の@c
+パート譜を譜刻する必要がある場合はどうでしょうか？今度の新しいテンプレートは 
+@code{@bs{}tag} 機能を用いて容易に楽曲を個々のパートに分ける方法を示しています。
+
+このテンプレートは別々のファイルに分ける必要があります。ファイル名は各ファイル@c
+の開始部分のコメントの中に記述されています。@code{piece.ly} はすべての音楽定義@c
+を保持しています。他のファイル - @code{score.ly}, @code{vn1.ly}, @code{vn2.ly}, 
+@code{vla.ly} それに @code{vlc.ly} - は対応するパートを作り出します。
+
+
+別々のファイルに分ける場合は、指定されたコメントを外すことを忘れないでください！
+"
diff --git a/Documentation/ja/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc b/Documentation/ja/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
new file mode 100644
index 0000000000..8355a1353b
--- /dev/null
+++ b/Documentation/ja/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
@@ -0,0 +1,7 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+このテンプレートは、\"合唱テンプレート\"で示された標準の SATB ボーカル譜に自動@c
+ピアノ譜を付け加えています。これは LilyPond の強みの 1 つを示しています - 音楽@c
+定義を何回も使用することができます。ボーカルの音符 (例えば、@code{tenorMusic} 
+の音符) に変更が加えられた場合、その変更はピアノ譜にも適用されます。
+"
diff --git a/Documentation/ja/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc b/Documentation/ja/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
new file mode 100644
index 0000000000..d51ae35e4c
--- /dev/null
+++ b/Documentation/ja/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
@@ -0,0 +1,5 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が 
+@code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
+"
diff --git a/Documentation/ja/texidocs/vocal-ensemble-template.texidoc b/Documentation/ja/texidocs/vocal-ensemble-template.texidoc
new file mode 100644
index 0000000000..436fe4bc00
--- /dev/null
+++ b/Documentation/ja/texidocs/vocal-ensemble-template.texidoc
@@ -0,0 +1,6 @@
+%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
+  texidocja = "
+これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
+もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
+便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
+歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
diff --git a/Documentation/ja/user/GNUmakefile b/Documentation/ja/user/GNUmakefile
deleted file mode 100644
index 1b51cfc8e2..0000000000
--- a/Documentation/ja/user/GNUmakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-ISOLANG = ja
-depth = ../../..
-LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-include $(depth)/make/stepmake.make
-
-$(outdir)/%.pdf:
-	true
diff --git a/Documentation/user/latex-example.latex b/Documentation/latex-example.latex
similarity index 100%
rename from Documentation/user/latex-example.latex
rename to Documentation/latex-example.latex
diff --git a/Documentation/user/latex-lilypond-example.latex b/Documentation/latex-lilypond-example.latex
similarity index 100%
rename from Documentation/user/latex-lilypond-example.latex
rename to Documentation/latex-lilypond-example.latex
diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/learning.tely
similarity index 87%
rename from Documentation/user/lilypond-learning.tely
rename to Documentation/learning.tely
index cb0c89f1fc..16235b8b77 100644
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/learning.tely
@@ -33,13 +33,13 @@
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-learning.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-learning-big-page.html,one big page}.
+@uref{source/Documentation/learning.pdf,PDF} and as
+@uref{source/Documentation/learning-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-learning.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-learning/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/learning.pdf,PDF} and as
+@uref{source/Documentation/learning/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
@@ -134,15 +134,15 @@ Appendices
 @contents
 
 
-@include preface.itely
-@include introduction.itely
-@include tutorial.itely
-@include fundamental.itely
-@include tweaks.itely
-@include working.itely
+@include learning/preface.itely
+@include learning/introduction.itely
+@include learning/tutorial.itely
+@include learning/fundamental.itely
+@include learning/tweaks.itely
+@include learning/working.itely
 
-@include templates.itely
-@include scheme-tutorial.itely
+@include learning/templates.itely
+@include learning/scheme-tutorial.itely
 @include fdl.itexi
 
 @node LilyPond index
diff --git a/Documentation/learning/GNUmakefile b/Documentation/learning/GNUmakefile
new file mode 100644
index 0000000000..c93c9e0624
--- /dev/null
+++ b/Documentation/learning/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/user/fundamental.itely b/Documentation/learning/fundamental.itely
similarity index 99%
rename from Documentation/user/fundamental.itely
rename to Documentation/learning/fundamental.itely
index 61b361a096..4bc867b8ba 100644
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/introduction.itely b/Documentation/learning/introduction.itely
similarity index 99%
rename from Documentation/user/introduction.itely
rename to Documentation/learning/introduction.itely
index e1db15797f..5ced19393a 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/learning/introduction.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/preface.itely b/Documentation/learning/preface.itely
similarity index 98%
rename from Documentation/user/preface.itely
rename to Documentation/learning/preface.itely
index d82632e77f..c699536306 100644
--- a/Documentation/user/preface.itely
+++ b/Documentation/learning/preface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/scheme-tutorial.itely b/Documentation/learning/scheme-tutorial.itely
similarity index 99%
rename from Documentation/user/scheme-tutorial.itely
rename to Documentation/learning/scheme-tutorial.itely
index 18f79c2d15..20455abcc5 100644
--- a/Documentation/user/scheme-tutorial.itely
+++ b/Documentation/learning/scheme-tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/templates.itely b/Documentation/learning/templates.itely
similarity index 99%
rename from Documentation/user/templates.itely
rename to Documentation/learning/templates.itely
index f2b22f6b2f..3c83ec8a6d 100644
--- a/Documentation/user/templates.itely
+++ b/Documentation/learning/templates.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/tutorial.itely b/Documentation/learning/tutorial.itely
similarity index 99%
rename from Documentation/user/tutorial.itely
rename to Documentation/learning/tutorial.itely
index b80d9a8c33..85372fe3a9 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/learning/tutorial.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/tweaks.itely b/Documentation/learning/tweaks.itely
similarity index 99%
rename from Documentation/user/tweaks.itely
rename to Documentation/learning/tweaks.itely
index 304fe5aa75..49a4243c89 100644
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/working.itely b/Documentation/learning/working.itely
similarity index 99%
rename from Documentation/user/working.itely
rename to Documentation/learning/working.itely
index 34e82c3bee..855c52c460 100644
--- a/Documentation/user/working.itely
+++ b/Documentation/learning/working.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond-learning.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/lily-flat-bw.png b/Documentation/lily-flat-bw.png
similarity index 100%
rename from Documentation/user/lily-flat-bw.png
rename to Documentation/lily-flat-bw.png
diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 86f549bc81..821977dd1b 100644
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -133,50 +133,50 @@
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,,learning-big-page,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning-big-page,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,,notation-big-page,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation-big-page,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,,application-big-page,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application-big-page,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,,snippets-big-page,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets-big-page,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,,internals-big-page,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals-big-page,Internals Reference}
 @end macro
 
 @end ifset
@@ -186,6 +186,70 @@
 
 @ifclear bigpage
 
+@ifnotinfo
+
+@macro rglos{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,music-glossary,Music Glossary}
+@end macro
+
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
+@end macro
+
+@macro rlearning{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,learning,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,learning,Learning Manual}
+@end macro
+
+@macro ruser{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,notation,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
+@end macro
+
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,application,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
+@end macro
+
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,snippets,Snippets}
+@end macro
+
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,internals,Internals Reference}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
+@end macro
+
+@end ifnotinfo
+
+@ifinfo
+
 @macro rglos{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,music-glossary,Music Glossary}
@@ -208,22 +272,22 @@
 
 @macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,lilypond-notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,lilypond-notation,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,lilypond-application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
@@ -244,6 +308,8 @@
 @ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
 @end macro
 
+@end ifinfo
+
 @end ifclear
 
 @end ifnottex
@@ -275,52 +341,52 @@
 
 @macro rlearning{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,learning,Learning Manual}
 @end macro
 
 @macro rlearningnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,\DISPLAY\,learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,notation,Notation Reference}
 @end macro
 
 @macro rusernamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
+@ref{\TEXT\,,\DISPLAY\,notation,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,application,Application Usage}
 @end macro
 
 @macro rprogramnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,application,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@ref{\TEXT\,,,snippets,Snippets}
 @end macro
 
 @macro rlsrnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@ref{\TEXT\,,\DISPLAY\,snippets,Snippets}
 @end macro
 
 @macro rinternals{TEXT}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,,internals,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @lilyvindex{\TEXT\}
-@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,internals,Internals Reference}
 @end macro
 
 @end iftex
diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index bb3beb4998..8292ed288e 100644
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..
 
 NAME = documentation
 
-STEPMAKE_TEMPLATES=documentation  texinfo
+STEPMAKE_TEMPLATES = documentation texinfo
 
 TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9])
 EXTRA_DIST_FILES = $(TEXTS)
diff --git a/Documentation/user/music-glossary.tely b/Documentation/music-glossary.tely
similarity index 99%
rename from Documentation/user/music-glossary.tely
rename to Documentation/music-glossary.tely
index 0ae60c04ea..874c4827f9 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -11,7 +11,7 @@
 @c see lilypond.tely for info installation note
 @dircategory LilyPond
 @direntry
-* Glossary: (lilypond/music-glossary).  Glossary of music terms.
+* Glossary: (music-glossary).  Glossary of music terms.
 @end direntry
 
 @titlepage
@@ -63,13 +63,13 @@ Copyright @copyright{} 1999--2009 by the authors
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/music-glossary.pdf,PDF} and as
-@uref{source/Documentation/user/music-glossary-big-page.html,one big page}.
+@uref{source/Documentation/music-glossary.pdf,PDF} and as
+@uref{source/Documentation/music-glossary-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/music-glossary.pdf,PDF} and as a
-@uref{source/Documentation/user/music-glossary/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/music-glossary.pdf,PDF} and as a
+@uref{source/Documentation/music-glossary/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
diff --git a/Documentation/user/lilypond.tely b/Documentation/notation.tely
similarity index 80%
rename from Documentation/user/lilypond.tely
rename to Documentation/notation.tely
index 8d2ca906d8..7d89b26e49 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/notation.tely
@@ -5,7 +5,7 @@
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
 @end ignore
-@setfilename lilypond.info
+@setfilename lilypond-notation.info
 @settitle GNU LilyPond Notation Reference
 @documentencoding UTF-8
 @documentlanguage en
@@ -27,7 +27,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
   * List all commands in direntry.
 
-@c  * lilypond: (lilypond/lilypond)Running LilyPond.      Invoking the
+@c  * lilypond: (lilypond-application)Running LilyPond.      Invoking the
 @c    LilyPond  program.
 @end ignore
 
@@ -39,15 +39,16 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @direntry
 * LilyPond Learning Manual: (lilypond-learning).  Start here.
 * Music Glossary: (music-glossary).               For non-English users.
-* LilyPond: (lilypond).                           LilyPond Notation Reference.
+* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
+* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
 * LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
-* LilyPond Application Usage: (lilypond-program). Installing and running applications.
-* abc2ly: (lilypond-program)Invoking abc2ly.      Importing ABC.      
-* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-program)Invoking etf2ly.      Importing Finale.
-* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music.
-* midi2ly: (lilypond-program)Invoking midi2ly.    Importing MIDI.
-* musicxml2ly: (lilypond-program)Invoking musicxml2ly.  Importing MusicXML.
+* LilyPond Application Usage: (lilypond-application). Installing and running applications.
+* abc2ly: (lilypond-application)Invoking abc2ly.      Importing ABC.      
+* convert-ly: (lilypond-application)Updating files with convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond-application)Invoking etf2ly.      Importing Finale.
+* lilypond-book: (lilypond-application)LilyPond-book. Integrating text and music.
+* midi2ly: (lilypond-application)Invoking midi2ly.    Importing MIDI.
+* musicxml2ly: (lilypond-application)Invoking musicxml2ly.  Importing MusicXML.
 @end direntry
 
 @c don't remove this comment.
@@ -70,13 +71,13 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-big-page.html,one big page}.
+@uref{source/Documentation/notation.pdf,PDF} and as
+@uref{source/Documentation/notation-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond.pdf,PDF} and as a
-@uref{source/Documentation/user/lilypond/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/notation.pdf,PDF} and as a
+@uref{source/Documentation/notation/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
@@ -177,19 +178,19 @@ Appendices
 @contents
 
 
-@include notation.itely
-@include specialist.itely
+@include notation/notation.itely
+@include notation/specialist.itely
 
-@include input.itely
-@include spacing.itely
+@include notation/input.itely
+@include notation/spacing.itely
 
-@include changing-defaults.itely
-@include programming-interface.itely
+@include notation/changing-defaults.itely
+@include notation/programming-interface.itely
 
 
-@include literature.itely
-@include notation-appendices.itely
-@include cheatsheet.itely
+@include notation/literature.itely
+@include notation/notation-appendices.itely
+@include notation/cheatsheet.itely
 
 @node LilyPond grammar
 @appendix LilyPond grammar
diff --git a/Documentation/notation/GNUmakefile b/Documentation/notation/GNUmakefile
new file mode 100644
index 0000000000..c93c9e0624
--- /dev/null
+++ b/Documentation/notation/GNUmakefile
@@ -0,0 +1,5 @@
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES = ly
+
+include $(depth)/make/stepmake.make
diff --git a/Documentation/user/ancient.itely b/Documentation/notation/ancient.itely
similarity index 100%
rename from Documentation/user/ancient.itely
rename to Documentation/notation/ancient.itely
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
similarity index 99%
rename from Documentation/user/changing-defaults.itely
rename to Documentation/notation/changing-defaults.itely
index b63980e924..e8a5ad20f1 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/cheatsheet.itely b/Documentation/notation/cheatsheet.itely
similarity index 99%
rename from Documentation/user/cheatsheet.itely
rename to Documentation/notation/cheatsheet.itely
index d6c8393345..34cf29ad44 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/notation/cheatsheet.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/chords.itely b/Documentation/notation/chords.itely
similarity index 100%
rename from Documentation/user/chords.itely
rename to Documentation/notation/chords.itely
diff --git a/Documentation/user/editorial.itely b/Documentation/notation/editorial.itely
similarity index 100%
rename from Documentation/user/editorial.itely
rename to Documentation/notation/editorial.itely
diff --git a/Documentation/user/expressive.itely b/Documentation/notation/expressive.itely
similarity index 100%
rename from Documentation/user/expressive.itely
rename to Documentation/notation/expressive.itely
diff --git a/Documentation/user/fretted-strings.itely b/Documentation/notation/fretted-strings.itely
similarity index 100%
rename from Documentation/user/fretted-strings.itely
rename to Documentation/notation/fretted-strings.itely
diff --git a/Documentation/user/input.itely b/Documentation/notation/input.itely
similarity index 99%
rename from Documentation/user/input.itely
rename to Documentation/notation/input.itely
index ead89488c4..1a08dbd0d1 100644
--- a/Documentation/user/input.itely
+++ b/Documentation/notation/input.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/keyboards.itely b/Documentation/notation/keyboards.itely
similarity index 100%
rename from Documentation/user/keyboards.itely
rename to Documentation/notation/keyboards.itely
diff --git a/Documentation/user/literature.itely b/Documentation/notation/literature.itely
similarity index 98%
rename from Documentation/user/literature.itely
rename to Documentation/notation/literature.itely
index cf05679e64..68cc70cc7c 100644
--- a/Documentation/user/literature.itely
+++ b/Documentation/notation/literature.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
similarity index 99%
rename from Documentation/user/notation-appendices.itely
rename to Documentation/notation/notation-appendices.itely
index bba5f751b1..fe0428ed4e 100644
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/notation.itely b/Documentation/notation/notation.itely
similarity index 76%
rename from Documentation/user/notation.itely
rename to Documentation/notation/notation.itely
index 57afdc00fd..4f18a28fee 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/notation/notation.itely
@@ -24,12 +24,12 @@ This chapter explains how to create musical notation.
 * Text::               Adding text to scores.
 @end menu
 
-@include pitches.itely
-@include rhythms.itely
-@include expressive.itely
-@include repeats.itely
-@include simultaneous.itely
-@include staff.itely
-@include editorial.itely
-@include text.itely
+@include notation/pitches.itely
+@include notation/rhythms.itely
+@include notation/expressive.itely
+@include notation/repeats.itely
+@include notation/simultaneous.itely
+@include notation/staff.itely
+@include notation/editorial.itely
+@include notation/text.itely
 
diff --git a/Documentation/user/percussion.itely b/Documentation/notation/percussion.itely
similarity index 100%
rename from Documentation/user/percussion.itely
rename to Documentation/notation/percussion.itely
diff --git a/Documentation/user/pitches.itely b/Documentation/notation/pitches.itely
similarity index 100%
rename from Documentation/user/pitches.itely
rename to Documentation/notation/pitches.itely
diff --git a/Documentation/user/programming-interface.itely b/Documentation/notation/programming-interface.itely
similarity index 99%
rename from Documentation/user/programming-interface.itely
rename to Documentation/notation/programming-interface.itely
index 2d28412eab..ecee99c8fd 100644
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/notation/programming-interface.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/repeats.itely b/Documentation/notation/repeats.itely
similarity index 100%
rename from Documentation/user/repeats.itely
rename to Documentation/notation/repeats.itely
diff --git a/Documentation/user/rhythms.itely b/Documentation/notation/rhythms.itely
similarity index 100%
rename from Documentation/user/rhythms.itely
rename to Documentation/notation/rhythms.itely
diff --git a/Documentation/user/simultaneous.itely b/Documentation/notation/simultaneous.itely
similarity index 100%
rename from Documentation/user/simultaneous.itely
rename to Documentation/notation/simultaneous.itely
diff --git a/Documentation/user/spacing.itely b/Documentation/notation/spacing.itely
similarity index 99%
rename from Documentation/user/spacing.itely
rename to Documentation/notation/spacing.itely
index fd7e52140a..bd844e3ebe 100644
--- a/Documentation/user/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -1,5 +1,5 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c This file is part of lilypond.tely
+
 @ignore
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
diff --git a/Documentation/user/specialist.itely b/Documentation/notation/specialist.itely
similarity index 69%
rename from Documentation/user/specialist.itely
rename to Documentation/notation/specialist.itely
index 98b7595821..e98730ce35 100644
--- a/Documentation/user/specialist.itely
+++ b/Documentation/notation/specialist.itely
@@ -26,13 +26,13 @@ types of instrument or in specific styles.
 * World music::
 @end menu
 
-@include vocal.itely
-@include keyboards.itely
-@include unfretted-strings.itely
-@include fretted-strings.itely
-@include percussion.itely
-@include wind.itely
-@include chords.itely
-@include ancient.itely
-@include world.itely
+@include notation/vocal.itely
+@include notation/keyboards.itely
+@include notation/unfretted-strings.itely
+@include notation/fretted-strings.itely
+@include notation/percussion.itely
+@include notation/wind.itely
+@include notation/chords.itely
+@include notation/ancient.itely
+@include notation/world.itely
 
diff --git a/Documentation/user/staff.itely b/Documentation/notation/staff.itely
similarity index 100%
rename from Documentation/user/staff.itely
rename to Documentation/notation/staff.itely
diff --git a/Documentation/user/text.itely b/Documentation/notation/text.itely
similarity index 100%
rename from Documentation/user/text.itely
rename to Documentation/notation/text.itely
diff --git a/Documentation/user/unfretted-strings.itely b/Documentation/notation/unfretted-strings.itely
similarity index 100%
rename from Documentation/user/unfretted-strings.itely
rename to Documentation/notation/unfretted-strings.itely
diff --git a/Documentation/user/vocal.itely b/Documentation/notation/vocal.itely
similarity index 100%
rename from Documentation/user/vocal.itely
rename to Documentation/notation/vocal.itely
diff --git a/Documentation/user/wind.itely b/Documentation/notation/wind.itely
similarity index 100%
rename from Documentation/user/wind.itely
rename to Documentation/notation/wind.itely
diff --git a/Documentation/user/world.itely b/Documentation/notation/world.itely
similarity index 100%
rename from Documentation/user/world.itely
rename to Documentation/notation/world.itely
diff --git a/Documentation/po/GNUmakefile b/Documentation/po/GNUmakefile
index dc3d16144c..b61cb723ee 100644
--- a/Documentation/po/GNUmakefile
+++ b/Documentation/po/GNUmakefile
@@ -34,3 +34,7 @@ po-update:
 	for i in $(CATALOGS); do \
 	  msgmerge -U $$i.po lilypond-doc.pot; \
 	done
+
+ifeq ($(out),www)
+local-WWW-1: messages
+endif
diff --git a/input/lsr/lilypond-snippets.tely b/Documentation/snippets.tely
similarity index 69%
rename from input/lsr/lilypond-snippets.tely
rename to Documentation/snippets.tely
index 0062153a2b..3e2b7cec59 100644
--- a/input/lsr/lilypond-snippets.tely
+++ b/Documentation/snippets.tely
@@ -6,14 +6,12 @@
 
 @iftex
 @afourpaper
-@c don't replace quotes with directed quotes
-@tex
-\gdef\SETtxicodequoteundirected{Foo}
-\gdef\SETtxicodequotebacktick{Bla}
-@end tex
 @end iftex
 
-@include version.itexi
+@c This disables @lydoctitle definition in common-macros.itexi
+@set snippets-sections
+
+@include macros.itexi
 
 @ifnothtml
 @macro lydoctitle{TEXT}
@@ -22,61 +20,12 @@
 @end ifnothtml
 
 @ifhtml
-
 @macro lydoctitle{TEXT}
 @node \TEXT\
 @unnumberedsec \TEXT\
 @end macro
-
-@ifset bigpage
-
-@macro rlearning{NAME}
-See also Learning Manual, section
-@ref{\NAME\,,,lilypond-learning-big-page,Learning Manual}.
-@end macro
-
-@macro ruser{NAME}
-These snippets illustrate the Notation Reference,
-section @ref{\NAME\,,,lilypond-big-page,Notation Reference}.
-@end macro
-
-@end ifset
-
-
-@ifclear bigpage
-
-@macro rlearning{NAME}
-See also Learning Manual, section
-@ref{\NAME\,,,lilypond-learning,Learning Manual}.
-@end macro
-
-@macro ruser{NAME}
-These snippets illustrate the Notation Reference,
-section @ref{\NAME\,,,lilypond,Notation Reference}.
-@end macro
-
-@end ifclear
-
 @end ifhtml
 
-
-@ifnothtml
-
-@macro rlearning{NAME}
-See also @ref{\NAME\,,,lilypond-learning,Learning Manual}.
-@end macro
-
-@macro ruser{NAME}
-These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
-@end macro
-
-@end ifnothtml
-
-@dircategory GNU LilyPond --- the music typesetter
-@direntry
-* LilyPond Snippets: (lilypond-snippets).       Short tricks, tips, and examples.
-@end direntry
-
 @finalout
 
 @titlepage
@@ -120,13 +69,13 @@ or figure for each example to see the corresponding input file.
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-snippets.pdf,PDF} and as
-@uref{source/input/lsr/lilypond-snippets-big-page.html,one big page}.
+@uref{source/Documentation/snippets.pdf,PDF} and as
+@uref{source/Documentation/snippets-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-snippets.pdf,PDF} and as
-@uref{source/input/lsr/lilypond-snippets/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/snippets.pdf,PDF} and as
+@uref{source/Documentation/snippets/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
@@ -135,9 +84,10 @@ This document shows a selected set of LilyPond snippets from the
 (LSR). It is in the public domain.
 
 Please note that it is not an exact subset of LSR: some snippets come
-from @file{input/new} LilyPond sources directory, and snippets from LSR
-are converted through @command{convert-ly}, as LSR is based on a stable
-LilyPond version, and this document is for version @version{}.
+from @file{Documentation/snippets/new} LilyPond sources directory, and
+snippets from LSR are converted through @command{convert-ly}, as LSR is
+based on a stable LilyPond version, and this document is for version
+@version{}.
 
 Snippets are grouped by tags; tags listed in the table of contents match
 a section of LilyPond notation manual.  Snippets may have several tags,
diff --git a/Documentation/snippets/GNUmakefile b/Documentation/snippets/GNUmakefile
new file mode 100644
index 0000000000..2a6f9ed8cc
--- /dev/null
+++ b/Documentation/snippets/GNUmakefile
@@ -0,0 +1,7 @@
+depth = ../..
+
+SUBDIRS = new
+EXTRA_DIST_FILES = $(call src-wildcard,*.snippet-list) \
+ $(call src-wildcard,*.ly) $(call src-wildcard,*.itely)
+
+include $(depth)/make/stepmake.make
diff --git a/input/lsr/README b/Documentation/snippets/README
similarity index 100%
rename from input/lsr/README
rename to Documentation/snippets/README
diff --git a/input/lsr/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
similarity index 100%
rename from input/lsr/accordion-discant-symbols.ly
rename to Documentation/snippets/accordion-discant-symbols.ly
diff --git a/input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly b/Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
similarity index 100%
rename from input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
rename to Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly
diff --git a/input/lsr/adding-ambitus-per-voice.ly b/Documentation/snippets/adding-ambitus-per-voice.ly
similarity index 100%
rename from input/lsr/adding-ambitus-per-voice.ly
rename to Documentation/snippets/adding-ambitus-per-voice.ly
diff --git a/input/lsr/adding-an-extra-staff-at-a-line-break.ly b/Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
similarity index 100%
rename from input/lsr/adding-an-extra-staff-at-a-line-break.ly
rename to Documentation/snippets/adding-an-extra-staff-at-a-line-break.ly
diff --git a/input/lsr/adding-an-extra-staff.ly b/Documentation/snippets/adding-an-extra-staff.ly
similarity index 100%
rename from input/lsr/adding-an-extra-staff.ly
rename to Documentation/snippets/adding-an-extra-staff.ly
diff --git a/input/lsr/adding-bar-lines-to-chordnames-context.ly b/Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
similarity index 100%
rename from input/lsr/adding-bar-lines-to-chordnames-context.ly
rename to Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
diff --git a/input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
similarity index 100%
rename from input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
rename to Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly
diff --git a/input/lsr/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
similarity index 100%
rename from input/lsr/adding-drum-parts.ly
rename to Documentation/snippets/adding-drum-parts.ly
diff --git a/input/lsr/adding-fingerings-to-a-score.ly b/Documentation/snippets/adding-fingerings-to-a-score.ly
similarity index 100%
rename from input/lsr/adding-fingerings-to-a-score.ly
rename to Documentation/snippets/adding-fingerings-to-a-score.ly
diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/Documentation/snippets/adding-fingerings-to-tablatures.ly
similarity index 100%
rename from input/lsr/adding-fingerings-to-tablatures.ly
rename to Documentation/snippets/adding-fingerings-to-tablatures.ly
diff --git a/input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly b/Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
similarity index 100%
rename from input/lsr/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
rename to Documentation/snippets/adding-parentheses-around-an-expressive-mark-or-chordal-note.ly
diff --git a/input/lsr/adding-the-current-date-to-a-score.ly b/Documentation/snippets/adding-the-current-date-to-a-score.ly
similarity index 100%
rename from input/lsr/adding-the-current-date-to-a-score.ly
rename to Documentation/snippets/adding-the-current-date-to-a-score.ly
diff --git a/input/lsr/adding-volta-brackets-to-additional-staves.ly b/Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
similarity index 100%
rename from input/lsr/adding-volta-brackets-to-additional-staves.ly
rename to Documentation/snippets/adding-volta-brackets-to-additional-staves.ly
diff --git a/input/lsr/additional-voices-to-avoid-collisions.ly b/Documentation/snippets/additional-voices-to-avoid-collisions.ly
similarity index 100%
rename from input/lsr/additional-voices-to-avoid-collisions.ly
rename to Documentation/snippets/additional-voices-to-avoid-collisions.ly
diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
similarity index 100%
rename from input/lsr/adjusting-lyrics-vertical-spacing.ly
rename to Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
diff --git a/input/lsr/adjusting-the-shape-of-falls-and-doits.ly b/Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
similarity index 100%
rename from input/lsr/adjusting-the-shape-of-falls-and-doits.ly
rename to Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly
diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/Documentation/snippets/aligning-and-centering-instrument-names.ly
similarity index 100%
rename from input/lsr/aligning-and-centering-instrument-names.ly
rename to Documentation/snippets/aligning-and-centering-instrument-names.ly
diff --git a/input/lsr/aligning-bar-numbers.ly b/Documentation/snippets/aligning-bar-numbers.ly
similarity index 100%
rename from input/lsr/aligning-bar-numbers.ly
rename to Documentation/snippets/aligning-bar-numbers.ly
diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/Documentation/snippets/aligning-marks-with-various-notation-objects.ly
similarity index 100%
rename from input/lsr/aligning-marks-with-various-notation-objects.ly
rename to Documentation/snippets/aligning-marks-with-various-notation-objects.ly
diff --git a/input/lsr/aligning-objects-created-with-the--mark-command.ly b/Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
similarity index 100%
rename from input/lsr/aligning-objects-created-with-the--mark-command.ly
rename to Documentation/snippets/aligning-objects-created-with-the--mark-command.ly
diff --git a/input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly b/Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
similarity index 100%
rename from input/lsr/allowing-fingerings-to-be-printed-inside-the-staff.ly
rename to Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly
diff --git a/input/lsr/ambitus-with-multiple-voices.ly b/Documentation/snippets/ambitus-with-multiple-voices.ly
similarity index 100%
rename from input/lsr/ambitus-with-multiple-voices.ly
rename to Documentation/snippets/ambitus-with-multiple-voices.ly
diff --git a/input/lsr/ambitus.ly b/Documentation/snippets/ambitus.ly
similarity index 100%
rename from input/lsr/ambitus.ly
rename to Documentation/snippets/ambitus.ly
diff --git a/input/lsr/analysis-brackets-above-the-staff.ly b/Documentation/snippets/analysis-brackets-above-the-staff.ly
similarity index 100%
rename from input/lsr/analysis-brackets-above-the-staff.ly
rename to Documentation/snippets/analysis-brackets-above-the-staff.ly
diff --git a/input/lsr/ancient-fonts.ly b/Documentation/snippets/ancient-fonts.ly
similarity index 100%
rename from input/lsr/ancient-fonts.ly
rename to Documentation/snippets/ancient-fonts.ly
diff --git a/input/lsr/ancient-notation-intro.itely b/Documentation/snippets/ancient-notation-intro.itely
similarity index 100%
rename from input/lsr/ancient-notation-intro.itely
rename to Documentation/snippets/ancient-notation-intro.itely
diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
similarity index 100%
rename from input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
rename to Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
similarity index 100%
rename from input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
rename to Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
diff --git a/input/lsr/ancient-notation.snippet-list b/Documentation/snippets/ancient-notation.snippet-list
similarity index 100%
rename from input/lsr/ancient-notation.snippet-list
rename to Documentation/snippets/ancient-notation.snippet-list
diff --git a/input/lsr/ancient-time-signatures.ly b/Documentation/snippets/ancient-time-signatures.ly
similarity index 100%
rename from input/lsr/ancient-time-signatures.ly
rename to Documentation/snippets/ancient-time-signatures.ly
diff --git a/input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly b/Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
similarity index 100%
rename from input/lsr/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
rename to Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the-scale.ly
diff --git a/input/lsr/arabic-improvisation.ly b/Documentation/snippets/arabic-improvisation.ly
similarity index 100%
rename from input/lsr/arabic-improvisation.ly
rename to Documentation/snippets/arabic-improvisation.ly
diff --git a/input/lsr/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
similarity index 100%
rename from input/lsr/automatic-beam-subdivisions.ly
rename to Documentation/snippets/automatic-beam-subdivisions.ly
diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/Documentation/snippets/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
similarity index 100%
rename from input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
rename to Documentation/snippets/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
diff --git a/input/lsr/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
similarity index 100%
rename from input/lsr/avoiding-collisions-with-chord-fingerings.ly
rename to Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
diff --git a/input/lsr/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
similarity index 100%
rename from input/lsr/beam-endings-in-score-context.ly
rename to Documentation/snippets/beam-endings-in-score-context.ly
diff --git a/input/lsr/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
similarity index 100%
rename from input/lsr/beam-grouping-in-7-8-time.ly
rename to Documentation/snippets/beam-grouping-in-7-8-time.ly
diff --git a/input/lsr/beams-across-line-breaks.ly b/Documentation/snippets/beams-across-line-breaks.ly
similarity index 100%
rename from input/lsr/beams-across-line-breaks.ly
rename to Documentation/snippets/beams-across-line-breaks.ly
diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
similarity index 100%
rename from input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
rename to Documentation/snippets/blanking-staff-lines-using-the--whiteout-command.ly
diff --git a/input/lsr/book-parts.ly b/Documentation/snippets/book-parts.ly
similarity index 100%
rename from input/lsr/book-parts.ly
rename to Documentation/snippets/book-parts.ly
diff --git a/input/lsr/breaks.snippet-list b/Documentation/snippets/breaks.snippet-list
similarity index 100%
rename from input/lsr/breaks.snippet-list
rename to Documentation/snippets/breaks.snippet-list
diff --git a/input/lsr/breathing-signs.ly b/Documentation/snippets/breathing-signs.ly
similarity index 100%
rename from input/lsr/breathing-signs.ly
rename to Documentation/snippets/breathing-signs.ly
diff --git a/input/lsr/broken-crescendo-hairpin.ly b/Documentation/snippets/broken-crescendo-hairpin.ly
similarity index 100%
rename from input/lsr/broken-crescendo-hairpin.ly
rename to Documentation/snippets/broken-crescendo-hairpin.ly
diff --git a/input/lsr/caesura-railtracks-with-fermata.ly b/Documentation/snippets/caesura-railtracks-with-fermata.ly
similarity index 100%
rename from input/lsr/caesura-railtracks-with-fermata.ly
rename to Documentation/snippets/caesura-railtracks-with-fermata.ly
diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/Documentation/snippets/center-text-below-hairpin-dynamics.ly
similarity index 100%
rename from input/lsr/center-text-below-hairpin-dynamics.ly
rename to Documentation/snippets/center-text-below-hairpin-dynamics.ly
diff --git a/input/lsr/changing--flageolet-mark-size.ly b/Documentation/snippets/changing--flageolet-mark-size.ly
similarity index 100%
rename from input/lsr/changing--flageolet-mark-size.ly
rename to Documentation/snippets/changing--flageolet-mark-size.ly
diff --git a/input/lsr/changing-a-single-notes-size-in-a-chord.ly b/Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
similarity index 100%
rename from input/lsr/changing-a-single-notes-size-in-a-chord.ly
rename to Documentation/snippets/changing-a-single-notes-size-in-a-chord.ly
diff --git a/input/lsr/changing-beam-knee-gap.ly b/Documentation/snippets/changing-beam-knee-gap.ly
similarity index 100%
rename from input/lsr/changing-beam-knee-gap.ly
rename to Documentation/snippets/changing-beam-knee-gap.ly
diff --git a/input/lsr/changing-chord-separator.ly b/Documentation/snippets/changing-chord-separator.ly
similarity index 100%
rename from input/lsr/changing-chord-separator.ly
rename to Documentation/snippets/changing-chord-separator.ly
diff --git a/input/lsr/changing-form-of-multi-measure-rests.ly b/Documentation/snippets/changing-form-of-multi-measure-rests.ly
similarity index 100%
rename from input/lsr/changing-form-of-multi-measure-rests.ly
rename to Documentation/snippets/changing-form-of-multi-measure-rests.ly
diff --git a/input/lsr/changing-midi-output-to-one-channel-per-voice.ly b/Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
similarity index 100%
rename from input/lsr/changing-midi-output-to-one-channel-per-voice.ly
rename to Documentation/snippets/changing-midi-output-to-one-channel-per-voice.ly
diff --git a/input/lsr/changing-partcombine-texts.ly b/Documentation/snippets/changing-partcombine-texts.ly
similarity index 100%
rename from input/lsr/changing-partcombine-texts.ly
rename to Documentation/snippets/changing-partcombine-texts.ly
diff --git a/input/lsr/changing-properties-for-individual-grobs.ly b/Documentation/snippets/changing-properties-for-individual-grobs.ly
similarity index 100%
rename from input/lsr/changing-properties-for-individual-grobs.ly
rename to Documentation/snippets/changing-properties-for-individual-grobs.ly
diff --git a/input/lsr/changing-stanza-fonts.ly b/Documentation/snippets/changing-stanza-fonts.ly
similarity index 100%
rename from input/lsr/changing-stanza-fonts.ly
rename to Documentation/snippets/changing-stanza-fonts.ly
diff --git a/input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly b/Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
similarity index 100%
rename from input/lsr/changing-text-and-spanner-styles-for-text-dynamics.ly
rename to Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly
diff --git a/input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly b/Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
similarity index 100%
rename from input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
rename to Documentation/snippets/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/Documentation/snippets/changing-the-breath-mark-symbol.ly
similarity index 100%
rename from input/lsr/changing-the-breath-mark-symbol.ly
rename to Documentation/snippets/changing-the-breath-mark-symbol.ly
diff --git a/input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly b/Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
similarity index 100%
rename from input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly
rename to Documentation/snippets/changing-the-chord-names-to-german-or-semi-german-notation.ly
diff --git a/input/lsr/changing-the-default-text-font-family.ly b/Documentation/snippets/changing-the-default-text-font-family.ly
similarity index 100%
rename from input/lsr/changing-the-default-text-font-family.ly
rename to Documentation/snippets/changing-the-default-text-font-family.ly
diff --git a/input/lsr/changing-the-number-of-lines-in-a-staff.ly b/Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
similarity index 100%
rename from input/lsr/changing-the-number-of-lines-in-a-staff.ly
rename to Documentation/snippets/changing-the-number-of-lines-in-a-staff.ly
diff --git a/input/lsr/changing-the-positions-of-figured-bass-alterations.ly b/Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
similarity index 100%
rename from input/lsr/changing-the-positions-of-figured-bass-alterations.ly
rename to Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly
diff --git a/input/lsr/changing-the-staff-size.ly b/Documentation/snippets/changing-the-staff-size.ly
similarity index 100%
rename from input/lsr/changing-the-staff-size.ly
rename to Documentation/snippets/changing-the-staff-size.ly
diff --git a/input/lsr/changing-the-tempo-without-a-metronome-mark.ly b/Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
similarity index 100%
rename from input/lsr/changing-the-tempo-without-a-metronome-mark.ly
rename to Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly
diff --git a/input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
similarity index 100%
rename from input/lsr/changing-the-time-signature-without-affecting-the-beaming.ly
rename to Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
diff --git a/input/lsr/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly
similarity index 100%
rename from input/lsr/changing-the-tuplet-number.ly
rename to Documentation/snippets/changing-the-tuplet-number.ly
diff --git a/input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
similarity index 100%
rename from input/lsr/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
rename to Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly
diff --git a/input/lsr/chant-or-psalms-notation.ly b/Documentation/snippets/chant-or-psalms-notation.ly
similarity index 100%
rename from input/lsr/chant-or-psalms-notation.ly
rename to Documentation/snippets/chant-or-psalms-notation.ly
diff --git a/input/lsr/chord-name-exceptions.ly b/Documentation/snippets/chord-name-exceptions.ly
similarity index 100%
rename from input/lsr/chord-name-exceptions.ly
rename to Documentation/snippets/chord-name-exceptions.ly
diff --git a/input/lsr/chord-name-major7.ly b/Documentation/snippets/chord-name-major7.ly
similarity index 100%
rename from input/lsr/chord-name-major7.ly
rename to Documentation/snippets/chord-name-major7.ly
diff --git a/input/lsr/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly
similarity index 100%
rename from input/lsr/chordchanges-for-fretboards.ly
rename to Documentation/snippets/chordchanges-for-fretboards.ly
diff --git a/input/lsr/chords-intro.itely b/Documentation/snippets/chords-intro.itely
similarity index 100%
rename from input/lsr/chords-intro.itely
rename to Documentation/snippets/chords-intro.itely
diff --git a/input/lsr/chords.snippet-list b/Documentation/snippets/chords.snippet-list
similarity index 100%
rename from input/lsr/chords.snippet-list
rename to Documentation/snippets/chords.snippet-list
diff --git a/input/lsr/clip-systems.ly b/Documentation/snippets/clip-systems.ly
similarity index 100%
rename from input/lsr/clip-systems.ly
rename to Documentation/snippets/clip-systems.ly
diff --git a/input/lsr/clusters.ly b/Documentation/snippets/clusters.ly
similarity index 100%
rename from input/lsr/clusters.ly
rename to Documentation/snippets/clusters.ly
diff --git a/input/lsr/coloring-notes-depending-on-their-pitch.ly b/Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
similarity index 100%
rename from input/lsr/coloring-notes-depending-on-their-pitch.ly
rename to Documentation/snippets/coloring-notes-depending-on-their-pitch.ly
diff --git a/input/lsr/combining-dynamics-with-markup-texts.ly b/Documentation/snippets/combining-dynamics-with-markup-texts.ly
similarity index 100%
rename from input/lsr/combining-dynamics-with-markup-texts.ly
rename to Documentation/snippets/combining-dynamics-with-markup-texts.ly
diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
similarity index 100%
rename from input/lsr/combining-two-parts-on-the-same-staff.ly
rename to Documentation/snippets/combining-two-parts-on-the-same-staff.ly
diff --git a/input/lsr/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
similarity index 100%
rename from input/lsr/compound-time-signatures.ly
rename to Documentation/snippets/compound-time-signatures.ly
diff --git a/input/lsr/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
similarity index 100%
rename from input/lsr/conducting-signs,-measure-grouping-signs.ly
rename to Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
diff --git a/input/lsr/contemporary-glissando.ly b/Documentation/snippets/contemporary-glissando.ly
similarity index 100%
rename from input/lsr/contemporary-glissando.ly
rename to Documentation/snippets/contemporary-glissando.ly
diff --git a/input/lsr/contexts-and-engravers-intro.itely b/Documentation/snippets/contexts-and-engravers-intro.itely
similarity index 100%
rename from input/lsr/contexts-and-engravers-intro.itely
rename to Documentation/snippets/contexts-and-engravers-intro.itely
diff --git a/input/lsr/contexts-and-engravers.snippet-list b/Documentation/snippets/contexts-and-engravers.snippet-list
similarity index 100%
rename from input/lsr/contexts-and-engravers.snippet-list
rename to Documentation/snippets/contexts-and-engravers.snippet-list
diff --git a/input/lsr/controlling-the-placement-of-chord-fingerings.ly b/Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
similarity index 100%
rename from input/lsr/controlling-the-placement-of-chord-fingerings.ly
rename to Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly
diff --git a/input/lsr/controlling-the-vertical-ordering-of-scripts.ly b/Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
similarity index 100%
rename from input/lsr/controlling-the-vertical-ordering-of-scripts.ly
rename to Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly
diff --git a/input/lsr/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly
similarity index 100%
rename from input/lsr/controlling-tuplet-bracket-visibility.ly
rename to Documentation/snippets/controlling-tuplet-bracket-visibility.ly
diff --git a/input/lsr/creating-a-delayed-turn.ly b/Documentation/snippets/creating-a-delayed-turn.ly
similarity index 100%
rename from input/lsr/creating-a-delayed-turn.ly
rename to Documentation/snippets/creating-a-delayed-turn.ly
diff --git a/input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
similarity index 100%
rename from input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
rename to Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly
diff --git a/input/lsr/creating-arpeggios-across-notes-in-different-voices.ly b/Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
similarity index 100%
rename from input/lsr/creating-arpeggios-across-notes-in-different-voices.ly
rename to Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly
diff --git a/input/lsr/creating-blank-staves.ly b/Documentation/snippets/creating-blank-staves.ly
similarity index 100%
rename from input/lsr/creating-blank-staves.ly
rename to Documentation/snippets/creating-blank-staves.ly
diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
similarity index 100%
rename from input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
rename to Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly
diff --git a/input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly b/Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
similarity index 100%
rename from input/lsr/creating-cross-staff-arpeggios-in-other-contexts.ly
rename to Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly
diff --git a/input/lsr/creating-metronome-marks-in-markup-mode.ly b/Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
similarity index 100%
rename from input/lsr/creating-metronome-marks-in-markup-mode.ly
rename to Documentation/snippets/creating-metronome-marks-in-markup-mode.ly
diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
similarity index 100%
rename from input/lsr/creating-real-parenthesized-dynamics.ly
rename to Documentation/snippets/creating-real-parenthesized-dynamics.ly
diff --git a/input/lsr/creating-simultaneous-rehearsal-marks.ly b/Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
similarity index 100%
rename from input/lsr/creating-simultaneous-rehearsal-marks.ly
rename to Documentation/snippets/creating-simultaneous-rehearsal-marks.ly
diff --git a/input/lsr/creating-slurs-across-voices.ly b/Documentation/snippets/creating-slurs-across-voices.ly
similarity index 100%
rename from input/lsr/creating-slurs-across-voices.ly
rename to Documentation/snippets/creating-slurs-across-voices.ly
diff --git a/input/lsr/creating-text-spanners.ly b/Documentation/snippets/creating-text-spanners.ly
similarity index 100%
rename from input/lsr/creating-text-spanners.ly
rename to Documentation/snippets/creating-text-spanners.ly
diff --git a/input/lsr/custodes.ly b/Documentation/snippets/custodes.ly
similarity index 100%
rename from input/lsr/custodes.ly
rename to Documentation/snippets/custodes.ly
diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
similarity index 100%
rename from input/lsr/customizing-fretboard-fret-diagrams.ly
rename to Documentation/snippets/customizing-fretboard-fret-diagrams.ly
diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/Documentation/snippets/customizing-markup-fret-diagrams.ly
similarity index 100%
rename from input/lsr/customizing-markup-fret-diagrams.ly
rename to Documentation/snippets/customizing-markup-fret-diagrams.ly
diff --git a/input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly b/Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
similarity index 100%
rename from input/lsr/default-direction-of-stems-on-the-center-line-of-the-staff.ly
rename to Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-staff.ly
diff --git a/input/lsr/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
similarity index 100%
rename from input/lsr/defining-predefined-fretboards-for-other-instruments.ly
rename to Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly
diff --git a/input/lsr/demo-midiinstruments.ly b/Documentation/snippets/demo-midiinstruments.ly
similarity index 100%
rename from input/lsr/demo-midiinstruments.ly
rename to Documentation/snippets/demo-midiinstruments.ly
diff --git a/input/lsr/demonstrating-all-headers.ly b/Documentation/snippets/demonstrating-all-headers.ly
similarity index 100%
rename from input/lsr/demonstrating-all-headers.ly
rename to Documentation/snippets/demonstrating-all-headers.ly
diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
similarity index 100%
rename from input/lsr/display-bracket-with-only-one-staff-in-a-system.ly
rename to Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly
diff --git a/input/lsr/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
similarity index 100%
rename from input/lsr/displaying-complex-chords.ly
rename to Documentation/snippets/displaying-complex-chords.ly
diff --git a/input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
similarity index 100%
rename from input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
rename to Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
diff --git a/input/lsr/dotted-harmonics.ly b/Documentation/snippets/dotted-harmonics.ly
similarity index 100%
rename from input/lsr/dotted-harmonics.ly
rename to Documentation/snippets/dotted-harmonics.ly
diff --git a/input/lsr/double-glissando.ly b/Documentation/snippets/double-glissando.ly
similarity index 100%
rename from input/lsr/double-glissando.ly
rename to Documentation/snippets/double-glissando.ly
diff --git a/input/lsr/drawing-boxes-around-grobs.ly b/Documentation/snippets/drawing-boxes-around-grobs.ly
similarity index 100%
rename from input/lsr/drawing-boxes-around-grobs.ly
rename to Documentation/snippets/drawing-boxes-around-grobs.ly
diff --git a/input/lsr/drawing-circles-around-various-objects.ly b/Documentation/snippets/drawing-circles-around-various-objects.ly
similarity index 100%
rename from input/lsr/drawing-circles-around-various-objects.ly
rename to Documentation/snippets/drawing-circles-around-various-objects.ly
diff --git a/input/lsr/editorial-annotations-intro.itely b/Documentation/snippets/editorial-annotations-intro.itely
similarity index 100%
rename from input/lsr/editorial-annotations-intro.itely
rename to Documentation/snippets/editorial-annotations-intro.itely
diff --git a/input/lsr/editorial-annotations.snippet-list b/Documentation/snippets/editorial-annotations.snippet-list
similarity index 100%
rename from input/lsr/editorial-annotations.snippet-list
rename to Documentation/snippets/editorial-annotations.snippet-list
diff --git a/input/lsr/embedding-native-postscript-in-a--markup-block.ly b/Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
similarity index 100%
rename from input/lsr/embedding-native-postscript-in-a--markup-block.ly
rename to Documentation/snippets/embedding-native-postscript-in-a--markup-block.ly
diff --git a/input/lsr/engravers-one-by-one.ly b/Documentation/snippets/engravers-one-by-one.ly
similarity index 100%
rename from input/lsr/engravers-one-by-one.ly
rename to Documentation/snippets/engravers-one-by-one.ly
diff --git a/input/lsr/engraving-ties-manually.ly b/Documentation/snippets/engraving-ties-manually.ly
similarity index 100%
rename from input/lsr/engraving-ties-manually.ly
rename to Documentation/snippets/engraving-ties-manually.ly
diff --git a/input/lsr/engraving-tremolos-with-floating-beams.ly b/Documentation/snippets/engraving-tremolos-with-floating-beams.ly
similarity index 100%
rename from input/lsr/engraving-tremolos-with-floating-beams.ly
rename to Documentation/snippets/engraving-tremolos-with-floating-beams.ly
diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
similarity index 100%
rename from input/lsr/entering-several-tuplets-using-only-one--times-command.ly
rename to Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly
diff --git a/input/lsr/expressive-marks-intro.itely b/Documentation/snippets/expressive-marks-intro.itely
similarity index 100%
rename from input/lsr/expressive-marks-intro.itely
rename to Documentation/snippets/expressive-marks-intro.itely
diff --git a/input/lsr/expressive-marks.snippet-list b/Documentation/snippets/expressive-marks.snippet-list
similarity index 100%
rename from input/lsr/expressive-marks.snippet-list
rename to Documentation/snippets/expressive-marks.snippet-list
diff --git a/input/lsr/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
similarity index 100%
rename from input/lsr/faking-a-hammer-in-tablatures.ly
rename to Documentation/snippets/faking-a-hammer-in-tablatures.ly
diff --git a/input/lsr/fine-tuning-pedal-brackets.ly b/Documentation/snippets/fine-tuning-pedal-brackets.ly
similarity index 100%
rename from input/lsr/fine-tuning-pedal-brackets.ly
rename to Documentation/snippets/fine-tuning-pedal-brackets.ly
diff --git a/input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly b/Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
similarity index 100%
rename from input/lsr/fingerings,-string-indications,-and-right-hand-fingerings.ly
rename to Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingerings.ly
diff --git a/input/lsr/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
similarity index 100%
rename from input/lsr/flamenco-notation.ly
rename to Documentation/snippets/flamenco-notation.ly
diff --git a/input/lsr/flat-flags-and-beam-nibs.ly b/Documentation/snippets/flat-flags-and-beam-nibs.ly
similarity index 100%
rename from input/lsr/flat-flags-and-beam-nibs.ly
rename to Documentation/snippets/flat-flags-and-beam-nibs.ly
diff --git a/input/lsr/flute-slap-notation.ly b/Documentation/snippets/flute-slap-notation.ly
similarity index 100%
rename from input/lsr/flute-slap-notation.ly
rename to Documentation/snippets/flute-slap-notation.ly
diff --git a/input/lsr/forcing-horizontal-shift-of-notes.ly b/Documentation/snippets/forcing-horizontal-shift-of-notes.ly
similarity index 100%
rename from input/lsr/forcing-horizontal-shift-of-notes.ly
rename to Documentation/snippets/forcing-horizontal-shift-of-notes.ly
diff --git a/input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly b/Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
similarity index 100%
rename from input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
rename to Documentation/snippets/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
diff --git a/input/lsr/formatting-lyrics-syllables.ly b/Documentation/snippets/formatting-lyrics-syllables.ly
similarity index 100%
rename from input/lsr/formatting-lyrics-syllables.ly
rename to Documentation/snippets/formatting-lyrics-syllables.ly
diff --git a/input/lsr/fret-diagrams-explained-and-developed.ly b/Documentation/snippets/fret-diagrams-explained-and-developed.ly
similarity index 100%
rename from input/lsr/fret-diagrams-explained-and-developed.ly
rename to Documentation/snippets/fret-diagrams-explained-and-developed.ly
diff --git a/input/lsr/fretted-strings-intro.itely b/Documentation/snippets/fretted-strings-intro.itely
similarity index 100%
rename from input/lsr/fretted-strings-intro.itely
rename to Documentation/snippets/fretted-strings-intro.itely
diff --git a/input/lsr/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list
similarity index 100%
rename from input/lsr/fretted-strings.snippet-list
rename to Documentation/snippets/fretted-strings.snippet-list
diff --git a/input/lsr/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly
similarity index 100%
rename from input/lsr/generating-random-notes.ly
rename to Documentation/snippets/generating-random-notes.ly
diff --git a/input/lsr/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly
similarity index 100%
rename from input/lsr/grid-lines--changing-their-appearance.ly
rename to Documentation/snippets/grid-lines--changing-their-appearance.ly
diff --git a/input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
similarity index 100%
rename from input/lsr/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
rename to Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
diff --git a/input/lsr/grouping-beats.ly b/Documentation/snippets/grouping-beats.ly
similarity index 100%
rename from input/lsr/grouping-beats.ly
rename to Documentation/snippets/grouping-beats.ly
diff --git a/input/lsr/guitar-strum-rhythms.ly b/Documentation/snippets/guitar-strum-rhythms.ly
similarity index 100%
rename from input/lsr/guitar-strum-rhythms.ly
rename to Documentation/snippets/guitar-strum-rhythms.ly
diff --git a/input/lsr/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
similarity index 100%
rename from input/lsr/heavily-customized-polymetric-time-signatures.ly
rename to Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
diff --git a/input/lsr/hiding-the-extender-line-for-text-dynamics.ly b/Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
similarity index 100%
rename from input/lsr/hiding-the-extender-line-for-text-dynamics.ly
rename to Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
similarity index 100%
rename from input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
rename to Documentation/snippets/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly
diff --git a/input/lsr/how-to-change-fret-diagram-position.ly b/Documentation/snippets/how-to-change-fret-diagram-position.ly
similarity index 100%
rename from input/lsr/how-to-change-fret-diagram-position.ly
rename to Documentation/snippets/how-to-change-fret-diagram-position.ly
diff --git a/input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly b/Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
similarity index 100%
rename from input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly
rename to Documentation/snippets/how-to-put-ties-between-syllables-in-lyrics.ly
diff --git a/input/lsr/incipit.ly b/Documentation/snippets/incipit.ly
similarity index 100%
rename from input/lsr/incipit.ly
rename to Documentation/snippets/incipit.ly
diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
similarity index 100%
rename from input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
rename to Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly
diff --git a/input/lsr/inserting-a-caesura.ly b/Documentation/snippets/inserting-a-caesura.ly
similarity index 100%
rename from input/lsr/inserting-a-caesura.ly
rename to Documentation/snippets/inserting-a-caesura.ly
diff --git a/input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
similarity index 100%
rename from input/lsr/inserting-score-fragments-above-a-staff,-as-markups.ly
rename to Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly
diff --git a/input/lsr/isolated-percent-repeats.ly b/Documentation/snippets/isolated-percent-repeats.ly
similarity index 100%
rename from input/lsr/isolated-percent-repeats.ly
rename to Documentation/snippets/isolated-percent-repeats.ly
diff --git a/input/lsr/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
similarity index 100%
rename from input/lsr/jazz-combo-template.ly
rename to Documentation/snippets/jazz-combo-template.ly
diff --git a/input/lsr/keyboards-intro.itely b/Documentation/snippets/keyboards-intro.itely
similarity index 100%
rename from input/lsr/keyboards-intro.itely
rename to Documentation/snippets/keyboards-intro.itely
diff --git a/input/lsr/keyboards.snippet-list b/Documentation/snippets/keyboards.snippet-list
similarity index 100%
rename from input/lsr/keyboards.snippet-list
rename to Documentation/snippets/keyboards.snippet-list
diff --git a/input/lsr/laissez-vibrer-ties.ly b/Documentation/snippets/laissez-vibrer-ties.ly
similarity index 100%
rename from input/lsr/laissez-vibrer-ties.ly
rename to Documentation/snippets/laissez-vibrer-ties.ly
diff --git a/input/lsr/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
similarity index 100%
rename from input/lsr/letter-tablature-formatting.ly
rename to Documentation/snippets/letter-tablature-formatting.ly
diff --git a/input/lsr/line-arrows.ly b/Documentation/snippets/line-arrows.ly
similarity index 100%
rename from input/lsr/line-arrows.ly
rename to Documentation/snippets/line-arrows.ly
diff --git a/input/lsr/lyrics-alignment.ly b/Documentation/snippets/lyrics-alignment.ly
similarity index 100%
rename from input/lsr/lyrics-alignment.ly
rename to Documentation/snippets/lyrics-alignment.ly
diff --git a/input/lsr/makam-example.ly b/Documentation/snippets/makam-example.ly
similarity index 100%
rename from input/lsr/makam-example.ly
rename to Documentation/snippets/makam-example.ly
diff --git a/input/lsr/making-an-object-invisible-with-the-transparent-property.ly b/Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly
similarity index 100%
rename from input/lsr/making-an-object-invisible-with-the-transparent-property.ly
rename to Documentation/snippets/making-an-object-invisible-with-the-transparent-property.ly
diff --git a/input/lsr/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
similarity index 100%
rename from input/lsr/making-slurs-with-complex-dash-structure.ly
rename to Documentation/snippets/making-slurs-with-complex-dash-structure.ly
diff --git a/input/lsr/making-some-staff-lines-thicker-than-the-others.ly b/Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
similarity index 100%
rename from input/lsr/making-some-staff-lines-thicker-than-the-others.ly
rename to Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly
diff --git a/input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly b/Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
similarity index 100%
rename from input/lsr/manually-break-figured-bass-extenders-for-only-some-numbers.ly
rename to Documentation/snippets/manually-break-figured-bass-extenders-for-only-some-numbers.ly
diff --git a/input/lsr/manually-controlling-beam-positions.ly b/Documentation/snippets/manually-controlling-beam-positions.ly
similarity index 100%
rename from input/lsr/manually-controlling-beam-positions.ly
rename to Documentation/snippets/manually-controlling-beam-positions.ly
diff --git a/input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly b/Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
similarity index 100%
rename from input/lsr/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
rename to Documentation/snippets/marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
diff --git a/input/lsr/markup-lines.ly b/Documentation/snippets/markup-lines.ly
similarity index 100%
rename from input/lsr/markup-lines.ly
rename to Documentation/snippets/markup-lines.ly
diff --git a/input/lsr/measure-counter.ly b/Documentation/snippets/measure-counter.ly
similarity index 100%
rename from input/lsr/measure-counter.ly
rename to Documentation/snippets/measure-counter.ly
diff --git a/input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly b/Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
similarity index 100%
rename from input/lsr/mensurstriche-layout-bar-lines-between-the-staves.ly
rename to Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly
diff --git a/input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly b/Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
similarity index 100%
rename from input/lsr/merging-multi-measure-rests-in-a-polyphonic-part.ly
rename to Documentation/snippets/merging-multi-measure-rests-in-a-polyphonic-part.ly
diff --git a/input/lsr/midi-intro.itely b/Documentation/snippets/midi-intro.itely
similarity index 100%
rename from input/lsr/midi-intro.itely
rename to Documentation/snippets/midi-intro.itely
diff --git a/input/lsr/midi.snippet-list b/Documentation/snippets/midi.snippet-list
similarity index 100%
rename from input/lsr/midi.snippet-list
rename to Documentation/snippets/midi.snippet-list
diff --git a/input/lsr/modern-tab-text-clef.ly b/Documentation/snippets/modern-tab-text-clef.ly
similarity index 100%
rename from input/lsr/modern-tab-text-clef.ly
rename to Documentation/snippets/modern-tab-text-clef.ly
diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
similarity index 100%
rename from input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
rename to Documentation/snippets/modifying-default-values-for-articulation-shorthand-notation.ly
diff --git a/input/lsr/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly
similarity index 100%
rename from input/lsr/modifying-tuplet-bracket-length.ly
rename to Documentation/snippets/modifying-tuplet-bracket-length.ly
diff --git a/input/lsr/multi-measure-rest-markup.ly b/Documentation/snippets/multi-measure-rest-markup.ly
similarity index 100%
rename from input/lsr/multi-measure-rest-markup.ly
rename to Documentation/snippets/multi-measure-rest-markup.ly
diff --git a/input/lsr/nesting-staves.ly b/Documentation/snippets/nesting-staves.ly
similarity index 100%
rename from input/lsr/nesting-staves.ly
rename to Documentation/snippets/nesting-staves.ly
diff --git a/Documentation/snippets/new/GNUmakefile b/Documentation/snippets/new/GNUmakefile
new file mode 100644
index 0000000000..155e3f120f
--- /dev/null
+++ b/Documentation/snippets/new/GNUmakefile
@@ -0,0 +1,6 @@
+depth = ../../..
+
+EXTRA_DIST_FILES = README
+EXTRA_DIST_FILES += $(call src-wildcard,*.ly)
+
+include $(depth)/make/stepmake.make
diff --git a/input/new/README b/Documentation/snippets/new/README
similarity index 100%
rename from input/new/README
rename to Documentation/snippets/new/README
diff --git a/input/new/chordchanges-for-fretboards.ly b/Documentation/snippets/new/chordchanges-for-fretboards.ly
similarity index 100%
rename from input/new/chordchanges-for-fretboards.ly
rename to Documentation/snippets/new/chordchanges-for-fretboards.ly
diff --git a/input/new/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly
similarity index 100%
rename from input/new/making-slurs-with-complex-dash-structure.ly
rename to Documentation/snippets/new/making-slurs-with-complex-dash-structure.ly
diff --git a/input/new/non-default-tuplet-numbers.ly b/Documentation/snippets/new/non-default-tuplet-numbers.ly
similarity index 100%
rename from input/new/non-default-tuplet-numbers.ly
rename to Documentation/snippets/new/non-default-tuplet-numbers.ly
diff --git a/input/new/non-traditional-key-signatures.ly b/Documentation/snippets/new/non-traditional-key-signatures.ly
similarity index 100%
rename from input/new/non-traditional-key-signatures.ly
rename to Documentation/snippets/new/non-traditional-key-signatures.ly
diff --git a/input/lsr/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
similarity index 100%
rename from input/lsr/non-default-tuplet-numbers.ly
rename to Documentation/snippets/non-default-tuplet-numbers.ly
diff --git a/input/lsr/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly
similarity index 100%
rename from input/lsr/non-traditional-key-signatures.ly
rename to Documentation/snippets/non-traditional-key-signatures.ly
diff --git a/input/lsr/orchestra,-choir-and-piano-template.ly b/Documentation/snippets/orchestra,-choir-and-piano-template.ly
similarity index 100%
rename from input/lsr/orchestra,-choir-and-piano-template.ly
rename to Documentation/snippets/orchestra,-choir-and-piano-template.ly
diff --git a/input/lsr/ottava-text.ly b/Documentation/snippets/ottava-text.ly
similarity index 100%
rename from input/lsr/ottava-text.ly
rename to Documentation/snippets/ottava-text.ly
diff --git a/input/lsr/outputting-the-version-number.ly b/Documentation/snippets/outputting-the-version-number.ly
similarity index 100%
rename from input/lsr/outputting-the-version-number.ly
rename to Documentation/snippets/outputting-the-version-number.ly
diff --git a/input/lsr/page-label.ly b/Documentation/snippets/page-label.ly
similarity index 100%
rename from input/lsr/page-label.ly
rename to Documentation/snippets/page-label.ly
diff --git a/input/lsr/paper-and-layout-intro.itely b/Documentation/snippets/paper-and-layout-intro.itely
similarity index 100%
rename from input/lsr/paper-and-layout-intro.itely
rename to Documentation/snippets/paper-and-layout-intro.itely
diff --git a/input/lsr/paper-and-layout.snippet-list b/Documentation/snippets/paper-and-layout.snippet-list
similarity index 100%
rename from input/lsr/paper-and-layout.snippet-list
rename to Documentation/snippets/paper-and-layout.snippet-list
diff --git a/input/lsr/percent-repeat-count-visibility.ly b/Documentation/snippets/percent-repeat-count-visibility.ly
similarity index 100%
rename from input/lsr/percent-repeat-count-visibility.ly
rename to Documentation/snippets/percent-repeat-count-visibility.ly
diff --git a/input/lsr/percent-repeat-counter.ly b/Documentation/snippets/percent-repeat-counter.ly
similarity index 100%
rename from input/lsr/percent-repeat-counter.ly
rename to Documentation/snippets/percent-repeat-counter.ly
diff --git a/input/lsr/percussion-beaters.ly b/Documentation/snippets/percussion-beaters.ly
similarity index 100%
rename from input/lsr/percussion-beaters.ly
rename to Documentation/snippets/percussion-beaters.ly
diff --git a/input/lsr/percussion-intro.itely b/Documentation/snippets/percussion-intro.itely
similarity index 100%
rename from input/lsr/percussion-intro.itely
rename to Documentation/snippets/percussion-intro.itely
diff --git a/input/lsr/percussion.snippet-list b/Documentation/snippets/percussion.snippet-list
similarity index 100%
rename from input/lsr/percussion.snippet-list
rename to Documentation/snippets/percussion.snippet-list
diff --git a/input/lsr/permitting-line-breaks-within-beamed-tuplets.ly b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
similarity index 100%
rename from input/lsr/permitting-line-breaks-within-beamed-tuplets.ly
rename to Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly
diff --git a/input/lsr/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
similarity index 100%
rename from input/lsr/piano-template-simple.ly
rename to Documentation/snippets/piano-template-simple.ly
diff --git a/input/lsr/piano-template-with-centered-dynamics.ly b/Documentation/snippets/piano-template-with-centered-dynamics.ly
similarity index 100%
rename from input/lsr/piano-template-with-centered-dynamics.ly
rename to Documentation/snippets/piano-template-with-centered-dynamics.ly
diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/Documentation/snippets/piano-template-with-centered-lyrics.ly
similarity index 100%
rename from input/lsr/piano-template-with-centered-lyrics.ly
rename to Documentation/snippets/piano-template-with-centered-lyrics.ly
diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/Documentation/snippets/piano-template-with-melody-and-lyrics.ly
similarity index 100%
rename from input/lsr/piano-template-with-melody-and-lyrics.ly
rename to Documentation/snippets/piano-template-with-melody-and-lyrics.ly
diff --git a/input/lsr/pitches-intro.itely b/Documentation/snippets/pitches-intro.itely
similarity index 100%
rename from input/lsr/pitches-intro.itely
rename to Documentation/snippets/pitches-intro.itely
diff --git a/input/lsr/pitches.snippet-list b/Documentation/snippets/pitches.snippet-list
similarity index 100%
rename from input/lsr/pitches.snippet-list
rename to Documentation/snippets/pitches.snippet-list
diff --git a/input/lsr/placement-of-right-hand-fingerings.ly b/Documentation/snippets/placement-of-right-hand-fingerings.ly
similarity index 100%
rename from input/lsr/placement-of-right-hand-fingerings.ly
rename to Documentation/snippets/placement-of-right-hand-fingerings.ly
diff --git a/input/lsr/polyphony-in-tablature.ly b/Documentation/snippets/polyphony-in-tablature.ly
similarity index 100%
rename from input/lsr/polyphony-in-tablature.ly
rename to Documentation/snippets/polyphony-in-tablature.ly
diff --git a/input/lsr/positioning-fingering-indications-precisely.ly b/Documentation/snippets/positioning-fingering-indications-precisely.ly
similarity index 100%
rename from input/lsr/positioning-fingering-indications-precisely.ly
rename to Documentation/snippets/positioning-fingering-indications-precisely.ly
diff --git a/input/lsr/positioning-grace-notes-with-floating-space.ly b/Documentation/snippets/positioning-grace-notes-with-floating-space.ly
similarity index 100%
rename from input/lsr/positioning-grace-notes-with-floating-space.ly
rename to Documentation/snippets/positioning-grace-notes-with-floating-space.ly
diff --git a/input/lsr/positioning-multi-measure-rests.ly b/Documentation/snippets/positioning-multi-measure-rests.ly
similarity index 100%
rename from input/lsr/positioning-multi-measure-rests.ly
rename to Documentation/snippets/positioning-multi-measure-rests.ly
diff --git a/input/lsr/positioning-segno-and-coda-with-line-break.ly b/Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
similarity index 100%
rename from input/lsr/positioning-segno-and-coda-with-line-break.ly
rename to Documentation/snippets/positioning-segno-and-coda-with-line-break.ly
diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/Documentation/snippets/positioning-text-markups-inside-slurs.ly
similarity index 100%
rename from input/lsr/positioning-text-markups-inside-slurs.ly
rename to Documentation/snippets/positioning-text-markups-inside-slurs.ly
diff --git a/input/lsr/preventing-extra-naturals-from-being-automatically-added.ly b/Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
similarity index 100%
rename from input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
rename to Documentation/snippets/preventing-extra-naturals-from-being-automatically-added.ly
diff --git a/input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly b/Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
similarity index 100%
rename from input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
rename to Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
diff --git a/input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly b/Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
similarity index 100%
rename from input/lsr/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
rename to Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly
diff --git a/input/lsr/printing-bar-numbers-at-regular-intervals.ly b/Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
similarity index 100%
rename from input/lsr/printing-bar-numbers-at-regular-intervals.ly
rename to Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly
diff --git a/input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly b/Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
similarity index 100%
rename from input/lsr/printing-bar-numbers-inside-boxes-or-circles.ly
rename to Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly
diff --git a/input/lsr/printing-hairpins-using-al-niente-notation.ly b/Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
similarity index 100%
rename from input/lsr/printing-hairpins-using-al-niente-notation.ly
rename to Documentation/snippets/printing-hairpins-using-al-niente-notation.ly
diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/Documentation/snippets/printing-marks-at-the-end-of-a-line-or-a-score.ly
similarity index 100%
rename from input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
rename to Documentation/snippets/printing-marks-at-the-end-of-a-line-or-a-score.ly
diff --git a/input/lsr/printing-marks-on-every-staff.ly b/Documentation/snippets/printing-marks-on-every-staff.ly
similarity index 100%
rename from input/lsr/printing-marks-on-every-staff.ly
rename to Documentation/snippets/printing-marks-on-every-staff.ly
diff --git a/input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly b/Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
similarity index 100%
rename from input/lsr/printing-metronome-and-rehearsal-marks-below-the-staff.ly
rename to Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff.ly
diff --git a/input/lsr/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly
similarity index 100%
rename from input/lsr/printing-music-with-different-time-signatures.ly
rename to Documentation/snippets/printing-music-with-different-time-signatures.ly
diff --git a/input/lsr/printing-text-from-right-to-left.ly b/Documentation/snippets/printing-text-from-right-to-left.ly
similarity index 100%
rename from input/lsr/printing-text-from-right-to-left.ly
rename to Documentation/snippets/printing-text-from-right-to-left.ly
diff --git a/input/lsr/printing-the-bar-number-for-the-first-measure.ly b/Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
similarity index 100%
rename from input/lsr/printing-the-bar-number-for-the-first-measure.ly
rename to Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly
diff --git a/input/lsr/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly
similarity index 100%
rename from input/lsr/proportional-strict-notespacing.ly
rename to Documentation/snippets/proportional-strict-notespacing.ly
diff --git a/input/lsr/quoting-another-voice-with-transposition.ly b/Documentation/snippets/quoting-another-voice-with-transposition.ly
similarity index 100%
rename from input/lsr/quoting-another-voice-with-transposition.ly
rename to Documentation/snippets/quoting-another-voice-with-transposition.ly
diff --git a/input/lsr/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
similarity index 100%
rename from input/lsr/quoting-another-voice.ly
rename to Documentation/snippets/quoting-another-voice.ly
diff --git a/input/lsr/redefining-grace-note-global-defaults.ly b/Documentation/snippets/redefining-grace-note-global-defaults.ly
similarity index 100%
rename from input/lsr/redefining-grace-note-global-defaults.ly
rename to Documentation/snippets/redefining-grace-note-global-defaults.ly
diff --git a/input/lsr/removing-bar-numbers-from-a-score.ly b/Documentation/snippets/removing-bar-numbers-from-a-score.ly
similarity index 100%
rename from input/lsr/removing-bar-numbers-from-a-score.ly
rename to Documentation/snippets/removing-bar-numbers-from-a-score.ly
diff --git a/input/lsr/removing-the-first-empty-line.ly b/Documentation/snippets/removing-the-first-empty-line.ly
similarity index 100%
rename from input/lsr/removing-the-first-empty-line.ly
rename to Documentation/snippets/removing-the-first-empty-line.ly
diff --git a/input/lsr/repeats-intro.itely b/Documentation/snippets/repeats-intro.itely
similarity index 100%
rename from input/lsr/repeats-intro.itely
rename to Documentation/snippets/repeats-intro.itely
diff --git a/input/lsr/repeats.snippet-list b/Documentation/snippets/repeats.snippet-list
similarity index 100%
rename from input/lsr/repeats.snippet-list
rename to Documentation/snippets/repeats.snippet-list
diff --git a/input/lsr/rest-styles.ly b/Documentation/snippets/rest-styles.ly
similarity index 100%
rename from input/lsr/rest-styles.ly
rename to Documentation/snippets/rest-styles.ly
diff --git a/input/lsr/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly
similarity index 100%
rename from input/lsr/reverting-default-beam-endings.ly
rename to Documentation/snippets/reverting-default-beam-endings.ly
diff --git a/input/lsr/rhythmic-slashes.ly b/Documentation/snippets/rhythmic-slashes.ly
similarity index 100%
rename from input/lsr/rhythmic-slashes.ly
rename to Documentation/snippets/rhythmic-slashes.ly
diff --git a/input/lsr/rhythms-intro.itely b/Documentation/snippets/rhythms-intro.itely
similarity index 100%
rename from input/lsr/rhythms-intro.itely
rename to Documentation/snippets/rhythms-intro.itely
diff --git a/input/lsr/rhythms.snippet-list b/Documentation/snippets/rhythms.snippet-list
similarity index 100%
rename from input/lsr/rhythms.snippet-list
rename to Documentation/snippets/rhythms.snippet-list
diff --git a/input/lsr/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly
similarity index 100%
rename from input/lsr/score-for-diatonic-accordion.ly
rename to Documentation/snippets/score-for-diatonic-accordion.ly
diff --git a/input/lsr/separating-key-cancellations-from-key-signature-changes.ly b/Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
similarity index 100%
rename from input/lsr/separating-key-cancellations-from-key-signature-changes.ly
rename to Documentation/snippets/separating-key-cancellations-from-key-signature-changes.ly
diff --git a/input/lsr/setting-hairpin-behavior-at-bar-lines.ly b/Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
similarity index 100%
rename from input/lsr/setting-hairpin-behavior-at-bar-lines.ly
rename to Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly
diff --git a/input/lsr/setting-the-minimum-length-of-hairpins.ly b/Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
similarity index 100%
rename from input/lsr/setting-the-minimum-length-of-hairpins.ly
rename to Documentation/snippets/setting-the-minimum-length-of-hairpins.ly
diff --git a/input/lsr/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly
similarity index 100%
rename from input/lsr/shortening-volta-brackets.ly
rename to Documentation/snippets/shortening-volta-brackets.ly
diff --git a/input/lsr/showing-chords-at-changes.ly b/Documentation/snippets/showing-chords-at-changes.ly
similarity index 100%
rename from input/lsr/showing-chords-at-changes.ly
rename to Documentation/snippets/showing-chords-at-changes.ly
diff --git a/input/lsr/simple-lead-sheet.ly b/Documentation/snippets/simple-lead-sheet.ly
similarity index 100%
rename from input/lsr/simple-lead-sheet.ly
rename to Documentation/snippets/simple-lead-sheet.ly
diff --git a/input/lsr/simultaneous-notes-intro.itely b/Documentation/snippets/simultaneous-notes-intro.itely
similarity index 100%
rename from input/lsr/simultaneous-notes-intro.itely
rename to Documentation/snippets/simultaneous-notes-intro.itely
diff --git a/input/lsr/simultaneous-notes.snippet-list b/Documentation/snippets/simultaneous-notes.snippet-list
similarity index 100%
rename from input/lsr/simultaneous-notes.snippet-list
rename to Documentation/snippets/simultaneous-notes.snippet-list
diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
similarity index 100%
rename from input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly
rename to Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly b/Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
similarity index 100%
rename from input/lsr/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
rename to Documentation/snippets/single-staff-template-with-notes,-lyrics,-chords-and-frets.ly
diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/Documentation/snippets/single-staff-template-with-notes-and-chords.ly
similarity index 100%
rename from input/lsr/single-staff-template-with-notes-and-chords.ly
rename to Documentation/snippets/single-staff-template-with-notes-and-chords.ly
diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
similarity index 100%
rename from input/lsr/single-staff-template-with-notes-and-lyrics.ly
rename to Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/Documentation/snippets/single-staff-template-with-only-notes.ly
similarity index 100%
rename from input/lsr/single-staff-template-with-only-notes.ly
rename to Documentation/snippets/single-staff-template-with-only-notes.ly
diff --git a/input/lsr/skips-in-lyric-mode-2.ly b/Documentation/snippets/skips-in-lyric-mode-2.ly
similarity index 100%
rename from input/lsr/skips-in-lyric-mode-2.ly
rename to Documentation/snippets/skips-in-lyric-mode-2.ly
diff --git a/input/lsr/skips-in-lyric-mode.ly b/Documentation/snippets/skips-in-lyric-mode.ly
similarity index 100%
rename from input/lsr/skips-in-lyric-mode.ly
rename to Documentation/snippets/skips-in-lyric-mode.ly
diff --git a/input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-markup-bartok-pizzicato.ly
similarity index 100%
rename from input/lsr/snap-pizzicato-markup-bartok-pizzicato.ly
rename to Documentation/snippets/snap-pizzicato-markup-bartok-pizzicato.ly
diff --git a/input/lsr/spacing-intro.itely b/Documentation/snippets/spacing-intro.itely
similarity index 100%
rename from input/lsr/spacing-intro.itely
rename to Documentation/snippets/spacing-intro.itely
diff --git a/input/lsr/spacing.snippet-list b/Documentation/snippets/spacing.snippet-list
similarity index 100%
rename from input/lsr/spacing.snippet-list
rename to Documentation/snippets/spacing.snippet-list
diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/Documentation/snippets/specifying-context-with-beatgrouping.ly
similarity index 100%
rename from input/lsr/specifying-context-with-beatgrouping.ly
rename to Documentation/snippets/specifying-context-with-beatgrouping.ly
diff --git a/input/lsr/staff-notation-intro.itely b/Documentation/snippets/staff-notation-intro.itely
similarity index 100%
rename from input/lsr/staff-notation-intro.itely
rename to Documentation/snippets/staff-notation-intro.itely
diff --git a/input/lsr/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
similarity index 100%
rename from input/lsr/staff-notation.snippet-list
rename to Documentation/snippets/staff-notation.snippet-list
diff --git a/input/lsr/stand-alone-two-column-markup.ly b/Documentation/snippets/stand-alone-two-column-markup.ly
similarity index 100%
rename from input/lsr/stand-alone-two-column-markup.ly
rename to Documentation/snippets/stand-alone-two-column-markup.ly
diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
similarity index 100%
rename from input/lsr/stem-and-beam-behavior-in-tablature.ly
rename to Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
diff --git a/input/lsr/stemlets.ly b/Documentation/snippets/stemlets.ly
similarity index 100%
rename from input/lsr/stemlets.ly
rename to Documentation/snippets/stemlets.ly
diff --git a/input/lsr/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
similarity index 100%
rename from input/lsr/string-quartet-template-simple.ly
rename to Documentation/snippets/string-quartet-template-simple.ly
diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
similarity index 100%
rename from input/lsr/string-quartet-template-with-separate-parts.ly
rename to Documentation/snippets/string-quartet-template-with-separate-parts.ly
diff --git a/input/lsr/sub-dividing-beams.ly b/Documentation/snippets/sub-dividing-beams.ly
similarity index 100%
rename from input/lsr/sub-dividing-beams.ly
rename to Documentation/snippets/sub-dividing-beams.ly
diff --git a/input/lsr/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
similarity index 100%
rename from input/lsr/suppressing-warnings-for-clashing-note-columns.ly
rename to Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
diff --git a/input/lsr/table-of-contents.ly b/Documentation/snippets/table-of-contents.ly
similarity index 100%
rename from input/lsr/table-of-contents.ly
rename to Documentation/snippets/table-of-contents.ly
diff --git a/input/lsr/template-intro.itely b/Documentation/snippets/template-intro.itely
similarity index 100%
rename from input/lsr/template-intro.itely
rename to Documentation/snippets/template-intro.itely
diff --git a/input/lsr/template.snippet-list b/Documentation/snippets/template.snippet-list
similarity index 100%
rename from input/lsr/template.snippet-list
rename to Documentation/snippets/template.snippet-list
diff --git a/input/lsr/text-intro.itely b/Documentation/snippets/text-intro.itely
similarity index 100%
rename from input/lsr/text-intro.itely
rename to Documentation/snippets/text-intro.itely
diff --git a/input/lsr/text.snippet-list b/Documentation/snippets/text.snippet-list
similarity index 100%
rename from input/lsr/text.snippet-list
rename to Documentation/snippets/text.snippet-list
diff --git a/input/lsr/three-sided-box.ly b/Documentation/snippets/three-sided-box.ly
similarity index 100%
rename from input/lsr/three-sided-box.ly
rename to Documentation/snippets/three-sided-box.ly
diff --git a/input/lsr/tick-bar-lines.ly b/Documentation/snippets/tick-bar-lines.ly
similarity index 100%
rename from input/lsr/tick-bar-lines.ly
rename to Documentation/snippets/tick-bar-lines.ly
diff --git a/input/lsr/time-signature-in-parentheses.ly b/Documentation/snippets/time-signature-in-parentheses.ly
similarity index 100%
rename from input/lsr/time-signature-in-parentheses.ly
rename to Documentation/snippets/time-signature-in-parentheses.ly
diff --git a/input/lsr/titles-intro.itely b/Documentation/snippets/titles-intro.itely
similarity index 100%
rename from input/lsr/titles-intro.itely
rename to Documentation/snippets/titles-intro.itely
diff --git a/input/lsr/titles.snippet-list b/Documentation/snippets/titles.snippet-list
similarity index 100%
rename from input/lsr/titles.snippet-list
rename to Documentation/snippets/titles.snippet-list
diff --git a/input/lsr/transcription-of-ancient-music-with-incipit.ly b/Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
similarity index 100%
rename from input/lsr/transcription-of-ancient-music-with-incipit.ly
rename to Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
diff --git a/input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
similarity index 100%
rename from input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
rename to Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
diff --git a/input/lsr/tweaking-clef-properties.ly b/Documentation/snippets/tweaking-clef-properties.ly
similarity index 100%
rename from input/lsr/tweaking-clef-properties.ly
rename to Documentation/snippets/tweaking-clef-properties.ly
diff --git a/input/lsr/tweaking-grace-layout-within-music.ly b/Documentation/snippets/tweaking-grace-layout-within-music.ly
similarity index 100%
rename from input/lsr/tweaking-grace-layout-within-music.ly
rename to Documentation/snippets/tweaking-grace-layout-within-music.ly
diff --git a/input/lsr/tweaks-and-overrides-intro.itely b/Documentation/snippets/tweaks-and-overrides-intro.itely
similarity index 100%
rename from input/lsr/tweaks-and-overrides-intro.itely
rename to Documentation/snippets/tweaks-and-overrides-intro.itely
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list
similarity index 100%
rename from input/lsr/tweaks-and-overrides.snippet-list
rename to Documentation/snippets/tweaks-and-overrides.snippet-list
diff --git a/input/lsr/unfretted-strings-intro.itely b/Documentation/snippets/unfretted-strings-intro.itely
similarity index 100%
rename from input/lsr/unfretted-strings-intro.itely
rename to Documentation/snippets/unfretted-strings-intro.itely
diff --git a/input/lsr/unfretted-strings.snippet-list b/Documentation/snippets/unfretted-strings.snippet-list
similarity index 100%
rename from input/lsr/unfretted-strings.snippet-list
rename to Documentation/snippets/unfretted-strings.snippet-list
diff --git a/input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly b/Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
similarity index 100%
rename from input/lsr/use-square-bracket-at-the-start-of-a-staff-group.ly
rename to Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
diff --git a/input/lsr/using-beatlength-and-beatgrouping.ly b/Documentation/snippets/using-beatlength-and-beatgrouping.ly
similarity index 100%
rename from input/lsr/using-beatlength-and-beatgrouping.ly
rename to Documentation/snippets/using-beatlength-and-beatgrouping.ly
diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/Documentation/snippets/using-double-slurs-for-legato-chords.ly
similarity index 100%
rename from input/lsr/using-double-slurs-for-legato-chords.ly
rename to Documentation/snippets/using-double-slurs-for-legato-chords.ly
diff --git a/input/lsr/using-grace-note-slashes-with-normal-heads.ly b/Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
similarity index 100%
rename from input/lsr/using-grace-note-slashes-with-normal-heads.ly
rename to Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly
diff --git a/input/lsr/using-postscript-to-generate-special-note-head-shapes.ly b/Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
similarity index 100%
rename from input/lsr/using-postscript-to-generate-special-note-head-shapes.ly
rename to Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
diff --git a/input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly b/Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
similarity index 100%
rename from input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
rename to Documentation/snippets/using-the--tweak-command-to-tweak-individual-grobs.ly
diff --git a/input/lsr/using-ties-with-arpeggios.ly b/Documentation/snippets/using-ties-with-arpeggios.ly
similarity index 100%
rename from input/lsr/using-ties-with-arpeggios.ly
rename to Documentation/snippets/using-ties-with-arpeggios.ly
diff --git a/input/lsr/utf-8.ly b/Documentation/snippets/utf-8.ly
similarity index 100%
rename from input/lsr/utf-8.ly
rename to Documentation/snippets/utf-8.ly
diff --git a/input/lsr/vertically-aligned-dynamics-and-textscripts.ly b/Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
similarity index 100%
rename from input/lsr/vertically-aligned-dynamics-and-textscripts.ly
rename to Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly
diff --git a/input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly b/Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
similarity index 100%
rename from input/lsr/vertically-aligning-dynamics-across-multiple-notes.ly
rename to Documentation/snippets/vertically-aligning-dynamics-across-multiple-notes.ly
diff --git a/input/lsr/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
similarity index 100%
rename from input/lsr/vertically-aligning-ossias-and-lyrics.ly
rename to Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly
diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/Documentation/snippets/vertically-centered-common-lyrics.ly
similarity index 100%
rename from input/lsr/vertically-centered-common-lyrics.ly
rename to Documentation/snippets/vertically-centered-common-lyrics.ly
diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
similarity index 100%
rename from input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
rename to Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
similarity index 100%
rename from input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
rename to Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
diff --git a/input/lsr/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
similarity index 100%
rename from input/lsr/vocal-ensemble-template.ly
rename to Documentation/snippets/vocal-ensemble-template.ly
diff --git a/input/lsr/vocal-music-intro.itely b/Documentation/snippets/vocal-music-intro.itely
similarity index 100%
rename from input/lsr/vocal-music-intro.itely
rename to Documentation/snippets/vocal-music-intro.itely
diff --git a/input/lsr/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
similarity index 100%
rename from input/lsr/vocal-music.snippet-list
rename to Documentation/snippets/vocal-music.snippet-list
diff --git a/input/lsr/volta-below-chords.ly b/Documentation/snippets/volta-below-chords.ly
similarity index 100%
rename from input/lsr/volta-below-chords.ly
rename to Documentation/snippets/volta-below-chords.ly
diff --git a/input/lsr/volta-multi-staff.ly b/Documentation/snippets/volta-multi-staff.ly
similarity index 100%
rename from input/lsr/volta-multi-staff.ly
rename to Documentation/snippets/volta-multi-staff.ly
diff --git a/input/lsr/volta-text-markup-using-repeatcommands.ly b/Documentation/snippets/volta-text-markup-using-repeatcommands.ly
similarity index 100%
rename from input/lsr/volta-text-markup-using-repeatcommands.ly
rename to Documentation/snippets/volta-text-markup-using-repeatcommands.ly
diff --git a/input/lsr/winds-intro.itely b/Documentation/snippets/winds-intro.itely
similarity index 100%
rename from input/lsr/winds-intro.itely
rename to Documentation/snippets/winds-intro.itely
diff --git a/input/lsr/winds.snippet-list b/Documentation/snippets/winds.snippet-list
similarity index 100%
rename from input/lsr/winds.snippet-list
rename to Documentation/snippets/winds.snippet-list
diff --git a/input/lsr/world-music-intro.itely b/Documentation/snippets/world-music-intro.itely
similarity index 100%
rename from input/lsr/world-music-intro.itely
rename to Documentation/snippets/world-music-intro.itely
diff --git a/input/lsr/world-music.snippet-list b/Documentation/snippets/world-music.snippet-list
similarity index 100%
rename from input/lsr/world-music.snippet-list
rename to Documentation/snippets/world-music.snippet-list
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
deleted file mode 100644
index d928f28375..0000000000
--- a/Documentation/user/GNUmakefile
+++ /dev/null
@@ -1,155 +0,0 @@
-depth=../..
-
-LATEX_FILES =$(call src-wildcard,*.latex)
-
-
-EXTRA_DIST_FILES = $(LATEX_FILES) $(IMAGES) $(EPS_ILLUSTRATIONS)
-EXTRA_DIST_FILES += README.txt
-
-IMAGES=$(call src-wildcard,*.png)
-EPS_ILLUSTRATIONS=context-example.eps
-PDF_ILLUSTRATIONS=context-example.pdf
-
-OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLUSTRATIONS))
-
-OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
-
-OUT_MASTER_TEXI_FILES = $(outdir)/lilypond-internals.texi
-OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
- $(ITELY_FILES:%.itely=$(outdir)/%.texi)
-
-HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
- $(outdir)/lilypond-internals-big-page.html
-
-# todo: add latex.
-PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)\
- $(outdir)/lilypond-internals.pdf
-
-MAIN_INFO_DOC = lilypond
-INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
-INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
-
-TEXI2PDF_FLAGS = \
-  -I $(outdir) \
-  -I $(top-src-dir)/Documentation/user \
-  -I $(top-build-dir)/Documentation/user/$(outconfbase)
-
-ifeq ($(out),www)
-INFO_IMAGES_DIR = lilypond
-DEST_INFO_IMAGES_SUBDIR = Documentation/user
-endif
-
-STEPMAKE_TEMPLATES=texinfo omf documentation
-OMF_FILES += $(outdir)/lilypond-internals.html.omf
-
-LOCALSTEPMAKE_TEMPLATES=lilypond ly
-
-include $(depth)/make/stepmake.make
-
-default:
-
-info: $(INFO_FILES)
-	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
-	@echo export PYTHONPATH=$(PYTHONPATH)
-
-xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
-
-
-local-clean:
-	rm -f $(INFO_IMAGES_DIR)
-
-local-help: extra-local-help
-
-extra-local-help:
-	@echo -e "\
-  info        update info pages\n\
-  xml	      update Docbook xml documentation\n\
-"
-
-#
-# Split manuals in HTML
-#
-$(outdir)/lilypond/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
-$(outdir)/lilypond-learning/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
-
-
-#
-# Manuals in one big HTML page
-#
-$(outdir)/lilypond-big-page.html: $(OUT_PNG_IMAGES)
-$(outdir)/lilypond-learning-big-page.html: $(OUT_PNG_IMAGES)
-
-$(outdir)/lilypond.xml: $(outdir)/lilypond.texi
-	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ --docbook $<
-
-$(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internals.texi
-	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(outdir)/lilypond-internals --docbook $<
-
-$(outdir)/lilypond.pdf $(outdir)/lilypond-learning.pdf: $(OUT_PDF_IMAGES)
-
-$(outdir)/%.png: %.png
-	convert -depth 8 -geometry 50x50% $< $@
-
-$(outdir)/%.png: %.eps
-	gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
-
-$(outdir)/%.pdf: %.png
-	convert -depth 8 $< $@
-
-$(outdir)/%.pdf: %.eps
-	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
-
-
-DEEP_HTML_FILES =\
- $(outdir)/lilypond/index.html\
- $(outdir)/lilypond-internals/index.html\
- $(outdir)/music-glossary/index.html\
- $(outdir)/lilypond-program/index.html\
- $(outdir)/lilypond-learning/index.html
-
-# Symlinks to refer to external source documents from split and non-split HTML
-source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source \
- $(outdir)/lilypond-program/source $(outdir)/lilypond-learning/source $(outdir)/lilypond-internals/source
-
-$(outdir)/source:
-	@rm -f $(@)
-	ln -sf $(depth) $(@)
-
-$(outdir)/%/source:
-	@rm -f $(@)
-	mkdir -p $(dir $@)
-	ln -sf $(depth)/.. $(@)
-
-ifeq ($(out),www)
-local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) info
-
-local-WWW-2: $(HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
-endif
-
-$(outdir)/%.bib: %.bib
-	ln -f $< $@
-
-# lilypond.texi deps
-$(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
-	$(MAKE) -C $(top-src-dir)/mf
-
-$(outdir)/lilypond.texi $(outdir)/lilypond-program.texi $(outdir)/lilypond-learning.texi $(outdir)/music-glossary.texi: $(ITELY_FILES) $(ITEXI_FILES)
-
-$(outdir)/lilypond.texi: $(outdir)/ly-grammar.txt
-
-# Rules for the automatically generated documentation
-
-$(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
-	cd $(outdir) && $(BISON) -v $<
-	$(auxscript-dir)/yyout2grammar.py $(outdir)/parser.output $@
-
-# There used to be a dependency on a dummy target, to force a rebuild
-# of lilypond-internals every time.  however, this triggers
-# compilation during install, which is a bad thing (tm).
-
-$(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
-	cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
-
-.SECONDARY:
diff --git a/Documentation/user/README.txt b/Documentation/user/README.txt
deleted file mode 100644
index 45058ea3ac..0000000000
--- a/Documentation/user/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Info for Documentation
-----------------------
-
-See CG 3. Documentation work
-
diff --git a/Documentation/user/glossary.html.in b/Documentation/user/glossary.html.in
deleted file mode 100644
index 086c9d9f23..0000000000
--- a/Documentation/user/glossary.html.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<!meta http-equiv=refresh content="0; url='music-glossary.html'">
-
-
-<h2>Music glossary has moved</h2>
-
-The new location is: <a href='music-glossary.html'>music-glossary.html</a>.
-
-<p>Please update your links.  Sorry for the inconvenience.
diff --git a/input/GNUmakefile b/input/GNUmakefile
index f6cc680093..8191ba5f5a 100644
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ..
 
-SUBDIRS = regression tutorial mutopia manual lsr new texidocs
+SUBDIRS = regression tutorial mutopia manual
 
 examples = typography-demo les-nereides wilhelmus proportional bach-schenker cary
 
diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
deleted file mode 100644
index 8afa862bb2..0000000000
--- a/input/lsr/GNUmakefile
+++ /dev/null
@@ -1,70 +0,0 @@
-depth = ../..
-
-# urg, can't name itely templates foo.itely.in because of standard rule
-
-STEPMAKE_TEMPLATES=documentation texinfo
-LOCALSTEPMAKE_TEMPLATES=lilypond ly
-EXTRA_DIST_FILES += README $(call src-wildcard,*.snippet-list)
-
-default:
-
-ifneq ($(out),)
-MAIN_INFO_DOC = lilypond-snippets
-INFO_DOCS = lilypond-snippets
-INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
-INFO_IMAGES_DIR = lilypond-snippets
-DEST_INFO_IMAGES_SUBDIR = input/lsr
-endif
-
-include $(depth)/make/stepmake.make
-
-TEXI2HTML_FLAGS += -D short_toc
-
-IN_ITELY_FILES = $(call src-wildcard,*-intro.itely)
-GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
-
-$(outdir)/%.itely: %-intro.itely %.snippet-list
-	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
-
-$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES) $(LY_FILES)
-
-source-links = $(outdir)/source $(outdir)/lilypond-snippets/source
-
-$(outdir)/source:
-	@rm -f $(@)
-	ln -sf $(depth) $(@)
-
-$(outdir)/%/source:
-	@rm -f $(@)
-	mkdir -p $(dir $@)
-	ln -sf $(depth)/.. $(@)
-
-info: $(INFO_FILES)
-
-ifneq ($(out),www)
-# cancel install-info target and $(INFO_FILES) 'default' target
-# (there is no lilypond-snippets.info without images)
-local-install-info:
-
-$(INFO_FILES):
-	true
-endif
-
-local-clean:
-	rm -f $(INFO_IMAGES_DIR)
-
-ifeq ($(out),www)
-# All web targets, except info image symlinks and info docs are
-# installed in non-recursing target from TOP-SRC-DIR
-local-install-WWW: local-install-info
-local-uninstall-WWW: local-uninstall-info
-
-local-WWW-1: info $(outdir)/lilypond-snippets.pdf \
-  $(outdir)/lilypond-snippets.texi
-
-local-WWW-2: $(outdir)/lilypond-snippets/index.html \
-  $(outdir)/lilypond-snippets-big-page.html \
-  $(source-links)
-endif
-
-.SECONDARY:
diff --git a/input/new/GNUmakefile b/input/new/GNUmakefile
deleted file mode 100644
index bc32848ae7..0000000000
--- a/input/new/GNUmakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-depth = ../..
-
-STEPMAKE_TEMPLATES=documentation
-EXTRA_DIST_FILES=README
-EXTRA_DIST_FILES+=$(call src-wildcard,*.ly)
-
-include $(depth)/make/stepmake.make
diff --git a/input/texidocs/aligning-bar-numbers.texidoc b/input/texidocs/aligning-bar-numbers.texidoc
deleted file mode 100644
index 110c4a55f4..0000000000
--- a/input/texidocs/aligning-bar-numbers.texidoc
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Los números de compás se alinean de forma predeterminada por la
-derecha con su objeto padre. Éste es por lo general el borde
-izquierdo de una línea o, si los números se imprimen dentro de la
-línea, el lado izquierdo de una línea divisoria.  Los números
-también se pueden situar directamente sobre la barra de compás o
-alineados por la izquierda con ella.
-
-"
-
-  doctitlees = "Alineación de los números de compás"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Taktnummern sind standardmäßig links an ihrem Ursprungsobjet
-ausgerichtet.  Das ist normalerweise die linke Ecke einer Linie oder,
-wenn die Nummern innerhalb einer Zeile gesetzt werden, auf der
-linken Seite eines Taktstrichs.  Die Nummern können auch
-direkt über dem Taktstrich positioniert werden oder rechts vom
-Taktstrich gesetzt werden.
-
-"
-  doctitlede = "Taktnummern ausrichten"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Les numéros de mesure s'alignent en principe sur la droite de l'objet 
-dont ils dépendent.  C'est normalement le coin gauche de la portée ou, 
-en cours de ligne, à gauche de la barre.  Vous pouvez toutefois les 
-centrer par rapport à la barre ou les afficher à droite de la barre.
-
-"
-  doctitlefr = "Alignement des numéros de mesure"
diff --git a/input/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc b/input/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
deleted file mode 100644
index 13efad76f3..0000000000
--- a/input/texidocs/allowing-fingerings-to-be-printed-inside-the-staff.texidoc
+++ /dev/null
@@ -1,23 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las cifras de digitación orientadas verticalmente se colocan de
-forma predeterminada fuera del pentagrama.  Sin embargo, este
-comportamiento se puede cancelar.
-
-"
-  doctitlees = "Permitir que las digitaciones se impriman dentro del pentagrama"
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-  texidocfr = "
-L'empilement des indications de doigté se fait par défaut à l'extérieur de la portée.  Néanmoins, il est possible d'annuler ce comportement.
-
-"
-  doctitlefr = "Impression des doigtés à l'intérieur de la portée"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Normalerweise werden vertikal orientierte Fingersatzzahlen außerhalb des Systems
-gesetzt.  Das kann aber verändert werden.
-
-"
-  doctitlede = "Fingersatz auch innerhalb des Systems setzen"
diff --git a/input/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc b/input/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
deleted file mode 100644
index b2dd4718c3..0000000000
--- a/input/texidocs/ancient-notation-template----modern-transcription-of-mensural-music.texidoc
+++ /dev/null
@@ -1,42 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Al transcribir música mensural, es útil un «incipit» al compienzo
-de la pieza para indicar la tonalidad y el tempo
-originales. Aunque los músicos actuales están acostumbrados a las
-barras de compás para reconocer con más facilidad los patrones
-rítmicos, durante el período de la música mensural aún no se
-habíen inventado las líneas divisorias; de hecho, la medida solía
-cambiar a cada pocas notas. Como compromiso, a menudo las líneas
-divisorias se imprimen entre los pentagramas en vez de hacerlo
-encima de ellos.
-
-"
-  doctitlees = "Plantilla de notación de música antigua (transcripción moderna de música mensural)"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d 
-  texidocde = "
-Bei der Transkription von Mensuralmusik ist es oft erwünscht, ein 
-Incipit an den Anfang des Stückes zu stellen, damit klar ist, wie 
-Tempo und Schlüssel in der Originalnotation gesetzt waren. Während 
-heutzutage Musiker an Taktlinien gewöhnt sind, um Rhythmen schneller 
-zu erkennen, wurden diese in der Mensuralmusik nicht verwendet. 
-Tatsächlich ändern sich die Rhythmen auch oft alle paar Noten. Als 
-ein Kompromiss werden die Notenlinien nicht auf dem System, sondern 
-zwischen den Systemen geschrieben.
-"
-
-doctitlede = "Vorlage für Alte Notation -- moderne Transkription von Mensuralmusik"
-
-%% Translation of GIT committish: 499a511d4166feaada31114e097f86b5e0c56421
-  texidocfr = "
-Lorsque l'on transcrit de la musique mensurale, il est d'usage 
-d'indiquer en début de partition,  par un « incipit », les tonalité 
-et tempo originaux.  De nos jours, les musiciens ont l'habitude de 
-voir des barres de mesure qui les aide à appréhender la structure 
-rythmique.  Ces barres n'existaient pas du temps où ces œuvres ont 
-été écrites ; en fait, la métrique évoluait au fil de la pièce.  Un 
-compromis consiste à imprimer des barres de mesure entre les portées 
-plutôt que sur la portée elle-même.
-
-"
-  doctitlefr = "Exemples de notation ancienne -- transcription moderne de musique mensurale"
diff --git a/input/texidocs/beam-endings-in-score-context.texidoc b/input/texidocs/beam-endings-in-score-context.texidoc
deleted file mode 100644
index adacca6b76..0000000000
--- a/input/texidocs/beam-endings-in-score-context.texidoc
+++ /dev/null
@@ -1,28 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las reglas de final de barra especificadas en el contexto
-@code{Score} se aplican a todos los pentagramas, pero se pueden
-modificar tanto en los niveles de @code{Staff} como de
-@code{Voice}:
-
-"
-  doctitlees = "Finales de barra en el contexto Score"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Balkenenderegeln, die im @code{Score}-Kontext definiert werden, wirken
-sich auf alle Systeme aus, können aber auf @code{Staff}- und
-@code{Voice}-Ebene neu verändert werden:
-
-"
-  doctitlede = "Balkenenden auf Score-Ebene"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Les règles de ligatures définies au niveau du contexte @code{Score}
-s'appliqueront à toutes les portées.  Il est toutefois possible de
-moduler au niveau @code{Staff} ou @code{Voice} :
-
-"
-  doctitlefr = "Définition de règles de ligature pour la partition"
diff --git a/input/texidocs/beam-grouping-in-7-8-time.texidoc b/input/texidocs/beam-grouping-in-7-8-time.texidoc
deleted file mode 100644
index 4ed387848d..0000000000
--- a/input/texidocs/beam-grouping-in-7-8-time.texidoc
+++ /dev/null
@@ -1,30 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-No está especificada ninguna agrupación predeterminada automática
-de las barras para el compás de 7/8, de forma que si se requieren
-barras automáticas se debe especificar la forma de agrupamiento.
-Por ejemplo, para agrupar todas las barras en la forma 2-3-2 en el
-compás de 7/8, especificamos los finales de barra en 2/8 y 5/8:
-
-"
-  doctitlees = "Agrupamiento de las barras en el compás de 7/8"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Es gibt keine automatischen Balkengruppen für 7/8-Takte.  Wenn diese
-Taktart benötigt wird, müssen die Gruppierungen definiert werden.  Um
-beispielsweise alle Noten in 2/8-3/8-2/8 aufzuteilen, müssen Balkenenden
-für 2/8 und 5/8 definiert werden:
-
-"
-  doctitlede = "Balkengruppen für 7/8-Takte"
-  
-%% Translation of GIT committish: bee31293920d834cd3698f00ddcc2402c3164619
-texidocfr = "
-Aucune règle de ligature automatique n'est disponible pour une mesure à
-7/8.  Il faudra donc, en pareil cas, définir vous-même les règles de
-regroupement.  Pour, par exemple, ligaturer sur la base de 2/8-3/8-2/8,
-il faudra donc définir les terminaisons de 2/8 et 5/8 :
-
-"
-  doctitlefr = "Règle de ligature dans une mesure à 7/8"
diff --git a/input/texidocs/beams-across-line-breaks.texidoc b/input/texidocs/beams-across-line-breaks.texidoc
deleted file mode 100644
index af2211ffe4..0000000000
--- a/input/texidocs/beams-across-line-breaks.texidoc
+++ /dev/null
@@ -1,26 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Normalmente están prohibidos los saltos de línea si las barras
-atraviesan las líneas divisorias.  Se puede cambiar este
-comportamiento como se muestra aquí:
-
-"
-  doctitle = "Barras que atraviesan saltos de línea"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
-texidocde = "
-Zeilenumbrüche sind normalerweise während Balken verboten.  Das kann geändert
-werden.
-
-"
-  doctitlede = "Balken über Zeilenumbrüche"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  
-  texidocfr = "
-Il est normalement impensable qu'un saut de ligne tombe au milieu d'une
-ligature.  LilyPond permet néanmoins de l'obtenir.
-
-"
-  doctitlefr = "Ligature au moment d'un saut de ligne"
diff --git a/input/texidocs/changing--flageolet-mark-size.texidoc b/input/texidocs/changing--flageolet-mark-size.texidoc
deleted file mode 100644
index 686aef37a8..0000000000
--- a/input/texidocs/changing--flageolet-mark-size.texidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Para hacer más pequeño el círculo de @code{\\flageolet} (armónico)
-utilice la siguiente función de Scheme.
-
-"
-  doctitlees = "Cambiar el tamaño de la marca de \\flageolet"
-
-%% Translation of GIT committish: 0099693675b95c7ec6664d7277f22411a14e9c1b
-
-  texidocfr = "
-Il est possible de rapetisser le cercle d'un @code{\\flageolet} grâce 
-à une fonction Scheme. 
-
-"
-  doctitlefr = "Modifier la taille d'un \\flageolet"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Um den @code{\\flageolet}-Kreis kleiner zu machen, kann diese
-Scheme-Funktion eingesetzt werden.
-
-"
-  doctitlede = "\\flageolet-Zeichen verkleinern"
diff --git a/input/texidocs/changing-beam-knee-gap.texidoc b/input/texidocs/changing-beam-knee-gap.texidoc
deleted file mode 100644
index 13062a3435..0000000000
--- a/input/texidocs/changing-beam-knee-gap.texidoc
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se insertan automáticamente barras en ángulo cuando se detecta un
-intervalo muy grande entre las notas.  Se puede hacer un ajuste
-fino de este comportamiento a través de la propiedad
-@code{auto-knee-gap}.  Se traza una barra doblada si el salto es
-mayor que el valor de @code{auto-knee-gap} más el ancho del objeto
-barra (que depende de la duración de las notas y de la inclinación
-de la barra).  De forma predeterminada @code{auto-knee-gap} está
-establecido a 5.5 espacios de pentagrama.
-
-"
-  doctitlees = "Cambiar el salto de las barras en ángulo"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Balken mit Hälsen in unterschiedliche Richtungen werden automatisch
-erstellt, wenn ein großer Sprung zwischen Tonhöhen gefunden wird.  Dieses
-Verhalten kann durch die @code{auto-knee-gap}-Eigenschaft beeinflusst
-werden.  Ein derartiger Knie-Balken wird erstellt, wenn der Abstand größer
-ist als der Wert von @code{auto-knee-gap} plus der Dicke des Balkens
-(was von der Notendauer und der Neigung des Balkens abhängt).  Der
-Standardwert von @code{auto-knee-gap} ist 5.5 Notensystemabstände.
-
-"
-  doctitlede = "Balken für weit auseinander liegende Noten ändern"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-LilyPond insère automatiquement des ligatures coudées --- certaines
-hampes vers le haut, d'autres vers le bas --- lorsqu'il détecte un
-intervalle important entre des têtes de notes. Ce comportement peut être
-changé par l'intermédiaire de l'objet @code{auto-knee-gap} --- défini
-par défaut à @samp{5,5} espace, plus la largeur et la pente de la
-ligature en question.
-
-"
-  doctitlefr = "Ligature et directions de hampe inversées"
diff --git a/input/texidocs/changing-form-of-multi-measure-rests.texidoc b/input/texidocs/changing-form-of-multi-measure-rests.texidoc
deleted file mode 100644
index 4934a8a339..0000000000
--- a/input/texidocs/changing-form-of-multi-measure-rests.texidoc
+++ /dev/null
@@ -1,31 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Cambiar la forma de los silencios multicompás"
- texidoces = "
-Si hay diez compases de silencio o menos, se imprime en el pentagrama
-una serie de silencios de breve y longa (conocidos en alemán como
-\"Kirchenpausen\", «silencios eclesiásticos»); en caso contrario se
-muestra una barra normal.  Este número predeterminado de diez se
-puede cambiar sobreescribiendo la propiedad @code{expand-limit}:
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn zehn oder weniger Pausentakte vorkommen, wird eine Reihe von Longa-
-und Brevispausen (auch Kirchenpausen genannt) gesetzt, bei mehr Takten
-wird eine Line mit der Taktanzahl ausgegeben.  Der vorgegebene Wert von
-zehn kann geändert werden, indem man die @code{expand-limit}-Eigenschaft
-setzt:
-"
-  doctitlede = "Die Erscheinung von Pausentakten ändern"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-texidocfr = "
-Dans le cas où ce silence dure moins de dix mesures, LilyPond imprime sur
-la portée des @qq{ silences d'église } -- @emph{Kirchenpause} en
-allemand -- et qui sont une simple suite de rectangles.  La propriété
-@code{expand-limit} permet d'obtenir un silence unique :
-
-"
-  doctitlefr = "Modifier l'apparence d'un silence multi-mesures"
diff --git a/input/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc b/input/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
deleted file mode 100644
index 3e2854d755..0000000000
--- a/input/texidocs/changing-the-time-signature-without-affecting-the-beaming.texidoc
+++ /dev/null
@@ -1,38 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-La instrucción @code{\time} establece las propiedades
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping} y
-@code{measureLength} en el contexto @code{Timing}, que normalmente
-tiene el alias @code{Score}.  La modificación del valor de
-@code{timeSignatureFraction} hace que se imprima la nueva indicación
-de compás sin que cambie ninguna de las demás propiedades:
-
-"
-  doctitlees = "Cambio de compás sin afectar al barrado"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Der @code{\\time}-Befehl verändert die Eigenschaften
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-und @code{measureLength} im @code{Timing}-Kontext, welcher normalerweise
-gleichbedeutend mit @code{Score} ist.  Wenn der Wert von
-@code{timeSignatureFraction} verändert wird, wird die neue
-Taktart ausgegeben, ohne die anderen Eigenschaften zu beeinflussen:
-
-"
-  doctitlede = "Die Taktart verändern ohne die Bebalkung zu beeinflussen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-La commande @code{\\time} gère les propriétés
-@code{timeSignatureFraction}, @code{beatLength}, @code{beatGrouping}
-et @code{measureLength} dans le contexte @code{Timing}, normallement
-rattaché à @code{Score}.  Le fait de modifier la valeur de
-@code{timeSignatureFraction} aura pour effet de changer l'apparence du
-symbole affiché sans pour autant affecter les autres propriétés de la
-métrique :
-
-"
-  doctitlefr = "Changement de métrique sans affecter les règles de ligature"
diff --git a/input/texidocs/changing-the-tuplet-number.texidoc b/input/texidocs/changing-the-tuplet-number.texidoc
deleted file mode 100644
index 8d1656bf2b..0000000000
--- a/input/texidocs/changing-the-tuplet-number.texidoc
+++ /dev/null
@@ -1,33 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Cambiar el número del grupo especial"
- texidoces = "
-
-De forma predeterminada sólo se imprime el numerador del grupo
-especial sobre el corchete de grupo, es decir, el denominador del
-argumento de la instrucción @code{\\times}. De forma alternativa, se
-puede imprimr un quebrado en la forma numerador:denominador del número
-del grupo, o eliminar el número.
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Standardmäßig wird nur der Zähler des N-tolen-Bruchs über der Klammer
-dargestellt, wie er dem @code{\\times}-Befehl übergeben wird.
-Man kann aber auch Zähler/Nenner ausgeben lassen, oder die Zahl
-vollständig unterdrücken.
-
-"
-  doctitlede = "Die Zahl der N-tole verändern"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-L'apparence du chiffre est déterminée par la propriété @code{text} dans
-@code{TupletNumber}.  La valeur par défaut imprime seulement le
-dénominateur, mais si elle est définie par la fonction
-@code{tuplet-number::calc-fraction-text}, la fraction entière
-@var{num}:@var{den} sera imprimée à la place.
-
-"
-  doctitlefr = "Modifier l'apparence du chiffre de nolet"
diff --git a/input/texidocs/compound-time-signatures.texidoc b/input/texidocs/compound-time-signatures.texidoc
deleted file mode 100644
index 30892f66d9..0000000000
--- a/input/texidocs/compound-time-signatures.texidoc
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Indicaciones de compases compuestos"
- texidoces = "
-Las indicaciones de compás poco frecuentes como \"5/8\" se pueden
-ejecutar como compases compuestos (p.ej. \"3/8 + 2/8\"), que combinan
-dos o más metros diferentes. LilyPond puede hacer la música de este
-tipo fácil de leer e interpretar, imprimiendo explícitamente las
-indicaciones de compás compuesto y adaptando el comportamiento
-automático de las barras (también se pueden añadir indicaciones
-gráficas de la agrupación de compases; véase el fragmento de código
-apropiado en la base de datos).
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Ungerade Taktarten werden (wie etwa \"5/8\") werden oft als zusammengesetzte
-Taktarten interpretiert (bspw. \"3/8 + 2/8\"), in welchen zwei oder mehr
-Teiltakte unterschieden werden.  LilyPond kann derartige Noten produzieren,
-indem entsprechende Taktarten gesetzt werden und die automatische
-Bebalkung angepasst wird.
-
-"
-  doctitlede = "Zusammengesetzte Taktarten"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Des métriques telles que @qq{5/8} peuvent s'interpréter sous une forme
-décomposée --- @qq{3/8 + 2/8} par exemple --- qui combine plusieurs
-métriques.  LilyPond est capable de rendre ce type de notation, plus
-  facile à lire et à interpréter, en imprimant cette métrique composite
-  et en adaptant les règles de ligature automatique en conséquence.
-
-"
-  doctitlefr = "Métrique décomposée"
diff --git a/input/texidocs/conducting-signs,-measure-grouping-signs.texidoc b/input/texidocs/conducting-signs,-measure-grouping-signs.texidoc
deleted file mode 100644
index b9ca5a39f5..0000000000
--- a/input/texidocs/conducting-signs,-measure-grouping-signs.texidoc
+++ /dev/null
@@ -1,49 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las opciones para agrupar los pulsos de un compás están a nuestra
-disposición a través de la función de Scheme
-@code{set-time-signature}, que acepta tres argumentos: el número
-de pulsos, la longitud del pulso, y la agrupación interna de los
-pulsos dentro del compás.  Si se incluye el grabador
-@code{Measure_grouping_engraver}, la función crea también símbolos
-de agrupación @code{MeasureGrouping}.  Dichos símbolos facilitan
-la lectura de la música moderna de cierta complejidad rítmica.  En
-el ejemplo, el compás de 9/8 se subdivide en 2, 2, 2 y 3.  Esto se
-pasa a la función @code{set-time-signature} como tercer argumento:
-@code{'(2 2 2 3)}:
-
-"
-doctitlees = "Símbolos de dirección, símbolos de agrupación de compás"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Optionen, mit denen die Balken in einem Takt gruppiert werden, sind
-durch die Scheme-Funktion @code{set-time-signature} erhältlich, die
-drei Argumente braucht:  Die Zahl der Taktschläge, die Länge des
-Schlages und die interne gruppieren von Balken in dem Takt.  Wenn der
-@code{Measure_grouping_engraver} hinzugefügt worden ist, erstellt
-diese Funktion auch @code{MeasureGrouping}-(Taktgruppen)-Zeichen.  Derartige
-Zeichen erleichtern das Lesen von rhythmisch komplexer Musik.  In dem
-Beispiel ist der 9/8-Takt in 2, 2, 2 und 3 aufgeteilt.  Das wird
-der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben:
-@code{'(2 2 2 3)}:
-
-"
-  doctitlede = "Dirigirzeichen, Taktgruppenzeichen"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-Il existe des options qui permettent de grouper les ligatures au sein
-d'une mesure, grâce à la fonction Scheme @code{set-time-signature}.
-Celle-ci prend trois arguments : le nombre de pulsations, la durée de la
-pulsation et le regroupement des pulsations dans la mesure.  Si l'on
-fait appel au @code{Measure_grouping_engraver}, la fonction 
-@code{set-time-signature} créera aussi des symboles
-@code{MeasureGrouping}.  Ces symboles aident à la lecture des œuvres
-modernes à la rythmique complexe.  Dans l'exemple qui suit, la mesure à
-9/8 est divisée en 2, 2, 2 et 3.  Ceci est fourni en tant que troisième
-argument à @code{set-time-signature} : @code{'(2 2 2 3)}.
-
-"
-  doctitlefr = "Signes de direction, signes de sous-groupe"
diff --git a/input/texidocs/controlling-the-placement-of-chord-fingerings.texidoc b/input/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
deleted file mode 100644
index fe4ed26bca..0000000000
--- a/input/texidocs/controlling-the-placement-of-chord-fingerings.texidoc
+++ /dev/null
@@ -1,22 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se puede controlar con precisión la colocación de los números de digitación.
-
-"
-  doctitlees = "Controlar la colocación de las digitaciones de acordes"
-
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-
-  texidocfr = "
-Le positionnement des doigtés peut être contrôlé de manière très précise.
-
-"
-  doctitlefr = "Conrôle du positionnement des doigtés"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Position von Fingersatzzahlen kann exakt kontrolliert werden.
-
-"
-  doctitlede = "Position von Fingersatz in Akkorden kontrollieren"
diff --git a/input/texidocs/customizing-markup-fret-diagrams.texidoc b/input/texidocs/customizing-markup-fret-diagrams.texidoc
deleted file mode 100644
index cba3b90d46..0000000000
--- a/input/texidocs/customizing-markup-fret-diagrams.texidoc
+++ /dev/null
@@ -1,31 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Se pueden establecer las propiedades de los diagramas de
-posiciones a través de @code{'fret-diagram-details}.  Para los
-diagramas de posiciones de marcado, se pueden aplicar overrides
-(sobreescrituras) al objeto @code{Voice.TextScript} o directamente al elemento de marcado.
-
-"
- doctitlees = "Personalizar diagramas de posiciones de marcado"
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-
-  texidocfr = "
-Les propriétés d'un diagramme de fret sont modifiables grâce au 
-@code{'fret-diagram-details}.  Lorsqu'ils sont générés sous forme 
-de @code{\markup}, rien n'empêche de les modifier en jouant sur les 
-réglages de l'objet @code{Voice.TextScript} ou bien directement sur 
-le @qq{markup}.
-
-"
-  doctitlefr = "Personnalisation des diagrammes de fret"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Bunddiagramme können mit der Eigenschaft @code{'fret-diagram-details}
-angepasst werden.  Bunddiagramme, die als Textbeschriftung eingefügt werden,
-können Veränderungen im @code{Voice.TextScript}-Objekt oder direkt in der
-Beschriftung vorgenommen werden.
-
-"
-  doctitlede = "Anpassung von Beschriftungs-Bunddiagrammen"
diff --git a/input/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc b/input/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
deleted file mode 100644
index 617ed81c3b..0000000000
--- a/input/texidocs/defining-predefined-fretboards-for-other-instruments.texidoc
+++ /dev/null
@@ -1,54 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Se pueden añadir diagramas de posiciones predefinidas para
-instrumentos nuevos además de los estándar que se usan para la
-guitarra.  Este archivo muestra cómo se hace, definiendo una afinación
-nueva y unas cuantas posiciones para el cuatro venezolano.
-
-Este archivo también muestra cómo se pueden incluir las digitaciones
-en los acordes que se usan como puntos de referencia para la búsqueda
-de acordes en la tabla, y mostrarse en el diagrama de posiciones y la
-tablatura @code{TabStaff}, pero no en la música.
-
-Estas posiciones no se pueden transportar porque contienen información
-de las cuerdas.  Hay planes para corregir esto en un futuro.
-
-"
-  doctitlees = "Definición de posiciones predefinidas para otros instrumentos"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-
-  texidocfr = "
-La liste des diagrammes standards prédéfinis pour la guitare peut être
- augmentée d'autres définitions spécifiques à d'autres instruments.  
-Voici comment définir un nouvel accordage ainsi que quelques diagrammes 
-prédéfinis pour le @qq{cuatro vénézuélien}.
-
-Cet exemple illustre aussi la manière d'ajouter des doigtés aux 
-accords ; ils serviront de référence pour la boucle d'accord et seront 
-indiqués dans les diagrammes et le @code{TabStaff}, mais pas dans la musique. 
-
-Ces diagrammes ne peuvent pas être transposés, dans la mesure où ils 
-contiennent des informations sur les cordes.  Ceci est amené à évoluer.
-
-"
-  doctitlefr = "Création de diagrammes de fret prédéfinis pour d'autres instruments"
-
-%% Translation of GIT committish: 33f623301a41fcc53efadf96bca1c72834763415
-  texidocde = "
-Vordefinierte Bunddiagramme können für neue Instrumente hinzugefügt werden
-neben denen, die schon für die Gitarre definiert sind.  Dieses Schnipsel
-zeigt, wie man eine neue Saitenstimmung definiert und dann eigene vordefinierte
-Bunddiagramme bestimmt.  Das Beispiel ist für das venezualische Cuatro.
-
-Dieses Schnipsel zeigt auch, wie Fingersatz in die Akkorde eingebunden
-werden kann, um als Referenzpunkt für die Akkordauswahl benutzt werden
-kann.  Dieser Fingersatz wird im Bunddiagramm und in der Tabulatur,
-aber nicht in den Noten angezeigt.
-
-Diese Bunddiagramme sind nicht transponierbar, weil sie Saiteninformationen
-enthalten.  Das soll in der Zukunft verbessert werden.
-
-"
-  doctitlede = "Eigene vordefinierte Bunddiagramme für andere Instrumente erstellen"
diff --git a/input/texidocs/engraving-ties-manually.texidoc b/input/texidocs/engraving-ties-manually.texidoc
deleted file mode 100644
index 9e3610c98d..0000000000
--- a/input/texidocs/engraving-ties-manually.texidoc
+++ /dev/null
@@ -1,32 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Grabado manual de las ligaduras"
- texidoces = "
-Se pueden grabar a mano las ligaduras modificando la propiedad
-@code{tie-configuration} del objeto @code{TieColumn}. El primer número
-indica la distancia a partir de la tercera línea del pentagrama en
-espacios de pentagrama, y el segundo número indica la dirección (1 =
-hacia arriba, -1 = hacia abajo).
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Überbindungen können manuell gesetzt werden, indem man die
-@code{tie-configuration}-Eigenschaft des @code{TieColumn}-Objekts
-beeinflusst.  Die erste Zahl zeigt den Abstand von der Mitte in
-Notensystemabständen an, die zweite Zahl zeigt die Richtung an (1 = nach oben,
--1 = nach unten).
-
-"
-  doctitlede = "Bindebögen manuell setzen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Il est possible de graver manuellement les liaisons de tenue, en
-modifiant la propriété @code{tie-configuration}.  Pour chaque paire, le
-premier nombre indique la distance à la portée, en espaces de portée, et
-le second la direction (1 pour haut, @minus{}1 pour bas).
-
-"
-  doctitlefr = "Dessin à main levée de liaisons de tenue"
diff --git a/input/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc b/input/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
deleted file mode 100644
index dcf9373376..0000000000
--- a/input/texidocs/entering-several-tuplets-using-only-one--times-command.texidoc
+++ /dev/null
@@ -1,47 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Escribir varios grupos especiales usando una sola instrucción \\times"
- texidoces = "
-La propiedad @code{tupletSpannerDuration} establece cuánto debe durar
-cada grupo de valoración especial contenido dentro del corchete que
-aparece después de @code{\\times}.  Así, se pueden escribir muchos
-tresillos seguidos dentro de una sola expresión @code{\\times},
-ahorrando trabajo de teclado.
-
-En el ejemplo se muestran dos tresillos, aunque se ha escrito
-@code{\\times} una sola vez.
-
-
-Para ver más inforamción sobre @code{make-moment}, véase
-\"Administración del tiempo\".
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Eigenschaft @code{tupletSpannerDuration} bestimmt, wie lange jede
-der N-tolen innerhalb der Klammern nach dem @code{\\times}-Befehl
-dauert.  Auf diese Art können etwa viele Triolen nacheinander mit nur
-einem @code{\\times}-Befehl geschrieben werden.
-
-Im Beispiel sind zwei Triolen zu sehen, obwohl @code{\\times} nur
-einmal geschrieben wurde.
-
-Mehr Information über @code{make-moment} gibt es in \"Verwaltung der Zeiteinheiten\". 
-
-"
-  doctitlede = "Mehrere Triolen notieren, aber nur einmal \\times benutzen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-La propriété @code{tupletSpannerDuration} spécifie la longueur voulue de
-chaque crochet.  Avec elle, vous pouvez faire plusieurs nolets en ne
-tapant @code{\\times} qu'une fois, ce qui évite une longue saisie.  
-
-Dans l'exemple suivant, deux triolets sont imprimés avec une seule fonction
-@code{\\times}.
-
-Pour plus d'information sur @code{make-moment}, voir @ref{Time administration}.
-
-"
-  doctitlefr = "Plusieurs triolets avec une seule commande \\times"
diff --git a/input/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc b/input/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
deleted file mode 100644
index 18766b75f5..0000000000
--- a/input/texidocs/fingerings,-string-indications,-and-right-hand-fingerings.texidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-En este ejemplo se combinan las digitaciones de la mano izquierda,
-indicaciones del número de cuerda y digitaciones de la mano
-derecha.
-
-"
-  doctitlees = "Digitaciones, indicación del número de cuerda y digitaciones de mano derecha"
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-
-  texidocfr = "
-L'exemple suivant illustre comment combiner des doigtés pour la main 
-gauche, des indications de corrde et des doigtés pour la main droite.
-
-"
-  doctitlefr = "Doigtés, indications de cordeet doigtés main droite"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Dieses Beispiel kombiniert Fingersatz für die linke Hand, Saitennummern
-und Fingersatz für die rechte Hand.
-
-"
-  doctitlede = "Fingersatz, Saitennummern und Fingersatz für die rechte Hand"
diff --git a/input/texidocs/flat-flags-and-beam-nibs.texidoc b/input/texidocs/flat-flags-and-beam-nibs.texidoc
deleted file mode 100644
index 7f97eb78f0..0000000000
--- a/input/texidocs/flat-flags-and-beam-nibs.texidoc
+++ /dev/null
@@ -1,95 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
- Son posibles tanto los corchetes rectos sobre notas sueltas como
-extremos de barra sueltos en figuras unidas, con una combinación de
-@code{stemLeftBeamCount}, @code{stemRightBeamCount} e indicadores de
-barra @code{[ ]} emparejados.
-
-Para corchetes rectos que apunten a la derecha sobre notas sueltas,
-use indicadores de barra emparejados @code{[]} y establezca
-@code{stemLeftBeamCount} a cero (véase el ejemplo 1).
-
-Para corchetes rectos que apunten a la izquierda, establezca en su
-lugar @code{stemRightBeamCount} (ejemplo 2).
-
-Para extremos sueltos que apunten a la derecha al final de un conjunto
-de notas unidas, establezca @code{stemRightBeamCount} a un valor
-positivo.  Y para extremos sueltos que apunten a la izquierda al
-principio de un conjunto de notas unidas, establezca
-@code{stemLeftBeamCount} en su lugar (ejemplo 3).
-
-A veces, para una nota suelta rodeada de silencios tiene sentido que
-lleve los dos extremos sueltos del corchete plano, apuntando a derecha
-e izquierda.  Hágalo solamente con indicadores de barra emparejados
-@code{[ ]} (ejemplo 4).
-
-(Observe que @code{\\set stemLeftBeamCount} siempre equivale a
-@code{\\once \\set}.  En otras palabras, los ajustes de la cantidad de
-barras no se recuerdan, y por ello el par de corchetes planos
-aplicados a la nota Do semicorchea @code{c'16[]} del último ejemplo
-no tiene nada que ver con el @code{\\set} de dos notas por detrás.)
-
-"
-  doctitlees = "Corchetes rectos y extremos de barra sueltos"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Gerade Fähnchen an einzelnen Noten und überstehende Balkenenden bei
-bebalkten Notengruppen sind möglich mit einer Kombination aus
-@code{stemLeftBeamCount}, @code{stemRightBeamCount} und Paaren von
-@code{[]}-Balkenbegrenzungen.
-
-Für gerade Fähnchen, die nach rechts zeigen, kann @code{[]} eingesetzt
-werden und @code{stemLeftBeamCount} auf Null gesetzt werden (wie
-Bsp. 1).
-
-Für gerade Fähnchen, die nach links zeigen, muss @code{stemRightBeamCount}
-eingesetzt werden (Bsp. 2).
-
-Für überstehende Balkenenden nach rechts muss @code{stemRightBeamCount}
-auf einen positiven Wert gesetzt werden, für Balkenenden, die nach links
-zeigen benutzt man @code{stemLeftBeamCount} (Bsp. 3).
-
-Manchmal können einzelne Noten, die von Pausen umgeben sind, auch Balkenenden
-in beide Richtungen tragen.  Das geschieht mit @code{[]}-Klammern (Bsp. 4).
-
-(@code{\\set stemLeftBeamCount} entspricht immer dem Befehl
-@code{\\once \\set}.  Anders gesagt müssen die Einstellungen immer wieder
-wiederholt werden und die Fähnchen des letzten Sechszehntels im letzten
-Beispiel haben nichts mit dem @code{\\set}-Befehl zwei Noten vorher zu tun.)
-
-"
-  doctitlede = "Gerade Fähnchen und überstehende Balkenenden"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-En combinant @code{stemLeftBeamCount}, @code{stemRightBeamCount} et des 
-paires de @code{[]}, vous pourrez obtenir des crochets rectilignes et 
-des ligatures qui débordent à leurs extrémités.
-
-Pour des crochets rectilignes à droite sur des notes isolées, il suffit 
-d'ajouter une paire d'indicateurs de ligature @code{[]} et de déterminer 
-@code{stemLeftBeamCount} à zéro, comme dans l'exemple 1.
-
-Pour des crochets rectiligne à gauche, c'est @code{stemRightBeamCount} 
-qu'il faudra déterminer (exemple 2).
-
-Pour que les barres de ligature débordent sur la droite, 
-@code{stemRightBeamCount} doit avoir une valeur positive ; pour un 
-débrodement à gauche, c'est sur @code{stemLeftBeamCount} qu'il faut 
-jouer.  Tout ceci est illustré par l'exemple 3.
-
-Il est parfois judicieux, lorsqu'une note est encadrée de silences, de 
-l'affubler de crochets rectilignes de part et d'autre. L'exemple 4 
-montre qu'il suffit d'adjoindre à cette note un @code{[]}.
-
-(Notez bien que @code{\\set stemLeftBeamCount} sera toujours synonyme de 
-@code{\\once \\set}.  Autrement dit, la détermination des ligatures
-n'est pas @qq{permanente} ; c'est la raison pour laquelle les crochets
-du @code{c'16[]} isolé du dernier exemple n'ont rien à voir avec le 
-@code{\\set} indiqué deux notes auparavant.)
-
-"
-  doctitlefr = "Crochet rectiligne et débordement de ligature"
diff --git a/input/texidocs/grouping-beats.texidoc b/input/texidocs/grouping-beats.texidoc
deleted file mode 100644
index 4e27feb9ff..0000000000
--- a/input/texidocs/grouping-beats.texidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Los patrones de barrado se pueden alterar con la propiedad
-@code{beatGrouping}:
-
-"
-  doctitlees = "Agrupar los pulsos"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Balkengruppen können mit der @code{beatGrouping}-Eigenschaft geändert
-werden:
-
-"
-  doctitlede = "Notengruppen"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-La manière de gérer les ligatures est influencée par la propriété 
-@code{beatGrouping} :
-
-"
-  doctitlefr = "Regroupement selon la pulsation"
diff --git a/input/texidocs/guitar-strum-rhythms.texidoc b/input/texidocs/guitar-strum-rhythms.texidoc
deleted file mode 100644
index 4020fd2663..0000000000
--- a/input/texidocs/guitar-strum-rhythms.texidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Para la música de guitarra, es posible mostrar los ritmos de rasgueo,
-además de las notas de la melodía, acordes y diagramas de posiciones.
-
-"
-  doctitlees = "Ritmos rasgueados de guitarra"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-In Guitarrennotation kann neben Melodie, Akkordbezeichnungen und
-Bunddiagrammen auch der Schlagrhythmus angegeben werden.
-
-"
-  doctitlede = "Schlagrhythmus für Guitarren"
-
-
-%% Translation of GIT committish: fa7695ea860d7ab2db86581dd5f8bc4f413f6705
-  texidocfr = "
-En matière de notation pour guitare, il arrive que soient indiqués les
-@qq{coups de gratte} en plus de la mélodie, grilles d'accords et
-diagrammes de tablature.
-
-"
-  doctitlefr = "Rythmique et guitare"
diff --git a/input/texidocs/multi-measure-rest-markup.texidoc b/input/texidocs/multi-measure-rest-markup.texidoc
deleted file mode 100644
index 9f0e2365d7..0000000000
--- a/input/texidocs/multi-measure-rest-markup.texidoc
+++ /dev/null
@@ -1,51 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-texidoces = "
-Los elementos de marcado aplicados a un silencio multicompás se
-centran encima o debajo de éste.  Los elementos de marcado extensos
-que se adjuntan a silencios multicompás no producen la expansión del
-compás.  Para expandir un silencio multicompás de forma que quepa todo
-el marcado, utilice un silencio de separación con un marcado aplicado
-antes del silencio multicompás.
-
-Observe que el silencio separador produce la inserción de un compás.
-El texto aplicado a un siencio sparador de esta forma se alinea por la
-izquierda a la posición en que la nota estaría situada dentro del
-compás, pero si la longitud del compás está determinada por la
-longitud del texto, éste aparecerá centrado.
-
-"
-
-doctitlees = "Marcado de silencios multicompás"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "Textbeschriftungen, die an Mehrtaktpausen gehängt wird,
-wird über oder unter der Pause zentriert.  Lange Beschriftungen
-lassen den Takt nicht breiter werden.  Um eine Mehrtaktpause einer
-Beschriftung anzupassen, muss eine unsichtbare Pause mit der
-Beschriftung direkt vor der Mehrtkatpause eingesetzt werden.
-
-Man sollte beachten, dass unsichtbare Pausen automatische Taktstriche
-nach sich ziehen.  Text, der an eine unsichtbare Pause gehänt wird,
-ist links ausgerichtet an der Position, wo die Pause erscheinen
-würde.  Wenn aber die Länge des Taktes durch die Länge des Textes
-bestimmt wird, sieht es so aus, als ob der Text zentriert gesetzt
-ist."
-
-  doctitlede = "Textbeschriftung und Mehrtaktpausen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Lorsque du texte est attaché à un silence multi-mesures, il sera centré
-dans la mesure, au-dessus ou en dessous de la portée.  Afin d'étirer la
-mesure dans le cas ou ce texte est relativement long, il suffit
-d'insérer un silence invisible auquel on attache le texte en question,
-avant le silence multi-mesures.
-
-Rappelez-vous qu'un silence invisible génère une barre de mesure.  Le
-texte attaché à ce silence invisible sera alors aligné sur la gauche de
-là où serait positionnée la note.  Cependant, si la taille de la mesure
-est déterminée par la longueur du texte, il apparaîtra comme centré.
-
-"
-  doctitlefr = "Ajout de texte à un silence multi-mesures"
diff --git a/input/texidocs/non-default-tuplet-numbers.texidoc b/input/texidocs/non-default-tuplet-numbers.texidoc
deleted file mode 100644
index 5187b133eb..0000000000
--- a/input/texidocs/non-default-tuplet-numbers.texidoc
+++ /dev/null
@@ -1,28 +0,0 @@
-%% Translation of GIT committish: d4f58bb3ad4e7fe1967a6b48f25e3addffc8aa14
-  texidoces = "
-LilyPond también proporciona funciones de formato para imprimir
-números de grupo especial diferentes a la propia fracción, así
-como para añadir una figura al número o a la fracción de la
-agrupación.
-
-"
-
-  doctitlees = "Números de agrupación especial distintos a los predeterminados"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-LilyPond stellt auch Formatierungsfunktionen zur Verfügung, mit denen
-N-tolennummern gesetzt werden können, die sich von dem eigentlichen Bruch
-unterscheiden.  Auch ein Notenwert kann zu Nenner oder Zähler des Bruchs
-hinzugefügt werden.
-"
-  doctitlede = "Nicht-standard-N-tolennummern"
-
-%% Translation of GIT committish: fa7695ea860d7ab2db86581dd5f8bc4f413f6705
-  texidocfr = "
-LilyPond sait aussi gérer des nolets dont le chiffrage imprimé ne
-correspond pas exactement à la fraction de mesure à laquelle ils se
-réfèrent, tout comme ceux auxquels une valeur de note vient en complément
-au chiffre.
-"
-  doctitlefr = "Nolets au chiffrage inhabituel"
diff --git a/input/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc b/input/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
deleted file mode 100644
index fa65d37507..0000000000
--- a/input/texidocs/permitting-line-breaks-within-beamed-tuplets.texidoc
+++ /dev/null
@@ -1,29 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Permitir saltos de línea dentro de grupos especiales con barra"
- texidoces = "
-Este ejemplo artificial muestra cómo se pueden permitir tanto los
-saltos de línea manuales como los automáticos dentro de un grupo de
-valoración especial unido por una barra.  Observe que estos grupos
-sincopados se deben barrar manualmente.
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Dieses künstliche Beispiel zeigt, wie sowohl automatische als auch
-manuelle Zeilenumbrüche innerhalb einer N-tole mit Balken erlaubt
-werden können.  Diese unregelmäßige Bebalkung muss allerdings manuell
-gesetzt werden.
-
-"
-  doctitlede = "Zeilenumbrüche bei N-tolen mit Balken erlauben"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Cet exemple peu académique démontre comment il est possible d'insérer un saut 
-de ligne dans un nolet portant une ligature.  Ces ligatures doivent toutefois
-être explicites.
-
-"
-  doctitlefr = "Saut de ligne au milieu d'un nolet avec ligature"
diff --git a/input/texidocs/piano-template-with-centered-dynamics.texidoc b/input/texidocs/piano-template-with-centered-dynamics.texidoc
deleted file mode 100644
index 536896c5ca..0000000000
--- a/input/texidocs/piano-template-with-centered-dynamics.texidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Muchas partituras de piano tienen las indicaciones dinámicas
-centradas entre los dos pentagramas.  Esto requiere un poco de
-trucaje, pero puesto que la plantilla está aquí mismo, no tenemos
-que hacer este trucaje por nuestra cuenta.
-
-"
-  doctitlees = "Plantilla de piano con matices centrados"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-In der meisten Klaviernotation werden die Dynamikzeichen zwischen 
-den beiden Systemen zentriert. Für LilyPond muss man die Einstellungen 
-etwas anpassen, aber Sie können ja das angepasste Beispiel von hier 
-kopieren.
-"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-多くのピアノ譜は、強弱記号を 2 つの譜の間に置きます。これを実現するにはちょっ@c
-とした調整が必要ですが、そのテンプレートがここにあるので、あなた自身が調整を行@c
-う必要はありません。
-"
diff --git a/input/texidocs/piano-template-with-centered-lyrics.texidoc b/input/texidocs/piano-template-with-centered-lyrics.texidoc
deleted file mode 100644
index 2770028bca..0000000000
--- a/input/texidocs/piano-template-with-centered-lyrics.texidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-En lugar de tener un pentagrama dedicado a la melodía y la letra, ésta
-se puede centrar entre los pentagramas de un sistema de piano.
-
-"
-  doctitlees = "Plantilla de piano con letra centrada"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Anstatt ein eigenes System für Melodie und Text zu schreiben, können 
-Sie den Text auch zwischen die beiden Klaviersysteme schreiben
-(und damit das zusätzliche System für die Gesangstimme auslassen).
-"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-旋律と歌詞のための譜表を持つ代わりに、歌詞をピアノ譜の 2 つの譜の間に置くことができます。
-"
diff --git a/input/texidocs/piano-template-with-melody-and-lyrics.texidoc b/input/texidocs/piano-template-with-melody-and-lyrics.texidoc
deleted file mode 100644
index e5995fce00..0000000000
--- a/input/texidocs/piano-template-with-melody-and-lyrics.texidoc
+++ /dev/null
@@ -1,20 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-He aquí el típico formato dde una canción: un pentagrama con la
-melodía y la letra, y el acompañamiento de piano por debajo.
-
-"
-  doctitlees = "Plantilla de piano con melodía y letra"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Das nächste Beispiel ist typisch für ein Lied: Im oberen System die 
-Melodie mit Text, darunter Klavierbegleitung.
-"
-
-  doctitlede = "Vorlage für Klavier und Gesangsstimme"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは一般的な歌曲のフォーマットです: 旋律と歌詞を持つ譜表と、その下にピアノ伴奏譜があります。
-"
diff --git a/input/texidocs/placement-of-right-hand-fingerings.texidoc b/input/texidocs/placement-of-right-hand-fingerings.texidoc
deleted file mode 100644
index ad111a3acc..0000000000
--- a/input/texidocs/placement-of-right-hand-fingerings.texidoc
+++ /dev/null
@@ -1,27 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Es posible ejercer un mayor control sobre la colocación de las
-digitaciones de la mano derecha estableciendo el valor de una
-propiedad específica, como se muestra en el ejemplo siguiente.
-
-"
-  doctitlees = "Posicionamiento de digitaciones de mano derecha"
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-
-  texidocfr = "
-Vous disposez d'une propriété spécifique qui permet de contrôler plus 
-finement le positionnement des doigtés main droite, comme l'indique 
-l'exemple suivant.
-
-"
-  doctitlefr = "Positionnement des doigtés main droite"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Man kann die Positionierung von Fingersatz der rechten Hand besser
-kontrollieren, wenn eine bestimmte Eigenschaft gesetzt wird, wie
-das folgende Beispiel zeigt:
-
-"
-  doctitlede = "Positionierung von Fingersatz der rechten Hand"
diff --git a/input/texidocs/polyphony-in-tablature.texidoc b/input/texidocs/polyphony-in-tablature.texidoc
deleted file mode 100644
index b435c9387d..0000000000
--- a/input/texidocs/polyphony-in-tablature.texidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-La polifonía se crea de la misma forma en un @code{TabStaff} que
-en una pauta normal.
-
-"
-  doctitlees = "Polifonía en tablaturas"
-
-%% Translation of GIT committish: 3f880f886831b8c72c9e944b3872458c30c6c839
-
-  texidocfr = "
-Une section polyphonique s'obtient dans un @code{TabStaff} de la
-même manière que dans une portée normale.
-
-"
-  doctitlefr = "Polyphonie en mode tablature"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Polyphonie kann in einer Tabulatur (@code{TabStaff}) genauso wie in einem
-normalen Notensystem erstellt werden.
-
-"
-  doctitlede = "Polyphonie in einer Tabulatur"
diff --git a/input/texidocs/positioning-grace-notes-with-floating-space.texidoc b/input/texidocs/positioning-grace-notes-with-floating-space.texidoc
deleted file mode 100644
index 1dbf1b4d93..0000000000
--- a/input/texidocs/positioning-grace-notes-with-floating-space.texidoc
+++ /dev/null
@@ -1,37 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Al establecer la propiedad @code{'strict-grace-spacing} hacemos
-que las columnas musicales para las notas de adorno sean
-'flotantes', es decir, desacopladas de las notas que no son de
-adorno: primero se aplica el espaciado de las notas normales, y
-luego se ponen las columnas musicales de las notas de adorno a la
-izquierda de las columnas musicales de las notas principales.
-
-"
-
-  doctitlees = "Posicionamiento de las notas de adorno con espacio flotante"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn man die Eigenschaft @code{'strict-grace-spacing} aktiviert,
-werden die Verzierungsnoten \"fließend\" gemacht, d.h. sie sind
-von den normalen Noten los gekoppelt: Zuerst werden die normalen
-Noten platziert, dann erst die Verzierungen links von der
-Hauptnote gesetzt.
-
-"
-  doctitlede = "Positionierung von Verzierungen mit verschiebbarem Platz"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Lorsque vous activez la propriété @code{'strict-grace-spacing},
-l'espacement des notes d'ornement se fera de manière @qq{élastique}.
-Autrement dit, elles seront décollées de leur note de rattachement :
-LilyPond commence par espacer les notes normales, puis les ornements
-sont placés à la gauche de leur note de rattachement.
-
-"
-  doctitlefr = "Positionnement des notes d'ornement avec espace flottant"
diff --git a/input/texidocs/positioning-multi-measure-rests.texidoc b/input/texidocs/positioning-multi-measure-rests.texidoc
deleted file mode 100644
index 4f76345438..0000000000
--- a/input/texidocs/positioning-multi-measure-rests.texidoc
+++ /dev/null
@@ -1,35 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Posicionar los silencios multicompás"
- texidoces = "
-A diferencia de los silencios normales, no existe una instrucción
-predefinida para modificar la posición predeterminada de un
-símbolo de silencio multicompás sobre el pentagrama, adjuntándolo
-a una nota, independientemente de cuál sea su forma.  Sin embargo,
-en la música polifónica los silencios multicompás de las voces de
-numeración par e impar están separados verticalmente.  La
-colocación de los silencios multicompás se puede controlar como se
-ve a continuación:
-
-"
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-texidocde = "
-Anders als bei normalen Pausen gibt es keinen direkten Befehl, um die
-vertikale Position von Ganztaktpausen zu beeinflussen, indem man sie an
-eine Tonhöhe anhängt.  In polyphoner Notation wird aber dennoch die
-Position der Pausen von geraden und ungeraden Stimmen voneinander
-unterschieden.  Die Position von Ganztaktpausen kann wie folgt verändert
-werden:
- "
-  doctitlede = "Positionierung von Ganztaktpausen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Si l'on peut positionner verticalement un silence simple en le
-rattachant à une note, il n'en va pas de même pour un silence
-multi-mesures.  Néanmoins, et uniquement dans le cadre de musique
-polyphonique, les silences multi-mesures sont positionnés différemment
-selon qu'ils appartiennent à une voix au numéro pair ou impair.  Le
-positionnement des silences multi-mesures peut se contrôler ainsi :
-"
-  doctitlefr = "Positionnement des silences multi-mesures"
diff --git a/input/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc b/input/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
deleted file mode 100644
index 6f3f5bc6cd..0000000000
--- a/input/texidocs/preventing-extra-naturals-from-being-automatically-added.texidoc
+++ /dev/null
@@ -1,31 +0,0 @@
-%% Translation of GIT committish: 203ab4a7388f36b9c89c66671498dbaefccbf86e
-  texidocfr = "
-En accord avec les règles standards de l'écriture musicale, on grave
-un bécarre avant un dièse ou un bémol si on a besoin d'annuler une
-altération précédente.  Pour modifier ce comportement, assignez la propriété
-@code{extraNatural} du contexte @code{Staff} à la valeur @code{##f} (faux).
-"
-
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-doctitlees = "Evitar que se añadan becuadros adicionales automáticamente"
-
-texidoces = "
-Según las reglas estándar de composición
-tipográfica, se imprime un becuadro antes de un sostenido o un
-bemol cuando se tiene que cancelar una alteración anterior en la
-misma nota.  Para modificar este comportamiento, establezca el
-valor de la propiedad @code{extraNatural} a @code{##f} (falso)
-dentro del contexto de @code{Staff}.
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  doctitlede = "Verhindern, dass zusätzliche Auflösungszeichen automatisch
-hinzugefügt werden"
-
-texidocde = "Den tranditionellen Notensatzregeln zufolge wird ein
-Auflösungszeichen immer dann vor einem Kreuz oder B gesetzt, wenn
-ein vorheriges Versetzungszeichen der gleichen Note aufgehoben werden
-soll.  Um dieses Verhalten zu ändern, muss die Eigenschaft
-@code{extraNatural} im @code{Staff}-Kontext auf \"false\" gesetzt werden.
-"
diff --git a/input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc b/input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
deleted file mode 100644
index 964c968187..0000000000
--- a/input/texidocs/printing-bar-numbers-at-regular-intervals.texidoc
+++ /dev/null
@@ -1,33 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Se pueden imprimir los números de compás a intervalos regulares
-mediante el establecimiento de la propiedad
-@code{barNumberVisibility}.  Aquí los números de compás se
-imprimen a cada dos compases excepto al final de la línea.
-
-"
-
-  doctitlees = "Imprimir números de compás a intervalos regulares"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Taktnummern können in regelmäßigen Intervallen gesetzt werden, indem
-man die Eigenschaft @code{barNumberVisibility} definiert.  In diesem
-Beispiel werden die Taktnummern jeden zweiten Takt gesetzt, außer
-am Ende einer Zeile.
-
-"
-  doctitlede = "Setzen der Taktnummern in regelmäßigen Intevallen"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Vous pouvez imprimer un numéro de mesure à intervalle régulier plutôt
-qu'en tête de chaque ligne seulement, en recourrant à la propriété
-@code{barNumberVisibility}.  Voici comment afficher le numéro toutes les 
-deux mesures sauf en fin de ligne.
-
-"
-  doctitlefr = "Imprimer les numéros de mesure à intervalle régulier"
diff --git a/input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc b/input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
deleted file mode 100644
index 967dc84566..0000000000
--- a/input/texidocs/printing-bar-numbers-inside-boxes-or-circles.texidoc
+++ /dev/null
@@ -1,23 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Los números de compás también se pueden imprimir dentro de rectángulos o de circunferencias.
-
-"
-  doctitlees = "Imprimir números de compás dentro de rectángulos o circunferencias"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Taktnummern können auch in Boxen oder Kreisen gesetzt werden.
-
-"
-  doctitlede = "Setzen von Taktnummern in Kästen oder Kreisen"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Les numéros de mesures peuvent être encadrés ou entourés d'un cercle.
-
-"
-  doctitlefr = "Inscrire le numéro de mesure dans un cadre ou un cercle"
diff --git a/input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc b/input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
deleted file mode 100644
index 1025cdc447..0000000000
--- a/input/texidocs/printing-the-bar-number-for-the-first-measure.texidoc
+++ /dev/null
@@ -1,40 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-De forma predeterminada se suprime el número del primer compás de
-una partitura si es menor o igual a `1'.  Al establecer el valor
-de @code{barNumberVisibility} a @code{all-bar-numbers-visible}, se
-puede imprimir cualquier número de compás para el primer compás y
-todos los siguientes.  Observe que, para que esto funcione, se
-debe insertar una líinea divisoria vacía antes de la primera nota.
-
-"
-
-  doctitlees = "Imprimir el número de compás en el primer compás"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Standardmäßig wird die erste Taktzahl einer Paritur nicht gesetzt,
-wenn sie weniger oder gleich '1' ist.  Indem man @code{barNumberVisibility}
-auf @code{all-bar-numbers-visible} setzt, kann eine beliebige
-Taktzahl für den ersten und die folgenden Takte gesetzt werden.
-Eine leere Taktlinie muss jedoch vor der ersten Note eingefügt
-werden, damit das funktioniert.
-
-"
-  doctitlede = "Setzen der Taktnummer für den ersten Takt"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Par défaut, LilyPond n'affiche pas le premier numéro de mesure s'il est 
-inférieur à 2. Le fait de définir @code{barNumberVisibility} à  
-@code{all-bar-numbers-visible} vous permettra d'imprimer n'importe quel 
-numéro pour la première mesure.  À noter que l'impression d'un numéro 
-de mesure ne peut intervenir que s'il y a une barre.  Aussi, pour 
-pouvoir le faire au début d'un morceau, devrez-vous ajouter une barre 
-vide avant la première note. 
-
-"
-  doctitlefr = "Afficher le numéro de la première mesure"
diff --git a/input/texidocs/redefining-grace-note-global-defaults.texidoc b/input/texidocs/redefining-grace-note-global-defaults.texidoc
deleted file mode 100644
index 598bb45702..0000000000
--- a/input/texidocs/redefining-grace-note-global-defaults.texidoc
+++ /dev/null
@@ -1,40 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Los valores predeterminados para las notas de adorno están
-almacenados en los identificadores @code{startGraceMusic},
-@code{stopGraceMusic}, @code{startAcciaccaturaMusic},
-@code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic} y
-@code{stopAppoggiaturaMusic}, que están definidos en el archivo
-@code{ly/grace-init.ly}.  Redefiniéndolos se pueden obtener otros
-efectos.
-
-"
-
-  doctitlees = "Redefinición de los valores globales predeterminados para notas de adorno"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die globalen Standardeinstellungen für Verzierungsnoten werden in
-den Variablen@code{startGraceMusic}, @code{stopGraceMusic},
-@code{startAcciaccaturaMusic}, @code{stopAcciaccaturaMusic},
-@code{startAppoggiaturaMusic} und @code{stopAppoggiaturaMusic}
-gespeichert, die in der Datei @code{ly/grace-init.ly} definiert
-sind.  Wenn man sie umdefiniert, können andere Effekte erreicht
-werden.
-
-"
-  doctitlede = "Globale Umdefinition von Verzierungsnoten"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Vous pouvez modifier les valeurs des variables @code{startGraceMusic}, 
-@code{stopGraceMusic}, @code{startAcciaccaturaMusic}, 
-@code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic}, et 
-@code{stopAppoggiaturaMusic} afin d'en personnaliser les effets.  Pour 
-plus de détails, voir le fichier @code{ly/grace-init.ly}. 
-
-"
-  doctitlefr = "Redéfinition des réglages de mise en forme par défaut des notes d'ornement"
diff --git a/input/texidocs/removing-bar-numbers-from-a-score.texidoc b/input/texidocs/removing-bar-numbers-from-a-score.texidoc
deleted file mode 100644
index 72a30e061c..0000000000
--- a/input/texidocs/removing-bar-numbers-from-a-score.texidoc
+++ /dev/null
@@ -1,30 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-Se pueden eliminar completamente los números de compás quitando el
-grabador @code{Bar_number_engraver} del contexto de @code{Score}.
-
-"
-
-  doctitlees = "Suprimir los números de compás de toda la partitura"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d 
-  texidocde = "
-Taktnummern können vollkommen aus den Noten entfernt werden, indem
-man den @code{Bar_number_engraver} aus dem @code{Score}-Kontext
-entfernt.
-
-"
-  doctitlede = "Entfernung von Taktnummern in einer Partitur"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Désactiver le graveur concerné --- @code{Bar_number_engraver} --- 
-donnera une partition  --- contexte @code{Score} --- sans numéros de 
-mesure.
-
-"
-  doctitlefr = "Supprimer les numéros de mesure d'une partition"
-
diff --git a/input/texidocs/rest-styles.texidoc b/input/texidocs/rest-styles.texidoc
deleted file mode 100644
index 5033ea2e74..0000000000
--- a/input/texidocs/rest-styles.texidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  doctitlees = "Estilos de silencios"
-  texidoces = "
-Los silencios se pueden imprimir en distintos estilos.
-"
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-
-  doctitlede = "Pausenstile"
-  texidocde = "
-Pausen können in verschiedenen Stilen dargestellt werden.
-"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Les silences peuvent être gravés selon différents styles.
-
-"
-  doctitlefr = "Styles de silences"
diff --git a/input/texidocs/reverting-default-beam-endings.texidoc b/input/texidocs/reverting-default-beam-endings.texidoc
deleted file mode 100644
index 10dd842de5..0000000000
--- a/input/texidocs/reverting-default-beam-endings.texidoc
+++ /dev/null
@@ -1,29 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Para tipografiar las barras agrupadas en la forma @code{3-4-3-2}
-en 12/8, en primer lugar tenemos que sobreescribir los finales de
-barra predeterminados en 12/8, y después preparar los finales de
-barra nuevos:
-
-"
-  doctitlees = "Alteración de los finales de barra predeterminados"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Um Balken im 12/8-Takt als @code{3-4-3-2} zu gruppieren, muss man zuerst die
-Standardwerte für die Balken im 12/8-Takt rückgängig machen und dann die neuen
-Werte setzen:
-
-"
-  doctitlede = "Standard-Balkenwerte rückgängig machen"
-
-
-%% Translation of GIT committish: bee31293920d834cd3698f00ddcc2402c3164619
-  texidocfr = "
-Pour obtenir des ligatures en groupes de @code{3-4-3-2} croches, dans
-une mesure à 12/8, il faudra préalablement annuler les réglages par
-défaut relatifs à 12/8, puis ajouter nos propres règles :
-
-"
-  doctitlefr = "Annulation des règles de ligature par défaut"
diff --git a/input/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc b/input/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
deleted file mode 100644
index cd4cbac892..0000000000
--- a/input/texidocs/single-staff-template-with-notes,-lyrics,-and-chords.texidoc
+++ /dev/null
@@ -1,20 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta plantilla facilita la preparación de una canción con melodía,
-letra y acordes.
-
-"
-  doctitlees = "Plantilla de pentagrama único con música, letra y acordes"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Mit diesem Beispiel können Sie einen Song mit Melodie, 
-Text und Akkorden schreiben.
-"
-
-  doctitlede = "Vorlage für eine Notenzeile mit Noten, Text und Akkorden"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは旋律、単語、コードを持つ歌曲の楽譜のためのテンプレートです。
-"
diff --git a/input/texidocs/single-staff-template-with-notes-and-chords.texidoc b/input/texidocs/single-staff-template-with-notes-and-chords.texidoc
deleted file mode 100644
index 408ed0bb7b..0000000000
--- a/input/texidocs/single-staff-template-with-notes-and-chords.texidoc
+++ /dev/null
@@ -1,21 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-¿Quiere preparar una hoja guía de acordes (o «lead sheet») con
-melodía y acordes?  ¡No busque más!
-
-"
-
-doctitlees = "Plantilla de pentagrama único con música y acordes"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wollen Sie ein Liedblatt mit Melodie und Akkorden schreiben?  Hier ist 
-das richtige Beispiel für Sie!
-"
-
-  doctitlede = "Vorlage für eine Notenzeile mit Akkorden"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-旋律とコードを持つリード譜を欲しくはありませんか？他を見る必要はありません！
-"
diff --git a/input/texidocs/single-staff-template-with-notes-and-lyrics.texidoc b/input/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
deleted file mode 100644
index 9f5a6a5917..0000000000
--- a/input/texidocs/single-staff-template-with-notes-and-lyrics.texidoc
+++ /dev/null
@@ -1,32 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta pequeña plantilla muestra una melodía sencilla con letra. Córtela
-y péguela, escriba las notas y luego la letra. Este ejemplo desactiva
-el barrado automático, que es lo más frecuente en las partes vocales
-antiguas. Para usar el barrado automático modifique o marque como un
-comentario la línea correspondiente.
-
-"
-  doctitlees = "Plantilla de pentagrama único don notas y letra"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Das nächste Beispiel zeigt eine einfache Melodie mit Text. Kopieren 
-Sie es in Ihre Datei, fügen Sie Noten und Text hinzu und übersetzen 
-Sie es mit LilyPond. In dem Beispiel wird die automatische 
-Balkenverbindung ausgeschaltet (mit dem Befehl @code{\autoBeamOff}), 
-wie es für Vokalmusik üblich ist. 
-Wenn Sie die Balken wieder einschalten wollen, müssen Sie die 
-entsprechende Zeile entweder ändern oder auskommentieren.
-"
-
-  doctitlede = "Vorlage für ein Notensystem mit Noten und Gesangstext"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-この小さなテンプレートは歌詞を持つ簡単な旋律を表しています。カット＆ペーストして、音符@c
-を付け加えて、それから歌詞の単語を付け加えてください。この例は自動ビームを off にして@c
-います。これはボーカル パートでは一般的なことです。自動ビームを使用するには、対応する@c
-行を変更するか、コメント アウトしてください。
-"
-
diff --git a/input/texidocs/single-staff-template-with-only-notes.texidoc b/input/texidocs/single-staff-template-with-only-notes.texidoc
deleted file mode 100644
index d9365e10a0..0000000000
--- a/input/texidocs/single-staff-template-with-only-notes.texidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta plantilla simple prepara un pentagrama con notas, adecuado para
-un instrumento solista o un fragmento melódico. Córtelo y péguelo en
-un archivo, escriba las notas y ¡ya está!
-
-"
-  doctitlees = "Plantilla de un solo pentagrama, con notas únicamente"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
-  texidocde = "
-Das erste Beispiel zeigt ein Notensystem mit Noten, passend für ein 
-Soloinstrument oder ein Melodiefragment. Kopieren Sie es und fügen 
-Sie es in Ihre Datei ein, schreiben Sie die Noten hinzu, und Sie haben 
-eine vollständige Notationsdatei.
-"
-
-  doctitlede = "Vorlage für ein Notensystem"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは音符を持つ譜表を提供するとても簡単なテンプレートであり、ソロの楽器や旋律に適しています。@c
-これをファイルにカット＆ペーストして、音符を付け加えれば完了です！
-"
-
diff --git a/input/texidocs/specifying-context-with-beatgrouping.texidoc b/input/texidocs/specifying-context-with-beatgrouping.texidoc
deleted file mode 100644
index 049a186164..0000000000
--- a/input/texidocs/specifying-context-with-beatgrouping.texidoc
+++ /dev/null
@@ -1,33 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Mediante la especificación del contexto, el efecto de
-@code{beatGrouping} puede limitarse al contexto especificado, y
-sobreescribirse los valores establecidos en contextos de niveles
-más altos.  Las instruccionees @code{\\set} se deben situar
-@emph{después} de todas las instrucciones @code{\\time}:
-
-
-"
-  doctitlees = "Especificar el contexto con beatGrouping"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Wenn der Kontext angegeben wird, kann die Auswirkung von @code{beatGrouping}
-auf den angegebenen Kontext beschränkt werden und die Werte, die in Kontexten
-auf höhrer Ebene angegeben wurden, können verändert werden.  Der
-@code{\\set}-Befehl muss @emph{nach} den @code{\\time}-Befehl geschrieben
-werden:
-"
-  doctitlede = "Den Kontext für beatGrouping angeben"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-Le fait de spécifier un contexte à @code{beatGrouping} permet d'en 
-limiter les effets.  Par voie de conséquence, il sera possible
-d'outrepasser les règles définies à un niveau supérieur.  La commande
-@code{\\set} destinée à en modifier les valeurs doit se placer après la 
-commande @code{\\time} :
-
-"
-  doctitlefr = "Spécification du contexte auquel s'appliquera beatGrouping"
diff --git a/input/texidocs/stem-and-beam-behavior-in-tablature.texidoc b/input/texidocs/stem-and-beam-behavior-in-tablature.texidoc
deleted file mode 100644
index 31ff6cd910..0000000000
--- a/input/texidocs/stem-and-beam-behavior-in-tablature.texidoc
+++ /dev/null
@@ -1,27 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-La dirección de las plicas se contola de la misma forma en la
-tablatura que en la notación tradicional. Las barras se pueden
-poner horizontales, como se muestra en este ejemplo.
-
-"
-  doctitlees = "Comportamiento de las plicas y las barras de corchea en tablaturas"
-
-%% Translation of GIT committish: cd4950757ab1ab6c89805b0b7c978bfca034f940
-
-  texidocfr = "
-La direction des hampes se gère dans les tablatures tout comme en 
-notation traditionnelle.  Les ligatures peuvent être mises à l'horizontale 
-comme le montre cet exemple.
-
-"
-  doctitlefr = "Hampes et ligatures en mode tablature"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Richtung von Hälsen wird in Tabulaturen genauso wie in normaler Notation
-eingestellt.  Balken können horizontal eingestellt werden, wie das Beispiel
-zeigt.
-
-"
-  doctitlede = "Hals- und Balkenverhalten in einer Tabulatur"
diff --git a/input/texidocs/string-quartet-template-simple.texidoc b/input/texidocs/string-quartet-template-simple.texidoc
deleted file mode 100644
index 9c56737ac6..0000000000
--- a/input/texidocs/string-quartet-template-simple.texidoc
+++ /dev/null
@@ -1,22 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta plantilla muestra un cuarteto de cuerda normal. También utiliza
-una sección @code{\\global} para el compás y la armadura
-
-"
-  doctitlees = "Plantilla de cuarteto de cuerda (sencilla)"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Dieses Beispiel demonstriert die Partitur für ein Streichquartett. Hier 
-wird auch eine @qq{@code{\global}}-Variable für Taktart und 
-Vorzeichen benutzt.
-"
-
-  doctitlede = "Vorlage für Streichquartett (einfach)"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは簡単な弦楽四重奏のためのテンプレートです。これは拍子記号と調号のために 
-@code{@bs{}global} セクションを使っています。
-"
diff --git a/input/texidocs/string-quartet-template-with-separate-parts.texidoc b/input/texidocs/string-quartet-template-with-separate-parts.texidoc
deleted file mode 100644
index 442985c9c6..0000000000
--- a/input/texidocs/string-quartet-template-with-separate-parts.texidoc
+++ /dev/null
@@ -1,54 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-El fragmento de código \"Plantilla de cuarteto de cuerda\" produce un
-resultado satisfactorio para el cuarteto, pero ¿y si tenemos que
-imprimir las particellas? Esta nueva plantilla muestra cómo usar la
-funcionalidad @code{\\tag} (etiqueta) para dividir fácilmente una
-pieza en particellas indicviduales.
-
-Tenemos que dividir esta plantilla en archivos independientes; los
-nombres de archivo están dentro de los comentarios al principio de
-cada archivo. @code{piece.ly} contiene todas las definiciones de
-música. Los otros archivos (@code{score.ly}, @code{vn1.ly},
-@code{vn2.ly}, @code{vla.ly} y @code{vlc.ly}) producen la particella
-correspondiente.
-
-¡No olvide quitar los comentarios que hemos especificado cuando use
-los archivos independientes!
-
-"
-  doctitlees = "Plantilla de cuarteto de cuerda con particellas independientes"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Mit diesem Beispiel können Sie ein schönes Streichquartett notieren, 
-aber wie gehen Sie vor, wenn Sie Stimmen brauchen? Das Beispiel 
-oben hat gezeigt, wie Sie mit Variablen einzelne Abschnitte getrennt 
-voneinander notieren können. Im nächsten Beispiel wird nun 
-gezeigt, wie Sie mit diesen Variablen einzelne Stimmen erstellen.
-
-Sie müssen das Beispiel in einzelne Dateien aufteilen; die Dateinamen
-sind in den Kommentaren am Anfang jeder Datei enthalten.  @code{piece.ly}
-enthält die Noten. Die anderen Dateien -- @code{score.ly},
-@code{vn1.ly}, @code{vn2.ly}, @code{vla.ly} und
-@code{vlc.ly} -- erstellen daraus die entsprechenden Stimmen bzw. die 
-Partitur (@code{score.ly}). Mit @code{\tag} wird den Stimmen ein Name 
-zugewiesen, auf den zurückgegriffen werden kann.
-"
-
-  doctitlede = "Vorlage für Streichquartett mit einzelnen Stimmen"
-  
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-\"弦楽四重奏テンプレート\" は適切な弦楽四重奏の楽譜を作り出しますが、個々の@c
-パート譜を譜刻する必要がある場合はどうでしょうか？今度の新しいテンプレートは 
-@code{@bs{}tag} 機能を用いて容易に楽曲を個々のパートに分ける方法を示しています。
-
-このテンプレートは別々のファイルに分ける必要があります。ファイル名は各ファイル@c
-の開始部分のコメントの中に記述されています。@code{piece.ly} はすべての音楽定義@c
-を保持しています。他のファイル - @code{score.ly}, @code{vn1.ly}, @code{vn2.ly}, 
-@code{vla.ly} それに @code{vlc.ly} - は対応するパートを作り出します。
-
-
-別々のファイルに分ける場合は、指定されたコメントを外すことを忘れないでください！
-"
diff --git a/input/texidocs/sub-dividing-beams.texidoc b/input/texidocs/sub-dividing-beams.texidoc
deleted file mode 100644
index 72b7bc2fe1..0000000000
--- a/input/texidocs/sub-dividing-beams.texidoc
+++ /dev/null
@@ -1,50 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Las barras de semicorcheas (o notas más breves) seguidas no se
-subdividen de forma predeterminada.  Esto es: las tres (o más)
-barras se prolongan, sin dividirse, sobre grupos completos de
-notas.  Este comportamiento se puede modificar para que las barras
-se subdividan en subgrupos mediante el establecimiento de la
-propiedad @code{subdivideBeams}.  Cuando está establecida, las
-diversas barras se subdividen a intervalos definidos por el valor
-actual de la longitud del pulso @code{beatLength} reduciendo las
-barras múltiples a una sola entre los subgrupos.  Observe que el
-valor predeterminado de @code{beatLength} es de una unidad sobre
-el denominador del compás en curso, si no está establecido
-explícitamente.  Se debe establecer al valor de una fracción que
-da la duración el subgrupo de barras utilizando la función
-@code{make-moment}, como se muestra aquí:
-
-"
-  doctitlees = "Subdivisión de las barras de semicorchea"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Balken von aufeinanderfolgenden Sechszehnteln (oder kürzeren Notenwerten)
-werden standardmäßig nicht unterteilt.  Dieses Verhalten kann verändert
-werden, sodass die Balken in Untergruppen aufgeteilt werden, indem man
-die Eigenschaft @code{subdivideBeams} verändert.  Man muss die Unterteilungsintervalle
-als Notenbruch mit der @code{make-moment}-Funktion für @code{beatLength} angeben,
-damit die Balken unterbrochen wird und nur ein Balken durchgezogen bleibt.  Der
-Standardwert für @code{beatLength} ist 1 / Zähler des aktuellen Taktes.
-
-"
-  doctitlede = "Balken in Untergruppen teilen"
-
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-Les ligatures d'une succession de notes de durée inférieure à la croche
-ne sont pas subdivisées par défaut.  Autrement dit, tous les traits de
-ligature seront continus.  Ce comportement peut être modifié afin de
-diviser la ligature en sous-groupes grâce à la propriété
-@code{subdivideBeams}.  Lorsqu'elle est activée, les ligatures seront
-subdivisées selon un intervalle défini par @code{beatLength} ; il n'y
-aura alors plus qu'un seul trait de ligature entre chaque sous-groupe.  
-Par défaut, @code{beatLength} fixe la valeur de référence à une noire.
-Il faudra donc lui fournir, à l'aide de la fonction @code{make-moment},
-une fraction correspondant au sous-groupe désiré, comme dans l'exemple
-suivant. 
-
-"
-  doctitlefr = "Subdivision des ligatures"
diff --git a/input/texidocs/tweaking-grace-layout-within-music.texidoc b/input/texidocs/tweaking-grace-layout-within-music.texidoc
deleted file mode 100644
index 656892f33e..0000000000
--- a/input/texidocs/tweaking-grace-layout-within-music.texidoc
+++ /dev/null
@@ -1,39 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-
-La disposición de las expresiones de adorno se puede cambiar a lo
-largo de toda la música usando las funciones
-@code{add-grace-property} y @code{remove-grace-property}.  El
-ejemplo siguiente borra la definición de la dirección de la plica
-para esta nota de adorno, de manera que las plicas no siemmpre
-apuntan hacia arriba, y cambia la forma predeterminada de las
-cabezas a aspas.
-
-"
-
-  doctitlees = "Trucar la disposición de las notas de adorno dentro de la música"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Das Layout von Verzierungsausdrücken kann in der Musik verändert
-werden mit den Funktionen @code{add-grace-property} und
-@code{remove-grace-property}.  Das folgende Beispiel definiert
-die Richtung von Hälsen (Stem) für diese Verzierung, sodass die
-Hälse nicht immer nach unten zeigen, und ändert den Standardnotenkopf
-in ein Kreuz.
-"
-  doctitlede = "Veränderung des Layouts von Verzierungen innerhalb der Noten"
-
-
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Il est possible de changer globalement la mise en forme des petites 
-notes dans un morceau, au moyen de la fonction 
-@code{add-grace-property}.  Ici, par exemple, on ôte la définition de 
-l'orientation des objets @code{Stem} pour toutes les petites notes, 
-afin que les hampes ne soient pas toujours orientées vers le haut, et on 
-leur préfère des têtes en forme de croix.
-
-"
-  doctitlefr = "Mise en forme des notes d'ornement"
diff --git a/input/texidocs/using-beatlength-and-beatgrouping.texidoc b/input/texidocs/using-beatlength-and-beatgrouping.texidoc
deleted file mode 100644
index c6c604a427..0000000000
--- a/input/texidocs/using-beatlength-and-beatgrouping.texidoc
+++ /dev/null
@@ -1,36 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-La propiedad @code{measureLength} determina dónde se deben insertar
-líneas divisorias y, con @code{beatLength} y @code{beatGrouping}, cómo
-se deben generar las barras autoomáticas para las duraciones de barra
-y compases para los que no hay ninguna regla definida para los finales
-de barra. Este ejemplo muestra distintas dormas de controlar el
-barrado mediante el establecimiento de estas propiedades. Las
-explicaciones están en forma de comentarios dentro del código.
-
-"
-  doctitlees = "Utilización de beatLength y beatGrouping"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Die Eigenschaft @code{measureLength} bestimmt, wo Taktstriche eingefügt
-werden sollen und, zusammen mit @code{beatLength} und
-@code{beatGrouping}, wie automtische Balken für Notenlängen und
-Taktarten, für die keine definierten Regeln gefunden werden, gesetzt
-werden sollen.  Dieses Beispiel zeigt verschiedene Möglichkeiten,
-die Balken zu kontrollieren, indem man diese Eigenschaften
-beeinflusst.  Die Erklärungen werden als Kommentare im Quellcode
-gegeben.
-"
-  doctitlede = "beatLength und beatGrouping benutzen"
-
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-La propriété @code{measureLength} détermine la pulsation et, combinée à
-@code{beatLength} et @code{beatGrouping}, comment générer les ligatures
-automatiques selon les durées et la métrique lorsqu'aucune règle n'a été
-définie.  L'exemple commenté qui suit indique différentes façons de
-contrôler les ligatures à l'aide de ces propriétés. 
-
-"
-  doctitlefr = "Utilisation conjointe de beatLength et beatGrouping"
diff --git a/input/texidocs/using-ties-with-arpeggios.texidoc b/input/texidocs/using-ties-with-arpeggios.texidoc
deleted file mode 100644
index c8be0b942d..0000000000
--- a/input/texidocs/using-ties-with-arpeggios.texidoc
+++ /dev/null
@@ -1,33 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
- doctitlees = "Uso de ligaduras en los arpegios"
- texidoces = "
-En ocasiones se usan ligaduras de unión para escribir los arpegios.
-En este caso, las dos notas ligadas no tienen que ser consecutivas.
-Esto se puede conseguir estableciendo la propiedad
-@code{tieWaitForNote} al valor @code{#t}.  La misma funcionalidad
-es de utilidad, por ejemplo, para ligar un trémolo a un acorde, pero
-en principio también se puede usar para notas normales consecutivas.
-
-"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
- texidocde = "
- Überbindungen werden teilweise benutzt, um Arpeggios zu notieren.  In
- diesem Fall stehen die übergebundenen Noten nicht unbedingt hintereinander.
-Das Verhalten kann erreicht werden, indem die @code{tieWaitForNote}-Eigenschaft
-auf @code{#t} gesetzt wird.  Diese Funktion ist auch sinnvoll, um etwa
-ein Tremolo mit einem Akkord zu überbinden, kann aber prinzipiell auch
-für normale Überbindungen eingesetzt werden
-"
-  doctitlede = "Überbingungen für Arpeggio genutzen"
-
-
-%% Translation of GIT committish: e71f19ad847d3e94ac89750f34de8b6bb28611df
-  texidocfr = "
-Les liaisons de tenue servent parfois à rendre un accord arpégé. Dans
-ce cas, les notes liées ne sont pas toutes consécutives. Il faut alors
-assigner à la propriété @code{tieWaitForNote} la valeur @code{#t}
-(@emph{true} pour @qq{vrai}).  Cette même méthode peut servir, par
-exemple, à lier un trémolo à un accord.
-"
-  doctitlefr = "Liaison de tenue et arpège"
diff --git a/input/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc b/input/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
deleted file mode 100644
index 6ad608e7b8..0000000000
--- a/input/texidocs/vocal-ensemble-template-with-automatic-piano-reduction.texidoc
+++ /dev/null
@@ -1,28 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta plantilla añade una reducción de piano automática a la partitura
-vocal SATB estándar que se mostró en la \"Plantilla de conjunto
-vocal\". Esto presenta uno de los puntos fuertes de LilyPond: podemos
-usar una definición de música más de una vez. Si se hace cualquier
-cambio en las notas de la parte vocal (digamos @code{tenorMusic}),
-entonces los cambios se aplicarán también a la reducción de piano.
-
-"
-  doctitlees = "Plantilla de conjunto vocal con reducción de piano automática"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-In diesem Beispiel wird ein automatischer Klavierauszug zu der 
-Chorpartitur hinzugefügt. Das zeigt eine der Stärken von LilyPond
--- man kann eine Variable mehr als einmal benutzen. Wenn Sie 
-irgendeine Änderung an einer Chorstimme vornehmen, (etwa 
-tenorMusic), verändert sich auch der Klavierauszug entsprechend.
-"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-このテンプレートは、\"合唱テンプレート\"で示された標準の SATB ボーカル譜に自動@c
-ピアノ譜を付け加えています。これは LilyPond の強みの 1 つを示しています - 音楽@c
-定義を何回も使用することができます。ボーカルの音符 (例えば、@code{tenorMusic} 
-の音符) に変更が加えられた場合、その変更はピアノ譜にも適用されます。
-"
diff --git a/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc b/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
deleted file mode 100644
index aac4775ddc..0000000000
--- a/input/texidocs/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.texidoc
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-Esta plantilla es, básicamente, la misma que la sencilla plantilla
-\"Conjunto vocal\", excepto que aquí todas las líneas de letra se
-colocan utilizando @code{alignAboveContext} y
-@code{alignBelowContext}.
-
-"
-  doctitlees = "Plantilla para conjunto vocal con letras alineadas encima y debajo de los pentagramas"
-  
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-In diesem Beispiel werden die Texte mit den Befehlen 
-@code{alignAboveContext} und @code{alignBelowContext}
-über und unter dem System angeordnet.
-"
-
-  doctitlede = "Vorlage für Vokalensemble mit dem Gesangstext über und unter dem System"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-このテンプレートは基本的に単純な \"合唱\" テンプレートと同じですが、歌詞が 
-@code{alignAboveContext} と @code{alignBelowContext} を用いて配置されています。
-"
diff --git a/input/texidocs/vocal-ensemble-template.texidoc b/input/texidocs/vocal-ensemble-template.texidoc
deleted file mode 100644
index f33a3bfccf..0000000000
--- a/input/texidocs/vocal-ensemble-template.texidoc
+++ /dev/null
@@ -1,27 +0,0 @@
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
-  texidoces = "
-He aquí una partitura vocal estándar para cuatro voces SATB. Con
-grupos mayores, suele ser útil incluir una sección que aparezca en
-todas las partes.  Por ejemplo, el compás y la armadura casi siempre
-son los mismos para todas. Como en la plantilla \"Himno\", las cuatro
-voces se reagrupan en sólo dos pentagramas.
-
-"
-  doctitlees = "Plantilla de conjunto vocal"
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d  
-  texidocde = "
-Dieses Beispiel ist für vierstimmigen Gesang (SATB). Bei größeren 
-Stücken ist es oft sinnvoll, eine allgemeine Variable zu bestimmen, 
-die in allen Stimmen eingefügt wird. Taktart und Vorzeichen etwa 
-sind fast immer gleich in allen Stimmen.
-"
-
-  doctitlede = "Vorlage für Vokalensemble"
-
-%% Translation of GIT committish: 06d99c3c9ad1c3472277b4eafd7761c4aadb84ae
-  texidocja = "
-これは標準の 4 パート SATB (ソプラノ、アルト、テナー、バス) ボーカル譜です。@c
-もっと大きな合唱では、すべてのパートで使用されるセクションをインクルードすると@c
-便利です。例えば、拍子記号と調号はほとんど常にすべてのパートで同じです。\"賛美@c
-歌\" テンプレートのように、4 つのボイスは 2 つの譜にグループ分けされています。"
diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index 1bb8bf6d7f..630b3f2b1c 100644
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -1 +1,39 @@
-# empty
+$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
+	mkdir -p $(dir $@)
+	mkdir -p $(outdir)/$*
+	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(outdir)/$* --prefix=index --split=section $(TEXI2HTML_INIT) $<
+	find $(outdir)/$* -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(buildscript-dir)/html-gettext $(ISOLANG)
+	find $(outdir)/$* -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir)
+
+
+$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
+	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
+	$(buildscript-dir)/html-gettext $(ISOLANG) $@
+
+
+$(outdir)/%.pdftexi: $(outdir)/%.texi
+	$(buildscript-dir)/texi-gettext $(ISOLANG) $<
+
+$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.pdftexi
+	cd $(outdir) && \
+	texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.pdftexi && \
+	mkdir -p $(dir $@) && mv $*.pdf $@
+
+$(outdir)/version.%: $(top-src-dir)/VERSION
+	echo '@macro version'> $@
+	echo $(TOPLEVEL_VERSION)>> $@
+	echo '@end macro'>> $@
+
+$(outdir)/%.png: $(top-build-dir)/Documentation/$(outdir)/%.png
+	ln -f $< $@
+
+$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
+	$(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) $(XREF_MAP_FLAGS) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $<
+
+$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
+
+$(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES)
+	find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/$(outdir)
+	touch $@
+
+.SECONDARY:
diff --git a/make/doc-i18n-root-targets.make b/make/doc-i18n-root-targets.make
index 213e478fa8..64c00b0348 100644
--- a/make/doc-i18n-root-targets.make
+++ b/make/doc-i18n-root-targets.make
@@ -1,6 +1,18 @@
 default:
 
 ifeq ($(out),www)
-local-WWW-2: $(OUT_HTML_FILES)
+ifeq ($(ISOLANG),ja)
+local-WWW-1: $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES)
+endif
+ifneq ($(ISOLANG),ja)
+local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES)
+endif
+
+local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET) $(OUT_HTML_FILES)
+# FIXME: move the following line to a rule that generate the right file
 	$(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) $(HTML_FILES)
+
+$(DOCUMENTATION_LOCALE_TARGET):
+	$(MAKE) -C $(depth)/Documentation/po out=www messages
+	touch $@
 endif
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index fdf8664263..5eaa432110 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -1,3 +1,51 @@
 HTML_PAGE_NAMES = index translations
 HTML_FILES = $(HTML_PAGE_NAMES:%=%.html)
 OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
+
+# ISOLANG must be defined
+
+LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py)
+
+CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
+SOURCE_PNG_IMAGES = $(shell ls $(top-src-dir)/Documentation/*.png)
+OUT_PNG_IMAGES = \
+  $(SOURCE_PNG_IMAGES:$(top-src-dir)/Documentation/%.png=$(outdir)/%.png) \
+  $(outdir)/context-example.png
+
+TELY_FILES := $(call src-wildcard,*.tely)
+MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
+BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
+DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html)
+PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf)
+
+ITELY_FILES := $(call src-wildcard,*.itely)
+ITEXI_FILES := $(call src-wildcard,*.itexi)
+
+DOCUMENTATION_INCLUDES = \
+  -I $(top-src-dir)/Documentation \
+  -I $(top-build-dir)/Documentation/$(outdir)
+
+LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
+MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
+MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
+
+# texi2html xref map files
+XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps
+XREF_MAPS_FILES=$(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map)
+XREF_MAP_FLAGS += -I $(outdir)
+
+# texi2html flags
+TEXI2HTML_INIT= --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+TEXI2HTML_LANG=--lang=$(ISOLANG)
+TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES) \
+  -I $(XREF_MAPS_DIR)
+TEXI2HTML = PERL_UNICODE=SD LANG= $(TEXI2HTML_PROGRAM)
+
+TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
+
+ifdef QUIET_BUILD
+TEXI2PDF_FLAGS += -q
+endif
+
+DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po
+TRANSLATION_LILY_IMAGES = $(outdir)/translation-lily-images
diff --git a/make/doc-i18n-topdocs-rules.make b/make/doc-i18n-topdocs-rules.make
deleted file mode 100644
index 874e7d5537..0000000000
--- a/make/doc-i18n-topdocs-rules.make
+++ /dev/null
@@ -1,14 +0,0 @@
-$(outdir)/%.html: $(outdir)/%.texi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
-
-$(outdir)/%.pdf: $(outdir)/%.texi
-	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).texi
-
-$(outdir)/version.%: $(top-src-dir)/VERSION
-	echo '@macro version'> $@
-	echo $(TOPLEVEL_VERSION)>> $@
-	echo '@end macro'>> $@
-
-$(outdir)/%.txt: $(outdir)/%.texi
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$@ --no-split --no-headers $< 
diff --git a/make/doc-i18n-topdocs-targets.make b/make/doc-i18n-topdocs-targets.make
deleted file mode 100644
index d7e26a95ce..0000000000
--- a/make/doc-i18n-topdocs-targets.make
+++ /dev/null
@@ -1,9 +0,0 @@
-default:
-
-ifeq ($(out),www)
-local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES)
-
-local-WWW-2: $(HTML_FILES)
-	find $(outdir) -name '*.html' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/topdocs/$(outdir) NEWS.pdf
-	find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/topdocs/$(outdir)
-endif
diff --git a/make/doc-i18n-topdocs-vars.make b/make/doc-i18n-topdocs-vars.make
deleted file mode 100644
index 456f79d56a..0000000000
--- a/make/doc-i18n-topdocs-vars.make
+++ /dev/null
@@ -1,26 +0,0 @@
-OUTTXT_FILES= $(outdir)/NEWS.txt
-
-TELY_FILES := $(call src-wildcard,*.tely)
-MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
-HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%.html)
-PDF_FILES := $(TELY_FILES:%.tely=$(outdir)/%.pdf)
-
-DOCUMENTATION_INCLUDES = \
-  -I $(top-src-dir)/Documentation/user \
-  -I $(top-build-dir)/Documentation/user/$(outdir)
-
-LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
-MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
-
-# texi2html flags
-TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
-TEXI2HTML_LANG=--lang=$(ISOLANG)
-TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES)
-TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
-
-TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
-
-ifdef QUIET_BUILD
-TEXI2PDF_FLAGS += -q
-endif
diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make
deleted file mode 100644
index e02da6f516..0000000000
--- a/make/doc-i18n-user-rules.make
+++ /dev/null
@@ -1,39 +0,0 @@
-$(top-build-dir)/Documentation/user/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
-	mkdir -p $(dir $@)
-	mkdir -p $(outdir)/$*
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(outdir)/$* --prefix=index --split=section $(TEXI2HTML_INIT) $<
-	find $(outdir)/$* -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(buildscript-dir)/html-gettext $(ISOLANG)
-	find $(outdir)/$* -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
-
-
-$(top-build-dir)/Documentation/user/$(outdir)/%-big-page.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
-	$(buildscript-dir)/html-gettext $(ISOLANG) $@
-
-
-$(outdir)/%.pdftexi: $(outdir)/%.texi
-	$(buildscript-dir)/texi-gettext $(ISOLANG) $<
-
-$(top-build-dir)/Documentation/user/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.pdftexi
-	cd $(outdir) && \
-	texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.pdftexi && \
-	mkdir -p $(dir $@) && mv $*.pdf $@
-
-$(outdir)/version.%: $(top-src-dir)/VERSION
-	echo '@macro version'> $@
-	echo $(TOPLEVEL_VERSION)>> $@
-	echo '@end macro'>> $@
-
-$(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
-	ln -f $< $@
-
-$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
-	$(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $<
-
-$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
-
-$(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES)
-	find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
-	touch $@
-
-.SECONDARY:
diff --git a/make/doc-i18n-user-targets.make b/make/doc-i18n-user-targets.make
deleted file mode 100644
index 85cc0b1927..0000000000
--- a/make/doc-i18n-user-targets.make
+++ /dev/null
@@ -1,16 +0,0 @@
-default:
-
-ifeq ($(out),www)
-ifeq ($(ISOLANG),ja)
-local-WWW-1: $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES)
-endif
-ifneq ($(ISOLANG),ja)
-local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES)
-endif
-
-local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET)
-
-$(DOCUMENTATION_LOCALE_TARGET):
-	$(MAKE) -C $(depth)/Documentation/po out=www messages
-	touch $@
-endif
diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make
deleted file mode 100644
index ff2e2afebe..0000000000
--- a/make/doc-i18n-user-vars.make
+++ /dev/null
@@ -1,46 +0,0 @@
-# ISOLANG must be defined
-
-LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py)
-
-CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
-SOURCE_PNG_IMAGES = $(shell ls $(top-src-dir)/Documentation/user/*.png)
-OUT_PNG_IMAGES = \
-  $(SOURCE_PNG_IMAGES:$(top-src-dir)/Documentation/user/%.png=$(outdir)/%.png) \
-  $(outdir)/context-example.png
-
-TELY_FILES := $(call src-wildcard,*.tely)
-MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
-BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%-big-page.$(ISOLANG).html)
-DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%/index.$(ISOLANG).html)
-PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%.$(ISOLANG).pdf)
-
-ITELY_FILES := $(call src-wildcard,*.itely)
-ITEXI_FILES := $(call src-wildcard,*.itexi)
-
-DOCUMENTATION_INCLUDES = \
-  -I $(top-src-dir)/Documentation/user \
-  -I $(top-build-dir)/Documentation/user/$(outdir)
-
-LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
-MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
-
-# texi2html xref map files
-XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps
-XREF_MAPS_FILES=$(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map)
-
-# texi2html flags
-TEXI2HTML_INIT= --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-TEXI2HTML_LANG=--lang=$(ISOLANG)
-TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES) \
-  -I $(XREF_MAPS_DIR)
-TEXI2HTML = PERL_UNICODE=SD LANG= $(TEXI2HTML_PROGRAM)
-
-TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
-
-ifdef QUIET_BUILD
-TEXI2PDF_FLAGS += -q
-endif
-
-DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po
-TRANSLATION_LILY_IMAGES = $(outdir)/translation-lily-images
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index ac5dae67ad..126d2c30d0 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -27,10 +27,10 @@ CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 
 LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir)	\
- -I $(input-dir)/lsr/ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \
+ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \
  -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/	\
  -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \
- -I $(top-src-dir)/Documentation
+ -I $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index 15fcbbec10..308e4370ac 100644
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -13,17 +13,19 @@ import langdefs
 
 # This is to try to make the docball not too big with almost duplicate files
 # see process_links()
-non_copied_pages = ['Documentation/user/out-www/lilypond-big-page',
-                    'Documentation/user/out-www/lilypond-internals-big-page',
-                    'Documentation/user/out-www/lilypond-learning-big-page',
-                    'Documentation/user/out-www/lilypond-program-big-page',
-                    'Documentation/user/out-www/music-glossary-big-page',
+non_copied_pages = ['Documentation/out-www/notation-big-page',
+                    'Documentation/out-www/internals-big-page',
+                    'Documentation/out-www/learning-big-page',
+                    'Documentation/out-www/application-big-page',
+                    'Documentation/out-www/music-glossary-big-page',
+                    'Documentation/out-www/contributor',
+                    'Documentation/out-www/changes',
+                    'Documentation/out-www/snippets',
                     'out-www/examples',
                     'Documentation/topdocs',
                     'Documentation/bibliography',
                     'Documentation/out-www/THANKS',
                     'Documentation/out-www/DEDICATION',
-                    'Documentation/out-www/devel',
                     'input/']
 
 def _doc (s):
@@ -91,13 +93,8 @@ def build_pages_dict (filelist):
 def source_links_replace (m, source_val):
     return 'href="' + os.path.join (source_val, m.group (1)) + '"'
 
-splitted_docs_re = re.compile ('(input/lsr/out-www/lilypond-snippets|\
-Documentation/user/out-www/(lilypond|music-glossary|lilypond-program|\
-lilypond-learning))/')
-
-snippets_ref_re = re.compile (r'href="(\.\./)?lilypond-snippets')
-user_ref_re = re.compile ('href="(?:\.\./)?lilypond\
-(-internals|-learning|-program|(?!-snippets))')
+splitted_docs_re = re.compile ('(Documentation/out-www/(notation|\
+music-glossary|application|learning|snippets))/')
 
 docindex_link_re = re.compile (r'href="index.html"')
 
@@ -110,20 +107,15 @@ def hack_urls (s, prefix):
     if splitted_docs_re.match (prefix):
         s = re.sub ('(href|src)="(../lily-.*?|.*?[.]png)"', '\\1="../\\2"', s)
 
-    # fix xrefs between documents in different directories ad hoc
-    if 'user/out-www/lilypond' in prefix:
-        s = snippets_ref_re.sub ('href="source/input/lsr/lilypond-snippets', s)
-    elif 'input/lsr' in prefix:
-        s = user_ref_re.sub ('href="source/Documentation/user/lilypond\\1', s)
-    
     # we also need to replace in the lsr, which is already processed above!
-    if 'input/' in prefix or 'Documentation/topdocs' in prefix:
+    if 'input/' in prefix or 'Documentation/topdocs' in prefix or \
+            'Documentation/contributor' in prefix:
         # fix the link from the regtest, lsr and topdoc pages to the doc index 
         # (rewrite prefix to obtain the relative path of the doc index page)
         rel_link = re.sub (r'out-www/.*$', '', prefix)
         rel_link = re.sub (r'[^/]*/', '../', rel_link)
-        if 'input/regression' in prefix:
-            indexfile = "Documentation/devel/index"
+        if 'input/regression' in prefix or 'Documentation/contributor' in prefix:
+            indexfile = "Documentation/devel"
         else:
             indexfile = "index"
         s = docindex_link_re.sub ('href="' + rel_link + indexfile + '.html\"', s)
@@ -225,7 +217,8 @@ def process_i18n_big_page_links (match, prefix, lang_ext):
     if big_page_name:
         destination_path = os.path.normpath (os.path.join (os.path.dirname (prefix),
                                                            big_page_name.group (0)))
-        if not lang_ext in pages_dict[destination_path]:
+        if not (destination_path in pages_dict and
+                lang_ext in pages_dict[destination_path]):
             return match.group (0)
     return 'href="' + match.group (1) + '.' + lang_ext \
         + match.group (2) + match.group (3) + '"'
diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 478eb20efc..ac33f4f09d 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -58,7 +58,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define file-name "lilypond-internals")
+(define file-name "internals")
 (define outname (string-append file-name ".texi"))
 
 (define out-port (open-output-file outname))
@@ -67,8 +67,8 @@
 
 (display
  (string-append
-  (texi-file-head "LilyPond program-reference" file-name
-		  "(lilypond/lilypond-internals.info)")
+  (texi-file-head "LilyPond Internals Reference" file-name
+		  "(lilypond-internals.info)")
   "
 
 @include macros.itexi
@@ -84,11 +84,6 @@
 
 @iftex
 @afourpaper
-@c don't replace quotes with directed quotes
-@tex
-\\gdef\\SETtxicodequoteundirected{Foo}
-\\gdef\\SETtxicodequotebacktick{Bla}
-@end tex
 @end iftex
 
 @finalout
@@ -120,13 +115,13 @@ For LilyPond version @version{}
 @ifhtml
 @ifclear bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-internals.pdf,PDF} and as
-@uref{source/Documentation/user/lilypond-internals-big-page.html,one big page}.
+@uref{source/Documentation/internals.pdf,PDF} and as
+@uref{source/Documentation/internals-big-page.html,one big page}.
 @end ifclear
 @ifset bigpage
 This document is also available as a
-@uref{source/Documentation/user/lilypond-internals.pdf,PDF} and as a
-@uref{source/Documentation/user/lilypond-internals/index.html,HTML indexed multiple pages}.
+@uref{source/Documentation/internals.pdf,PDF} and as a
+@uref{source/Documentation/internals/index.html,HTML indexed multiple pages}.
 @end ifset
 @end ifhtml
 
diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index 80628cbf16..88731719c1 100755
--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -5,23 +5,31 @@ import os
 import glob
 import re
 
+os.environ['PYTHONPATH'] += ':python'
+import langdefs
+
+DEST = os.path.join ('Documentation', 'snippets')
+NEW_LYS = os.path.join ('Documentation', 'snippets', 'new')
+TEXIDOCS = [os.path.join ('Documentation', language_code, 'texidocs')
+            for language_code in langdefs.LANGDICT]
+
 USAGE = '''  Usage: makelsr.py [LSR_SNIPPETS_DIR]
 This script must be run from top of the source tree;
-it updates snippets input/lsr with snippets in input/new or LSR_SNIPPETS_DIR.
-If a snippet is present in both directories, the one from input/new is preferred.
-'''
-
-LY_HEADER_LSR = '''%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+it updates snippets %(DEST)s with snippets
+from %(NEW_LYS)s or LSR_SNIPPETS_DIR.
+If a snippet is present in both directories, the one
+from %(NEW_LYS)s is preferred.
+''' % vars ()
+
+LY_HEADER_LSR = '''%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
 '''
 
-LY_HEADER_NEW = '''%% Do not edit this file; it is auto-generated from input/new
+LY_HEADER_NEW = '''%% Do not edit this file; it is automatically
+%% generated from %s
 %% This file is in the public domain.
-'''
-
-DEST = os.path.join ('input', 'lsr')
-NEW_LYS = os.path.join ('input', 'new')
-TEXIDOCS = os.path.join ('input', 'texidocs')
+''' % NEW_LYS
 
 TAGS = []
 # NR 1
@@ -70,11 +78,13 @@ ly_new_version_re = re.compile (r'\\version\s*"(.+?)"')
 
 # add tags to ly files from LSR
 def add_tags (ly_code, tags):
-    return begin_header_re.sub ('\\g<0>\n  lsrtags = "' + tags + '"\n', ly_code, 1)
+    return begin_header_re.sub ('\\g<0>\n  lsrtags = "' + tags + '"\n',
+                                ly_code, 1)
 
 # for snippets from input/new, add message for earliest working version
 def add_version (ly_code):
-    return '''%% Note: this file works from version ''' + ly_new_version_re.search (ly_code).group (1) + '\n'
+    return '''%% Note: this file works from version ''' + \
+        ly_new_version_re.search (ly_code).group (1) + '\n'
 
 def copy_ly (srcdir, name, tags):
     global unsafe
@@ -83,15 +93,16 @@ def copy_ly (srcdir, name, tags):
     tags = ', '.join (tags)
     s = open (os.path.join (srcdir, name)).read ()
 
-    texidoc_translations_path = os.path.join (TEXIDOCS,
-                                              os.path.splitext (name)[0] + '.texidoc')
-    if os.path.exists (texidoc_translations_path):
-        texidoc_translations = open (texidoc_translations_path).read ()
-        # Since we want to insert the translations verbatim using a 
-        # regexp, \\ is understood as ONE escaped backslash. So we have
-        # to escape those backslashes once more...
-        texidoc_translations = texidoc_translations.replace ('\\', '\\\\')
-        s = begin_header_re.sub ('\\g<0>\n' + texidoc_translations, s, 1)
+    for path in TEXIDOCS:
+        texidoc_translation_path = \
+            os.path.join (path, os.path.splitext (name)[0] + '.texidoc')
+        if os.path.exists (texidoc_translation_path):
+            texidoc_translation = open (texidoc_translation_path).read ()
+            # Since we want to insert the translations verbatim using a 
+            # regexp, \\ is understood as ONE escaped backslash. So we have
+            # to escape those backslashes once more...
+            texidoc_translation = texidoc_translation.replace ('\\', '\\\\')
+            s = begin_header_re.sub ('\\g<0>\n' + texidoc_translation, s, 1)
 
     if in_dir and in_dir in srcdir:
         s = LY_HEADER_LSR + add_tags (s, tags)
@@ -188,7 +199,7 @@ if unsafe:
     sys.stderr.write ('''
 
 Unsafe files printed in lsr-unsafe.txt: CHECK MANUALLY!
-  git add input/lsr/*.ly
+  git add %s/*.ly
   xargs git diff HEAD < lsr-unsafe.txt
 
-''')
+''' % DEST)
diff --git a/scripts/build/www_post.py b/scripts/build/www_post.py
index c568734c1b..b329390a5d 100644
--- a/scripts/build/www_post.py
+++ b/scripts/build/www_post.py
@@ -29,20 +29,8 @@ static_files = {
 <html><body>Redirecting to the documentation index...</body></html>\n''',
     os.path.join (outdir, 'VERSION'):
         package_version + '\n',
-    os.path.join ('input', 'lsr', outdir, 'index.html'):
-        '''<META HTTP-EQUIV="refresh" content="0;URL=../../index.html">
-<html><body>Redirecting to the documentation index...</body></html>\n'''
     }
 
-for l in langdefs.LANGUAGES:
-    static_files[os.path.join (
-            'Documentation',
-            'user',
-            outdir,
-            l.file_name ('index', '.html'))] = \
-            '<META HTTP-EQUIV="refresh" content="0;URL=../' + l.file_name ('index', '.html') + \
-            '">\n<html><body>Redirecting to the documentation index...</body></html>\n'
-
 for f, contents in static_files.items ():
     open (f, 'w').write (contents)
 
@@ -85,9 +73,6 @@ for t in targets:
         if not os.path.exists (dest):
             os.symlink (p, dest)
 
-    ## ad-hoc renaming to make xrefs between PDFs work
-    os.rename (os.path.join (out_root, 'input/lsr/lilypond-snippets.pdf'),
-               os.path.join (out_root, 'Documentation/user/lilypond-snippets.pdf'))
 
 # need this for content negotiation with documentation index
 if 'online' in targets:
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 351a1cc2d8..c07a86e6c7 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -13,7 +13,7 @@
 # prerequisite, otherwise %.info are always outdated (because older
 # than $(outdir)), hence this .dep file
 
-$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep: $(INFO_DOCS:%=$(outdir)/%.texi)
+$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep: $(OUT_TEXI_FILES)
 ifneq ($(INFO_IMAGES_DIR),)
 	rm -f $(INFO_IMAGES_DIR)
 	ln -s $(outdir) $(INFO_IMAGES_DIR)
@@ -26,13 +26,14 @@ endif
 $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
+$(outdir)/lilypond-%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
+	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
 	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
 $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
 	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
-	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
 $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/%.html.omf
 	mkdir -p $(dir $@)
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index bcd5f1e576..8054cbe826 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -4,6 +4,8 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
+OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TEXI_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
+
 GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
@@ -14,8 +16,10 @@ MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 # texi2html xref map files
-XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps
-XREF_MAPS_FILES=$(INFO_DOCS:%=$(XREF_MAPS_DIR)/%.xref-map)
+XREF_MAPS_DIR = $(top-build-dir)/out/xref-maps
+XREF_MAPS_FILES += $(TEXI_FILES:%.texi=$(XREF_MAPS_DIR)/%.xref-map) \
+ $(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.xref-map)
+XREF_MAP_FLAGS += -I $(outdir)
 
 # texi2html flags
 ifneq ($(ISOLANG),)
@@ -33,7 +37,7 @@ endif
 
 # info stuff
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
-INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
+INFO_INSTALL_COMMAND = $(if $(INFO_INSTALL_FILES),\
 	$(INSTALLPY) -d $(DESTDIR)$(infodir) ; \
 	$(MAKE) INSTALLATION_OUT_DIR=$(infodir) \
 		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
diff --git a/stepmake/stepmake/topdocs-vars.make b/stepmake/stepmake/topdocs-vars.make
index b47fb8867d..24731bf46b 100644
--- a/stepmake/stepmake/topdocs-vars.make
+++ b/stepmake/stepmake/topdocs-vars.make
@@ -1,3 +1,4 @@
 TO_TOP_FILES=$(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
-DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation/user
+DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation/application \
+ $(top-src-dir)/Documentation/contributor
-- 
2.39.2