From: Han-Wen Nienhuys Date: Sat, 16 Aug 2008 18:57:48 +0000 (-0300) Subject: Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond X-Git-Tag: release/2.11.56-1~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f49e954f4a1c1c388ebe8c0581a20da0238aed25;hp=b4d4ac4ddd6c142a7017918814e3a0a57a037861;p=lilypond.git Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond --- diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 15b6a6f297..d265a1ee96 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -6,14 +6,17 @@ SUBDIRS=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)"' -README_TOP_FILES= DEDICATION THANKS +README_TOP_FILES= DEDICATION THANKS EXTRA_DIST_FILES= texinfo.css TRANSLATION include $(depth)/make/stepmake.make +HTML_PAGE_NAMES= index devel translations +OUT_HTML_FILES= $(HTML_PAGE_NAMES:%=$(outdir)/%.html) + default: local-doc -local-WWW: txt-to-html $(outdir)/index.html $(outdir)/devel.html +local-WWW: txt-to-html $(OUT_HTML_FILES) local-WWW-clean: deep-WWW-clean diff --git a/Documentation/TRANSLATION b/Documentation/TRANSLATION index 7ad31416f5..455653cdea 100644 --- a/Documentation/TRANSLATION +++ b/Documentation/TRANSLATION @@ -112,57 +112,57 @@ Word counts (excluding lilypond snippets) are given for each file. -1- Documentation index and Tutorial 412 user/lilypond-learning.tely -5652 user/tutorial.itely +5685 user/tutorial.itely 23 user/dedication.itely 378 user/macros.itexi -218 index.html.in -3457 po/lilypond-doc.pot (translate to po/.po) -10140 total +228 index.html.in +3438 po/lilypond-doc.pot (translate to po/.po) +10164 total -2- Introduction and beginning of Application Usage 411 user/preface.itely -3699 user/introduction.itely +3678 user/introduction.itely 390 user/lilypond-program.tely 1681 user/install.itely (partial translation) 1012 user/setup.itely 2879 user/running.itely -10072 total +10051 total -3- Learning manual 9800 user/fundamental.itely -- Fundamental concepts -12262 user/tweaks.itely -- Tweaking output +12334 user/tweaks.itely -- Tweaking output 3005 user/working.itely -- Working on LilyPond files 483 user/templates.itely -- Templates -25550 total +25622 total -4- Notation reference -544 user/lilypond.tely +547 user/lilypond.tely 91 user/notation.itely -- Musical notation -2822 user/pitches.itely -6657 user/rhythms.itely -843 user/expressive.itely -940 user/repeats.itely -883 user/simultaneous.itely -2310 user/staff.itely -827 user/editorial.itely -1851 user/text.itely +2948 user/pitches.itely +6785 user/rhythms.itely +1119 user/expressive.itely +556 user/repeats.itely +1000 user/simultaneous.itely +1800 user/staff.itely +908 user/editorial.itely +2082 user/text.itely 73 user/specialist.itely -- Specialist notation -2745 user/vocal.itely -1303 user/chords.itely +2799 user/vocal.itely +1352 user/chords.itely 702 user/piano.itely -546 user/percussion.itely +747 user/percussion.itely 826 user/guitar.itely 66 user/strings.itely 242 user/bagpipes.itely 3474 user/ancient.itely -5399 user/input.itely -- Input syntax +5431 user/input.itely -- Input syntax 2164 user/non-music.itely -- Non-musical notation -8400 user/spacing.itely -- Spacing issues -6855 user/changing-defaults.itely -- Changing defaults -5213 user/programming-interface.itely -- Interfaces for programmers -1127 user/notation-appendices.itely -- Notation manual tables +7896 user/spacing.itely -- Spacing issues +8377 user/changing-defaults.itely -- Changing defaults +5218 user/programming-interface.itely -- Interfaces for programmers +1146 user/notation-appendices.itely -- Notation manual tables 250 user/cheatsheet.itely -- Cheat sheet -57153 total +58599 total -5- Application usage 3175 user/lilypond-book.itely -- LilyPond-book @@ -397,13 +397,17 @@ between files, without updating contents itself. In other words, the game is catching where has gone each section. In Learning manual, and in Notation Reference sections which have been revised in GDP, there may be completely new sections: in this case, copy @node and -@section-command from English docs, and put the usual tricky line -'UNTRANSLATED NODE: IGNORE ME'. Note that it is not possible to -exactly match subsections or subsubsections of documentation in -English, when contents has been deeply revised; in this case, kee -obsolete (sub)subsections in the translation. +@section-command from English docs, and add the marker for +untranslated status '@untranslated' on a single line. Note that it is +not possible to exactly match subsections or subsubsections of +documentation in English, when contents has been deeply revised; in +this case, keep obsolete (sub)subsections in the translation, marking +them with a line '@c obsolete' just before the node. -* Hints for Emacs users (without Emacs AucTeX installed) +4) update sections finished in GDP; check sections status at GDP website. + + +* Hints for Emacs users Emacs with Texinfo mode makes this step easier: diff --git a/Documentation/de/GNUmakefile b/Documentation/de/GNUmakefile index eee4de1f51..8acbe9e78c 100644 --- a/Documentation/de/GNUmakefile +++ b/Documentation/de/GNUmakefile @@ -2,10 +2,6 @@ ISOLANG = de depth = ../.. SUBDIRS = user STEPMAKE_TEMPLATES = documentation +LOCALSTEPMAKE_TEMPLATES = doc-i18n-root include $(depth)/make/stepmake.make - -local-WWW: lang-merge - -lang-merge: $(outdir)/index.html - ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html diff --git a/Documentation/de/translations.html.in b/Documentation/de/translations.html.in index 5993822045..bd0ed39ef3 100644 --- a/Documentation/de/translations.html.in +++ b/Documentation/de/translations.html.in @@ -1,4 +1,4 @@ -

Last updated Sat Jul 19 15:59:20 UTC 2008 +

Last updated Mon Aug 11 16:16:20 UTC 2008

pre-GDP - 1 Einleitung
(3699) + 1 Einleitung
(3678) Till Rettig partially (65 %) - partially + partially pre-GDP - 2 Übung
(5652) + 2 Übung
(5685) Till Rettig yes - partially + partially pre-GDP @@ -61,7 +61,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 Die Ausgabe verändern
(12262) + 4 Die Ausgabe verändern
(12334) Till Rettig partially (17 %) @@ -163,11 +163,11 @@ translations.template.html.in; DO NOT EDIT !--> Other info - Section titles
(544) + Section titles
(547) Till Rettig yes - partially + partially pre-GDP @@ -179,7 +179,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.1 Tonhöhen
(2822) + 1.1 Tonhöhen
(2948) Till Rettig yes @@ -187,7 +187,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.2 Rhythmus
(6657) + 1.2 Rhythmus
(6785) Till Rettig partially (86 %) @@ -195,7 +195,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.3 Ausdrucksbezeichnungen
(843) + 1.3 Ausdrucksbezeichnungen
(1119) Till Rettig yes @@ -203,7 +203,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.4 Wiederholungszeichen
(940) + 1.4 Wiederholungszeichen
(556) Till Rettig yes @@ -211,31 +211,31 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.5 Gleichzeitig erscheinende Noten
(883) + 1.5 Gleichzeitig erscheinende Noten
(1000) Till Rettig - partially (81 %) + partially (71 %) partially pre-GDP - 1.6 Notation innerhalb eines Systems
(2310) + 1.6 Notation innerhalb eines Systems
(1800) Till Rettig - partially (63 %) - partially + partially (87 %) + partially pre-GDP - 1.7 Anmerkungen
(827) + 1.7 Anmerkungen
(908) Till Rettig - partially (47 %) + partially (44 %) partially pre-GDP - 1.8 Text
(1851) + 1.8 Text
(2082) no @@ -251,7 +251,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.1 Notation von Gesang
(2745) + 2.1 Notation von Gesang
(2799) no @@ -259,11 +259,11 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.2 Tasteninstrumente
(561) + 2.2 Tasteninstrumente
(668) Till Rettig - partially (90 %) - partially + partially (89 %) + partially pre-GDP @@ -275,18 +275,18 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.4 Saiteninstrumente mit Bünden
(857) + 2.4 Saiteninstrumente mit Bünden
(1369) Till Rettig - partially (32 %) + partially (16 %) partially pre-GDP - 2.5 Schlagzeug
(546) + 2.5 Schlagzeug
(747) Till Rettig - partially (95 %) + partially (96 %) partially pre-GDP @@ -299,10 +299,10 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.7 Notation von Akkorden
(1303) + 2.7 Notation von Akkorden
(1352) Till Rettig - partially (65 %) + partially (62 %) partially pre-GDP @@ -315,7 +315,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 3 Die Eingabe-Syntax
(5399) + 2.9 World music
(1115) no @@ -323,7 +323,15 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 Abstände
(8400) + 3 General input and output
(5431) + Till Rettig + + partially (6 %) + partially + pre-GDP + + + 4 Abstände
(7896) no @@ -331,7 +339,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 5 Standardeinstellungen verändern
(6855) + 5 Standardeinstellungen verändern
(8377) no @@ -339,7 +347,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 6 Schnittstellen für Programmierer
(5213) + 6 Schnittstellen für Programmierer
(5218) no @@ -355,11 +363,11 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - B Notationsübersicht
(1127) + B Notationsübersicht
(1146) Till Rettig - yes - partially + partially (99 %) + partially pre-GDP diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely index 6f1446db67..5c549d300a 100644 --- a/Documentation/de/user/ancient.itely +++ b/Documentation/de/user/ancient.itely @@ -13,7 +13,7 @@ @node Ancient notation @section Ancient notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Introduction to ancient notation:: @@ -28,7 +28,7 @@ UNTRANSLATED NODE: IGNORE ME @node Introduction to ancient notation @subsection Introduction to ancient notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Ancient notation supported:: @@ -38,13 +38,13 @@ UNTRANSLATED NODE: IGNORE ME @node Ancient notation supported @subsubsection Ancient notation supported -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Alternative note signs @subsection Alternative note signs -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Ancient note heads:: @@ -163,7 +163,7 @@ des @rinternals{KeySignature}-Objektes gesetzt wird. @seealso -In diesem Handbuch: @ref{Pitches}, @ref{Cautionary accidentals} und +In diesem Handbuch: @ref{Pitches}, @ref{Accidentals} und @ref{Automatic accidentals} geben eine allgemeine Einführung in die Benutzung von Versetzungszeichen. Der Abschnitt @ref{Key signature} zeigt die allgemeine Benutzung von Vorzeichen. @@ -610,7 +610,7 @@ eine Textbeschriftung (@code{\markup}). @node Additional note signs @subsection Additional note signs -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Ancient articulations:: @@ -1894,7 +1894,7 @@ Präfixen in arbiträrer Reihenfolge notiert werden kann. @node Pre-defined contexts @subsection Pre-defined contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Gregorian chant contexts:: @@ -1974,7 +1974,7 @@ werden kann. Siehe das folgende Beispiel: @node Transcribing ancient music @subsection Transcribing ancient music -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Ancient and modern from one source:: @@ -1987,31 +1987,31 @@ UNTRANSLATED NODE: IGNORE ME @node Ancient and modern from one source @subsubsection Ancient and modern from one source -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Incipits @subsubsection Incipits -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Mensurstriche layout @subsubsection Mensurstriche layout -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Transcribing Gregorian chant @subsubsection Transcribing Gregorian chant -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Editorial markings @subsection Editorial markings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Annotational accidentals:: @@ -2053,5 +2053,5 @@ Programmreferenz: @rinternals{Accidental_engraver}-Setzer und das @node Baroque rhythmic notation @subsubsection Baroque rhythmic notation -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/changing-defaults.itely b/Documentation/de/user/changing-defaults.itely index 923c402bef..9672e1723e 100644 --- a/Documentation/de/user/changing-defaults.itely +++ b/Documentation/de/user/changing-defaults.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,149 +11,346 @@ @node Changing defaults @chapter Changing defaults -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Interpretation contexts:: +* Explaining the Internals Reference:: +* Modifying properties:: +* Useful concepts and properties:: +* Common properties:: +* Advanced tweaks:: +* Discussion of specific tweaks:: +@end menu -@menu -* Interpretation contexts:: -* The \override command:: -* Discussion of specific tweaks:: -@end menu @node Interpretation contexts @section Interpretation contexts -UNTRANSLATED NODE: IGNORE ME - -@menu -* Contexts explained:: -* Creating contexts:: -* Changing context properties on the fly:: -* Modifying context plug-ins:: -* Layout tunings within contexts:: -* Changing context default settings:: -* Defining new contexts:: -* Aligning contexts:: -* Vertical grouping of grobs:: -@end menu +@untranslated + + +@menu +* Contexts explained:: +* Creating contexts:: +* Modifying context plug-ins:: +* Changing context default settings:: +* Defining new contexts:: +* Aligning contexts:: +@end menu + @node Contexts explained @subsection Contexts explained -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Score - the master of all contexts:: +* Top-level contexts - staff containers:: +* Intermediate-level contexts - staves:: +* Bottom-level contexts - voices:: +@end menu + +@node Score - the master of all contexts +@unnumberedsubsubsec Score - the master of all contexts + +@untranslated + + +@node Top-level contexts - staff containers +@unnumberedsubsubsec Top-level contexts - staff containers + +@untranslated + + +@node Intermediate-level contexts - staves +@unnumberedsubsubsec Intermediate-level contexts - staves + +@untranslated + + +@node Bottom-level contexts - voices +@unnumberedsubsubsec Bottom-level contexts - voices + +@untranslated + @node Creating contexts @subsection Creating contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Changing context properties on the fly -@subsection Changing context properties on the fly - -UNTRANSLATED NODE: IGNORE ME @node Modifying context plug-ins @subsection Modifying context plug-ins -UNTRANSLATED NODE: IGNORE ME - -@node Layout tunings within contexts -@subsection Layout tunings within contexts +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Changing context default settings @subsection Changing context default settings -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Defining new contexts @subsection Defining new contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Aligning contexts @subsection Aligning contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Vertical grouping of grobs -@subsection Vertical grouping of grobs -UNTRANSLATED NODE: IGNORE ME +@node Explaining the Internals Reference +@section Explaining the Internals Reference -@node The \override command -@section The @code{\override} command +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Constructing a tweak:: -* Navigating the program reference:: -* Layout interfaces:: -* Determining the grob property:: -* Objects connected to the input:: -* Using Scheme code instead of \tweak:: -* \set versus \override:: -* Difficult tweaks:: -@end menu -@node Constructing a tweak -@subsection Constructing a tweak - -UNTRANSLATED NODE: IGNORE ME +@menu +* Navigating the program reference:: +* Layout interfaces:: +* Determining the grob property:: +* Naming conventions:: +@end menu @node Navigating the program reference @subsection Navigating the program reference -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Layout interfaces @subsection Layout interfaces -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Determining the grob property @subsection Determining the grob property -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Naming conventions +@subsection Naming conventions -@node Objects connected to the input -@subsection Objects connected to the input +@untranslated -UNTRANSLATED NODE: IGNORE ME -@node Using Scheme code instead of \tweak -@subsection Using Scheme code instead of @code{\tweak} +@node Modifying properties +@section Modifying properties -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node \set versus \override + +@menu +* Overview of modifying properties:: +* The set command:: +* The override command:: +* set versus override:: +* The tweak command:: +@end menu + +@node Overview of modifying properties +@subsection Overview of modifying properties + +@untranslated + + +@node The set command +@subsection The @code{\set} command + +@untranslated + + +@node The override command +@subsection The @code{\override} command + +@untranslated + + +@node set versus override @subsection @code{\set} vs. @code{\override} -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Difficult tweaks -@subsection Difficult tweaks -UNTRANSLATED NODE: IGNORE ME +@node The tweak command +@subsection The @code{\tweak} command -@node Discussion of specific tweaks -@section Discussion of specific tweaks +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Line styles:: -* Controlling visibility of objects:: -@end menu -@node Line styles -@subsection Line styles +@node Useful concepts and properties +@section Useful concepts and properties + +@untranslated + + +@menu +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Spanners:: +@end menu + +@node Input modes +@subsection Input modes + +@untranslated + + +@node Direction and placement +@subsection Direction and placement + +@untranslated + + +@node Distances and measurements +@subsection Distances and measurements + +@untranslated + + +@node Spanners +@subsection Spanners + +@untranslated -UNTRANSLATED NODE: IGNORE ME + +@node Common properties +@section Common properties + +@untranslated + + +@menu +* Controlling visibility of objects:: +* Line styles:: +* Rotating objects:: +* Aligning objects:: +@end menu @node Controlling visibility of objects @subsection Controlling visibility of objects -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Removing the stencil:: +* Making objects transparent:: +* Painting objects white:: +* Using break-visibility:: +* Special considerations:: +@end menu + +@node Removing the stencil +@unnumberedsubsubsec Removing the stencil + +@untranslated + + +@node Making objects transparent +@unnumberedsubsubsec Making objects transparent + +@untranslated + + +@node Painting objects white +@unnumberedsubsubsec Painting objects white + +@untranslated + + +@node Using break-visibility +@unnumberedsubsubsec Using break-visibility + +@untranslated + + +@node Special considerations +@unnumberedsubsubsec Special considerations + +@untranslated + + +@node Line styles +@subsection Line styles + +@untranslated + + +@node Rotating objects +@subsection Rotating objects + +@untranslated + + +@node Aligning objects +@subsection Aligning objects + +@untranslated + + +@node Advanced tweaks +@section Advanced tweaks + +@untranslated + + +@menu +* Vertical grouping of grobs:: +* Modifying ends of spanners:: +* Modifying stencils:: +* Modifying shapes:: +@end menu + +@node Vertical grouping of grobs +@subsection Vertical grouping of grobs + +@untranslated + + +@node Modifying ends of spanners +@subsection Modifying ends of spanners + +@untranslated + + +@node Modifying stencils +@subsection Modifying stencils + +@untranslated + + +@node Modifying shapes +@subsection Modifying shapes + +@untranslated + + +@node Discussion of specific tweaks +@section Discussion of specific tweaks + +@untranslated + + +@menu +* old Contexts explained:: +@end menu + +@node old Contexts explained +@subsection old Contexts explained + +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/chords.itely b/Documentation/de/user/chords.itely index 9fd209e208..fd7fb6d8da 100644 --- a/Documentation/de/user/chords.itely +++ b/Documentation/de/user/chords.itely @@ -12,7 +12,7 @@ @node Chord notation @section Chord notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Chord mode:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Chord mode @subsection Chord mode -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Chord mode overview:: @@ -228,12 +228,12 @@ weil @code{5+} als letztes kommt. @node Extended and altered chords @unnumberedsubsubsec Extended and altered chords -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Displaying chords @subsection Displaying chords -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Printing chord names:: @@ -445,12 +445,12 @@ wenn die Akkorde mit der @code{< ... >} Syntax notiert werden. @node Customizing chord names @unnumberedsubsubsec Customizing chord names -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Figured bass @subsection Figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Introduction to figured bass:: @@ -659,9 +659,9 @@ Programmreferenz: @rinternals{NewBassFigure}-, @node Entering figured bass @unnumberedsubsubsec Entering figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Displaying figured bass @unnumberedsubsubsec Displaying figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/converters.itely b/Documentation/de/user/converters.itely index 704750c013..0ade506a79 100644 --- a/Documentation/de/user/converters.itely +++ b/Documentation/de/user/converters.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,41 +11,46 @@ @node Converting from other formats @chapter Converting from other formats -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Invoking midi2ly:: * Invoking musicxml2ly:: * Invoking abc2ly:: * Invoking etf2ly:: * Generating LilyPond files:: -@end menu +@end menu + @node Invoking midi2ly @section Invoking @command{midi2ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Invoking musicxml2ly @section Invoking @code{musicxml2ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Invoking abc2ly @section Invoking @code{abc2ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Invoking etf2ly @section Invoking @command{etf2ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Generating LilyPond files @section Generating LilyPond files -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely index 9c90b530e6..2550e858e0 100644 --- a/Documentation/de/user/editorial.itely +++ b/Documentation/de/user/editorial.itely @@ -35,7 +35,7 @@ @node Selecting notation font size @unnumberedsubsubsec Selecting notation font size -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Fingering instructions @@ -103,19 +103,19 @@ Beispiele: @node Hidden notes @unnumberedsubsubsec Hidden notes -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Coloring objects @unnumberedsubsubsec Coloring objects -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Parentheses @unnumberedsubsubsec Parentheses -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Stems @@ -164,16 +164,16 @@ a4 b c b @node Balloon help @unnumberedsubsubsec Balloon help -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Grid lines @unnumberedsubsubsec Grid lines -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Analysis brackets @unnumberedsubsubsec Analysis brackets -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely index 15bfb28061..7a8f4b1f14 100644 --- a/Documentation/de/user/expressive.itely +++ b/Documentation/de/user/expressive.itely @@ -305,7 +305,7 @@ Vertikale Positionierung der Symbole wird von der Eigenschaft @node New dynamic marks @subsubsection New dynamic marks -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Curves diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely index c6ec8b9a1f..a32c4b4a30 100644 --- a/Documentation/de/user/fretted-strings.itely +++ b/Documentation/de/user/fretted-strings.itely @@ -12,7 +12,7 @@ @node Fretted string instruments @section Fretted string instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for fretted strings:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for fretted strings @subsection Common notation for fretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for fretted strings:: @@ -37,7 +37,7 @@ UNTRANSLATED NODE: IGNORE ME @node References for fretted strings @subsubsection References for fretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node String number indications @subsubsection String number indications @@ -311,7 +311,7 @@ Program reference: @rinternals{StrokeFinger} @node Guitar @subsection Guitar -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Guitar tablatures:: @@ -321,7 +321,7 @@ UNTRANSLATED NODE: IGNORE ME @node Guitar tablatures @subsubsection Guitar tablatures -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Indicating position and barring @subsubsection Indicating position and barring @@ -350,7 +350,7 @@ gezeigt. @node Banjo @subsection Banjo -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Banjo tablatures:: diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely index 0f5c3101f7..ff65642a03 100644 --- a/Documentation/de/user/fundamental.itely +++ b/Documentation/de/user/fundamental.itely @@ -150,7 +150,7 @@ im Kapitel @ruser{File structure}. @node Introduction to the LilyPond file structure @subsection Introduction to the LilyPond file structure -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Score is a (single) compound musical expression @subsection Score is a (single) compound musical expression @@ -298,18 +298,18 @@ gleichen Stelle beginnt. @node Nesting music expressions @subsection Nesting music expressions -UNTRANSLATED NODE: IGNORE ME +@untranslated @ @node On the un-nestedness of brackets and ties @subsection On the un-nestedness of brackets and ties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Voices contain music @section Voices contain music -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * I'm hearing Voices:: @@ -319,22 +319,22 @@ UNTRANSLATED NODE: IGNORE ME @node I'm hearing Voices @subsection I'm hearing Voices -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Explicitly instantiating voices @subsection Explicitly instantiating voices -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Voices and vocals @subsection Voices and vocals -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Contexts and engravers @section Contexts and engravers -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Contexts explained:: @@ -347,32 +347,32 @@ UNTRANSLATED NODE: IGNORE ME @node Contexts explained @subsection Contexts explained -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Creating contexts @subsection Creating contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Engravers explained @subsection Engravers explained -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Modifying context properties @subsection Modifying context properties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Adding and removing engravers @subsection Adding and removing engravers -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Extending the templates @section Extending the templates -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Soprano and cello:: @@ -383,15 +383,15 @@ UNTRANSLATED NODE: IGNORE ME @node Soprano and cello @subsection Soprano and cello -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Four-part SATB vocal score @subsection Four-part SATB vocal score -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Building a score from scratch @subsection Building a score from scratch -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely index 4d297e6533..84523f9077 100644 --- a/Documentation/de/user/input.itely +++ b/Documentation/de/user/input.itely @@ -7,129 +7,251 @@ version that you are working on. See TRANSLATION for details. @end ignore +@c \version "2.11.51" + +@node General input and output +@chapter General input and output + +@untranslated + + +@menu +* Input structure:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: +@end menu + +@node Input structure +@section Input structure + +@untranslated -@node Input syntax -@chapter Input syntax - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Input files:: -* Common syntax issues TODO name?:: -* Other stuffs TODO move?:: -@end menu -@node Input files -@section Input files - -UNTRANSLATED NODE: IGNORE ME - -@menu -* File structure:: -* A single music expression:: -* Multiple scores in a book:: -* Extracting fragments of notation:: -* Including LilyPond files:: -* Text encoding:: -* Different editions from one source:: -@end menu -@node File structure -@subsection File structure -UNTRANSLATED NODE: IGNORE ME +@menu +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: +@end menu -@node A single music expression -@subsection A single music expression +@node Structure of a score +@subsection Structure of a score + +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Multiple scores in a book @subsection Multiple scores in a book -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node File structure +@subsection File structure + +@untranslated + + +@node Titles and headers +@section Titles and headers + +@untranslated + + +@menu +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: +@end menu + +@node Creating titles +@subsection Creating titles + +@untranslated + + +@node Custom titles +@subsection Custom titles + +@untranslated + + +@node Reference to page numbers +@subsection Reference to page numbers + +@untranslated + + +@node Table of contents +@subsection Table of contents + +@untranslated + + +@node Working with input files +@section Working with input files -@node Extracting fragments of notation -@subsection Extracting fragments of notation +@untranslated -UNTRANSLATED NODE: IGNORE ME + +@menu +* Including LilyPond files:: +* Different editions from one source:: +* Text encoding:: +* Displaying LilyPond notation:: +@end menu @node Including LilyPond files @subsection Including LilyPond files -UNTRANSLATED NODE: IGNORE ME - -@node Text encoding -@subsection Text encoding +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Different editions from one source @subsection Different editions from one source -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Using variables:: +* Using tags:: +@end menu + +@node Using variables +@unnumberedsubsubsec Using variables + +@untranslated -@node Common syntax issues TODO name? -@section Common syntax issues TODO name? -UNTRANSLATED NODE: IGNORE ME +@node Using tags +@unnumberedsubsubsec Using tags -@menu -* Controlling direction and placement:: -* Distances and measurements MAYBE MOVE:: -* When to add a -:: -@end menu -@node Controlling direction and placement -@subsection Controlling direction and placement +@cindex Erweiterung von Wiederholungen +@funindex \unfoldRepeats -UNTRANSLATED NODE: IGNORE ME +Mit ein bisschen Anpassung können alle Wiederholungstypen +auch in der MIDI-Datei wiedergegeben werden. Das wird erreicht +durch die @code{\unfoldRepeats}-Funktion. Hiermit werden alle +Wiederholungen, welcher Art auch immer, in notengetreue Wiederholungen +umgewandelt, die Noten werden also wiederholt ausgegeben. -@node Distances and measurements MAYBE MOVE -@subsection Distances and measurements MAYBE MOVE +@lilypond[quote,verbatim,fragment,line-width=8.0\cm] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond -UNTRANSLATED NODE: IGNORE ME +Wenn man eine Partitur schreibt, die diesen @code{\unfoldRepeats}-Befehl +für die MIDI-Ausgabe benutzt, muss man zwei @code{\score}-Umgebungen +schreiben: eine für die MIDI-Ausgabe, wo die Wiederholungen ausgeschrieben +werden, und eine für die gedruckte Notation, in der Klammern, Tremolo und +Prozent-Wiederholungen benutzt werden. Zum Beispiel: -@node When to add a - -@subsection When to add a - +@example +\score @{ + @var{..music..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..music..} + \midi @{ .. @} +@} +@end example -UNTRANSLATED NODE: IGNORE ME -@node Other stuffs TODO move? -@section Other stuffs TODO move? +@node Text encoding +@subsection Text encoding + +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Displaying LilyPond notation:: -* Skipping corrected music:: -* context list FIXME:: -* another thing FIXME:: -* Input modes FIXME:: -@end menu @node Displaying LilyPond notation @subsection Displaying LilyPond notation -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Controlling output +@section Controlling output + +@untranslated + + +@menu +* Extracting fragments of music:: +* Skipping corrected music:: +@end menu + +@node Extracting fragments of music +@subsection Extracting fragments of music + +@untranslated + @node Skipping corrected music @subsection Skipping corrected music -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node MIDI output +@section MIDI output + +@untranslated + + +@menu +* Creating MIDI files:: +* MIDI block:: +* What goes into the MIDI output?:: +* Repeats in MIDI:: +* Controlling MIDI dynamics:: +@end menu + +@node Creating MIDI files +@subsection Creating MIDI files + +@untranslated + + +@unnumberedsubsubsec Instrument names +@node MIDI block +@subsection MIDI block + +@untranslated + + +@node What goes into the MIDI output? +@subsection What goes into the MIDI output? + +@untranslated -@node context list FIXME -@subsection context list FIXME -UNTRANSLATED NODE: IGNORE ME +@unnumberedsubsubsec Supported in MIDI +@unnumberedsubsubsec Unsupported in MIDI +@node Repeats in MIDI +@subsection Repeats in MIDI -@node another thing FIXME -@subsection another thing FIXME +@untranslated -UNTRANSLATED NODE: IGNORE ME -@node Input modes FIXME -@subsection Input modes FIXME +@node Controlling MIDI dynamics +@subsection Controlling MIDI dynamics -UNTRANSLATED NODE: IGNORE ME +@untranslated --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@unnumberedsubsubsec Dynamic marks +@unnumberedsubsubsec Overall MIDI volume +@unnumberedsubsubsec Equalizing different instruments (i) +@unnumberedsubsubsec Equalizing different instruments (ii) diff --git a/Documentation/de/user/install.itely b/Documentation/de/user/install.itely index 281dcd3aac..c5f0fed16a 100644 --- a/Documentation/de/user/install.itely +++ b/Documentation/de/user/install.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,71 +11,98 @@ @node Install @chapter Install -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Precompiled binaries:: * Compiling from source:: -@end menu +@end menu + @node Precompiled binaries @section Precompiled binaries -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subsection Downloading @node Compiling from source @section Compiling from source -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Downloading source code:: * Requirements:: * Building LilyPond:: -* Building documentation without compiling LilyPond:: +* Building documentation:: * Testing LilyPond:: * Problems:: -@end menu +@end menu + @node Downloading source code @subsection Downloading source code -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Requirements @subsection Requirements -UNTRANSLATED NODE: IGNORE ME +@untranslated + @unnumberedsubsubsec Compilation @unnumberedsubsubsec Running requirements -@unnumberedsubsubsec Building documentation +@unnumberedsubsubsec Requirements for building documentation @node Building LilyPond @subsection Building LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated + @unnumberedsubsubsec Compiling @unnumberedsubsubsec Compiling for multiple platforms +@unnumberedsubsubsec Compiling outside the source tree +@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 -@subsection Building documentation without compiling LilyPond +@unnumberedsubsubsec Building documentation without compiling LilyPond + +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Testing LilyPond @subsection Testing LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Problems @subsection Problems -UNTRANSLATED NODE: IGNORE ME +@untranslated + @unnumberedsubsubsec Bison 1.875 @unnumberedsubsubsec Solaris @unnumberedsubsubsec FreeBSD @unnumberedsubsubsec International fonts --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely index 10e862dfb1..9068237839 100644 --- a/Documentation/de/user/keyboards.itely +++ b/Documentation/de/user/keyboards.itely @@ -34,9 +34,7 @@ @node References for keyboards @subsubsection References for keyboards -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -77,7 +75,7 @@ manuell erzielt werden. Die Zeichenkette @var{Systembezeichnung} ist die Bezeichnung des Systems. Damit wird die aktuelle Stimme vom aktuellen System zu dem System mit der @var{Systembezeichnung} gewechselt. Üblicherweise ist die Systembezeichnung @code{"up"} oder -@code{"down"}. Dieses System (@context{Staff}), auf das verweisen wird, +@code{"down"}. Dieses System (@code{Staff}), auf das verweisen wird, muss auch wirklich existieren, weshalb die Aufstellung eines Klaviersystems dann üblicherweise damit beginnt, die Systeme zu benennen. Hierbei können natürlich beliebige Namen vergeben werden. @@ -323,9 +321,7 @@ Im Handbuch: @ref{Laissez vibrer ties} @node Discant symbols @subsubsection Discant symbols -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml diff --git a/Documentation/de/user/lilypond-book.itely b/Documentation/de/user/lilypond-book.itely index f32948f558..627b95f041 100644 --- a/Documentation/de/user/lilypond-book.itely +++ b/Documentation/de/user/lilypond-book.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,20 +11,23 @@ @node LilyPond-book @chapter @command{lilypond-book}: Integrating text and music -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * An example of a musicological document:: * Integrating music and text:: * Music fragment options:: * Invoking lilypond-book:: * Filename extensions:: * Alternate methods of mixing text and music:: -@end menu +@end menu + @node An example of a musicological document @section An example of a musicological document -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Input @subheading Processing @@ -32,33 +35,39 @@ UNTRANSLATED NODE: IGNORE ME @node Integrating music and text @section Integrating music and text -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * LaTeX:: * Texinfo:: * HTML:: * DocBook:: -@end menu +@end menu + @node LaTeX @subsection @LaTeX{} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Texinfo @subsection Texinfo -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node HTML @subsection HTML -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node DocBook @subsection DocBook -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Common conventions @subheading Including a LilyPond file @@ -67,12 +76,14 @@ UNTRANSLATED NODE: IGNORE ME @node Music fragment options @section Music fragment options -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Invoking lilypond-book @section Invoking @command{lilypond-book} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Format-specific instructions @subsubheading @LaTeX{} @@ -81,34 +92,38 @@ UNTRANSLATED NODE: IGNORE ME @node Filename extensions @section Filename extensions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Alternate methods of mixing text and music @section Alternative methods of mixing text and music -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Many quotes from a large score:: * Inserting LilyPond output into OpenOffice.org:: * Inserting LilyPond output into other programs:: -@end menu +@end menu + @node Many quotes from a large score @subsection Many quotes from a large score -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Inserting LilyPond output into OpenOffice.org @subsection Inserting LilyPond output into OpenOffice.org -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Inserting LilyPond output into other programs @subsection Inserting LilyPond output into other programs -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/lilypond.tely b/Documentation/de/user/lilypond.tely index 822028a751..607abf3c4b 100644 --- a/Documentation/de/user/lilypond.tely +++ b/Documentation/de/user/lilypond.tely @@ -204,8 +204,7 @@ finden sich Kopien dieser und anderer Dokumentationsdateien. @menu * Musical notation:: Allgemeine Notation von Musik. * Specialist notation:: Notation, die nur für spezielle Zwecke eingesetzt wird. -* Input syntax:: Allgemeine Information über die Quelldateien von LilyPond. -* Non-musical notation:: Alles, was nicht Musiknotation ist. +* General input and output:: Allgemeine Information über die Quelldateien von LilyPond. * Spacing issues:: Anzeige der Ausgabe auf dem Papier. * Changing defaults:: Das Notenbild verfeinern. * Interfaces for programmers:: Benutzung für Experten. @@ -228,7 +227,6 @@ Anhänge @include specialist.itely @include input.itely -@include non-music.itely @include spacing.itely @include changing-defaults.itely diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi index 03751cdace..9114eea639 100644 --- a/Documentation/de/user/macros.itexi +++ b/Documentation/de/user/macros.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5 + Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -12,9 +12,11 @@ @c ***** Displaying text ***** -@c we need this since @q{\} doesn't work with makeinfo 4.8 -- -@c say @q{@value{backslash}} instead -@set backslash \ +@c we need this since @q{\} doesn't work with makeinfo 4.11 -- +@c say @q{@bs{}} instead +@macro bs +\\ +@end macro @c to get decent quotes in `foo' and ``foo'' @c these need to be split up so that "@qq{foo}." looks nice. :( @@ -26,6 +28,15 @@ @quotedblbase{}\TEXT\@quotedblleft{} @end macro +@ifhtml +@macro warning{TEXT} +@cartouche +@b{Achtung:} \TEXT\ +@end cartouche +@end macro +@end ifhtml + +@ifnothtml @macro warning{TEXT} @quotation @quotation @@ -35,6 +46,7 @@ @end quotation @end quotation @end macro +@end ifnothtml @ifnotinfo @macro notation{TEXT} @@ -107,12 +119,6 @@ @end macro -@c obsolete, remove when translation is fully updated -@macro context{TEXT} -@vindex \TEXT\ -@code{\TEXT\}@c should use rinternals -@end macro - @macro lydoctitle {TEXT} @emph{\TEXT\} @@ -151,31 +157,43 @@ +@c **** Links and references **** + @c Definitions for references: -@c @rinternals @c @rglos -@c @rprogram -@c @ruser @c @rlearning +@c @ruser +@c @rprogram +@c @rlsr +@c @rinternals +@c all these also have a @...named version, which allows to specify the +@c displayed text for the reference as second argument -@ifhtml -@c ***** HTML ***** +@c ***** HTML + bigpage is a special case (other manual names), all other +@c formats are treated similarly + +@ifnottex @ifset bigpage -@macro rinternals{TEXT} +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz} +@ref{\TEXT\,,,music-glossary-big-page,Glossar} @end macro -@macro rglos{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary-big-page,Glossar} +@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossar} @end macro -@macro rprogram{TEXT} +@macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung} +@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen} @end macro @macro ruser{TEXT} @@ -183,39 +201,52 @@ @ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch} @end macro -@macro rlearning{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen} +@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Benutzerhandbuch} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung} @end macro +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Programmbenutzung} +@end macro -@end ifset - +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele} +@end macro -@ifclear bigpage +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Beispiele} +@end macro @macro rinternals{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Programmreferenz} +@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz} @end macro -@macro rglos{TEXT} +@macro rinternalsnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossar} +@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Programmreferenz} @end macro -@macro rprogram{TEXT} +@end ifset + + +@ifclear bigpage + +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Programmbenutzung} +@ref{\TEXT\,,,music-glossary,Glossar} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Benutzerhandbuch} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar} @end macro @macro rlearning{TEXT} @@ -223,27 +254,19 @@ @ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Beispiele} +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen} @end macro - -@end ifclear - -@end ifhtml - - -@ifdocbook -@c ***** DOCBOOK-XML ***** - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Programmreferenz} +@ref{\TEXT\,,,lilypond,Benutzerhandbuch} @end macro -@macro rglos{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossar} +@ref{\TEXT\,,\DISPLAY\,lilypond,Benutzerhandbuch} @end macro @macro rprogram{TEXT} @@ -251,93 +274,98 @@ @ref{\TEXT\,,,lilypond-program,Programmbenutzung} @end macro -@macro ruser{TEXT} +@macro rprogramnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Benutzerhandbuch} -@end macro - -@macro rlearning{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Programmbenutzung} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Beispiele} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals,Programmreferenz} +@end macro -@end ifdocbook +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz} +@end macro +@end ifclear -@ifinfo -@c **** INFO **** +@end ifnottex -@macro rinternals{NAME} -@vindex \NAME\ -@inforef{\NAME\,,lilypond-internals,Programmreferenz} -@end macro -@macro rglos{NAME} -@vindex \NAME\ -@inforef{\NAME\,,music-glossary,Glossar} -@end macro +@c **** TEX **** +@iftex -@macro rprogram{TEXT} +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Programmbenutzung} +@ref{\TEXT\,,,music-glossary,Glossar} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Benutzerhandbuch} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar} @end macro @macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen} +@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Beispiele} +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen} @end macro - -@end ifinfo - - -@c **** TEX **** -@iftex - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@code{\TEXT\} +@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch} @end macro -@macro rglos {TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossar} +@ref{\TEXT\,,\DISPLAY\,lilypond.de,Benutzerhandbuch} @end macro @macro rprogram{TEXT} +@vindex \TEXT\ @ref{\TEXT\,,,lilypond-program.de,Programmbenutzung} @end macro -@macro ruser{TEXT} -@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch} -@end macro - -@macro rlearning{TEXT} -@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen} +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Programmbenutzung} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Beispiele} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@code{\TEXT\} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@code{\DISPLAY\} +@end macro @end iftex -@c Commands specific to translated docs +@c **** Macros specific to translated docs **** @c ugh, cannot set/define global variable 'translationof' in some way? @iftex @@ -359,3 +387,13 @@ Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den Abschnitt im englischen Benutzerhandbuch. @end macro +@ifhtml +@macro untranslated +UNTRANSLATED NODE: IGNORE ME +@end macro +@end ifhtml + +@ifnothtml +@macro untranslated +@end macro +@end ifnothtml diff --git a/Documentation/de/user/non-music.itely b/Documentation/de/user/non-music.itely deleted file mode 100644 index 7deba779d8..0000000000 --- a/Documentation/de/user/non-music.itely +++ /dev/null @@ -1,135 +0,0 @@ -@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- -@c This file is part of lilypond.tely -@ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 - - When revising a translation, copy the HEAD committish of the - version that you are working on. See TRANSLATION for details. -@end ignore - - -@node Non-musical notation -@chapter Non-musical notation - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Titles and headers:: -* MIDI output:: -* other midi:: -@end menu -@node Titles and headers -@section Titles and headers - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: -@end menu -@node Creating titles -@subsection Creating titles - -UNTRANSLATED NODE: IGNORE ME - -@node Custom titles -@subsection Custom titles - -UNTRANSLATED NODE: IGNORE ME - -@node Reference to page numbers -@subsection Reference to page numbers - -UNTRANSLATED NODE: IGNORE ME - -@node Table of contents -@subsection Table of contents - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI output -@section MIDI output - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Creating MIDI files:: -* MIDI block:: -* MIDI instrument names:: -* What goes into the MIDI? FIXME:: -@end menu -@node Creating MIDI files -@subsection Creating MIDI files - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI block -@subsection MIDI block - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI instrument names -@subsection MIDI instrument names - -UNTRANSLATED NODE: IGNORE ME - -@node What goes into the MIDI? FIXME -@subsection What goes into the MIDI? FIXME - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Repeats and MIDI:: -@end menu - -@node Repeats and MIDI -@subsubsection Repeats and MIDI - -@cindex Erweiterung von Wiederholungen -@funindex \unfoldRepeats - -Mit ein bisschen Anpassung können alle Wiederholungstypen -auch in der MIDI-Datei wiedergegeben werden. Das wird erreicht -durch die @code{\unfoldRepeats}-Funktion. Hiermit werden alle -Wiederholungen, welcher Art auch immer, in notengetreue Wiederholungen -umgewandelt, die Noten werden also wiederholt ausgegeben. - -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } -} -\bar "|." -@end lilypond - -Wenn man eine Partitur schreibt, die diesen @code{\unfoldRepeats}-Befehl -für die MIDI-Ausgabe benutzt, muss man zwei @code{\score}-Umgebungen -schreiben: eine für die MIDI-Ausgabe, wo die Wiederholungen ausgeschrieben -werden, und eine für die gedruckte Notation, in der Klammern, Tremolo und -Prozent-Wiederholungen benutzt werden. Zum Beispiel: - -@example -\score @{ - @var{..music..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..music..} - \midi @{ .. @} -@} -@end example - - -@node other midi -@section other midi - -UNTRANSLATED NODE: IGNORE ME - - diff --git a/Documentation/de/user/percussion.itely b/Documentation/de/user/percussion.itely index e4357458f1..48b469731c 100644 --- a/Documentation/de/user/percussion.itely +++ b/Documentation/de/user/percussion.itely @@ -11,7 +11,7 @@ @node Percussion @section Percussion -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu @@ -35,7 +35,7 @@ aber hiermit kann auch der Rhythmus einer Melodie dargestellt werden. @node References for percussion @subsubsection References for percussion -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Basic percussion notation @subsubsection Basic percussion notation @@ -293,7 +293,7 @@ Klammer- (@code{\parenthesize})-Befehl, beschrieben in @ref{Parentheses}, erstellt werden. Im Standard-@code{\drummode}-Modus ist aber das @code{Parenthesis_engraver}-Plugin nicht automatisch enthalten. Sie müssen das Plugin ausdrücklich in den Kontext-Definitionen -laden, wie im Abschnitt @ref{Changing context properties on the fly} +laden, wie im Abschnitt @rlearning{Modifying context properties} detailliert beschrieben. @lilypond[quote,ragged-right,verbatim,fragment] diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely index 17ce46f1a3..8e24e29529 100644 --- a/Documentation/de/user/pitches.itely +++ b/Documentation/de/user/pitches.itely @@ -29,15 +29,14 @@ This section discusses how to specify the pitch of notes. Into text. @menu -* Normal pitches:: +* Absolute octave entry:: +* Relative octave entry:: * Accidentals:: -* Cautionary accidentals:: -* Micro tones:: * Note names in other languages:: @end menu -@node Normal pitches -@unnumberedsubsubsec Normal pitches +@node Absolute octave entry +@unnumberedsubsubsec Absolute octave entry @cindex Tonhöhenbezeichnungen @@ -82,7 +81,94 @@ Eine alternative Methode gibt am Anfang die Oktave vor, innerhalb derer die Noten gesetzt werden, dabei werden unter Umständen weniger Oktavangaben (@code{'} oder @code{,}) benötigt. Siehe auch -@ref{Relative octaves}. +@ref{Relative octave entry}. + + +@node Relative octave entry +@unnumberedsubsubsec Relative octave entry + +@cindex Relativ +@cindex Relative Oktavbestimmung +@funindex \relative + +Oktaven werden angegeben, indem man @code{'} oder @code{,} +an die Notenbezeichnung hängt. Wenn Sie schon existierende +Musik kopieren, passiert es schnell, eine Note aus Versehen +in die falsche Oktave zu setzen, und der Fehler ist schwer zu +finden. Der relative Oktaven-Modus verhindert solche Fehler, +indem mögliche Fehler stark vergrößert werden: ein einziger +Oktavierungsfehler wirkt sich auf den gesamten Rest des Stückes aus. + +Die Syntax des Befehls lautet: + +@example +\relative @var{Referenzoktave} @var{musikalischer Ausdruck} +@end example + +@noindent +oder: + +@example +\relative @var{musikalischer Ausdruck} +@end example + +@noindent +Das eingestrichene C (@code{c'}) wird als Referenzoktave angenommen, +wenn sie nicht extra angegeben wird. + +Die Oktave von Noten, die im musikalischen Ausdruck notiert sind, +wird wie folgt erschlossen: Wenn keine Oktavversetzungszeichen +benutzt werden, wird als Intervall zwischen der Noten und der +vorhergehenden immer eine Quarte oder kleiner angenommen. Dieser +Abstand wird ohne Rücksicht auf Alterationen bestimmt. Eine +übermäßige Quarte ist also ein kleineres Intervall als eine +verminderte Quinte, auch wenn beide sechs Halbtöne groß sind. + +Die Oktavversetzungszeichen @code{'} und @code{,} können +hinzugefügt werden, um die Tonhöhe um eine Oktave zu erhöhen +oder zu erniedrigen. Wenn der relative Modus beginnt, kann +ein Referenzton angegeben werden, der als die vorhergehende Note +für die erste Tonhöhe des musikalischen Ausdrucks verwendet +wird. Wenn dieser Referenzton nicht angeben wird, wird das +eingestrichene C verwendet. + +So funktioniert der relative Modus: + +@lilypond[quote,fragment,ragged-right,verbatim] +\relative c'' { + b c d c b c bes a +} +@end lilypond + +Oktavversetzungen müssen für alle Intervalle angezeigt werden, +die größer als eine Quarte sind. + +@lilypond[quote,ragged-right,fragment,verbatim] +\relative c'' { + c g c f, c' a, e'' +} +@end lilypond + +Wenn der vorherige Ausdruck ein Akkord ist, wird die erste Note +des Akkordes benutzt, um die erste Note des nächsten Akkordes zu +bestimmen. + +@lilypond[quote,ragged-right,fragment,verbatim] +\relative c' { + c + + +} +@end lilypond + +Die Tonhöhe nach @code{\relative} muss eine Notenbezeichnung enthalten. + +Die relative Veränderung wirkt sich nicht auf +Transposition (@code{\transpose}), +Akkordnotation (@code{\chordmode}) oder @code{\relative}-Abschnitte +aus. Um den relativen Modus innerhalb von transponierter Musik zu +verwenden, muss ein zusätzliches @code{\relative} innerhalb der +Klammern des @code{\transpose}-Befehls gesetzt werden. @node Accidentals @@ -158,7 +244,34 @@ Programmreferenz: @rinternals{LedgerLineSpanner}, @rinternals{NoteHead}. -@node Cautionary accidentals +@unnumberedsubsubsec Micro tones + +@cindex Vierteltöne +@cindex Vorzeichen, Vierteltöne +@cindex Versetzungszeichen, Vierteltöne +@cindex Mikrotöne + +Versetzungszeichen für Vierteltöne werden durch Anhängen der Endungen +@code{-eh} (Erniedrigung) und @code{-ih} (Erhöhung) an den +Tonhöhenbuchstaben erstellt. Das Beispiel zeigt eine in Vierteltönen +aufsteigende Serie vom kleinen C. + +@lilypond[verbatim,ragged-right,quote,relative=2,fragment] +\set Staff.extraNatural = ##f +ceseh ceh cih cisih +@end lilypond + +Mikrotöne werden auch in die MIDI-Dateien geschrieben. + + + +@knownissues + +Es gibt keine allgemein anerkannten Standards für die +Notation von Dreiviertelton-Erniedrigungszeichen. LilyPonds +Symbol entspricht also keinem Standard. + + @unnumberedsubsubsec Cautionary accidentals @cindex Versetzungszeichen, Erinnerung @@ -190,35 +303,6 @@ beeinflusst werden. Mehr Information dazu siehe @ref{Automatic accidentals}. -@node Micro tones -@unnumberedsubsubsec Micro tones - -@cindex Vierteltöne -@cindex Vorzeichen, Vierteltöne -@cindex Versetzungszeichen, Vierteltöne -@cindex Mikrotöne - -Versetzungszeichen für Vierteltöne werden durch Anhängen der Endungen -@code{-eh} (Erniedrigung) und @code{-ih} (Erhöhung) an den -Tonhöhenbuchstaben erstellt. Das Beispiel zeigt eine in Vierteltönen -aufsteigende Serie vom kleinen C. - -@lilypond[verbatim,ragged-right,quote,relative=2,fragment] -\set Staff.extraNatural = ##f -ceseh ceh cih cisih -@end lilypond - -Mikrotöne werden auch in die MIDI-Dateien geschrieben. - - - -@knownissues - -Es gibt keine allgemein anerkannten Standards für die -Notation von Dreiviertelton-Erniedrigungszeichen. LilyPonds -Symbol entspricht also keinem Standard. - - @node Note names in other languages @unnumberedsubsubsec Note names in other languages @@ -286,99 +370,12 @@ espanol.ly do re mi fa sol la sib si @subsection Changing multiple pitches @menu -* Relative octaves:: -* Octave check:: +* Octave checks:: * Transpose:: @end menu -@node Relative octaves -@unnumberedsubsubsec Relative octaves - -@cindex Relativ -@cindex Relative Oktavbestimmung -@funindex \relative - -Oktaven werden angegeben, indem man @code{'} oder @code{,} -an die Notenbezeichnung hängt. Wenn Sie schon existierende -Musik kopieren, passiert es schnell, eine Note aus Versehen -in die falsche Oktave zu setzen, und der Fehler ist schwer zu -finden. Der relative Oktaven-Modus verhindert solche Fehler, -indem mögliche Fehler stark vergrößert werden: ein einziger -Oktavierungsfehler wirkt sich auf den gesamten Rest des Stückes aus. - -Die Syntax des Befehls lautet: - -@example -\relative @var{Referenzoktave} @var{musikalischer Ausdruck} -@end example - -@noindent -oder: - -@example -\relative @var{musikalischer Ausdruck} -@end example - -@noindent -Das eingestrichene C (@code{c'}) wird als Referenzoktave angenommen, -wenn sie nicht extra angegeben wird. - -Die Oktave von Noten, die im musikalischen Ausdruck notiert sind, -wird wie folgt erschlossen: Wenn keine Oktavversetzungszeichen -benutzt werden, wird als Intervall zwischen der Noten und der -vorhergehenden immer eine Quarte oder kleiner angenommen. Dieser -Abstand wird ohne Rücksicht auf Alterationen bestimmt. Eine -übermäßige Quarte ist also ein kleineres Intervall als eine -verminderte Quinte, auch wenn beide sechs Halbtöne groß sind. - -Die Oktavversetzungszeichen @code{'} und @code{,} können -hinzugefügt werden, um die Tonhöhe um eine Oktave zu erhöhen -oder zu erniedrigen. Wenn der relative Modus beginnt, kann -ein Referenzton angegeben werden, der als die vorhergehende Note -für die erste Tonhöhe des musikalischen Ausdrucks verwendet -wird. Wenn dieser Referenzton nicht angeben wird, wird das -eingestrichene C verwendet. - -So funktioniert der relative Modus: - -@lilypond[quote,fragment,ragged-right,verbatim] -\relative c'' { - b c d c b c bes a -} -@end lilypond - -Oktavversetzungen müssen für alle Intervalle angezeigt werden, -die größer als eine Quarte sind. - -@lilypond[quote,ragged-right,fragment,verbatim] -\relative c'' { - c g c f, c' a, e'' -} -@end lilypond - -Wenn der vorherige Ausdruck ein Akkord ist, wird die erste Note -des Akkordes benutzt, um die erste Note des nächsten Akkordes zu -bestimmen. - -@lilypond[quote,ragged-right,fragment,verbatim] -\relative c' { - c - - -} -@end lilypond - -Die Tonhöhe nach @code{\relative} muss eine Notenbezeichnung enthalten. - -Die relative Veränderung wirkt sich nicht auf -Transposition (@code{\transpose}), -Akkordnotation (@code{\chordmode}) oder @code{\relative}-Abschnitte -aus. Um den relativen Modus innerhalb von transponierter Musik zu -verwenden, muss ein zusätzliches @code{\relative} innerhalb der -Klammern des @code{\transpose}-Befehls gesetzt werden. - -@node Octave check -@unnumberedsubsubsec Octave check +@node Octave checks +@unnumberedsubsubsec Octave checks @cindex Oktavenüberprüfung @@ -739,30 +736,29 @@ Programmreferenz: @rinternals{KeyCancellation}, @node Ottava brackets @unnumberedsubsubsec Ottava brackets -UNTRANSLATED NODE: IGNORE ME - +@untranslated @node Instrument transpositions @unnumberedsubsubsec Instrument transpositions -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Automatic accidentals @unnumberedsubsubsec Automatic accidentals -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Ambitus @unnumberedsubsubsec Ambitus -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Note heads @subsection Note heads -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Special note heads:: @@ -774,19 +770,19 @@ UNTRANSLATED NODE: IGNORE ME @node Special note heads @unnumberedsubsubsec Special note heads -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Easy notation note heads @unnumberedsubsubsec Easy notation note heads -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Shape note heads @unnumberedsubsubsec Shape note heads -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Improvisation @unnumberedsubsubsec Improvisation -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/programming-interface.itely b/Documentation/de/user/programming-interface.itely index f84d010efd..eed3a8c6cd 100644 --- a/Documentation/de/user/programming-interface.itely +++ b/Documentation/de/user/programming-interface.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,22 +11,26 @@ @node Interfaces for programmers @chapter Interfaces for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Music functions:: * Programmer interfaces:: * Building complicated functions:: * Markup programmer interface:: * Contexts for programmers:: * Scheme procedures as properties:: -@end menu +* TODO moved into scheme:: +@end menu + @node Music functions @section Music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Overview of music functions:: * Simple substitution functions:: * Paired substitution functions:: @@ -34,149 +38,199 @@ UNTRANSLATED NODE: IGNORE ME * Void functions:: * Functions without arguments:: * Overview of available music functions:: -@end menu +@end menu + @node Overview of music functions @subsection Overview of music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Simple substitution functions @subsection Simple substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Paired substitution functions @subsection Paired substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Mathematics in functions @subsection Mathematics in functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Void functions @subsection Void functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Functions without arguments @subsection Functions without arguments -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Overview of available music functions @subsection Overview of available music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @include identifiers.tely @node Programmer interfaces @section Programmer interfaces -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Input variables and Scheme:: * Internal music representation:: -@end menu +@end menu + @node Input variables and Scheme @subsection Input variables and Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Internal music representation @subsection Internal music representation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Building complicated functions @section Building complicated functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Displaying music expressions:: * Music properties:: * Doubling a note with slurs (example):: * Adding articulation to notes (example):: -@end menu +@end menu + @node Displaying music expressions @subsection Displaying music expressions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music properties @subsection Music properties -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Doubling a note with slurs (example) @subsection Doubling a note with slurs (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Adding articulation to notes (example) @subsection Adding articulation to notes (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Markup programmer interface @section Markup programmer interface -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Markup construction in Scheme:: * How markups work internally:: * New markup command definition:: * New markup list command definition:: -@end menu +@end menu + @node Markup construction in Scheme @subsection Markup construction in Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node How markups work internally @subsection How markups work internally -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup command definition @subsection New markup command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup list command definition @subsection New markup list command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Contexts for programmers @section Contexts for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Context evaluation:: * Running a function on all layout objects:: -@end menu +@end menu + @node Context evaluation @subsection Context evaluation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Running a function on all layout objects @subsection Running a function on all layout objects -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Scheme procedures as properties @section Scheme procedures as properties -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node TODO moved into scheme +@section TODO moved into scheme + +@untranslated + + +@menu +* Using Scheme code instead of \tweak:: +* Difficult tweaks:: +@end menu + +@node Using Scheme code instead of \tweak +@subsection Using Scheme code instead of @code{\tweak} + +@untranslated + + +@node Difficult tweaks +@subsection Difficult tweaks + +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely index 6ffd7bb313..58eb42769f 100644 --- a/Documentation/de/user/rhythms.itely +++ b/Documentation/de/user/rhythms.itely @@ -409,7 +409,7 @@ Programmreferenz: @rinternals{SkipMusic}. @node Multi measure rests @subsubsection Multi measure rests -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Displaying rhythms @@ -604,7 +604,7 @@ einfügen, um anzuzeigen, wo umgebrochen werden darf. @node Polymetric notation @subsubsection Polymetric notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Automatic note splitting @@ -803,12 +803,12 @@ Balken vermeiden nicht andere Objekte, wie etwa Text und Versetzungszeichen. @node Feathered beams @subsubsection Feathered beams -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Setting automatic beam behavior @subsubsection Setting automatic beam behavior -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bars @@ -965,7 +965,7 @@ Programmreferenz: @rinternals{BarLine} (auf Partitur @node Bar numbers @subsubsection Bar numbers -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Barnumber check @@ -989,7 +989,7 @@ nicht mit dem Wert 123 übereinstimmt. @node Rehearsal marks @subsubsection Rehearsal marks -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Special rhythmic concerns @@ -1221,17 +1221,17 @@ zu Fehlermeldungen oder Abstürzen kommen. @node Aligning to cadenzas @subsubsection Aligning to cadenzas -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Time administration @subsubsection Time administration -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Proportional notation (introduction) @subsubsection Proportional notation (introduction) -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/running.itely b/Documentation/de/user/running.itely index 95bc7b3070..b35fb13a11 100644 --- a/Documentation/de/user/running.itely +++ b/Documentation/de/user/running.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,53 +11,81 @@ @node Running LilyPond @chapter Running LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Normal usage:: * Command-line usage:: * Error messages:: * Updating files with convert-ly:: * Reporting bugs:: -@end menu +@end menu + @node Normal usage @section Normal usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Command-line usage @section Command-line usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Invoking lilypond:: +* Command line options:: +* Environment variables:: +@end menu +@node Invoking lilypond @subsection Invoking lilypond + +@untranslated + + +@node Command line options @subsection Command line options + +@untranslated + + +@node Environment variables @subsection Environment variables + +@untranslated + + @node Error messages @section Error messages -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Updating files with convert-ly @section Updating with @command{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subsection Command line options -@menu +@menu * Problems with convert-ly:: -@end menu +@end menu + @node Problems with convert-ly @subsection Problems with @code{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Reporting bugs @section Reporting bugs -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely index 06b1ca7438..c933655e3a 100644 --- a/Documentation/de/user/simultaneous.itely +++ b/Documentation/de/user/simultaneous.itely @@ -53,7 +53,7 @@ Siehe @ref{Chord notation} für mehr Information. @node Clusters @unnumberedsubsubsec Clusters -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Multiple voices @@ -412,7 +412,7 @@ die spezielle Cluster-Notationsweise, siehe @ref{Clusters}. @node Automatic part combining @unnumberedsubsubsec Automatic part combining -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Writing music in parallel diff --git a/Documentation/de/user/spacing.itely b/Documentation/de/user/spacing.itely index 2e80570c7f..4411022f0f 100644 --- a/Documentation/de/user/spacing.itely +++ b/Documentation/de/user/spacing.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 3121682025660b6c85fbf3f22bb9cd8396699ad1 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,66 +11,71 @@ @node Spacing issues @chapter Spacing issues -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Paper and pages:: * Music layout:: -* Displaying spacing:: * Breaks:: * Vertical spacing:: * Horizontal spacing:: -* Page layout MOVED FROM LM:: -@end menu +* Fitting music onto fewer pages:: +@end menu + @node Paper and pages @section Paper and pages -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Paper size:: * Page formatting:: -@end menu +@end menu + @node Paper size @subsection Paper size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page formatting @subsection Page formatting -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music layout @section Music layout -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Setting the staff size:: * Score layout:: -@end menu +@end menu + @node Setting the staff size @subsection Setting the staff size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Score layout @subsection Score layout -UNTRANSLATED NODE: IGNORE ME - -@node Displaying spacing -@section Displaying spacing +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Breaks @section Breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Line breaking:: * Page breaking:: * Optimal page breaking:: @@ -78,154 +83,239 @@ UNTRANSLATED NODE: IGNORE ME * Minimal page breaking:: * Explicit breaks:: * Using an extra voice for breaks:: -@end menu +@end menu + @node Line breaking @subsection Line breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page breaking @subsection Page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page breaking @subsection Optimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page turning @subsection Optimal page turning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Minimal page breaking @subsection Minimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit breaks @subsection Explicit breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Using an extra voice for breaks @subsection Using an extra voice for breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing @section Vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Vertical spacing inside a system:: * Vertical spacing between systems:: * Explicit staff and system positioning:: * Two-pass vertical spacing:: * Vertical collision avoidance:: -@end menu +@end menu + @node Vertical spacing inside a system @subsection Vertical spacing inside a system -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing between systems @subsection Vertical spacing between systems -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit staff and system positioning @subsection Explicit staff and system positioning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Two-pass vertical spacing @subsection Two-pass vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical collision avoidance @subsection Vertical collision avoidance -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Horizontal spacing @section Horizontal Spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Horizontal spacing overview:: * New spacing area:: * Changing horizontal spacing:: * Line length:: * Proportional notation:: -@end menu +@end menu + @node Horizontal spacing overview @subsection Horizontal spacing overview -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New spacing area @subsection New spacing area -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Changing horizontal spacing @subsection Changing horizontal spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Line length @subsection Line length -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Proportional notation @subsection Proportional notation -UNTRANSLATED NODE: IGNORE ME - -@node Page layout MOVED FROM LM -@section Page layout MOVED FROM LM +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Introduction to layout:: -* Global sizes:: -* Line breaks:: -* Page breaks:: -* Fitting music onto fewer pages:: -@end menu -@node Introduction to layout -@subsection Introduction to layout - -UNTRANSLATED NODE: IGNORE ME - -@node Global sizes -@subsection Global sizes - -UNTRANSLATED NODE: IGNORE ME - -@node Line breaks -@subsection Line breaks - -UNTRANSLATED NODE: IGNORE ME - -@node Page breaks -@subsection Page breaks +@node Fitting music onto fewer pages +@section Fitting music onto fewer pages -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Fitting music onto fewer pages -@subsection Fitting music onto fewer pages -UNTRANSLATED NODE: IGNORE ME +@menu +* Displaying spacing:: +* Changing spacing:: +@end menu +@node Displaying spacing +@subsection Displaying spacing + +@untranslated + + +@node Changing spacing +@subsection Changing spacing + +Manchmal bleiben nur noch ein oder zwei Systeme auf der +letzten Seite übrig. Das ist immer ärgerlich, besonders +wenn es scheint, dass auf den vorigen Seiten genug Platz +ist, um die Systeme noch unterzubringen. + +Wenn man versucht, das Layout zu verändern, kommt einem +der Befehl @code{annotate-spacing} zu Hilfe. Mit diesem +Befehl erhält man die Werte von verschiedenen Abstandsbefehlen +ausgedruckt, mehr Information im Kapitel @ref{Displaying spacing}. +Anhand dieser Angaben kann dann entschieden werden, welche +Werte verändert werden müssen. + +Neben Rändern gibt es nämlich weitere Optionen, Platz zu sparen: + +@itemize +@item +LilyPond kann die Systeme so dicht wie möglich platzieren (damit +so viele Systeme wie möglich auf eine Seite passen), aber sie +dann so anordnen, dass kein weißer Rand unten auf der Seite entsteht. + +@example +\paper @{ + between-system-padding = #0.1 + between-system-space = #0.1 + ragged-last-bottom = ##f + ragged-bottom = ##f +@} +@end example + +@item +Die Anzahl der Systeme kann reduziert werden (wenn LilyPond +die Musik auf 11 Systeme verteilt, kann man die Benutzung von +nur 10 Systemen erzwingen). + +@example +\paper @{ + system-count = #10 +@} +@end example + +@item +Vermeidung von Objekten, die den vertikalen Abstand von Systemen +vergrößern, hilft oft. Die Verwendung von Klammern bei Wiederholungen +etwa braucht mehr Platz. Wenn die Noten innerhalb der Klammern auf +zwei Systeme verteilt sind, brauchen sie mehr Platz, als wenn sie +nur auf einer Zeile gedruckt werden. + +Ein anderes Beispiel ist es, Dynamik-Zeichen, die besonders +weit @qq{hervorstehen}, zu verschieben. + +@lilypond[verbatim,quote,fragment] +\relative c' { + e4 c g\f c + \override DynamicLineSpanner #'padding = #-1.8 + \override DynamicText #'extra-offset = #'( -2.1 . 0) + e4 c g\f c +} +@end lilypond + +@item +Die horizontalen Abstände können mit der + @code{SpacingSpanner}-Eigenschaft verändert werden. Siehe +@ref{Changing horizontal spacing} für Einzelheiten. + +@lilypond[verbatim,quote] +\score { + \relative c'' { + g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 | + g4 e e2 | f4 d d2 | c4 e g g | c,1 | + d4 d d d | d4 e f2 | e4 e e e | e4 f g2 | + g4 e e2 | f4 d d2 | c4 e g g | c,1 | + } + \layout { + \context { + \Score + \override SpacingSpanner + #'base-shortest-duration = #(ly:make-moment 1 4) + } + } +} +@end lilypond + +@end itemize --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. diff --git a/Documentation/de/user/specialist.itely b/Documentation/de/user/specialist.itely index b7e6eb7170..a5aed0d4d4 100644 --- a/Documentation/de/user/specialist.itely +++ b/Documentation/de/user/specialist.itely @@ -23,6 +23,7 @@ types of instrument or in specific styles. * Wind instruments:: * Chord notation:: * Ancient notation:: +* World music:: @end menu @include vocal.itely @@ -33,5 +34,4 @@ types of instrument or in specific styles. @include wind.itely @include chords.itely @include ancient.itely - - +@include world.itely diff --git a/Documentation/de/user/staff.itely b/Documentation/de/user/staff.itely index 2dd5897090..0992571cc5 100644 --- a/Documentation/de/user/staff.itely +++ b/Documentation/de/user/staff.itely @@ -177,7 +177,7 @@ Beispiele: @node Hiding staves @unnumberedsubsubsec Hiding staves -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Writing parts @@ -193,23 +193,23 @@ UNTRANSLATED NODE: IGNORE ME @node Metronome marks @unnumberedsubsubsec Metronome marks -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Instrument names @unnumberedsubsubsec Instrument names -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Quoting other voices @unnumberedsubsubsec Quoting other voices -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Formatting cue notes @unnumberedsubsubsec Formatting cue notes -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/text.itely b/Documentation/de/user/text.itely index a2f35b6b31..4a1d30ed96 100644 --- a/Documentation/de/user/text.itely +++ b/Documentation/de/user/text.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,75 +11,125 @@ @node Text @section Text -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Writing text:: * Formatting text:: -@end menu +* Fonts:: +@end menu + @node Writing text @subsection Writing text -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Text scripts:: * Text spanners:: * Text marks:: * Separate text:: -@end menu +@end menu + @node Text scripts @subsubsection Text scripts -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Text spanners @subsubsection Text spanners -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Text marks @subsubsection Text marks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Separate text @subsubsection Separate text -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Formatting text @subsection Formatting text -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Text markup introduction:: -* Nested scores:: -* Page wrapping text:: -* Font selection:: -@end menu +* Selecting font and font size:: +* Text alignment:: +* Graphic notation inside markup:: +* Music notation inside markup:: +* Multi-page markup:: +@end menu + @node Text markup introduction @subsubsection Text markup introduction -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Selecting font and font size +@subsubsection Selecting font and font size + +@untranslated + + +@node Text alignment +@subsubsection Text alignment + +@untranslated + + +@node Graphic notation inside markup +@subsubsection Graphic notation inside markup + +@untranslated + + +@node Music notation inside markup +@subsubsection Music notation inside markup + +@untranslated + + +@node Multi-page markup +@subsubsection Multi-page markup + +@untranslated + + +@node Fonts +@subsection Fonts + +@untranslated + + +@menu +* Entire document fonts:: +* Single entry fonts:: +@end menu -@node Nested scores -@subsubsection Nested scores +@node Entire document fonts +@subsubsection Entire document fonts -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Page wrapping text -@subsubsection Page wrapping text -UNTRANSLATED NODE: IGNORE ME +@node Single entry fonts +@subsubsection Single entry fonts -@node Font selection -@subsubsection Font selection +@untranslated -UNTRANSLATED NODE: IGNORE ME --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/user/tweaks.itely index 79ebf1456d..b9df747938 100644 --- a/Documentation/de/user/tweaks.itely +++ b/Documentation/de/user/tweaks.itely @@ -18,18 +18,138 @@ Notenfragment kann geändert werden. @menu -* Moving objects:: -* Fixing overlapping notation:: +* Tweaking basics:: +* The Internals Reference manual:: +* Appearance of objects:: +* Placement of objects:: +* Collisions of objects:: * Common tweaks:: -* Default files:: -* Fitting music onto fewer pages:: -* Advanced tweaks with Scheme:: -* Avoiding tweaks with slower processing:: +* Further tweaking:: @end menu +@node Tweaking basics +@section Tweaking basics + +@untranslated + +@menu +* Introduction to tweaks:: +* Objects and interfaces:: +* Naming conventions of objects and properties:: +* Tweaking methods:: +@end menu + +@node Introduction to tweaks +@subsection Introduction to tweaks + +@untranslated + +@node Objects and interfaces +@subsection Objects and interfaces + +@untranslated + +@node Naming conventions of objects and properties +@subsection Naming conventions of objects and properties + +@untranslated + +@node Tweaking methods +@subsection Tweaking methods + +@untranslated + +@node The Internals Reference manual +@section The Internals Reference manual + +@untranslated + +@menu +* Properties of layout objects:: +* Properties found in interfaces:: +* Types of properties:: +@end menu + +@node Properties of layout objects +@subsection Properties of layout objects + +@untranslated + +@node Properties found in interfaces +@subsection Properties found in interfaces + +@untranslated + +@node Types of properties +@subsection Types of properties + +@untranslated + +@node Appearance of objects +@section Appearance of objects + +@untranslated + +@menu +* Visibility and color of objects:: +* Size of objects:: +* Length and thickness of objects:: +@end menu + +@node Visibility and color of objects +@subsection Visibility and color of objects + +@untranslated + +@node Size of objects +@subsection Size of objects + +@untranslated + +@node Length and thickness of objects +@subsection Length and thickness of objects + +@untranslated + +@node Placement of objects +@section Placement of objects + +@untranslated + +@menu +* Automatic behavior:: +* Within-staff objects:: +* Outside staff objects:: +@end menu + +@node Automatic behavior +@subsection Automatic behavior + +@untranslated + +@node Within-staff objects +@subsection Within-staff objects + +@untranslated + +@node Outside staff objects +@subsection Outside staff objects + +@untranslated + + +@node Collisions of objects +@section Collisions of objects + +@menu +* Moving objects:: +* Fixing overlapping notation:: +* Real music example:: +@end menu + @node Moving objects -@section Moving objects +@subsection Moving objects Es wird vielleicht eine Überraschung sein, aber LilyPond ist nicht perfekt. Einige Notationselemente können sich überschneiden. Das @@ -171,7 +291,7 @@ c4^"piu mosso" d e f @node Fixing overlapping notation -@section Fixing overlapping notation +@subsection Fixing overlapping notation Im Kapitel @ref{Moving objects} wurde gezeigt, wie man Texte (@code{TextScript}-Objekte) verschiebt. Mit der gleichen @@ -214,8 +334,16 @@ aber die gebräuchlichsten finden sich hier: @end multitable +@node Real music example +@subsection Real music example + +@untranslated + + +@c DEPRECATED SECTION @node Common tweaks @section Common tweaks + Bestimmte Korrekturen sind so häufig, dass für sie schon fertige angepasste Befehle bereitgestellt sind, so etwa @code{\slurUp} um einen Bindebogen oberhalb anzuzeigen oder @@ -261,7 +389,7 @@ für bestimmte Objekte zuständig ist. Weil das @code{MetronomeMark}-Objekt vom @code{Score}-Kontext gesetzt wird, werden Veränderungen innerhalb des @code{Voice}-Kontextes nicht berücksichtigt. Genauere Details im Kapitel -@ruser{Constructing a tweak}. +@ruser{The \override command}. @cindex extra-offset @cindex zusätzlicher Abstand @@ -352,8 +480,29 @@ verhalten sich anders, etwa die Dicke von Balken ist an die Notenzeilenabstände gekoppelt. Mehr Information findet sich im relevanten Teil der Programmreferenz. -@node Default files -@section Default files +@node Further tweaking +@section Further tweaking + +@menu +* Other uses for tweaks:: +* Using variables for tweaks:: +* Other sources of information:: +* Avoiding tweaks with slower processing:: +* Advanced tweaks with Scheme:: +@end menu + +@node Other uses for tweaks +@subsection Other uses for tweaks + +@untranslated + +@node Using variables for tweaks +@subsection Using variables for tweaks + +@untranslated + +@node Other sources of information +@subsection Other sources of information Die Programmreferenz enthält sehr viel Information über LilyPond, aber noch mehr Information findet sich in den internen @@ -386,96 +535,23 @@ Dateien wie @file{ly/property-init.ly} und @file{ly/declarations-init.ly} definieren alle häufig vorkommenden Veränderungen. -@node Fitting music onto fewer pages -@section Fitting music onto fewer pages - -Manchmal bleiben nur noch ein oder zwei Systeme auf der -letzten Seite übrig. Das ist immer ärgerlich, besonders -wenn es scheint, dass auf den vorigen Seiten genug Platz -ist, um die Systeme noch unterzubringen. - -Wenn man versucht, das Layout zu verändern, kommt einem -der Befehl @code{annotate-spacing} zu Hilfe. Mit diesem -Befehl erhält man die Werte von verschiedenen Abstandsbefehlen -ausgedruckt, mehr Information im Kapitel @ruser{Displaying spacing}. -Anhand dieser Angaben kann dann entschieden werden, welche -Werte verändert werden müssen. - -Neben Rändern gibt es nämlich weitere Optionen, Platz zu sparen: - -@itemize -@item -LilyPond kann die Systeme so dicht wie möglich platzieren (damit -so viele Systeme wie möglich auf eine Seite passen), aber sie -dann so anordnen, dass kein weißer Rand unten auf der Seite entsteht. - -@example -\paper @{ - between-system-padding = #0.1 - between-system-space = #0.1 - ragged-last-bottom = ##f - ragged-bottom = ##f -@} -@end example +@node Avoiding tweaks with slower processing +@subsection Avoiding tweaks with slower processing -@item -Die Anzahl der Systeme kann reduziert werden (wenn LilyPond -die Musik auf 11 Systeme verteilt, kann man die Benutzung von -nur 10 Systemen erzwingen). +LilyPond kann einige zusätzliche Tests durchführen, während +die Noten gesetzt werden. Dadurch braucht das Programm länger, +um den Notensatz zu produzieren, aber üblicherweise werden +weniger nachträgliche Anpassungen nötig sein. @example -\paper @{ - system-count = #10 -@} +%% Um sicher zu gehen, dass Texte und Liedtext +%% innerhalb der Papierränder bleiben +\override Score.PaperColumn #'keep-inside-line = ##t @end example -@item -Vermeidung von Objekten, die den vertikalen Abstand von Systemen -vergrößern, hilft oft. Die Verwendung von Klammern bei Wiederholungen -etwa braucht mehr Platz. Wenn die Noten innerhalb der Klammern auf -zwei Systeme verteilt sind, brauchen sie mehr Platz, als wenn sie -nur auf einer Zeile gedruckt werden. - -Ein anderes Beispiel ist es, Dynamik-Zeichen, die besonders -weit @qq{hervorstehen}, zu verschieben. - -@lilypond[verbatim,quote,fragment] -\relative c' { - e4 c g\f c - \override DynamicLineSpanner #'padding = #-1.8 - \override DynamicText #'extra-offset = #'( -2.1 . 0) - e4 c g\f c -} -@end lilypond - -@item -Die horizontalen Abstände können mit der - @code{SpacingSpanner}-Eigenschaft verändert werden. Siehe -@ruser{Changing horizontal spacing} für Einzelheiten. - -@lilypond[verbatim,quote] -\score { - \relative c'' { - g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 | - g4 e e2 | f4 d d2 | c4 e g g | c,1 | - d4 d d d | d4 e f2 | e4 e e e | e4 f g2 | - g4 e e2 | f4 d d2 | c4 e g g | c,1 | - } - \layout { - \context { - \Score - \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 4) - } - } -} -@end lilypond - -@end itemize - @node Advanced tweaks with Scheme -@section Advanced tweaks with Scheme +@subsection Advanced tweaks with Scheme Es wurde schon gezeigt, wie die LilyPond-Ausgabe sehr stark verändert werden kann, indem man Befehle wie @@ -535,20 +611,3 @@ pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) } @end lilypond - -@node Avoiding tweaks with slower processing -@section Avoiding tweaks with slower processing - -LilyPond kann einige zusätzliche Tests durchführen, während -die Noten gesetzt werden. Dadurch braucht das Programm länger, -um den Notensatz zu produzieren, aber üblicherweise werden -weniger nachträgliche Anpassungen nötig sein. - -@example -%% Um sicher zu gehen, dass Texte und Liedtext -%% innerhalb der Papierränder bleiben -\override Score.PaperColumn #'keep-inside-line = ##t -@end example - - - diff --git a/Documentation/de/user/unfretted-strings.itely b/Documentation/de/user/unfretted-strings.itely index 4a5f7aa995..032966b59b 100644 --- a/Documentation/de/user/unfretted-strings.itely +++ b/Documentation/de/user/unfretted-strings.itely @@ -12,7 +12,7 @@ @node Unfretted string instruments @section Unfretted string instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for unfretted strings:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for unfretted strings @subsection Common notation for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for unfretted strings:: @@ -32,12 +32,12 @@ UNTRANSLATED NODE: IGNORE ME @node References for unfretted strings @subsubsection References for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bowed instruments @subsection Bowed instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for bowed strings:: @@ -59,7 +59,7 @@ Befehl @code{\harmonic} markiert wird. @node Plucked instruments @subsection Plucked instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Harp:: @@ -68,5 +68,5 @@ UNTRANSLATED NODE: IGNORE ME @node Harp @subsubsection Harp -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely index 2bc9fbef26..66744882a6 100644 --- a/Documentation/de/user/vocal.itely +++ b/Documentation/de/user/vocal.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 02cb8b672238eeb53bffa2240c87f23dd8ca9e60 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,167 +11,207 @@ @node Vocal music @section Vocal music -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu -* Simple lyrics:: + +@menu +* Common notation for vocals:: * Aligning lyrics to a melody:: -* Vocals and variables:: -* Flexibility in placement:: -* Spacing vocals:: -* More about stanzas:: -@end menu -@node Simple lyrics -@subsection Simple lyrics +* Placement of lyrics:: +* Stanzas:: +@end menu + +@node Common notation for vocals +@subsection Common notation for vocals + +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu +@menu +* References for vocal music:: * Setting simple songs:: * Entering lyrics:: -@end menu +* Working with lyrics and variables:: +@end menu + +@node References for vocal music +@subsubsection References for vocal music + +@untranslated + + @node Setting simple songs @subsubsection Setting simple songs -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Entering lyrics @subsubsection Entering lyrics -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Working with lyrics and variables +@subsubsection Working with lyrics and variables + +@untranslated + @node Aligning lyrics to a melody @subsection Aligning lyrics to a melody -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Automatic syllable durations:: -* Another way of entering lyrics:: -* Assigning more than one syllable to a single note:: -* More than one note on a single syllable:: +* Manual syllable durations:: +* Multiple syllables to one note:: +* Multiple notes to one syllable:: +* Skipping notes:: * Extenders and hyphens:: -@end menu +* Lyrics and repeats:: +@end menu + @node Automatic syllable durations @subsubsection Automatic syllable durations -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Manual syllable durations +@subsubsection Manual syllable durations + +@untranslated + + +@node Multiple syllables to one note +@subsubsection Multiple syllables to one note + +@untranslated -@node Another way of entering lyrics -@subsubsection Another way of entering lyrics -UNTRANSLATED NODE: IGNORE ME +@node Multiple notes to one syllable +@subsubsection Multiple notes to one syllable -@node Assigning more than one syllable to a single note -@subsubsection Assigning more than one syllable to a single note +@untranslated -UNTRANSLATED NODE: IGNORE ME -@node More than one note on a single syllable -@subsubsection More than one note on a single syllable +@node Skipping notes +@subsubsection Skipping notes + +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Extenders and hyphens @subsubsection Extenders and hyphens -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Vocals and variables -@subsection Vocals and variables -UNTRANSLATED NODE: IGNORE ME +@node Lyrics and repeats +@subsubsection Lyrics and repeats + +@untranslated -@menu -* Working with lyrics and variables:: -@end menu -@node Working with lyrics and variables -@subsubsection Working with lyrics and variables -UNTRANSLATED NODE: IGNORE ME +@node Placement of lyrics +@subsection Placement of lyrics -@node Flexibility in placement -@subsection Flexibility in placement +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Lyrics to multiple notes of a melisma:: +@menu * Divisi lyrics:: -* Switching the melody associated with a lyrics line:: * Lyrics independent of notes:: -@end menu -@node Lyrics to multiple notes of a melisma -@subsubsection Lyrics to multiple notes of a melisma - -UNTRANSLATED NODE: IGNORE ME +* Chants:: +* Spacing out syllables:: +* Centering lyrics between staves:: +@end menu @node Divisi lyrics @subsubsection Divisi lyrics -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Switching the melody associated with a lyrics line -@subsubsection Switching the melody associated with a lyrics line - -UNTRANSLATED NODE: IGNORE ME @node Lyrics independent of notes @subsubsection Lyrics independent of notes -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Chants +@subsubsection Chants + +@untranslated + + +@node Spacing out syllables +@subsubsection Spacing out syllables -@node Spacing vocals -@subsection Spacing vocals +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Spacing lyrics:: -@end menu -@node Spacing lyrics -@subsubsection Spacing lyrics +@node Centering lyrics between staves +@subsubsection Centering lyrics between staves -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node More about stanzas -@subsection More about stanzas -UNTRANSLATED NODE: IGNORE ME +@node Stanzas +@subsection Stanzas -@menu +@untranslated + + +@menu * Adding stanza numbers :: -* Adding dynamics marks:: -* Adding singer names:: +* Adding dynamics marks to stanzas:: +* Adding singers' names to stanzas:: +* Stanzas with different rhythms:: * Printing stanzas at the end :: * Printing stanzas at the end in multiple columns :: -@end menu -@node Adding stanza numbers -@subsubsection Adding stanza numbers +@end menu + +@node Adding stanza numbers +@subsubsection Adding stanza numbers + +@untranslated + + +@node Adding dynamics marks to stanzas +@subsubsection Adding dynamics marks to stanzas + +@untranslated + + +@node Adding singers' names to stanzas +@subsubsection Adding singers' names to stanzas + +@untranslated + -UNTRANSLATED NODE: IGNORE ME +@node Stanzas with different rhythms +@subsubsection Stanzas with different rhythms -@node Adding dynamics marks -@subsubsection Adding dynamics marks +@untranslated -UNTRANSLATED NODE: IGNORE ME -@node Adding singer names -@subsubsection Adding singer names +@subsubheading Ignoring melismata +@subsubheading Switching to an alternative melody +@node Printing stanzas at the end +@subsubsection Printing stanzas at the end -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Printing stanzas at the end -@subsubsection Printing stanzas at the end -UNTRANSLATED NODE: IGNORE ME +@node Printing stanzas at the end in multiple columns +@subsubsection Printing stanzas at the end in multiple columns -@node Printing stanzas at the end in multiple columns -@subsubsection Printing stanzas at the end in multiple columns +@untranslated -UNTRANSLATED NODE: IGNORE ME --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/de/user/wind.itely b/Documentation/de/user/wind.itely index 40b1f872a3..7f63dbbdf9 100644 --- a/Documentation/de/user/wind.itely +++ b/Documentation/de/user/wind.itely @@ -13,7 +13,7 @@ @node Wind instruments @section Wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for wind instruments:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for wind instruments @subsection Common notation for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for wind instruments:: @@ -33,17 +33,17 @@ UNTRANSLATED NODE: IGNORE ME @node References for wind instruments @subsubsection References for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Half-holes @subsubsection Half-holes -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bagpipes @subsection Bagpipes -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Bagpipe definitions:: diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely index f4396dcae3..4d4c8de092 100644 --- a/Documentation/de/user/working.itely +++ b/Documentation/de/user/working.itely @@ -83,7 +83,7 @@ vor einem Jahr verwendet hat. Auch @code{convert-ly} benötigt die Versionsnummer. @item @strong{Benutzen Sie Überprüfungen}: @ruser{Bar check}, -@ruser{Octave check} und +@ruser{Octave checks} und @ruser{Barnumber check}. Wenn Sie hier und da diese Überprüfungen einfügen, finden Sie einen möglichen Fehler weit schneller. Wie oft aber @@ -844,5 +844,5 @@ erstellt werden, finden sich im Notationshandbuch, siehe Das Setzen der Variablen, die das Verhalten von LilyPond beeinflussen (@q{properties}), wird im Kapitel -@ruser{Changing context properties on the fly} besprochen. +@ref{Modifying context properties} besprochen. diff --git a/Documentation/de/user/world.itely b/Documentation/de/user/world.itely new file mode 100644 index 0000000000..a11f1fff9b --- /dev/null +++ b/Documentation/de/user/world.itely @@ -0,0 +1,73 @@ +@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- +@c This file is part of lilypond.tely +@ignore + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e + + When revising a translation, copy the HEAD committish of the + version that you are working on. See TRANSLATION for details. +@end ignore + + +@node World music +@section World music + +@untranslated + + +@menu +* Arabic music:: +@end menu + +@node Arabic music +@subsection Arabic music + +@untranslated + + +@menu +* References for Arabic music:: +* Arabic note names :: +* Arabic key signatures:: +* Arabic time signatures:: +* Arabic music example:: +* Further reading:: +@end menu + +@node References for Arabic music +@unnumberedsubsubsec References for Arabic music + +@untranslated + + +@node Arabic note names +@unnumberedsubsubsec Arabic note names + +@untranslated + + +@node Arabic key signatures +@unnumberedsubsubsec Arabic key signatures + +@untranslated + + +@node Arabic time signatures +@unnumberedsubsubsec Arabic time signatures + +@untranslated + + +@node Arabic music example +@unnumberedsubsubsec Arabic music example + +@untranslated + + +@node Further reading +@unnumberedsubsubsec Further reading + +@untranslated + + + +@c -- SKELETON FILE -- diff --git a/Documentation/es/GNUmakefile b/Documentation/es/GNUmakefile index bc58051120..90e3f678e9 100644 --- a/Documentation/es/GNUmakefile +++ b/Documentation/es/GNUmakefile @@ -2,10 +2,6 @@ ISOLANG = es depth = ../.. SUBDIRS = user STEPMAKE_TEMPLATES = documentation +LOCALSTEPMAKE_TEMPLATES = doc-i18n-root include $(depth)/make/stepmake.make - -local-WWW: lang-merge - -lang-merge: $(outdir)/index.html - ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html diff --git a/Documentation/es/translations.html.in b/Documentation/es/translations.html.in index 30e97d9da3..f7545bd735 100644 --- a/Documentation/es/translations.html.in +++ b/Documentation/es/translations.html.in @@ -1,4 +1,4 @@ -

Last updated Sat Jul 19 15:59:20 UTC 2008 +

Actualizado en Mon Aug 11 16:16:20 UTC 2008

Más inf. - Section titles
(412) + Títulos de sección
(412) Francisco Vila sí @@ -37,20 +37,20 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1 Introducción
(3699) + 1 Introducción
(3678) Francisco Vila - parcialmente (65 %) - parcialmente - pre-GDP + sí + parcialmente + post-GDP - 2 Tutorial
(5652) + 2 Tutorial
(5685) Francisco Vila sí - parcialmente - pre-GDP + parcialmente + post-GDP 3 Conceptos fundamentales
(9800) @@ -61,11 +61,11 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 Trucar la salida
(12262) + 4 Trucar la salida
(12334) Francisco Vila sí - parcialmente + parcialmente pre-GDP @@ -104,7 +104,7 @@ translations.template.html.in; DO NOT EDIT !--> Más inf. - Section titles
(390) + Títulos de sección
(390) Francisco Vila sí @@ -163,11 +163,11 @@ translations.template.html.in; DO NOT EDIT !--> Más inf. - Section titles
(544) + Títulos de sección
(547) Francisco Vila sí - parcialmente + parcialmente pre-GDP @@ -179,67 +179,67 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 1.1 Alturas
(2822) + 1.1 Alturas
(2948) Francisco Vila sí - sí + parcialmente pre-GDP - 1.2 Duraciones
(6657) + 1.2 Duraciones
(6785) Francisco Vila - parcialmente (96 %) - parcialmente + parcialmente (95 %) + parcialmente pre-GDP - 1.3 Expresiones
(843) + 1.3 Expresiones
(1119) Francisco Vila sí - parcialmente + parcialmente pre-GDP - 1.4 Repeticiones
(940) + 1.4 Repeticiones
(556) Francisco Vila sí - parcialmente + parcialmente pre-GDP - 1.5 Notas simultáneas
(883) + 1.5 Notas simultáneas
(1000) Francisco Vila sí - parcialmente - pre-GDP + parcialmente + post-GDP - 1.6 Notación de los pentagramas
(2310) + 1.6 Notación de los pentagramas
(1800) Francisco Vila sí - sí + parcialmente pre-GDP - 1.7 Anotaciones editoriales
(827) + 1.7 Anotaciones editoriales
(908) Francisco Vila sí - sí + parcialmente pre-GDP - 1.8 Texto
(1851) + 1.8 Texto
(2082) Francisco Vila - parcialmente (85 %) - parcialmente + parcialmente (86 %) + parcialmente pre-GDP @@ -251,19 +251,19 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.1 Música vocal
(2745) + 2.1 Música vocal
(2799) Francisco Vila parcialmente (96 %) - parcialmente + parcialmente pre-GDP - 2.2 Instrumentos de teclado
(561) + 2.2 Instrumentos de teclado
(668) Francisco Vila - parcialmente (90 %) - parcialmente + parcialmente (89 %) + parcialmente pre-GDP @@ -275,19 +275,19 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.4 Instrumentos de cuerda con trastes
(857) + 2.4 Instrumentos de cuerda con trastes
(1369) Francisco Vila - parcialmente (82 %) - parcialmente + parcialmente (35 %) + parcialmente pre-GDP - 2.5 Percusión
(546) + 2.5 Percusión
(747) Francisco Vila - parcialmente (97 %) - sí + parcialmente (98 %) + parcialmente pre-GDP @@ -299,11 +299,11 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 2.7 Notación de acordes
(1303) + 2.7 Notación de acordes
(1352) Francisco Vila sí - parcialmente + parcialmente pre-GDP @@ -315,7 +315,7 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 3 Sintaxis de escritura
(5399) + 2.9 Músicas del mundo
(1115) ninguno @@ -323,7 +323,15 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 4 Problemas de espaciado
(8400) + 3 Entrada y salida generales
(5431) + Francisco Vila + + parcialmente (43 %) + sí + pre-GDP + + + 4 Problemas de espaciado
(7896) ninguno @@ -331,15 +339,15 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - 5 Cambiar los valores por omisión
(6855) + 5 Cambiar los valores por omisión
(8377) Francisco Vila - parcialmente (93 %) - parcialmente + parcialmente (69 %) + parcialmente pre-GDP - 6 Interfaces para programadores
(5213) + 6 Interfaces para programadores
(5218) ninguno @@ -355,11 +363,11 @@ translations.template.html.in; DO NOT EDIT !--> pre-GDP - B Tablas del manual sobre notación
(1127) + B Tablas del manual sobre notación
(1146) Francisco Vila - sí - parcialmente + parcialmente (99 %) + parcialmente pre-GDP diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/user/changing-defaults.itely index cb9542f2ed..933c73f00e 100644 --- a/Documentation/es/user/changing-defaults.itely +++ b/Documentation/es/user/changing-defaults.itely @@ -62,7 +62,7 @@ compás distinta. @item Disposición de la página: cambiar el aspecto visual del espaciado, los saltos de línea y las dimensiones de la página. Estas modificaciones -se discuten en @ref{Non-musical notation} y @ref{Spacing issues}. +se discuten en @ref{General input and output} y @ref{Spacing issues}. @end itemize Internamente, LilyPond utiliza el lenguaje Scheme (un dialecto de @@ -82,8 +82,6 @@ listas, cadenas y símbolos en Scheme.} * Useful concepts and properties:: * Common properties:: * Advanced tweaks:: -* old The \override command:: -* Discussion of specific tweaks:: @end menu @@ -425,7 +423,7 @@ compás independiente. @node Changing context default settings @subsection Changing context default settings -Los ajustes de las secciones previas ( @ref{The \set command}, +Los ajustes de las secciones previas ( @ref{The set command}, @ref{Modifying context plug-ins} y @ref{Overview of modifying properties}) también se pueden escribir separados de la música dentro del bloque @code{\layout}: @@ -962,17 +960,17 @@ El grabador Fingering_engraver es parte de los contextos: @dots{} @node Naming conventions @subsection Naming conventions -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Modifying properties @section Modifying properties @menu * Overview of modifying properties:: -* The \set command:: -* The \override command:: -* \set versus \override:: -* Objects connected to the input:: +* The set command:: +* The override command:: +* set versus override:: +* The tweak command:: @end menu @@ -1099,7 +1097,7 @@ valores Scheme de propiedades pueden producir cuelgues o salidas abruptas, o las dos cosas. -@node The \set command +@node The set command @subsection The @code{\set} command @cindex propiedades @@ -1230,7 +1228,7 @@ usuario. -@node The \override command +@node The override command @subsection The @code{\override} command Las instrucciones que modifican la salida tienen por lo general un @@ -1275,7 +1273,7 @@ causarína problemas. Mostraremos a continuación cómo localizar esta información en el manual de notación y en la referencia de funcionamiento interno. -@node \set versus \override +@node set versus override @subsection @code{\set} vs. @code{\override} Hemos visto dos formas de cambiar las propiedades: @code{\set} y @@ -1328,8 +1326,8 @@ Al ser éste un cambio muy común, se creó la propiedad especial (modificada con @code{\set}). -@node Objects connected to the input -@subsection Objects connected to the input +@node The tweak command +@subsection The @code{\tweak} command @funindex \tweak @@ -1580,7 +1578,7 @@ significan @qq{utilizar la dirección predeterminada}, como antes. @node Distances and measurements @subsection Distances and measurements -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Spanners @subsection Spanners @@ -1769,8 +1767,6 @@ Referencia del programa: @end menu - - @node Vertical grouping of grobs @subsection Vertical grouping of grobs @@ -1787,26 +1783,10 @@ partitura, pero cada @code{Staff}, @code{Lyrics}, etc. tiene su propio @node Modifying ends of spanners @subsection Modifying ends of spanners +@untranslated + @node Modifying stencils @subsection Modifying stencils -@node old The \override command -@section old The @code{\override} command - -UNTRANSLATED NODE: IGNORE ME - -@node Discussion of specific tweaks -@section Discussion of specific tweaks - -UNTRANSLATED NODE: IGNORE ME - -@menu -* old Contexts explained:: -@end menu - -@node old Contexts explained -@subsection old Contexts explained - -UNTRANSLATED NODE: IGNORE ME - +@untranslated diff --git a/Documentation/es/user/chords.itely b/Documentation/es/user/chords.itely index ee784ed814..4f7836ca0e 100644 --- a/Documentation/es/user/chords.itely +++ b/Documentation/es/user/chords.itely @@ -918,7 +918,7 @@ instead of @c @rlearning{ }. @c Notation Reference: -@c @ruser{ }. +@c @ref{ }. @c Application Usage: @c @rprogram{ }. diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely index 770fc67689..4a6a568155 100644 --- a/Documentation/es/user/editorial.itely +++ b/Documentation/es/user/editorial.itely @@ -169,8 +169,8 @@ individuales del acorde escribiéndolas después de las alturas. @end lilypond Las indicaciones de digitación se pueden situar manualmente encima o -debajo del pentagrama, véase @ref{Controlling direction and -placement}. +debajo del pentagrama, véase @ref{Direction +and placement}. @snippets @@ -180,7 +180,7 @@ placement}. @seealso Referencia de la notación: -@ref{Controlling direction and placement} +@ref{Direction and placement} Fragmentos de código: @rlsr{Editorial annotations}. @@ -305,8 +305,8 @@ gis4 a @seealso Referencia de la notación: -@ref{List of colors}, @ref{Objects connected to -the input}. +@ref{List of colors}, @ref{The +tweak command}. Fragmentos de código: @rlsr{Editorial annotations}. @@ -324,8 +324,8 @@ sea: @code{#blue}, azul, @code{#green}, verde, @code{#red}, rojo). Las notas de un acorde no se pueden colorear con @code{\override}; en -su lugar utilice @code{\tweak}. Consulte @ref{Objects connected to -the input} para ver más detalles. +su lugar utilice @code{\tweak}. Consulte @ref{The +tweak command} para ver más detalles. @node Parentheses @@ -394,7 +394,7 @@ crean pero se hacen invisibles. @seealso Referencia de la notación: -@ref{Controlling direction and placement}. +@ref{Direction and placement}. Fragmentos de código: @rlsr{Editorial annotations}. diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely index 058d033718..2d58f01488 100644 --- a/Documentation/es/user/fretted-strings.itely +++ b/Documentation/es/user/fretted-strings.itely @@ -36,7 +36,7 @@ @node References for fretted strings @subsubsection References for fretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node String number indications @subsubsection String number indications @@ -362,7 +362,7 @@ Referencia de funcionamiento interno: @node Guitar tablatures @subsubsection Guitar tablatures -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Indicating position and barring @subsubsection Indicating position and barring diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely index 31b2e042fc..a48f8d948f 100644 --- a/Documentation/es/user/input.itely +++ b/Documentation/es/user/input.itely @@ -1,137 +1,831 @@ -@c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- +@c -*- coding: utf-8; mode: texinfo; documentlanguage: de -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 66dde21fe63499f32a718f6098abe70e1429059b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" +@node General input and output +@chapter General input and output -@node Input syntax -@chapter Input syntax +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Input files:: -* Common syntax issues TODO name?:: -* Other stuffs TODO move?:: -@end menu -@node Input files -@section Input files +@menu +* Input structure:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: +@end menu -UNTRANSLATED NODE: IGNORE ME +@node Input structure +@section Input structure + +@untranslated -@menu -* File structure:: -* A single music expression:: -* Multiple scores in a book:: -* Extracting fragments of notation:: -* Including LilyPond files:: -* Text encoding:: -* Different editions from one source:: -@end menu -@node File structure -@subsection File structure -UNTRANSLATED NODE: IGNORE ME +@menu +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: +@end menu -@node A single music expression -@subsection A single music expression +@node Structure of a score +@subsection Structure of a score + +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Multiple scores in a book @subsection Multiple scores in a book -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Extracting fragments of notation -@subsection Extracting fragments of notation -UNTRANSLATED NODE: IGNORE ME +@node File structure +@subsection File structure + +@untranslated + + +@node Titles and headers +@section Titles and headers + +Casi toda la música impresa tiene un título y el nombre del +compositor; ciertas piezas tienen mucha más información. + +@menu +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: +@end menu + +@node Creating titles +@subsection Creating titles + +Se crean títulos para cada uno de los bloques @code{\score} así como +para todo el archivo de entrada (o bloque @code{\book} (libro)). + +El contenido de cada título se extrae a partir de los bloques +@code{\header} (cabecera). El bloque de cabecera de un libro +contempla lo siguiente: + +@table @code +@funindex dedicatoria +@item dedication +El dedicatario de la música, centrado en lo alto de la primera página. + +@funindex title +@item title +El título de la música, centrado justo debajo de la +dedicatoria. + +@funindex subtitle +@item subtitle +Subtítulo, centrado debajo del título. + +@funindex subsubtitle +@item subsubtitle +Sub-subtítulo, centrado debajo del subtítulo. + +@funindex poet +@item poet +Nombre del poeta, a la izquierda, debajo del subtítulo. + +@funindex composer +@item composer +Nombre del compositor, a la derecha, debajo del subtítulo. + +@funindex meter +@item meter +Texto de la medida, a la izquierda, debajo del poeta. + +@funindex opus +@item opus +Nombre del Opus, a la derecha, debajo del compositor. + +@funindex arranger +@item arranger +Nombre del arreglista, a la derecha, debajo del Opus. + +@funindex instrument +@item instrument +Nombre del instrumento, centrado, debajo del arreglista. También +aparece centrado en lo alto de cada página (aparte de la primera). + +@funindex piece +@item piece +Nombre de la pieza, a la izquierda, debajo del instrumento. + +@cindex página, saltos, forzar +@funindex breakbefore +@item breakbefore +Esto fuerza que el título comience sobre una página nueva (establézcalo a ##t o a ##f). + +@funindex copyright +@item copyright +Aviso de Copyright, centrado en la parte inferior de la primera +página. Para insertar el símbolo de copyright symbol, consulte +@ref{Text encoding}. + +@funindex tagline +@item tagline +Cartel de propósito general en el pie de página, centrado al final de la última. + +@end table + +A continuación presentamos una demostración de todos los campos que +están disponibles. Fíjese en que puede utilizar en la cabecera +cualquier instrucción de marcado de texto (Véase @ref{Formatting text}). + +@lilypond[quote,verbatim,line-width=11.0\cm] +\paper { + line-width = 9.0\cm + paper-height = 10.0\cm +} + +\book { + \header { + dedication = "dedicated to me" + title = \markup \center-align { "Title first line" "Title second line, +longer" } + subtitle = "the subtitle," + subsubtitle = #(string-append "subsubtitle LilyPond version " +(lilypond-version)) + poet = "Poet" + composer = \markup \center-align { "composer" \small "(1847-1973)" } + texttranslator = "Text Translator" + meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge +"r" } + arranger = \markup { \fontsize #8.5 "a" \fontsize #2.5 "r" \fontsize +#-2.5 "r" \fontsize #-5.3 "a" \fontsize #7.5 "nger" } + instrument = \markup \bold \italic "instrument" + piece = "Piece" + } + + \score { + { c'1 } + \header { + piece = "piece1" + opus = "opus1" + } + } + \markup { + and now... + } + \score { + { c'1 } + \header { + piece = "piece2" + opus = "opus2" + } + } +} +@end lilypond + +Como se mostró anteriormente, puede usar varios bloques +@code{\header}. Cuando los mismos campos aparecen en distintos +bloques, tiene validez el último en definirse. A continuación un +breve ejemplo. + +@example +\header @{ + composer = "Compositor" +@} +\header @{ + piece = "Pieza" +@} +\score @{ + \new Staff @{ c'4 @} + \header @{ + piece = "Otra pieza" % sobreescribe a la anterior + @} +@} +@end example + +Si define la cabecera @code{\header} dentro del bloque @code{\score}, +por lo general se imprimirán solamente las cabeceras @code{piece} y +@code{opus}. Fíjese en que la expresión musical debe aparecer antes +del @code{\header}. + +@lilypond[quote,verbatim,line-width=11.0\cm] +\score { + { c'4 } + \header { + title = "title" % not printed + piece = "piece" + opus = "opus" + } +} +@end lilypond + +@funindex printallheaders +@noindent +Se puede cambiar este comportamiento (e imprimir todas las cabeceras +cuando la cabecera @code{\header} está definida dentro del bloque +@code{\score}) mediante la utilización de + +@example +\paper@{ + printallheaders=##t +@} +@end example + +@cindex copyright +@cindex tagline + +El pie de página por omisión se encuentra vacío, excepto para la +primera página, en la que se inserta el campo de @code{copyright} +extraído del @code{\header}, y para la última página, en la que se +escribe el cartel @code{tagline} sacado del bloque @code{\header}. La +línea por omisión para este cartel es @qq{Music engraving by LilyPond +(@var{version})}.@footnote{Las partituras bien tipografiadas son una +magnífica promoción para nosotros, así que por favor, si puede, +conserve intacta la línea del letrero.} + +Las cabeceras se pueden quitar completamente estableciendo su valor a +falso. + +@example +\header @{ + tagline = ##f + composer = ##f +@} +@end example + + +@node Custom titles +@subsection Custom titles + +Una opción más avanzada es cambiar las definiciones de las variables +siguientes dentro del bloque @code{\paper} block. El archivo de +inicio @file{ly/titling-init.ly} ofrece un listado de la disposición +predeterminada. + +@table @code +@funindex bookTitleMarkup +@item bookTitleMarkup + Es el título que se escribe en lo alto del documento de salida +completo. Normalmente contiene el compositor y el título de la pieza. + +@funindex scoreTitleMarkup +@item scoreTitleMarkup + Es el título que se coloca por encima de un bloque @code{\score}. +normalmente contiene el nombre del movimiento (campo @code{piece}). + +@funindex oddHeaderMarkup +@item oddHeaderMarkup + Es el encabezamiento de las páginas de numeración impar. + +@funindex evenHeaderMarkup +@item evenHeaderMarkup + Es el encabezamiento de las páginas de numeración par. Si se deja + sin especificar, se usará el encabezamiento de las páginas impares. + + De forma predeterminada, los encabezamientos se definen de tal forma +que el número de página está en el borde exterior, y el isntrumento +está centrado. + +@funindex oddFooterMarkup +@item oddFooterMarkup + Es el pie de las páginas de numeración impar. + +@funindex evenFooterMarkup +@item evenFooterMarkup + Es el pie de las páginas de numeración par. Si se deja sin + especificar, se usará en su lugar el encabezamiento de las páginas + impares. + + De forma predeterminada, el pie de página tiene el aviso de +copyright en la primera página, y el cartel @code{tagline} en la +última. +@end table + + +@cindex \paper +@cindex encabezamiento +@cindex header +@cindex pie +@cindex disposición de la página +@cindex títulos + +La definición siguiente pone el título en el extremo izquierdo, y el +compositor en el extremo derecho sobre una única línea. + +@verbatim +\paper { + bookTitleMarkup = \markup { + \fill-line { + \fromproperty #'header:title + \fromproperty #'header:composer + } + } +} +@end verbatim + +@node Reference to page numbers +@subsection Reference to page numbers + +Se puede marcar un lugar determinado de una partitura utilizando la +instrucción @code{\label} (etiqueta), bien en lo alto de la estructura +o bien dentro de la música. Posteriormente se puede hacer referencia +a esta etiqueta dentro de un elemento de marcado, para obtener el +número de la página en que se encuentra la marca, usando la +instrucción de marcado @code{\page-ref}. + +@lilypond[verbatim,line-width=11.0\cm] +\header { tagline = ##f } +\book { + \label #'firstScore + \score { + { + c'1 + \pageBreak \mark A \label #'markA + c' + } + } + + \markup { The first score begins on page \page-ref #'firstScore "0" "?" } + \markup { Mark A is on page \page-ref #'markA "0" "?" } +} +@end lilypond + +La instrucción de marcado @code{\page-ref} toma tres argumentos: +@enumerate +@item la etiqueta, un símbolo de scheme, p.ej. @code{#'firstScore}; +@item un elemento de marcado que se usará como medidor para estimar las dimensiones del marcado; +@item un elemento de marcado que se utilizará en sustitución del número de página si la etiqueta es desconocida. +@end enumerate + +El motivo de que se necesite un medidor es que en el momento en que se +están interpretando los marcados, los saltos de página aún no se han +producido y por tanto los números de página no se conocen todavía. +Para sortear este inconveniente, la interpretación real del marcado se +retrasa hasta un momento posterior; sin embargo, las dimensiones del +marcado se tienen que conocer de antemano, así que se usa el medidor +para decidir estas dimensiones. Si el libro tiene entre 10 y 99 +páginas, el medidor puede ser "00", es decir, un número de dos +dígitos. + +@predefined + +@funindex \label +@code{\label} +@funindex \page-ref +@code{\page-ref} + +@node Table of contents +@subsection Table of contents +Se puede insertar un índice general o tabla de contenidos utilizando +la instrucción @code{\markuplines \table-of-contents}. Los elementos +que deben aparecer en la tabla de contenidos se introducen con la +instrucción @code{\tocItem}, que se puede usar en el nivel más alto de +la jerarquía del código, o dentro de una expresión musical. + +@verbatim +\markuplines \table-of-contents +\pageBreak + +\tocItem \markup "Primera partitura" +\score { + { + c' % ... + \tocItem \markup "Un punto concreto dentro de la primera partitura" + d' % ... + } +} + +\tocItem \markup "Segunda partitura" +\score { + { + e' % ... + } +} +@end verbatim + +Los elementos de marcado que se usan para dar formato al índice +general se encuentran definidos dentro del bloque @code{\paper}. Los +elementos predeterminados son @code{tocTitleMarkup}, para dar formato +al título de la tabla, y @code{tocItemMarkup}, para aplicar formato a +los elementos del índice, que consisten en el título del elemento y el +número de página. Estas variables se pueden cambiar por parte del +usuario: + +@verbatim +\paper { + %% Traducir el título del índice al español: + tocTitleMarkup = \markup \huge \column { + \fill-line { \null "Índice general" \null } + \hspace #1 + } + %% usar una fuente mayor + tocItemMarkup = \markup \large \fill-line { + \fromproperty #'toc:text \fromproperty #'toc:page + } +} +@end verbatim + +Observe la forma en que nos referimos al texto y al número de página +del elemento de índice, dentro de la definición @code{tocItemMarkup}. + +También se pueden definir nuevas instrucciones y elementos de +marcado para crear índices generales más eleborados: +@itemize +@item en primer lugar, defina una variable de marcado nueva dentro del bloque @code{\paper} +@item luego defina una función de música cuyo propósito es añadir un elemento al índice general +utilizando esta variable de marcado del bloque @code{\paper}. +@end itemize + +En el ejemplo siguiente se define un estilo nuevo para introducir los +nombres de los actos de una ópera en el índice general: + +@verbatim +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) +@end verbatim + +@lilypond[line-width=11.0\cm] +\header { tagline = ##f } +\paper { + tocActMarkup = \markup \large \column { + \hspace #1 + \fill-line { \null \italic \fromproperty #'toc:text \null } + \hspace #1 + } +} + +tocAct = +#(define-music-function (parser location text) (markup?) + (add-toc-item! 'tocActMarkup text)) + +\book { + \markuplines \table-of-contents + \tocAct \markup { Atto Primo } + \tocItem \markup { Coro. Viva il nostro Alcide } + \tocItem \markup { Cesare. Presti omai l'Egizzia terra } + \tocAct \markup { Atto Secondo } + \tocItem \markup { Sinfonia } + \tocItem \markup { Cleopatra. V'adoro, pupille, saette d'Amore } + \markup \null +} +@end lilypond + +@seealso + +Archivos de inicio: @file{ly/@/toc@/-init@/.ly}. + +@predefined + +@funindex \table-of-contents +@code{\table-of-contents} +@funindex \tocItem +@code{\tocItem} + + +@node Working with input files +@section Working with input files + +@untranslated + + +@menu +* Including LilyPond files:: +* Different editions from one source:: +* Text encoding:: +* Displaying LilyPond notation:: +@end menu @node Including LilyPond files @subsection Including LilyPond files -UNTRANSLATED NODE: IGNORE ME - -@node Text encoding -@subsection Text encoding +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Different editions from one source @subsection Different editions from one source -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@node Common syntax issues TODO name? -@section Common syntax issues TODO name? +@menu +* Using variables:: +* Using tags:: +@end menu -UNTRANSLATED NODE: IGNORE ME +@node Using variables +@unnumberedsubsubsec Using variables -@menu -* Controlling direction and placement:: -* Distances and measurements MAYBE MOVE:: -* When to add a -:: -@end menu -@node Controlling direction and placement -@subsection Controlling direction and placement +@untranslated -UNTRANSLATED NODE: IGNORE ME -@node Distances and measurements MAYBE MOVE -@subsection Distances and measurements MAYBE MOVE +@node Using tags +@unnumberedsubsubsec Using tags -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node When to add a - -@subsection When to add a - -UNTRANSLATED NODE: IGNORE ME +@node Text encoding +@subsection Text encoding -@node Other stuffs TODO move? -@section Other stuffs TODO move? +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Displaying LilyPond notation:: -* Skipping corrected music:: -* context list FIXME:: -* another thing FIXME:: -* Input modes FIXME:: -@end menu @node Displaying LilyPond notation @subsection Displaying LilyPond notation -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Controlling output +@section Controlling output + +@untranslated + + +@menu +* Extracting fragments of music:: +* Skipping corrected music:: +@end menu + +@node Extracting fragments of music +@subsection Extracting fragments of music + +@untranslated + @node Skipping corrected music @subsection Skipping corrected music -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node MIDI output +@section MIDI output + +@cindex sonido +@cindex MIDI + +El MIDI (Musical Instrument Digital Interface, Interfase Digital para +Instrumentos Musicales) es un estándar para interconectar y controlar +instrumentos musicales electrónicos. Un archivo o secuencia MIDI es +una serie de notas dentro de un conjunto de pistas. No es un archivoo +de sonidos reales; se necesita un programa reproductor especial para +traducir la serie de notas en sonidos de verdad. + +Cualquier música se puede convertir a archivos MIDI, de manera que +podamos escuchar lo que hayamos introducido. Esto es muy conveniente +para comprobar la corrección de la música; las octavas equivocadas o +las alteraciones erróneas se ponen de relieve muy claramente al +escuchar la salida MIDI. + +@knownissues + +Muchhos efectos con interés musical como el swing, la articulación, el +fraseo, etc., no se traducen al midi. + +La salida midi reserva un canal para cada pentagrama, y uno más para +los ajustes globales. Por ello, el archivo de entrada no debería +tener más de 15 pentagramas (o 14 si no usa percusión). Los otros +pentagramas permanecerán en silencio. + +No todos los reproductores de midi manejan correctamente los cambios +de tempo en la salida midi. Entre los reproductores que se sabe que +funcionan, se encuentra +@uref{http://@/timidity@/.sourceforge@/.net/,timidity}. + + +@menu +* Creating MIDI files:: +* MIDI block:: +* What goes into the MIDI output?:: +* Repeats in MIDI:: +* Controlling MIDI dynamics:: +@end menu + +@node Creating MIDI files +@subsection Creating MIDI files + +Para crear un MIDI a partir de una pieza de música, escriba un bloque +@code{\midi} en la partitura, por ejemplo: + +@example +\score @{ + @var{...música...} + \midi @{ + \context @{ + \Score + tempoWholesPerMinute = #(ly:make-moment 72 4) + @} + @} +@} +@end example + +El tempo se puede especificar utilizando la instrucción @code{\tempo} +dentro de la propia música, véase @ref{Metronome marks}. Más abajo se +muestra una alternativa que no da lugar a una indicación metronómica +en la partitura impresa. En este ejemplo, el tempo de negras se +establece en 72 pulsos por minuto. Esta clase de especificación del +tempo no puede tomar notas con puntillo como argumento. En este caso, +divida las notas con puntillo en unidades más pequeñas. Por ejemplo, +un tempo de 90 negras con puntillo por minuto se puede especificar +como 270 corcheas por minuto: + +@example +tempoWholesPerMinute = #(ly:make-moment 270 8) +@end example + +Si hay una instrucción @code{\midi} dentro de un @code{\score}, +solamente se producirá MIDI. Si se necesita también una notación +impresa, se debe escribir un bloque @code{\layout} + +@example +\score @{ + @var{...música...} + \midi @{ @} + \layout @{ @} +@} +@end example +@cindex layout, bloque + + + +Se interpretan las ligaduras de unión, los matices dinámicos y los +cambios de tempo. Las marcas dinámicas, crescendi y decrescendi se +traducen en niveles de volumen MIDI. Las marcas de dinámica se +traducen a una fracción fija del rango de volumen MIDI disponible, los +crescendi y decrescendi hacen que el volumen varíe de forma lineal +entre sus dos extremos. Las fracciones se pueden ajustar mediante +@code{dynamicAbsoluteVolumeFunction} dentro de un contexto +@rinternals{Voice}. Para cada tipo de instrumento MIDI se puede +definir un rango de volumen. Esto proporciona un control de +ecualización básico, que puede realzar significativamente la calidad +de la salida MIDI. El ecualizador se puede controlar estableciendo un +valor para @code{instrumentEqualizer}, o fijando + +@example +\set Staff.midiMinimumVolume = #0.2 +\set Staff.midiMaximumVolume = #0.8 +@end example + +Para quitar los matices dinámicos de la salida MIDI, escriba las +siguientes líneas dentro de la sección @code{\midi@{@}}. + +@example +\midi @{ + ... + \context @{ + \Voice + \remove "Dynamic_performer" + @} +@} +@end example + + +@knownissues + +Los (de)crescendos sin terminar no se procesarán adecuadamente en el +archivo midi, dando como resultado pasajes de música en silenco. Una +forma de sortearlo es terminar el (de)crescendo explícitamente. Por +ejemmplo, + +@example +@{ a\< b c d\f @} +@end example + +@noindent +no funcionará bien, pero + +@example +@{ a\< b c d\!\f @} +@end example + +@noindent +sí lo hará. + + +Solamente se crea una salida MIDI cuando la instrucción @code{\midi} +está dentro de un bloque @code{\score}. Si lo escribe dentro de un +contexto instanciado explícitamente (es decir: @code{\new Score} ) el +archivo no se producirá. Para solucionarlo, encierre el @code{\new +Score} y el @code{\midi} dentro de un bloque @code{\score}. + +@example +\score @{ + \new Score @{ @dots{}notas@dots{} @} + \midi +@} +@end example + + +@unnumberedsubsubsec Instrument names +@cindex instrumento, nombres de +@funindex Staff.midiInstrument + +El nombre del instrumento MIDI se establece mediante la propiedad +@code{Staff.midiInstrument}. El nombre del instrumento se debe elegir +de entre los que están en la lista que aparece en @ref{MIDI +instruments}. + +@example +\set Staff.midiInstrument = "glockenspiel" +@var{...notes...} +@end example + +Si el instrumento elegido no coincide exactamente con uno de los +instrumentos de la lista de instrumentos MIDI, se usará el instrumento +Piano de Cola (@code{"acoustic grand"}). + + +@node MIDI block +@subsection MIDI block + +@cindex bloque MIDI + + +El bloque @code{\midi} es similar al bloque @code{\layout}, pero algo +más simple. Puede contener definiciones de contexto. + + +@cindex contexto, definición de + +Las definiciones de contexto siguen con exactitud la misma sintaxis +que dentro del bloque \layout. Los módulos de traducción para el +sonido reciben el nombre de «performers» o intérpretes. Los contextos +para la salida MIDI se encuentran definidos dentro de +@file{ly/@/performer@/-init@/.ly}. + + +@node What goes into the MIDI output? +@subsection What goes into the MIDI output? + +@untranslated + +@unnumberedsubsubsec Supported in MIDI +@unnumberedsubsubsec Unsupported in MIDI + +@node Repeats in MIDI +@subsection Repeats in MIDI + +@cindex repeticiones, expandir +@funindex \unfoldRepeats + +Con un poco de trucaje, se puede hacer que cualquier tipo de +repetición esté presente en la salida MIDI. Esto se consigue mediante +la aplicación de la función musical @code{\unfoldRepeats}. Esta +función cambia todas las repeticiones a repeticiones desplegadas. -@node context list FIXME -@subsection context list FIXME +@lilypond[quote,verbatim,fragment,line-width=8.0\cm] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond -UNTRANSLATED NODE: IGNORE ME +Al crear un archivo de partitura que use @code{\unfoldRepeats} para el +MIDI, es necesario hacer dos bloques @code{\score}: uno para el MIDI +(con repeticiones desplegadas) y otro para la notación impresa (con +repeticiones de volta --primera y segunda vez--, tremolo --trémolo--, +y percent --repetición de compases--). Por ejemplo, -@node another thing FIXME -@subsection another thing FIXME +@example +\score @{ + @var{..música..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..música..} + \midi @{ .. @} +@} +@end example -UNTRANSLATED NODE: IGNORE ME -@node Input modes FIXME -@subsection Input modes FIXME +@node Controlling MIDI dynamics +@subsection Controlling MIDI dynamics -UNTRANSLATED NODE: IGNORE ME +@untranslated --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@unnumberedsubsubsec Dynamic marks +@unnumberedsubsubsec Overall MIDI volume +@unnumberedsubsubsec Equalizing different instruments (i) +@unnumberedsubsubsec Equalizing different instruments (ii) diff --git a/Documentation/es/user/install.itely b/Documentation/es/user/install.itely index 16fc086c97..384fecd6d4 100644 --- a/Documentation/es/user/install.itely +++ b/Documentation/es/user/install.itely @@ -74,7 +74,7 @@ win32-x86 @node Compiling from source @section Compiling from source -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Downloading source code:: @@ -87,12 +87,12 @@ UNTRANSLATED NODE: IGNORE ME @node Downloading source code @subsection Downloading source code -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Requirements @subsection Requirements -UNTRANSLATED NODE: IGNORE ME +@untranslated @unnumberedsubsubsec Compilation @unnumberedsubsubsec Running requirements @@ -100,24 +100,24 @@ UNTRANSLATED NODE: IGNORE ME @node Building LilyPond @subsection Building LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated @unnumberedsubsubsec Compiling @unnumberedsubsubsec Compiling for multiple platforms @node Building documentation without compiling LilyPond @subsection Building documentation without compiling LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Testing LilyPond @subsection Testing LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Problems @subsection Problems -UNTRANSLATED NODE: IGNORE ME +@untranslated @unnumberedsubsubsec Bison 1.875 @unnumberedsubsubsec Solaris diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/user/introduction.itely index ef6fe95ccc..7353cbb37f 100644 --- a/Documentation/es/user/introduction.itely +++ b/Documentation/es/user/introduction.itely @@ -871,7 +871,7 @@ Esta sección proporciona detalles sobre notación especial que solamente será útil para ciertos grupos de instrumentos (o voces). @item -@ruser{Input syntax}: +@ruser{General input and output}: trata de información general sobre los archivos de LilyPond y el control sobre la salida. diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely index fc740dedba..eb068bec64 100644 --- a/Documentation/es/user/keyboards.itely +++ b/Documentation/es/user/keyboards.itely @@ -33,9 +33,7 @@ @node References for keyboards @subsubsection References for keyboards -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -74,7 +72,7 @@ Las voces se pueden cambiar de pentagrama manualmente usando la instrucción La cadena @var{nombre_del_pentagrama} es el nombre del pentagrama. Cambia la voz actual de su pentagrama en curso al pentagrama de nombre @var{nombre_del_pentagrama}. Por lo común @var{nombre_del_pentagrama} -es @code{"up"} o @code{"down"}. El @context{Staff} referido debe +es @code{"up"} o @code{"down"}. El @code{Staff} referido debe existir previamente, por ello normalmente la preparación de una partitura empezará por la preparación de los pentagramas, @@ -90,7 +88,7 @@ partitura empezará por la preparación de los pentagramas, @end example -y la @context{Voice} se inserta con posterioridad +y la @code{Voice} se inserta con posterioridad @example \context Staff = down @@ -316,9 +314,7 @@ Referencia de la notación: @ref{Ties} (laissez vibrer). @node Discant symbols @subsubsection Discant symbols -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml diff --git a/Documentation/es/user/lilypond-book.itely b/Documentation/es/user/lilypond-book.itely index 9a34189af4..6c623161df 100644 --- a/Documentation/es/user/lilypond-book.itely +++ b/Documentation/es/user/lilypond-book.itely @@ -984,7 +984,7 @@ del método automatizado con @command{lilypond-book}. Si tiene que citar muchos fragmentos extraídos de una partitura grade, puede también usar la capacidad de recorte de sistemas, véase -@ruser{Extracting fragments of notation}. +@ruser{Extracting fragments of music}. @node Inserting LilyPond output into OpenOffice.org diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/user/lilypond.tely index c3b36153a0..d69333f228 100644 --- a/Documentation/es/user/lilypond.tely +++ b/Documentation/es/user/lilypond.tely @@ -203,8 +203,7 @@ de la presente documentación y de otras. @menu * Musical notation:: Notación musical. * Specialist notation:: Notación especializada. -* Input syntax:: General information about lilypond input files. -* Non-musical notation:: Salida que no es notación musical. +* General input and output:: General information about LilyPond input and output. * Spacing issues:: Presentación de la salida sobre papel. * Changing defaults:: Ajuste fino de la salida. * Interfaces for programmers:: Utilización por expertos. @@ -227,7 +226,6 @@ Apéndices @include specialist.itely @include input.itely -@include non-music.itely @include spacing.itely @include changing-defaults.itely diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi index 33859d863b..a4d2e17890 100644 --- a/Documentation/es/user/macros.itexi +++ b/Documentation/es/user/macros.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: d0333749421c9695907a4da61a6e1cd7eafcb726 + Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -25,6 +25,15 @@ @quotedblleft{}\TEXT\@quotedblright{} @end macro +@ifhtml +@macro warning{TEXT} +@cartouche +@b{Nota:} \TEXT\ +@end cartouche +@end macro +@end ifhtml + +@ifnothtml @macro warning{TEXT} @quotation @quotation @@ -34,6 +43,7 @@ @end quotation @end quotation @end macro +@end ifnothtml @ifnotinfo @macro notation{TEXT} @@ -106,18 +116,6 @@ @end macro -@c * Deprecated: not in English macros.itexi * -@macro context{TEXT} -@vindex \TEXT\ -@code{\TEXT\}@c should use rinternals -@end macro - -@c * Deprecated: not in English macros.itexi * -@macro refcommand{TEXT} -@vindex \TEXT\ -@code{\TEXT\} -@end macro - @macro lydoctitle {TEXT} @emph{\TEXT\} @@ -132,52 +130,41 @@ @c **** Links and references **** -@c Possibly deprecated; under discussion. -@c usage: @lsr{ancient,custodes.ly} -@macro lsr{DIR,TEXT} -@ifhtml -@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}} -@end ifhtml -@ifnothtml -@file{\DIR\/\TEXT\} -@end ifnothtml -@end macro - -@macro lsrdir{DIR} -@ifhtml -@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/} -@end ifhtml -@ifnothtml -\DIR\ -@end ifnothtml -@end macro - - @c Definitions for references: -@c @rinternals @c @rglos -@c @rprogram -@c @ruser @c @rlearning +@c @ruser +@c @rprogram +@c @rlsr +@c @rinternals +@c all these also have a @...named version, which allows to specify the +@c displayed text for the reference as second argument -@ifhtml -@c ***** HTML ***** +@c ***** HTML + bigpage is a special case (other manual names), all other +@c formats are treated similarly + +@ifnottex @ifset bigpage -@macro rinternals{TEXT} +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals-big-page,Referencia de Funcionamiento Interno} +@ref{\TEXT\,,,music-glossary-big-page,Glosario Musical} @end macro -@macro rglos{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary-big-page,Glosario Musical} +@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glosario Musical} @end macro -@macro rprogram{TEXT} +@macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program-big-page,Utilización del Programa} +@ref{\TEXT\,,,lilypond-learning-big-page,Manual de Aprendizaje} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manual de Aprendizaje} @end macro @macro ruser{TEXT} @@ -185,38 +172,52 @@ @ref{\TEXT\,,,lilypond-big-page,Referencia de la Notación} @end macro -@macro rlearning{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning-big-page,Manual de Aprendizaje} +@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Referencia de la Notación} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets-big-page,Fragmentos de código} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program-big-page,Utilización del Programa} @end macro -@end ifset +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Utilización del Programa} +@end macro +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets-big-page,Fragmentos de código} +@end macro -@ifclear bigpage +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Fragmentos de código} +@end macro @macro rinternals{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno} +@ref{\TEXT\,,,lilypond-internals-big-page,Referencia de Funcionamiento Interno} @end macro -@macro rglos{TEXT} +@macro rinternalsnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glosario Musical} +@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referencia de Funcionamiento Interno} @end macro -@macro rprogram{TEXT} +@end ifset + + +@ifclear bigpage + +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Utilización del Programa} +@ref{\TEXT\,,,music-glossary,Glosario Musical} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Referencia de la Notación} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glosario Musical} @end macro @macro rlearning{TEXT} @@ -224,26 +225,19 @@ @ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código} +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manual de Aprendizaje} @end macro -@end ifclear - -@end ifhtml - - -@ifdocbook -@c ***** DOCBOOK-XML ***** - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno} +@ref{\TEXT\,,,lilypond,Referencia de la Notación} @end macro -@macro rglos{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glosario Musical} +@ref{\TEXT\,,\DISPLAY\,lilypond,Referencia de la Notación} @end macro @macro rprogram{TEXT} @@ -251,95 +245,99 @@ @ref{\TEXT\,,,lilypond-program,Utilización del Programa} @end macro -@macro ruser{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Referencia de la Notación} -@end macro - -@macro rlearning{TEXT} +@macro rprogramnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Utilización del Programa} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Fragmentos de código} @end macro - - -@end ifdocbook - - -@ifinfo -@c **** INFO **** +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código} +@end macro @macro rinternals{TEXT} @vindex \TEXT\ -@inforef{\TEXT\,,lilypond-internals,Referencia de Funcionamiento Interno} +@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno} @end macro -@macro rglos{TEXT} +@macro rinternalsnamed{TEXT,DISPLAY} @vindex \TEXT\ -@inforef{\TEXT\,,music-glossary,Glosario Musical} +@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referencia de Funcionamiento Interno} @end macro -@macro rprogram{TEXT} +@end ifclear + +@end ifnottex + + +@c **** TEX **** +@iftex + +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Utilización del Programa} +@ref{\TEXT\,,,music-glossary,Glosario Musical} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Referencia de la Notación} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glosario Musical} @end macro @macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje} +@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código} +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning.es,Manual de Aprendizaje} @end macro - - -@end ifinfo - - -@c **** TEX **** -@iftex - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@code{\TEXT\} +@ref{\TEXT\,,,lilypond.es,Referencia de la Notación} @end macro -@macro rglos {TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glosario Musical} +@ref{\TEXT\,,\DISPLAY\,lilypond.es,Referencia de la Notación} @end macro @macro rprogram{TEXT} +@vindex \TEXT\ @ref{\TEXT\,,,lilypond-program.es,Utilización del Programa} @end macro -@macro ruser{TEXT} -@ref{\TEXT\,,,lilypond.es,Referencia de la Notación} -@end macro - -@macro rlearning{TEXT} -@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje} +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program.es,Utilización del Programa} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Fragmentos de código} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@code{\TEXT\} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@code{\DISPLAY\} +@end macro + @end iftex -@c Commands specific to translated docs +@c **** Macros specific to translated docs **** @c ugh, cannot set/define global variable 'translationof' in some way? @iftex @@ -360,3 +358,13 @@ Esta sección aún no está traducida; consulte el manual en inglés. @end macro +@ifhtml +@macro untranslated +UNTRANSLATED NODE: IGNORE ME +@end macro +@end ifhtml + +@ifnothtml +@macro untranslated +@end macro +@end ifnothtml diff --git a/Documentation/es/user/non-music.itely b/Documentation/es/user/non-music.itely deleted file mode 100644 index 2f0ea420e1..0000000000 --- a/Documentation/es/user/non-music.itely +++ /dev/null @@ -1,724 +0,0 @@ -@c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond.tely -@ignore - Translation of GIT committish: 0d5071774c7990f75685c18c732f293b8336ae6c - - When revising a translation, copy the HEAD committish of the - version that you are working on. See TRANSLATION for details. -@end ignore - -@c \version "2.11.51" - -@c A menu is needed before every deeper *section nesting of @node's; run -@c M-x texinfo-all-menus-update -@c to automatically fill in these menus before saving changes - -@node Non-musical notation -@chapter Non-musical notation - -Esta sección se ocupa de temas generales sobre lilypond, no de -notación específica. - -@menu -* Titles and headers:: -* MIDI output:: -* other midi:: -@end menu - - -@node Titles and headers -@section Titles and headers - -Casi toda la música impresa tiene un título y el nombre del -compositor; ciertas piezas tienen mucha más información. - -@menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: -@end menu - - -@node Creating titles -@subsection Creating titles - -Se crean títulos para cada uno de los bloques @code{\score} así como -para todo el archivo de entrada (o bloque @code{\book} (libro)). - -El contenido de cada título se extrae a partir de los bloques -@code{\header} (cabecera). El bloque de cabecera de un libro -contempla lo siguiente: - -@table @code -@funindex dedicatoria -@item dedication -El dedicatario de la música, centrado en lo alto de la primera página. - -@funindex title -@item title -El título de la música, centrado justo debajo de la -dedicatoria. - -@funindex subtitle -@item subtitle -Subtítulo, centrado debajo del título. - -@funindex subsubtitle -@item subsubtitle -Sub-subtítulo, centrado debajo del subtítulo. - -@funindex poet -@item poet -Nombre del poeta, a la izquierda, debajo del subtítulo. - -@funindex composer -@item composer -Nombre del compositor, a la derecha, debajo del subtítulo. - -@funindex meter -@item meter -Texto de la medida, a la izquierda, debajo del poeta. - -@funindex opus -@item opus -Nombre del Opus, a la derecha, debajo del compositor. - -@funindex arranger -@item arranger -Nombre del arreglista, a la derecha, debajo del Opus. - -@funindex instrument -@item instrument -Nombre del instrumento, centrado, debajo del arreglista. También -aparece centrado en lo alto de cada página (aparte de la primera). - -@funindex piece -@item piece -Nombre de la pieza, a la izquierda, debajo del instrumento. - -@cindex página, saltos, forzar -@funindex breakbefore -@item breakbefore -Esto fuerza que el título comience sobre una página nueva (establézcalo a ##t o a ##f). - -@funindex copyright -@item copyright -Aviso de Copyright, centrado en la parte inferior de la primera -página. Para insertar el símbolo de copyright symbol, consulte -@ref{Text encoding}. - -@funindex tagline -@item tagline -Cartel de propósito general en el pie de página, centrado al final de la última. - -@end table - -A continuación presentamos una demostración de todos los campos que -están disponibles. Fíjese en que puede utilizar en la cabecera -cualquier instrucción de marcado de texto (Véase @ref{Formatting text}). - -@lilypond[quote,verbatim,line-width=11.0\cm] -\paper { - line-width = 9.0\cm - paper-height = 10.0\cm -} - -\book { - \header { - dedication = "dedicated to me" - title = \markup \center-align { "Title first line" "Title second line, -longer" } - subtitle = "the subtitle," - subsubtitle = #(string-append "subsubtitle LilyPond version " -(lilypond-version)) - poet = "Poet" - composer = \markup \center-align { "composer" \small "(1847-1973)" } - texttranslator = "Text Translator" - meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge -"r" } - arranger = \markup { \fontsize #8.5 "a" \fontsize #2.5 "r" \fontsize -#-2.5 "r" \fontsize #-5.3 "a" \fontsize #7.5 "nger" } - instrument = \markup \bold \italic "instrument" - piece = "Piece" - } - - \score { - { c'1 } - \header { - piece = "piece1" - opus = "opus1" - } - } - \markup { - and now... - } - \score { - { c'1 } - \header { - piece = "piece2" - opus = "opus2" - } - } -} -@end lilypond - -Como se mostró anteriormente, puede usar varios bloques -@code{\header}. Cuando los mismos campos aparecen en distintos -bloques, tiene validez el último en definirse. A continuación un -breve ejemplo. - -@example -\header @{ - composer = "Compositor" -@} -\header @{ - piece = "Pieza" -@} -\score @{ - \new Staff @{ c'4 @} - \header @{ - piece = "Otra pieza" % sobreescribe a la anterior - @} -@} -@end example - -Si define la cabecera @code{\header} dentro del bloque @code{\score}, -por lo general se imprimirán solamente las cabeceras @code{piece} y -@code{opus}. Fíjese en que la expresión musical debe aparecer antes -del @code{\header}. - -@lilypond[quote,verbatim,line-width=11.0\cm] -\score { - { c'4 } - \header { - title = "title" % not printed - piece = "piece" - opus = "opus" - } -} -@end lilypond - -@funindex printallheaders -@noindent -Se puede cambiar este comportamiento (e imprimir todas las cabeceras -cuando la cabecera @code{\header} está definida dentro del bloque -@code{\score}) mediante la utilización de - -@example -\paper@{ - printallheaders=##t -@} -@end example - -@cindex copyright -@cindex tagline - -El pie de página por omisión se encuentra vacío, excepto para la -primera página, en la que se inserta el campo de @code{copyright} -extraído del @code{\header}, y para la última página, en la que se -escribe el cartel @code{tagline} sacado del bloque @code{\header}. La -línea por omisión para este cartel es @qq{Music engraving by LilyPond -(@var{version})}.@footnote{Las partituras bien tipografiadas son una -magnífica promoción para nosotros, así que por favor, si puede, -conserve intacta la línea del letrero.} - -Las cabeceras se pueden quitar completamente estableciendo su valor a -falso. - -@example -\header @{ - tagline = ##f - composer = ##f -@} -@end example - - -@node Custom titles -@subsection Custom titles - -Una opción más avanzada es cambiar las definiciones de las variables -siguientes dentro del bloque @code{\paper} block. El archivo de -inicio @file{ly/titling-init.ly} ofrece un listado de la disposición -predeterminada. - -@table @code -@funindex bookTitleMarkup -@item bookTitleMarkup - Es el título que se escribe en lo alto del documento de salida -completo. Normalmente contiene el compositor y el título de la pieza. - -@funindex scoreTitleMarkup -@item scoreTitleMarkup - Es el título que se coloca por encima de un bloque @code{\score}. -normalmente contiene el nombre del movimiento (campo @code{piece}). - -@funindex oddHeaderMarkup -@item oddHeaderMarkup - Es el encabezamiento de las páginas de numeración impar. - -@funindex evenHeaderMarkup -@item evenHeaderMarkup - Es el encabezamiento de las páginas de numeración par. Si se deja - sin especificar, se usará el encabezamiento de las páginas impares. - - De forma predeterminada, los encabezamientos se definen de tal forma -que el número de página está en el borde exterior, y el isntrumento -está centrado. - -@funindex oddFooterMarkup -@item oddFooterMarkup - Es el pie de las páginas de numeración impar. - -@funindex evenFooterMarkup -@item evenFooterMarkup - Es el pie de las páginas de numeración par. Si se deja sin - especificar, se usará en su lugar el encabezamiento de las páginas - impares. - - De forma predeterminada, el pie de página tiene el aviso de -copyright en la primera página, y el cartel @code{tagline} en la -última. -@end table - - -@cindex \paper -@cindex encabezamiento -@cindex header -@cindex pie -@cindex disposición de la página -@cindex títulos - -La definición siguiente pone el título en el extremo izquierdo, y el -compositor en el extremo derecho sobre una única línea. - -@verbatim -\paper { - bookTitleMarkup = \markup { - \fill-line { - \fromproperty #'header:title - \fromproperty #'header:composer - } - } -} -@end verbatim - -@node Reference to page numbers -@subsection Reference to page numbers - -Se puede marcar un lugar determinado de una partitura utilizando la -instrucción @code{\label} (etiqueta), bien en lo alto de la estructura -o bien dentro de la música. Posteriormente se puede hacer referencia -a esta etiqueta dentro de un elemento de marcado, para obtener el -número de la página en que se encuentra la marca, usando la -instrucción de marcado @code{\page-ref}. - -@lilypond[verbatim,line-width=11.0\cm] -\header { tagline = ##f } -\book { - \label #'firstScore - \score { - { - c'1 - \pageBreak \mark A \label #'markA - c' - } - } - - \markup { The first score begins on page \page-ref #'firstScore "0" "?" } - \markup { Mark A is on page \page-ref #'markA "0" "?" } -} -@end lilypond - -La instrucción de marcado @code{\page-ref} toma tres argumentos: -@enumerate -@item la etiqueta, un símbolo de scheme, p.ej. @code{#'firstScore}; -@item un elemento de marcado que se usará como medidor para estimar las dimensiones del marcado; -@item un elemento de marcado que se utilizará en sustitución del número de página si la etiqueta es desconocida. -@end enumerate - -El motivo de que se necesite un medidor es que en el momento en que se -están interpretando los marcados, los saltos de página aún no se han -producido y por tanto los números de página no se conocen todavía. -Para sortear este inconveniente, la interpretación real del marcado se -retrasa hasta un momento posterior; sin embargo, las dimensiones del -marcado se tienen que conocer de antemano, así que se usa el medidor -para decidir estas dimensiones. Si el libro tiene entre 10 y 99 -páginas, el medidor puede ser "00", es decir, un número de dos -dígitos. - -@predefined - -@funindex \label -@code{\label} -@funindex \page-ref -@code{\page-ref} - -@node Table of contents -@subsection Table of contents -Se puede insertar un índice general o tabla de contenidos utilizando -la instrucción @code{\markuplines \table-of-contents}. Los elementos -que deben aparecer en la tabla de contenidos se introducen con la -instrucción @code{\tocItem}, que se puede usar en el nivel más alto de -la jerarquía del código, o dentro de una expresión musical. - -@verbatim -\markuplines \table-of-contents -\pageBreak - -\tocItem \markup "Primera partitura" -\score { - { - c' % ... - \tocItem \markup "Un punto concreto dentro de la primera partitura" - d' % ... - } -} - -\tocItem \markup "Segunda partitura" -\score { - { - e' % ... - } -} -@end verbatim - -Los elementos de marcado que se usan para dar formato al índice -general se encuentran definidos dentro del bloque @code{\paper}. Los -elementos predeterminados son @code{tocTitleMarkup}, para dar formato -al título de la tabla, y @code{tocItemMarkup}, para aplicar formato a -los elementos del índice, que consisten en el título del elemento y el -número de página. Estas variables se pueden cambiar por parte del -usuario: - -@verbatim -\paper { - %% Traducir el título del índice al español: - tocTitleMarkup = \markup \huge \column { - \fill-line { \null "Índice general" \null } - \hspace #1 - } - %% usar una fuente mayor - tocItemMarkup = \markup \large \fill-line { - \fromproperty #'toc:text \fromproperty #'toc:page - } -} -@end verbatim - -Observe la forma en que nos referimos al texto y al número de página -del elemento de índice, dentro de la definición @code{tocItemMarkup}. - -También se pueden definir nuevas instrucciones y elementos de -marcado para crear índices generales más eleborados: -@itemize -@item en primer lugar, defina una variable de marcado nueva dentro del bloque @code{\paper} -@item luego defina una función de música cuyo propósito es añadir un elemento al índice general -utilizando esta variable de marcado del bloque @code{\paper}. -@end itemize - -En el ejemplo siguiente se define un estilo nuevo para introducir los -nombres de los actos de una ópera en el índice general: - -@verbatim -\paper { - tocActMarkup = \markup \large \column { - \hspace #1 - \fill-line { \null \italic \fromproperty #'toc:text \null } - \hspace #1 - } -} - -tocAct = -#(define-music-function (parser location text) (markup?) - (add-toc-item! 'tocActMarkup text)) -@end verbatim - -@lilypond[line-width=11.0\cm] -\header { tagline = ##f } -\paper { - tocActMarkup = \markup \large \column { - \hspace #1 - \fill-line { \null \italic \fromproperty #'toc:text \null } - \hspace #1 - } -} - -tocAct = -#(define-music-function (parser location text) (markup?) - (add-toc-item! 'tocActMarkup text)) - -\book { - \markuplines \table-of-contents - \tocAct \markup { Atto Primo } - \tocItem \markup { Coro. Viva il nostro Alcide } - \tocItem \markup { Cesare. Presti omai l'Egizzia terra } - \tocAct \markup { Atto Secondo } - \tocItem \markup { Sinfonia } - \tocItem \markup { Cleopatra. V'adoro, pupille, saette d'Amore } - \markup \null -} -@end lilypond - -@seealso - -Archivos de inicio: @file{ly/@/toc@/-init@/.ly}. - -@predefined - -@funindex \table-of-contents -@code{\table-of-contents} -@funindex \tocItem -@code{\tocItem} - -@node MIDI output -@section MIDI output - -@cindex sonido -@cindex MIDI - -El MIDI (Musical Instrument Digital Interface, Interfase Digital para -Instrumentos Musicales) es un estándar para interconectar y controlar -instrumentos musicales electrónicos. Un archivo o secuencia MIDI es -una serie de notas dentro de un conjunto de pistas. No es un archivoo -de sonidos reales; se necesita un programa reproductor especial para -traducir la serie de notas en sonidos de verdad. - -Cualquier música se puede convertir a archivos MIDI, de manera que -podamos escuchar lo que hayamos introducido. Esto es muy conveniente -para comprobar la corrección de la música; las octavas equivocadas o -las alteraciones erróneas se ponen de relieve muy claramente al -escuchar la salida MIDI. - -@knownissues - -Muchhos efectos con interés musical como el swing, la articulación, el -fraseo, etc., no se traducen al midi. - -La salida midi reserva un canal para cada pentagrama, y uno más para -los ajustes globales. Por ello, el archivo de entrada no debería -tener más de 15 pentagramas (o 14 si no usa percusión). Los otros -pentagramas permanecerán en silencio. - -No todos los reproductores de midi manejan correctamente los cambios -de tempo en la salida midi. Entre los reproductores que se sabe que -funcionan, se encuentra -@uref{http://@/timidity@/.sourceforge@/.net/,timidity}. - -@menu -* Creating MIDI files:: -* MIDI block:: -* MIDI instrument names:: -* What goes into the MIDI? FIXME:: -@end menu - -@node Creating MIDI files -@subsection Creating MIDI files - -Para crear un MIDI a partir de una pieza de música, escriba un bloque -@code{\midi} en la partitura, por ejemplo: - -@example -\score @{ - @var{...música...} - \midi @{ - \context @{ - \Score - tempoWholesPerMinute = #(ly:make-moment 72 4) - @} - @} -@} -@end example - -El tempo se puede especificar utilizando la instrucción @code{\tempo} -dentro de la propia música, véase @ref{Metronome marks}. Más abajo se -muestra una alternativa que no da lugar a una indicación metronómica -en la partitura impresa. En este ejemplo, el tempo de negras se -establece en 72 pulsos por minuto. Esta clase de especificación del -tempo no puede tomar notas con puntillo como argumento. En este caso, -divida las notas con puntillo en unidades más pequeñas. Por ejemplo, -un tempo de 90 negras con puntillo por minuto se puede especificar -como 270 corcheas por minuto: - -@example -tempoWholesPerMinute = #(ly:make-moment 270 8) -@end example - -Si hay una instrucción @code{\midi} dentro de un @code{\score}, -solamente se producirá MIDI. Si se necesita también una notación -impresa, se debe escribir un bloque @code{\layout} - -@example -\score @{ - @var{...música...} - \midi @{ @} - \layout @{ @} -@} -@end example -@cindex layout, bloque - - - -Se interpretan las ligaduras de unión, los matices dinámicos y los -cambios de tempo. Las marcas dinámicas, crescendi y decrescendi se -traducen en niveles de volumen MIDI. Las marcas de dinámica se -traducen a una fracción fija del rango de volumen MIDI disponible, los -crescendi y decrescendi hacen que el volumen varíe de forma lineal -entre sus dos extremos. Las fracciones se pueden ajustar mediante -@code{dynamicAbsoluteVolumeFunction} dentro de un contexto -@rinternals{Voice}. Para cada tipo de instrumento MIDI se puede -definir un rango de volumen. Esto proporciona un control de -ecualización básico, que puede realzar significativamente la calidad -de la salida MIDI. El ecualizador se puede controlar estableciendo un -valor para @code{instrumentEqualizer}, o fijando - -@example -\set Staff.midiMinimumVolume = #0.2 -\set Staff.midiMaximumVolume = #0.8 -@end example - -Para quitar los matices dinámicos de la salida MIDI, escriba las -siguientes líneas dentro de la sección @code{\midi@{@}}. - -@example -\midi @{ - ... - \context @{ - \Voice - \remove "Dynamic_performer" - @} -@} -@end example - - -@knownissues - -Los (de)crescendos sin terminar no se procesarán adecuadamente en el -archivo midi, dando como resultado pasajes de música en silenco. Una -forma de sortearlo es terminar el (de)crescendo explícitamente. Por -ejemmplo, - -@example -@{ a\< b c d\f @} -@end example - -@noindent -no funcionará bien, pero - -@example -@{ a\< b c d\!\f @} -@end example - -@noindent -sí lo hará. - - -Solamente se crea una salida MIDI cuando la instrucción @code{\midi} -está dentro de un bloque @code{\score}. Si lo escribe dentro de un -contexto instanciado explícitamente (es decir: @code{\new Score} ) el -archivo no se producirá. Para solucionarlo, encierre el @code{\new -Score} y el @code{\midi} dentro de un bloque @code{\score}. - -@example -\score @{ - \new Score @{ @dots{}notas@dots{} @} - \midi -@} -@end example - - -@node MIDI block -@subsection MIDI block -@cindex bloque MIDI - - -El bloque @code{\midi} es similar al bloque @code{\layout}, pero algo -más simple. Puede contener definiciones de contexto. - - -@cindex contexto, definición de - -Las definiciones de contexto siguen con exactitud la misma sintaxis -que dentro del bloque \layout. Los módulos de traducción para el -sonido reciben el nombre de «performers» o intérpretes. Los contextos -para la salida MIDI se encuentran definidos dentro de -@file{ly/@/performer@/-init@/.ly}. - - -@node MIDI instrument names -@subsection MIDI instrument names - -@cindex instrumento, nombres de -@funindex Staff.midiInstrument - -El nombre del instrumento MIDI se establece mediante la propiedad -@code{Staff.midiInstrument}. El nombre del instrumento se debe elegir -de entre los que están en la lista que aparece en @ref{MIDI -instruments}. - -@example -\set Staff.midiInstrument = "glockenspiel" -@var{...notes...} -@end example - -Si el instrumento elegido no coincide exactamente con uno de los -instrumentos de la lista de instrumentos MIDI, se usará el instrumento -Piano de Cola (@code{"acoustic grand"}). - - -@node What goes into the MIDI? FIXME -@subsection What goes into the MIDI? FIXME - -@menu -* Repeats and MIDI:: -@end menu - -@node Repeats and MIDI -@subsubsection Repeats and MIDI - -@cindex repeticiones, expandir -@funindex \unfoldRepeats - -Con un poco de trucaje, se puede hacer que cualquier tipo de -repetición esté presente en la salida MIDI. Esto se consigue mediante -la aplicación de la función musical @code{\unfoldRepeats}. Esta -función cambia todas las repeticiones a repeticiones desplegadas. - -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } -} -\bar "|." -@end lilypond - -Al crear un archivo de partitura que use @code{\unfoldRepeats} para el -MIDI, es necesario hacer dos bloques @code{\score}: uno para el MIDI -(con repeticiones desplegadas) y otro para la notación impresa (con -repeticiones de volta --primera y segunda vez--, tremolo --trémolo--, -y percent --repetición de compases--). Por ejemplo, - -@example -\score @{ - @var{..música..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..música..} - \midi @{ .. @} -@} -@end example - - -@node other midi -@section other midi - -Los microtonos también se exportan hacia el archivo MIDI. - - - - diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/user/percussion.itely index c614515832..7f96f6070c 100644 --- a/Documentation/es/user/percussion.itely +++ b/Documentation/es/user/percussion.itely @@ -32,7 +32,7 @@ se puede utilizar para mostrar los valores rítmicos una melodía. @node References for percussion @subsubsection References for percussion -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Basic percussion notation diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/user/pitches.itely index 3ae57fcf37..0144186977 100644 --- a/Documentation/es/user/pitches.itely +++ b/Documentation/es/user/pitches.itely @@ -84,7 +84,7 @@ Glosario musical: @rglos{Pitch names}. Fragmentos de código: -@lsrdir{Pitches,Pitches}. +@rlsr{Pitches}. @node Relative octave entry diff --git a/Documentation/es/user/programming-interface.itely b/Documentation/es/user/programming-interface.itely index 1946ae40a7..20f33c492f 100644 --- a/Documentation/es/user/programming-interface.itely +++ b/Documentation/es/user/programming-interface.itely @@ -1,34 +1,36 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 66dde21fe63499f32a718f6098abe70e1429059b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Interfaces for programmers @chapter Interfaces for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Music functions:: * Programmer interfaces:: * Building complicated functions:: * Markup programmer interface:: * Contexts for programmers:: * Scheme procedures as properties:: -@end menu +* TODO moved into scheme:: +@end menu + @node Music functions @section Music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Overview of music functions:: * Simple substitution functions:: * Paired substitution functions:: @@ -36,149 +38,199 @@ UNTRANSLATED NODE: IGNORE ME * Void functions:: * Functions without arguments:: * Overview of available music functions:: -@end menu +@end menu + @node Overview of music functions @subsection Overview of music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Simple substitution functions @subsection Simple substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Paired substitution functions @subsection Paired substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Mathematics in functions @subsection Mathematics in functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Void functions @subsection Void functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Functions without arguments @subsection Functions without arguments -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Overview of available music functions @subsection Overview of available music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @include identifiers.tely @node Programmer interfaces @section Programmer interfaces -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Input variables and Scheme:: * Internal music representation:: -@end menu +@end menu + @node Input variables and Scheme @subsection Input variables and Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Internal music representation @subsection Internal music representation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Building complicated functions @section Building complicated functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Displaying music expressions:: * Music properties:: * Doubling a note with slurs (example):: * Adding articulation to notes (example):: -@end menu +@end menu + @node Displaying music expressions @subsection Displaying music expressions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music properties @subsection Music properties -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Doubling a note with slurs (example) @subsection Doubling a note with slurs (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Adding articulation to notes (example) @subsection Adding articulation to notes (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Markup programmer interface @section Markup programmer interface -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Markup construction in Scheme:: * How markups work internally:: * New markup command definition:: * New markup list command definition:: -@end menu +@end menu + @node Markup construction in Scheme @subsection Markup construction in Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node How markups work internally @subsection How markups work internally -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup command definition @subsection New markup command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup list command definition @subsection New markup list command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Contexts for programmers @section Contexts for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Context evaluation:: * Running a function on all layout objects:: -@end menu +@end menu + @node Context evaluation @subsection Context evaluation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Running a function on all layout objects @subsection Running a function on all layout objects -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Scheme procedures as properties @section Scheme procedures as properties -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node TODO moved into scheme +@section TODO moved into scheme + +@untranslated + + +@menu +* Using Scheme code instead of \tweak:: +* Difficult tweaks:: +@end menu + +@node Using Scheme code instead of \tweak +@subsection Using Scheme code instead of @code{\tweak} + +@untranslated + + +@node Difficult tweaks +@subsection Difficult tweaks + +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely index f80fae53cc..f56c28309d 100644 --- a/Documentation/es/user/rhythms.itely +++ b/Documentation/es/user/rhythms.itely @@ -121,8 +121,8 @@ otros ajustes que controlan la notación proporcional, consulte Normalmente los puntillos se desplazan hacia arriba para evitar las líneas del pentagrama, excepto en situaciones de polifonía. Para -forzar una dirección concreta de forma manual, véase @ref{Controlling -direction and placement}. +forzar una dirección concreta de forma manual, véase @ref{Direction +and placement}. @predefined @@ -255,7 +255,7 @@ Manual de aprendizaje: Referencia de la notación: @ref{Time administration}, @ref{Scaling durations}, -@ref{Objects connected to the input}, +@ref{The tweak command}, @ref{Polymetric notation}. Fragmentos de código: @@ -451,7 +451,7 @@ percusión. Se pueden introducir de la siguiente manera: Es posible controlar la colocación vertical de las ligaduras de unión; véase la sección de instrucciones predefinidas, o para ver más -detalles, consulte @ref{Controlling direction and placement}. +detalles, consulte @ref{Direction and placement}. @cindex ligaduras, apariencia @@ -963,7 +963,7 @@ para indicar dónde se pueden producir los saltos. @node Polymetric notation @subsubsection Polymetric notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Automatic note splitting diff --git a/Documentation/es/user/running.itely b/Documentation/es/user/running.itely index 097a5a474f..519eefbc45 100644 --- a/Documentation/es/user/running.itely +++ b/Documentation/es/user/running.itely @@ -1,65 +1,91 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 66dde21fe63499f32a718f6098abe70e1429059b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Running LilyPond @chapter Running LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Normal usage:: * Command-line usage:: * Error messages:: * Updating files with convert-ly:: * Reporting bugs:: -@end menu +@end menu + @node Normal usage @section Normal usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Command-line usage @section Command-line usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + +@menu +* Invoking lilypond:: +* Command line options:: +* Environment variables:: +@end menu + +@node Invoking lilypond @subsection Invoking lilypond + +@untranslated + + +@node Command line options @subsection Command line options + +@untranslated + + +@node Environment variables @subsection Environment variables + +@untranslated + + @node Error messages @section Error messages -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Updating files with convert-ly @section Updating with @command{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subsection Command line options -@menu +@menu * Problems with convert-ly:: -@end menu +@end menu + @node Problems with convert-ly @subsection Problems with @code{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Reporting bugs @section Reporting bugs -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/user/spacing.itely index 715431be2b..29e3cf33be 100644 --- a/Documentation/es/user/spacing.itely +++ b/Documentation/es/user/spacing.itely @@ -1,78 +1,81 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 66dde21fe63499f32a718f6098abe70e1429059b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Spacing issues @chapter Spacing issues -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Paper and pages:: * Music layout:: -* Displaying spacing:: * Breaks:: * Vertical spacing:: * Horizontal spacing:: -* Page layout MOVED FROM LM:: -@end menu +* Fitting music onto fewer pages:: +@end menu + @node Paper and pages @section Paper and pages -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Paper size:: * Page formatting:: -@end menu +@end menu + @node Paper size @subsection Paper size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page formatting @subsection Page formatting -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music layout @section Music layout -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Setting the staff size:: * Score layout:: -@end menu +@end menu + @node Setting the staff size @subsection Setting the staff size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Score layout @subsection Score layout -UNTRANSLATED NODE: IGNORE ME - -@node Displaying spacing -@section Displaying spacing +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Breaks @section Breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Line breaking:: * Page breaking:: * Optimal page breaking:: @@ -80,154 +83,160 @@ UNTRANSLATED NODE: IGNORE ME * Minimal page breaking:: * Explicit breaks:: * Using an extra voice for breaks:: -@end menu +@end menu + @node Line breaking @subsection Line breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page breaking @subsection Page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page breaking @subsection Optimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page turning @subsection Optimal page turning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Minimal page breaking @subsection Minimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit breaks @subsection Explicit breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Using an extra voice for breaks @subsection Using an extra voice for breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing @section Vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Vertical spacing inside a system:: * Vertical spacing between systems:: * Explicit staff and system positioning:: * Two-pass vertical spacing:: * Vertical collision avoidance:: -@end menu +@end menu + @node Vertical spacing inside a system @subsection Vertical spacing inside a system -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing between systems @subsection Vertical spacing between systems -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit staff and system positioning @subsection Explicit staff and system positioning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Two-pass vertical spacing @subsection Two-pass vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical collision avoidance @subsection Vertical collision avoidance -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Horizontal spacing @section Horizontal Spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * Horizontal spacing overview:: * New spacing area:: * Changing horizontal spacing:: * Line length:: * Proportional notation:: -@end menu +@end menu + @node Horizontal spacing overview @subsection Horizontal spacing overview -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New spacing area @subsection New spacing area -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Changing horizontal spacing @subsection Changing horizontal spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Line length @subsection Line length -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Proportional notation @subsection Proportional notation -UNTRANSLATED NODE: IGNORE ME - -@node Page layout MOVED FROM LM -@section Page layout MOVED FROM LM +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Introduction to layout:: -* Global sizes:: -* Line breaks:: -* Page breaks:: -* Fitting music onto fewer pages:: -@end menu -@node Introduction to layout -@subsection Introduction to layout +@node Fitting music onto fewer pages +@section Fitting music onto fewer pages -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Global sizes -@subsection Global sizes -UNTRANSLATED NODE: IGNORE ME +@menu +* Displaying spacing:: +* Changing spacing:: +@end menu -@node Line breaks -@subsection Line breaks +@node Displaying spacing +@subsection Displaying spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Page breaks -@subsection Page breaks -UNTRANSLATED NODE: IGNORE ME +@node Changing spacing +@subsection Changing spacing -@node Fitting music onto fewer pages -@subsection Fitting music onto fewer pages +@untranslated -UNTRANSLATED NODE: IGNORE ME --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/es/user/specialist.itely b/Documentation/es/user/specialist.itely index b95042b3b4..b5239967ca 100644 --- a/Documentation/es/user/specialist.itely +++ b/Documentation/es/user/specialist.itely @@ -23,6 +23,7 @@ types of instrument or in specific styles. * Wind instruments:: * Chord notation:: * Ancient notation:: +* World music:: @end menu @include vocal.itely @@ -33,3 +34,4 @@ types of instrument or in specific styles. @include wind.itely @include chords.itely @include ancient.itely +@include world.itely diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely index d2db60d398..3b0475cf5b 100644 --- a/Documentation/es/user/text.itely +++ b/Documentation/es/user/text.itely @@ -325,7 +325,7 @@ usando la sintaxis específica del modo de @code{\markup}. @menu * Text markup introduction:: -* Common markup commands:: +* Selecting font and font size:: * Text alignment:: * Graphic notation inside markup:: * Music notation inside markup:: @@ -454,25 +454,25 @@ Los errores de sintaxis para el modo de marcado a menudo producen confusión. -@node Common markup commands -@subsubsection Common markup commands +@node Selecting font and font size +@subsubsection Selecting font and font size -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Text alignment @subsubsection Text alignment -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Graphic notation inside markup @subsubsection Graphic notation inside markup -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Music notation inside markup @subsubsection Music notation inside markup -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Multi-page markup @subsubsection Multi-page markup diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely index d6e5fbc980..8db1ef5cf7 100644 --- a/Documentation/es/user/tweaks.itely +++ b/Documentation/es/user/tweaks.itely @@ -384,7 +384,7 @@ tresillo corto. @end lilypond Encontrará más detalles de la instrucción @code{\tweak} en -@ruser{Objects connected to the input}. +@ruser{The tweak command}. Si los grupos anidados no comienzan en el mismo momento, su apariencia se puede modificar de la forma usual mediante instrucciones @@ -2326,8 +2326,8 @@ Observe en el segundo ejemplo la gran importancia que tiene saber qué contexto maneja un determinado objeto. Puesto que el objeto @code{MetronomeMark} se maneja dentro del contexto @code{Score}, los cambios de propiedades en el contexto @code{Voice} pasarán -inadvertidos. Para ver más detalles, consulte @ruser{Constructing a -tweak}. +inadvertidos. Para ver más detalles, consulte @ruser{The +\override command}. Si la propiedad de relleno @code{padding} de un objeto se incrementa cuando dicho objeto se encuentra en una pila de objetos que se están diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/user/unfretted-strings.itely index f4f3d08e7b..07df592439 100644 --- a/Documentation/es/user/unfretted-strings.itely +++ b/Documentation/es/user/unfretted-strings.itely @@ -12,7 +12,7 @@ @node Unfretted string instruments @section Unfretted string instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for unfretted strings:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for unfretted strings @subsection Common notation for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for unfretted strings:: @@ -32,12 +32,12 @@ UNTRANSLATED NODE: IGNORE ME @node References for unfretted strings @subsubsection References for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bowed instruments @subsection Bowed instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for bowed strings:: @@ -58,7 +58,7 @@ introducen marcando la nota que es un armónico mediante @code{\harmonic}. @node Plucked instruments @subsection Plucked instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Harp:: @@ -67,5 +67,5 @@ UNTRANSLATED NODE: IGNORE ME @node Harp @subsubsection Harp -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely index 4fbc2c96a7..1b26f31db0 100644 --- a/Documentation/es/user/vocal.itely +++ b/Documentation/es/user/vocal.itely @@ -583,7 +583,7 @@ se deben insertar a mano. @node Skipping notes @subsubsection Skipping notes -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Extenders and hyphens @subsubsection Extenders and hyphens @@ -620,7 +620,7 @@ Referencia de funcionamiento interno: @rinternals{LyricExtender}, @node Lyrics and repeats @subsubsection Lyrics and repeats -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Placement of lyrics @subsection Placement of lyrics @@ -714,7 +714,7 @@ lyr = \lyricmode { I like my cat! } @node Chants @subsubsection Chants -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Spacing out syllables @@ -763,7 +763,7 @@ completa, establezca la propiedad dentro del @q{layout} o disposición. @node Centering lyrics between staves @subsubsection Centering lyrics between staves -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Stanzas @subsection Stanzas @@ -884,7 +884,7 @@ texto, tal y como se muestra a continuación: more slow -- ly } \new Lyrics \lyricsto "lahlah" { - \set ignoreMelismata = ##t % applies to "fas" + \set ignoreMelismata = ##t % se aplica al "fas" go fas -- ter \unset ignoreMelismata still diff --git a/Documentation/es/user/wind.itely b/Documentation/es/user/wind.itely index 66af9fb7e0..887830e626 100644 --- a/Documentation/es/user/wind.itely +++ b/Documentation/es/user/wind.itely @@ -13,7 +13,7 @@ @node Wind instruments @section Wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for wind instruments:: @@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for wind instruments @subsection Common notation for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for wind instruments:: @@ -33,17 +33,17 @@ UNTRANSLATED NODE: IGNORE ME @node References for wind instruments @subsubsection References for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Half-holes @subsubsection Half-holes -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bagpipes @subsection Bagpipes -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Bagpipe definitions:: diff --git a/Documentation/es/user/world.itely b/Documentation/es/user/world.itely new file mode 100644 index 0000000000..52a903908d --- /dev/null +++ b/Documentation/es/user/world.itely @@ -0,0 +1,73 @@ +@c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*- +@c This file is part of lilypond.tely +@ignore + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e + + When revising a translation, copy the HEAD committish of the + version that you are working on. See TRANSLATION for details. +@end ignore + + +@node World music +@section World music + +@untranslated + + +@menu +* Arabic music:: +@end menu + +@node Arabic music +@subsection Arabic music + +@untranslated + + +@menu +* References for Arabic music:: +* Arabic note names :: +* Arabic key signatures:: +* Arabic time signatures:: +* Arabic music example:: +* Further reading:: +@end menu + +@node References for Arabic music +@unnumberedsubsubsec References for Arabic music + +@untranslated + + +@node Arabic note names +@unnumberedsubsubsec Arabic note names + +@untranslated + + +@node Arabic key signatures +@unnumberedsubsubsec Arabic key signatures + +@untranslated + + +@node Arabic time signatures +@unnumberedsubsubsec Arabic time signatures + +@untranslated + + +@node Arabic music example +@unnumberedsubsubsec Arabic music example + +@untranslated + + +@node Further reading +@unnumberedsubsubsec Further reading + +@untranslated + + + +@c -- SKELETON FILE -- diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile index 003d9c02bd..ad17d7e4cc 100644 --- a/Documentation/fr/GNUmakefile +++ b/Documentation/fr/GNUmakefile @@ -2,10 +2,6 @@ ISOLANG = fr depth = ../.. SUBDIRS = user STEPMAKE_TEMPLATES = documentation +LOCALSTEPMAKE_TEMPLATES = doc-i18n-root include $(depth)/make/stepmake.make - -local-WWW: lang-merge - -lang-merge: $(outdir)/index.html - ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in index 769b6d380a..c315519ce7 100644 --- a/Documentation/fr/index.html.in +++ b/Documentation/fr/index.html.in @@ -1,6 +1,6 @@ + diff --git a/Documentation/fr/translations.html.in b/Documentation/fr/translations.html.in index f34744b4e3..2e9c92b32b 100644 --- a/Documentation/fr/translations.html.in +++ b/Documentation/fr/translations.html.in @@ -1,16 +1,48 @@ -

Last updated Sat Jul 19 15:59:20 UTC 2008 +

Last updated Mon Aug 11 16:16:20 UTC 2008

+ + État de la traduction de la documentation de LilyPond + + +

Retour à l'accueil de la documentation

+ +

Avancement de la traduction de la documentation

+ +

Cette page présente pour chaque partie de la documentation de + LilyPond @TOPLEVEL_VERSION@ l'avancement de la traduction + francophone. Pour chaque partie sont indiqués le nombre de mots de + l'original en anglais, les noms des traducteurs et relecteurs, + le proportion de matériel traduit, l'état de mise à jour, et + l'indicateur de révision par rapport au Grand Documentation Project + (GDP). +

+ +

Au cours du GDP, la documentation en anglais a été complètement + remaniée, et sa révision se poursuit encore actuellement ; le rythme + de cette révision ne permet pas de maintenir toutes les traductions + à jour. Cependant, le fait que certaines traductions ne soient pas + du tout à jour (avec une indication sur fond rouge) ne signifient + pas qu'elles sont périmées, cela signifie juste que les traductions + n'atteignent pas la qualité de la documentation en anglais récemment + remaniée : les traducteurs font de leur mieux pour au moins mettre à + jour dans la documentation la syntaxe et les noms de commande + LilyPond. La mise à jour des traductions après le GDP est en + cours ; vous pouvez accélérer et améliorer ce processus en + participant aux traductions et relectures, qui sont organisées sur + la liste de diffusion + lilypond-user-fr@gnu.org. +

@@ -38,17 +70,17 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + + - + @@ -56,8 +88,8 @@ translations.template.html.in; DO NOT EDIT !--> Valentin Villenave
John Mandereau - - + + @@ -69,7 +101,7 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -192,11 +224,11 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude - + - + @@ -205,7 +237,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -214,7 +246,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -223,7 +255,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -232,7 +264,7 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - + @@ -259,11 +291,11 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -273,11 +305,11 @@ translations.template.html.in; DO NOT EDIT !--> Jean-Charles Malahieude - + - + @@ -285,12 +317,12 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + + @@ -303,20 +335,20 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - + @@ -330,11 +362,11 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -348,15 +380,24 @@ translations.template.html.in; DO NOT EDIT !--> - - + + + + + + + + + + - + - + @@ -364,15 +405,15 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + + - + @@ -388,12 +429,12 @@ translations.template.html.in; DO NOT EDIT !--> - + - - + + diff --git a/Documentation/fr/translations.template.html.in b/Documentation/fr/translations.template.html.in index b1d0d6db43..950c6bec2e 100644 --- a/Documentation/fr/translations.template.html.in +++ b/Documentation/fr/translations.template.html.in @@ -1,12 +1,44 @@ + + État de la traduction de la documentation de LilyPond + + +

Retour à l'accueil de la documentation

+ +

Avancement de la traduction de la documentation

+ +

Cette page présente pour chaque partie de la documentation de + LilyPond @TOPLEVEL_VERSION@ l'avancement de la traduction + francophone. Pour chaque partie sont indiqués le nombre de mots de + l'original en anglais, les noms des traducteurs et relecteurs, + le proportion de matériel traduit, l'état de mise à jour, et + l'indicateur de révision par rapport au Grand Documentation Project + (GDP). +

+ +

Au cours du GDP, la documentation en anglais a été complètement + remaniée, et sa révision se poursuit encore actuellement ; le rythme + de cette révision ne permet pas de maintenir toutes les traductions + à jour. Cependant, le fait que certaines traductions ne soient pas + du tout à jour (avec une indication sur fond rouge) ne signifient + pas qu'elles sont périmées, cela signifie juste que les traductions + n'atteignent pas la qualité de la documentation en anglais récemment + remaniée : les traducteurs font de leur mieux pour au moins mettre à + jour dans la documentation la syntaxe et les noms de commande + LilyPond. La mise à jour des traductions après le GDP est en + cours ; vous pouvez accélérer et améliorer ce processus en + participant aux traductions et relectures, qui sont organisées sur + la liste de diffusion + lilypond-user-fr@gnu.org. +

diff --git a/Documentation/fr/user/ancient.itely b/Documentation/fr/user/ancient.itely index 7544335515..79f6ff8e52 100644 --- a/Documentation/fr/user/ancient.itely +++ b/Documentation/fr/user/ancient.itely @@ -11,7 +11,7 @@ @node Ancient notation @section Ancient notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu @@ -60,7 +60,7 @@ grobs à une forme de notation particulière, ce qui évite la création de nouveaux concepts de notation. En plus des signes d'articulation standards décrits à la section -@ref{Articulations}, la notation ancienne dispose de signes particuliers. +@ref{Articulations and ornamentations}, la notation ancienne dispose de signes particuliers. @itemize @bullet @item @@ -113,14 +113,14 @@ Voici les points que nous allons aborder : @node Ancient notation supported @subsubsection Ancient notation supported -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Alternative note signs @subsection Alternative note signs -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu @@ -236,7 +236,7 @@ par la propriété @code{glyph-name-alist} de l'objet @seealso -Dans ce manuel : @ref{Pitches}, @ref{Cautionary accidentals}, et +Dans ce manuel : @ref{Pitches}, @ref{Accidentals}, et @ref{Automatic accidentals}, pour les principes généraux d'utilisation des altérations ; @ref{Key signature} pour les armures. @@ -681,7 +681,7 @@ plutôt un @code{\markup}. @node Additional note signs @subsection Additional note signs -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu @@ -699,7 +699,7 @@ UNTRANSLATED NODE: IGNORE ME @cindex articulations En plus des signes d'articulation standards décrits à la section -@ref{Articulations}, LilyPond fournit des articulations pour la musique +@ref{Articulations and ornamentations}, LilyPond fournit des articulations pour la musique ancienne. Elles sont spécifiquement destinées au style Editio Vaticana. @lilypond[quote,ragged-right,verbatim] @@ -1967,7 +1967,7 @@ s'intégrer avec d'autres préfixes dans n'importe quel ordre. @node Pre-defined contexts @subsection Pre-defined contexts -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu @@ -2050,7 +2050,7 @@ lancer dans la saisie de votre chant comme ci-après : @node Transcribing ancient music @subsection Transcribing ancient music -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Ancient and modern from one source:: @@ -2062,30 +2062,30 @@ UNTRANSLATED NODE: IGNORE ME @node Ancient and modern from one source @subsubsection Ancient and modern from one source -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Incipits @subsubsection Incipits -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Mensurstriche layout @subsubsection Mensurstriche layout -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Transcribing Gregorian chant @subsubsection Transcribing Gregorian chant -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Editorial markings @subsection Editorial markings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Annotational accidentals:: @@ -2131,5 +2131,5 @@ lancer dans la saisie de votre chant comme ci-après : @node Baroque rhythmic notation @subsubsection Baroque rhythmic notation -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely index a107f6f67e..34a76058bd 100644 --- a/Documentation/fr/user/changing-defaults.itely +++ b/Documentation/fr/user/changing-defaults.itely @@ -57,7 +57,7 @@ notation -- par exemple, le fait d'attribuer un chiffre de mesure distinct à ch @item La mise en page, autrement dit les marges, l'espacement, la taille du papier ; tous ces facteurs -font l'objet des chapitres @ref{Non-musical notation} et @ref{Spacing issues}. +font l'objet des chapitres @ref{General input and output} et @ref{Spacing issues}. @end itemize En sous-main, LilyPond se sert du langage Scheme (un dérivé du LISP) comme @@ -72,7 +72,7 @@ des listes, des chaînes de caractères ou des symboles, en Scheme.} @menu * Automatic notation:: * Interpretation contexts:: -* The \override command:: +* The override command:: @end menu @@ -80,368 +80,12 @@ des listes, des chaînes de caractères ou des symboles, en Scheme.} @section Automatic notation Cette section s'intéresse au réglage de l'impression automatique des -altérations accidentelles et ligatures. +ligatures. @menu -* Automatic accidentals:: * Setting automatic beam behavior:: @end menu -@node Automatic accidentals -@subsection Automatic accidentals -@cindex Altérations accidentelles automatiques - -Une fonction a été créée pour regrouper les règles suivant lesquelles -s'impriment les altérations. Elle s'invoque de la manière suivante : - -@funindex set-accidental-style -@example -#(set-accidental-style 'REGLE) -@end example - -@c TODO: check the context stuff below -@c -does it *really* work? -@c -the default contexts as specified in -@c scm/music-function.scm seem to be different -vv - -Cette fonction prend pour argument le nom de la règle d'altérations, -auquel peut s'ajouter, comme argument facultatif, le contexte -devant être affecté : - -@example -#(set-accidental-style 'REGLE #('CONTEXTE#)) -@end example - -Si aucun contexte n'est spécifié, le contexte @code{Staff} sera affecté ; -cependant on peut souhaiter l'appliquer au contexte @code{Voice} en lieu -et place. - -Les régles d'altérations suivantes sont possibles : - -@table @code -@item default -C'est la règle d'impression par défaut, qui se rapporte à l'usage -en vigueur au XVIIIème siècle : les altérations accidentelles sont valables toute -une mesure, et uniquement à leur propre octave. - - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - %#(set-accidental-style 'default) - \musicA } - \context Staff = "down"{ - %#(set-accidental-style 'default) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'default" }}} -} -@end lilypond - -@item voice -En principe, LilyPond se souvient de toutes les altérations présentes sur la -portée (contexte Staff). Avec cette règle, cependant, les altérations sont indépendantes -pour chacune des voix. - - -@example - \new Staff << - #(set-accidental-style 'voice) - @{ @dots{} @} - >> -@end example - -De ce fait, les altérations d'une voix sont ignorées dans les autres voix, -ce qui peut donner lieu à un résultat malencontreux. Dans l'exemple suivant, -il est difficile de dire si le deuxième @samp{la} est dièse ou naturel. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'voice) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'voice) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'voice" }}} -} -@end lilypond - -La règle @code{voice} n'est à envisager que dans le cas de voix devant être lues par -des musiciens différents. S'il s'agit d'un @q{conducteur}, ou d'une portée destinée -à un seul musicien, il vaut mieux utiliser @code{modern} ou @code{modern-cautionary}. - - -@item modern -@funindex modern style accidentals -Cette règle est la plus courante au XXème siècle. Les altérations accidentelles -sont imprimées comme avec le style @code{default}, mais lorsqu'une note non-altérée -apparaît à une octave différente, ou bien dans la mesure suivante, des bécarres de précaution -sont ajoutés. Dans l'exemple suivant, notez ainsi les deux bécarres dans la -deuxième mesure de la main droite. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'modern) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'modern) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'modern" }}} -} -@end lilypond - -@item @code{modern-cautionary} -@funindex modern-cautionary -Cette règle est équivalente à @code{modern}, mais les bécarres de précaution sont -imprimés de façon particulière : soit plus petits, soit (par défaut) entre parenthèses. -Il est possible de le définir au moyen de la propriété @code{cautionary-style} -pour l'objet @rinternals{AccidentalSuggestion}. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'modern-cautionary) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'modern-cautionary) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'modern-cautionary" }}} -} -@end lilypond - -@funindex modern-voice -@item modern-voice -Cette règle sert aux altérations dans de la musique polyphonique destinée -autant à des musiciens différents qu'à quelqu'un qui lirait l'ensemble des voix. -Les altérations sont imprimées voix par voix, mais les autres voix, dans le même -contexte @rinternals{Staff}, en @emph{tiennent compte} cette fois. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'modern-voice) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'modern-voice) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'modern-voice" }}} -} -@end lilypond - -@funindex modern-voice-cautionary -@item modern-voice-cautionary -Cette régle est similaire à la précédente, mais les altérations de précautions -(celles que n'aurait pas ajoutées @code{voice}), sont imprimées de façon -particulière. On retrouve donc toutes les altérations qu'imprimerait -@code{default}, mais certaines sont considérées comme étant @qq{de précaution}. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'modern-voice-cautionary) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'modern-voice-cautionary) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'modern-voice-cautionary" }}} -} -@end lilypond - -@item piano -@funindex piano accidentals -Cette règle est adaptée aux contextes GrandStaff -- ce qui n'empêche pas de devoir la spécifier -pour chaque portée individuelle au sein du contexte GrandStaff. - -@example -\new GrandStaff @{ << - \new Staff = "up" @{ << - #(set-accidental-style 'piano) - @{ @dots{} @} - >> @} - \new Staff = "down"@{ << - #(set-accidental-style 'piano) - @{ @dots{} @} - >> @} ->> @} -@end example - -Cette règle est communément employée pour les partitions de piano au XXème siècle. -Très similaire à @code{modern} de par son comportement, elle s'en distingue en ce que -les altérations tiennent compte des autre portées du contexte @rinternals{GrandStaff} ou -@rinternals{PianoStaff}. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'piano) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'piano) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'piano" }}} -} -@end lilypond - -@item piano-cautionary -@funindex #(set-accidental-style 'piano-cautionary) -Identique à @code{#(set-accidental-style 'piano)}, mais les altérations de précaution -sont imprimées différemment. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'piano-cautionary) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'piano-cautionary) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'piano-cautionary" }}} -} -@end lilypond - -@item no-reset -@funindex no-reset accidental style -C'est la même règle que @code{default}, mais l'effet des altérations accidentelles -ne cesse jamais, même dans les mesures suivantes. -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'no-reset) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'no-reset) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'no-reset" }}} -} -@end lilypond - -@item forget -Tout le contraire de @code{no-reset}: l'effet des altérations cesse aussitôt, -et de ce fait, toutes les altérations, quelque soit leur place dans la mesure, sont -imprimées, en fonction de l'éventuelle armure. - -@lilypond[quote,ragged-right] -musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ - \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } - -musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 - \change Staff = up cis' \change Staff = down - \change Staff = up dis' | \change Staff = down 4 gis - 2 | } }} - -\score { - \new PianoStaff { - << \context Staff = "up" { - #(set-accidental-style 'forget) - \musicA } - \context Staff = "down"{ - #(set-accidental-style 'forget) - \musicB } >> } - \header { piece = \markup {\fill-line { \fontsize #3 "'forget" }}} -} -@end lilypond -@end table - - -@seealso - -Référence du programme : @rinternals{Accidental_engraver}, -@rinternals{Accidental}, @rinternals{AccidentalSuggestion} et @rinternals{AccidentalPlacement}. - - -@knownissues - -Les notes simultanées sont considérées comme des évènements séquentiels. -Ce qui implique que, dans un accord, les altérations accidentelles seront -imprimées comme si les notes de l'accords apparaissaient une par une, en fonction -de l'ordre dans lequels elles ont été saisies -- ce qui peut poser problème lorsqu'au -sein d'un accord certaines altérations dépendent les unes des autres. -Ce problème est à résoudre manuellement, en insérant des @code{!} et des @code{?} après les notes -concernées. - - @node Setting automatic beam behavior @subsection Setting automatic beam behavior @@ -685,7 +329,7 @@ Ce changement étant appliqué @q{à la volée}, il n'affecte que le second grou Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer dans le contexte le plus restreint où elle est employée : le plus souvent - @context{ChordNames}, @context{Voice}, ou @context{Lyrics}. Dans l'exemple suivant, + @code{ChordNames}, @code{Voice}, ou @code{Lyrics}. Dans l'exemple suivant, @lilypond[quote,verbatim,relative=2,fragment] c8 c c c @@ -709,8 +353,8 @@ R1*2 @end lilypond Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau -supérieur est spécifié (par exemple @context{Staff}), la propriété sera modifée dans -tous les contextes inférieurs (tous les contextes @context{Voice}, par exemple) +supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans +tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple) qu'il contient. @funindex \unset @@ -921,7 +565,7 @@ La commande suivante : @noindent rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles sont 1,3 fois plus épaisses que les lignes de la portée). Dans la mesure où nous avons -indiqué @context{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ; +indiqué @code{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ; les autres portées demeureront intactes. @@ -934,10 +578,10 @@ c4 @end lilypond La commande @code{\override} modifie donc la définition de l'objet @code{Stem} -dans le contexte @context{Staff} ; toutes les hampes qui suivent seront affectées. +dans le contexte @code{Staff} ; toutes les hampes qui suivent seront affectées. Tout comme avec la commande @code{\set}, l'argument @var{contexte} peut être omis, auquel -cas le contexte par défaut (ici, @context{Voice}) sera employé. La commande @code{\once} +cas le contexte par défaut (ici, @code{Voice}) sera employé. La commande @code{\once} permet de n'appliquer la modification qu'une seule fois. @lilypond[quote,fragment,verbatim,relative=2] @@ -1026,9 +670,9 @@ de la musique dans le bloc @code{\layout}, au moyen de la commande @code{\contex @end example Le raccourci @code{\Staff} invoque les définitions inhérentes au contexte -@context{Staff}, de façon à ce qu'elles puissent être modifiées. +@code{Staff}, de façon à ce qu'elles puissent être modifiées. -Les lignes suivantes affecteront toutes les portées (tous les contextes @context{Staff}) +Les lignes suivantes affecteront toutes les portées (tous les contextes @code{Staff}) dans la partition. @example \set fontSize = #-2 @@ -1073,12 +717,12 @@ avoir invoqué @code{\RemoveEmptyStaffContext} : @node Defining new contexts @subsection Defining new contexts -Les contextes tels que @context{Staff} ou @code{Voice} sont faits +Les contextes tels que @code{Staff} ou @code{Voice} sont faits de briques de constructions empilées. En combinant divers graveurs, il est possible de créer de nouveaux types de contextes. Dans l'exemple suivant, on construit, de zéro, un nouveau contexte très -semblable à @context{Voice}, mais qui n'imprime que des têtes de notes en forme +semblable à @code{Voice}, mais qui n'imprime que des têtes de notes en forme de barres obliques au centre de la portée. Un tel contexte, par exemple, peut servir à indiquer un passage improvisé dans un morceau de jazz. @@ -1127,9 +771,9 @@ En lieu et place des points (@dots{}), voici les éléments à saisir : \name ImproVoice @end example -@item Comme il est très semblable à @context{Voice}, nous souhaitons que toutes les -commandes associées au @context{Voice} déjà existant, restent valables. D'où nécessité -de la commande @code{\alias}, qui va l'associer au contexte @context{Voice} : +@item Comme il est très semblable à @code{Voice}, nous souhaitons que toutes les +commandes associées au @code{Voice} déjà existant, restent valables. D'où nécessité +de la commande @code{\alias}, qui va l'associer au contexte @code{Voice} : @example \alias Voice @@ -1191,9 +835,9 @@ Récapitulons -- on se retrouve avec le bloc suivant : @funindex \accepts Ce n'est pas tout. En effet, on veut intégrer le nouveau contexte -@context{ImproVoice} dans la hiérarchie des contextes. Tout comme le +@code{ImproVoice} dans la hiérarchie des contextes. Tout comme le contexte @code{Voice}, sa place est au sein du contexte @code{Staff}. -Nous allons donc modifier le contexte @context{Staff}, +Nous allons donc modifier le contexte @code{Staff}, au moyen de la commande @code{\accepts} : @example @@ -1273,11 +917,11 @@ travaillent de concert. Comme leurs noms anglais l'indiquent, (@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis @code{VerticalAlignment} synchronise verticalement ces différents groupes. En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble -de la partition, mais chaque contexte @context{Staff}, @context{Lyrics}, etc. +de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc. possède son propre @code{VerticalAxisGroup}. -@node The \override command +@node The override command @section The @code{\override} command La commande @code{\override} permet de modifier la mise en page @@ -1296,9 +940,9 @@ La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte * Navigating the program reference:: * Layout interfaces:: * Determining the grob property:: -* Objects connected to the input:: -* Using Scheme code instead of \tweak:: -* \set versus \override:: +* The tweak command:: +* Using Scheme code instead of tweak:: +* set versus override:: * Difficult tweaks:: @end menu @@ -1318,7 +962,7 @@ ressemblent en général à Pour élaborer un réglage de ce type, on a besoin de connaître précisément : @itemize -@item le contexte : ici @context{Voice} (la voix). +@item le contexte : ici @code{Voice} (la voix). @item l'objet à affecter : ici @code{Stem} (les hampes). @item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait). @item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3). @@ -1554,7 +1198,7 @@ propriétés internes). Pour aller encore plus loin, plutôt que de simplement parler de l'objet @code{Fingering}, ce qui ne nous avance pas à grand chose, on peut aller explorer son âme même, dans les fichiers source de LilyPond (voir -@rlearning{Default files}), en l'occurence le fichier +@rlearning{Other sources of information}), en l'occurence le fichier @file{scm/@/define@/-grobs@/.scm} : @example @@ -1658,7 +1302,7 @@ f @end lilypond -Dans le cas présent, le réglage intervient dans le contexte @context{Voice}, +Dans le cas présent, le réglage intervient dans le contexte @code{Voice}, ce qui pouvait également se déduire de la Référence du programme, où la page du graveur @rinternals{Fingering_engraver} indique : @@ -1673,8 +1317,8 @@ Le graveur Fingering_engraver fait partie des contextes : @dots{} @rinternals{Vo @end quotation -@node Objects connected to the input -@subsection Objects connected to the input +@node The tweak command +@subsection The @code{\tweak} command @funindex \tweak @@ -1723,7 +1367,7 @@ pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet : Voir pour plus de détails @ref{Displaying music expressions}. -@node Using Scheme code instead of \tweak +@node Using Scheme code instead of tweak @subsection Using Scheme code instead of @code{\tweak} L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa @@ -1769,7 +1413,7 @@ Le dernier élément, dans ce bloc @code{let}, est la valeur finale de @samp{m} lui-même. -@node \set versus \override +@node set versus override @subsection @code{\set} vs. @code{\override} Si les propriétés peuvent être modifiées de deux façons, par les commandes diff --git a/Documentation/fr/user/chords.itely b/Documentation/fr/user/chords.itely index 78a252c38b..128504ff42 100644 --- a/Documentation/fr/user/chords.itely +++ b/Documentation/fr/user/chords.itely @@ -15,7 +15,7 @@ @node Chord notation @section Chord notation -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Chord mode:: @@ -26,7 +26,7 @@ UNTRANSLATED NODE: IGNORE ME @node Chord mode @subsection Chord mode -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Chord mode overview:: @@ -212,12 +212,12 @@ car elle est indiquée en dernier : @node Extended and altered chords @unnumberedsubsubsec Extended and altered chords -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Displaying chords @subsection Displaying chords -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Printing chord names:: @@ -413,12 +413,12 @@ chiffrages étranges. @node Customizing chord names @unnumberedsubsubsec Customizing chord names -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Figured bass @subsection Figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Introduction to figured bass:: @@ -635,9 +635,9 @@ Référence du programme : les objets @rinternals{NewBassFigure}, @node Entering figured bass @unnumberedsubsubsec Entering figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Displaying figured bass @unnumberedsubsubsec Displaying figured bass -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely index 3c029114e4..60f4e85fd7 100644 --- a/Documentation/fr/user/editorial.itely +++ b/Documentation/fr/user/editorial.itely @@ -31,7 +31,6 @@ * Hidden notes:: * Coloring objects:: * Parentheses:: -* Ambitus:: * Stems:: @end menu @@ -262,7 +261,7 @@ normale ayant un nom similaire. Vous ne pouvez pas coloriser des notes à l'intérieur d'un accord avec @code{\override}. si besoin est, utilisez @code{\tweak}. -Pour plus de détails, consultez @ref{Objects connected to the input}. +Pour plus de détails, consultez @ref{The tweak command}. @node Parentheses @@ -291,100 +290,6 @@ comprendre qu'une seule note. @end example -@node Ambitus -@unnumberedsubsubsec Ambitus -@cindex ambitus - -L'@emph{ambitus} est l'amplitude des hauteurs d'une voix donnée dans une -partition. Ce terme peut aussi désigner la tessiture qu'un instrument -est capable d'atteindre. Souvent, cet ambitus est imprimé au début des -partitions vocales, afin que les exécutants puissent voir au premier -coup d'oeil s'ils sont en mesure de tenir la partie en question. - -Pour exprimer l'ambitus d'une pièce, on indique avant la clé deux notes -représentant la hauteur la plus basse et la plus haute. Pour imprimer -cet ambitus, il faut ajouter le graveur @rinternals{Ambitus_engraver} -au contexte @rinternals{Voice}. Ainsi, - -@example -\layout @{ - \context @{ - \Voice - \consists Ambitus_engraver - @} -@} -@end example - -@noindent -donne pour résultat - -@lilypond[quote,ragged-right] -\layout { - \context { - \Staff - \consists Ambitus_engraver - } -} - -\relative \new Staff { - as'' c e2 cis,2 -} -@end lilypond - -Si plusieurs voix se trouvent sur une même portée, on peut attribuer le -graveur @rinternals{Ambitus_engraver} au contexte @rinternals{Staff} -plutôt qu'au contexte @rinternals{Voice} ; l'ambitus affiché sera -alors celui de toutes les voix cumulées, non d'une seule des voix -actives. - -@lilypond[verbatim,ragged-right,quote] -\new Staff \with { - \consists "Ambitus_engraver" -} -<< - \new Voice \with { - \remove "Ambitus_engraver" - } \relative c'' { - \override Ambitus #'X-offset = #-1.0 - \voiceOne - c4 a d e f2 - } - \new Voice \with { - \remove "Ambitus_engraver" - } \relative c' { - \voiceTwo - es4 f g as b2 - } ->> -@end lilypond - -@noindent -Cet exemple met en œuvre une fonctionnalité avancée : - -@example -\override Ambitus #'X-offset = #-1.0 -@end example - -@noindent -Ce réglage déplace l'ambitus vers la gauche. Le même résultat aurait pu -être obtenu avec @code{extra-offset}, mais alors le système de mise en -forme n'aurait pas attribué d'espace supplémentaire pour l'objet -déplacé. - -@seealso - -Référence du programme : @rinternals{Ambitus}, -@rinternals{AmbitusLine}, @rinternals{AmbitusNoteHead}, -@rinternals{AmbitusAccidental}. - -Exemples : @rlsr{Pitches}, @rlsr{Vocal music}. - -@knownissues - -LilyPond ne gère pas les collisions entre plusieurs ambitus présents sur -une même portée. - - @node Stems @unnumberedsubsubsec Stems @@ -422,11 +327,12 @@ a4 b c b @menu * Balloon help:: * Grid lines:: +* Analysis brackets:: * Blank music sheet:: @end menu @node Balloon help -@subsubsection Balloon help +@unnumberedsubsubsec Balloon help Vous pouvez marquer et nommer des éléments de notation à l'aide de bulles. L'objectif premier de cette fonctionnalité est d'expliquer la @@ -458,7 +364,7 @@ Référence du programme : @rinternals{text-balloon-interface}. @node Grid lines -@subsubsection Grid lines +@unnumberedsubsubsec Grid lines Vous pouvez tracer des lignes entre les portées, synchronisées avec les notes. @@ -500,8 +406,41 @@ les notes. Exemples : @rlsr{Editorial annotations}. +@node Analysis brackets +@unnumberedsubsubsec Analysis brackets +@cindex crochets +@cindex crochets de phrasé +@cindex analyse musicologique +@cindex crochet de regroupement de notes + +On utilise des crochets en analyse musicale, pour indiquer la +structure d'une pièce. LilyPond permet d'utiliser une forme +simplifiée de crochets horizontaux imbriqués, dans la mesure où le +contexte @rinternals{Staff} comporte le graveur +@rinternals{Horizontal_bracket_engraver}. Un crochet s'ouvre avec +@code{\startGroup}, et se ferme avec @code{\stopGroup}. + +@lilypond[quote,ragged-right,verbatim] +\score { + \relative c'' { + c4\startGroup\startGroup + c4\stopGroup + c4\startGroup + c4\stopGroup\stopGroup + } + \layout { + \context { + \Staff \consists "Horizontal_bracket_engraver" +}}} +@end lilypond + +@seealso + +Référence du programme : @rinternals{HorizontalBracket}. + + @node Blank music sheet -@subsubsection Blank music sheet +@unnumberedsubsubsec Blank music sheet @cindex Papier musique @cindex Portées, feuille blanche diff --git a/Documentation/fr/user/expressive.itely b/Documentation/fr/user/expressive.itely index c746124b85..3337cbfcd5 100644 --- a/Documentation/fr/user/expressive.itely +++ b/Documentation/fr/user/expressive.itely @@ -29,16 +29,17 @@ @menu -* Articulations:: +* Articulations and ornamentations:: * Dynamics:: +* New dynamic marks:: @end menu -@node Articulations -@unnumberedsubsubsec Articulations +@node Articulations and ornamentations +@unnumberedsubsubsec Articulations and ornamentations @cindex articulations @cindex symboles d'ornementation -@cindex ornementations, symboles +@cindex ornementation, symboles Différents symboles peuvent être ajoutés au-dessus ou au-dessous des @@ -306,147 +307,55 @@ Le placement vertical de ces éléments graphiques est géré par le @rinternals{DynamicLineSpanner}. -@node Curves -@subsection Curves - -@menu -* Ties:: -* Slurs:: -* Phrasing slurs:: -* Laissez vibrer ties:: -* Breath marks:: -* Falls and doits:: -@end menu - -@node Ties -@unnumberedsubsubsec Ties - -@cindex liaison de prolongation -@funindex ~ - -Une liaison de tenue (ou de prolongation) relie deux notes adjacentes de -même hauteur. Dans les faits, elle prolonge la durée d'une note, et ne -doit donc pas être confondue avec les liaisons d'articulation ou de -phrasé. Une liaison de tenue est indiquée au moyen d'un tilde @samp{~}. - -@lilypond[quote,ragged-right,fragment,verbatim] -e' ~ e' ~ -@end lilypond - - -Quand une liaison de tenue se trouve entre deux accords, toutes les -notes de même hauteur entre ces deux accords sont reliées. S'il n'y en -a aucune, aucune liaison n'est créée. Il est également possible de lier -partiellement deux accords, en mettant les liaisons à l'intérieur des -accords. - -@lilypond[quote,ragged-right,fragment,verbatim,relative=1] - -@end lilypond +@node New dynamic marks +@unnumberedsubsubsec New dynamic marks +Grâce à la commande @code{make-dynamic-script}, vous pouvez créer de +nouvelles marques textuelles de nuances que vous combinerez +éventuellement avec les signes de nuances. +Notez bien que la police des nuances en contient que les caractères +@code{f,m,p,r,s} and @code{z}. -Une liaison de tenue est un moyen parmi d'autres pour prolonger la durée -d'une note, tout comme les points. L'exemple suivant montre deux -manières de matérialiser exactement la même idée : +Certains composants, tels que les marques de nuances, possèdent des +propriétés particulières et prédéfinies quant à leur police. Lorsque +vous créez du texte en pareille situation, nous vous recommandons +d'utiliser @code{normal-text} pour annuler ces propriétés. Voir +@ref{Text markup commands} pour plus de détails. +@cindex make-dynamic-script -@lilypond[quote,fragment,ragged-right] -\time 3/4 c'2. c'2 ~ c'4 -@end lilypond - -@noindent -Les liaisons de tenues sont utilisées soit lorsque la note dépasse de la -mesure, soit quand les points ne suffisent pas à donner la bonne durée. -Lorsque l'on utilise ces liaisons, les valeurs rythmiques les plus -longues doivent s'aligner sur les subidivisions de la mesure, comme ici : - -@c KEEP LY -@lilypond[fragment,quote,ragged-right] -\relative { - r8^"oui" c8 ~ c2 r4 | r8^"non" c2 ~ c8 r4 +@lilypond[quote,verbatim,ragged-right] +sfzp = #(make-dynamic-script "sfzp") +\relative c' { + c4 c c\sfzp c } @end lilypond +@cindex Nuances éditoriales +@cindex Nuances, entre parenthèses -Lorsque l'on doit lier de nombreuses notes sur plusieurs mesures, il -devient plus facile d'avoir recours à la division automatique des notes ---- voir @ref{Automatic note splitting}. Ce procédé divise -automatiquement les notes trop longues, et les lie par-delà les barres -de mesure. - -@funindex \repeatTie - -Lorsqu'une mesure de seconde fois après une reprise commence sur une -note liée, la liaison doit être répétée. C'est à cela que sert la -commande @code{\repeatTie} : - -@lilypond[fragment,quote,ragged-right,relative=2] -r \repeatTie -@end lilypond - -@cindex liaison de prolongation, répétition -@cindex reprises avec alternatives et liaisons de prolongation - -@commonprop +Vous pouvez aussi encadrer les nuances entre parenthèses ou entre +crochets. Ceci est souvent utilisé pour ajouter des nuances propres à +une édition donnée. -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 @emph{vrai} -(@q{t} pour @q{true}). Cette même méthode peut servir, par exemple, à -lier un trémolo à un accord. - -@lilypond[fragment,verbatim,relative=1,ragged-right,quote] -\set tieWaitForNote = ##t -\grace { c16[~ e~ g]~ } 2 -\repeat tremolo 8 { c32~ c'~ } 1 -e8~ c~ a~ f~ 2 +@lilypond[quote,verbatim,ragged-right] +rndf = \markup{ \center-align {\line { \bold{\italic (} + \dynamic f \bold{\italic )} }} } +boxf = \markup{ \bracket { \dynamic f } } +{ c'1_\rndf c'1_\boxf } @end lilypond -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). - -@lilypond[fragment,verbatim,relative=1,ragged-right,quote] -2~ | -\override TieColumn #'tie-configuration = - #'((0.0 . 1) (-2.0 . 1) (-4.0 . 1)) -~ | -@end lilypond - - -@predefined - -@funindex \tieUp -@code{\tieUp}, -@funindex \tieDown -@code{\tieDown}, -@funindex \tieNeutral -@code{\tieNeutral}, -@funindex \tieDotted -@code{\tieDotted}, -@funindex \tieDashed -@code{\tieDashed}, -@funindex \tieSolid -@code{\tieSolid}. -@seealso - -Dans ce même manuel : @ref{Automatic note splitting}. - -Référence du programme : @rinternals{Tie}. - - -@knownissues - -Un changement de portée, lorsqu'une liaison de tenue est active, ne -peut produire une liaison oblique. - -Le changement de clé ou d'octave pendant une liaison de tenue produit un -résultat indéfini. Dans ces cas-là, il est préférable d'utiliser un -legato. +@node Curves +@subsection Curves +@menu +* Slurs:: +* Phrasing slurs:: +* Breath marks:: +* Falls and doits:: +@end menu @node Slurs @unnumberedsubsubsec Slurs @@ -554,30 +463,6 @@ Il n'est pas possible d'avoir plusieurs liaisons de phrasé en même temps. Référence du programme : @rinternals{PhrasingSlur}. -@node Laissez vibrer ties -@unnumberedsubsubsec Laissez vibrer ties - -@cindex laissez vibrer -@cindex liaison, laissez vibrer - -Les liaisons @qq{Laissez vibrer} (L.V.) sont utilisées pour le piano, la -harpe, et certains instruments de percussion. Elles indiquent à -l'instrumentiste de laisser sonner la note ou l'accord au lieu de -l'étouffer. Cet effet s'obtient avec la commande @code{\laissezVibrer}. - -@lilypond[fragment,ragged-right,verbatim,relative=1] -\laissezVibrer -@end lilypond - -@seealso - -Référence du programme : -@rinternals{LaissezVibrerTie}, -@rinternals{LaissezVibrerTieColumn}. - -Exemples : @rlsr{Expressive marks}. - - @node Breath marks @unnumberedsubsubsec Breath marks @@ -629,7 +514,6 @@ c4-\bendAfter #-3 * Glissando:: * Arpeggio:: * Trills:: -* Analysis brackets:: @end menu @node Glissando @@ -760,7 +644,7 @@ non connectées. @unnumberedsubsubsec Trills Les trilles brefs s'indiquent comme n'importe quelle ponctuation : -voir @ref{Articulations}. +voir @ref{Articulations and ornamentations}. Les trilles plus longs sont délimités par @code{\startTrillSpan} et @@ -801,36 +685,3 @@ sera imprimée comme une tête de note noire entre parenthèses. Référence du programme : @rinternals{TrillSpanner}. -@node Analysis brackets -@unnumberedsubsubsec Analysis brackets -@cindex crochets -@cindex crochets de phrasé -@cindex analyse musicologique -@cindex crochet de regroupement de notes - -On utilise des crochets en analyse musicale, pour indiquer la -structure d'une pièce. LilyPond permet d'utiliser une forme -simplifiée de crochets horizontaux imbriqués, dans la mesure où le -contexte @rinternals{Staff} comporte le graveur -@rinternals{Horizontal_bracket_engraver}. Un crochet s'ouvre avec -@code{\startGroup}, et se ferme avec @code{\stopGroup}. - -@lilypond[quote,ragged-right,verbatim] -\score { - \relative c'' { - c4\startGroup\startGroup - c4\stopGroup - c4\startGroup - c4\stopGroup\stopGroup - } - \layout { - \context { - \Staff \consists "Horizontal_bracket_engraver" -}}} -@end lilypond - -@seealso - -Référence du programme : @rinternals{HorizontalBracket}. - - diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely index 6b3678f063..ec1247bcb2 100644 --- a/Documentation/fr/user/fretted-strings.itely +++ b/Documentation/fr/user/fretted-strings.itely @@ -15,7 +15,7 @@ @node Fretted string instruments @section Fretted string instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for fretted strings:: @@ -26,7 +26,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for fretted strings @subsection Common notation for fretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for fretted strings:: @@ -40,7 +40,7 @@ UNTRANSLATED NODE: IGNORE ME @node References for fretted strings @subsubsection References for fretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node String number indications @subsubsection String number indications @@ -304,7 +304,7 @@ Référence du programme : @rinternals{StrokeFinger} @node Guitar @subsection Guitar -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Guitar tablatures:: @@ -314,7 +314,7 @@ UNTRANSLATED NODE: IGNORE ME @node Guitar tablatures @subsubsection Guitar tablatures -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Indicating position and barring @subsubsection Indicating position and barring @@ -373,7 +373,7 @@ Référence du programme : @rinternals{StrokeFinger} @node Banjo @subsection Banjo -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Banjo tablatures:: diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely index 9398a9b2c1..834bbd6425 100644 --- a/Documentation/fr/user/fundamental.itely +++ b/Documentation/fr/user/fundamental.itely @@ -296,17 +296,17 @@ horizontal dans votre éditeur de texte ! @node Nesting music expressions @subsection Nesting music expressions -UNTRANSLATED NODE: IGNORE ME +@untranslated @node On the un-nestedness of brackets and ties @subsection On the un-nestedness of brackets and ties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Voices contain music @section Voices contain music -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * I'm hearing Voices:: @@ -317,7 +317,7 @@ UNTRANSLATED NODE: IGNORE ME @node I'm hearing Voices @subsection I'm hearing Voices -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Explicitly instantiating voices @subsection Explicitly instantiating voices @@ -445,7 +445,7 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice) @node Voices and vocals @subsection Voices and vocals -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Contexts and engravers @section Contexts and engravers @@ -482,11 +482,11 @@ une altération n'a d'effet que sur une seule portée, tandis qu'une barre de me être synchronisée sur toute l'étendue verticale de la partition. LilyPond regroupe ces règles et ces fragments d'information dans des -@emph{Contextes}. Certains contextes sont les voix (contexte @context{Voice}), -les portées (contexte @context{Staff}), ou la partition dans son ensemble -(contexte @context{Score}). Ils sont ordonnés hiérarchiquement : ainsi un -contexte @context{Staff} peut contenir plusieurs contextes @context{Voice}, et un -contexte @context{Score} peut contenir plusieurs contextes @context{Staff}. +@emph{Contextes}. Certains contextes sont les voix (contexte @code{Voice}), +les portées (contexte @code{Staff}), ou la partition dans son ensemble +(contexte @code{Score}). Ils sont ordonnés hiérarchiquement : ainsi un +contexte @code{Staff} peut contenir plusieurs contextes @code{Voice}, et un +contexte @code{Score} peut contenir plusieurs contextes @code{Staff}. @quotation @image{context-example,5cm,,} @@ -494,14 +494,14 @@ contexte @context{Score} peut contenir plusieurs contextes @context{Staff}. Chaque contexte est chargé de faire appliquer certaines règles de gravure, de créer certains objets, et de prendre en compte les propriétés qui leur -sont associées. Ainsi, le contexte @context{Voice} peut faire intervenir une -altération accidentelle, puis le contexte @context{Staff} devra déterminer si +sont associées. Ainsi, le contexte @code{Voice} peut faire intervenir une +altération accidentelle, puis le contexte @code{Staff} devra déterminer si cette dernière devra être imprimée ou non dans la suite de la mesure. Les barres -de mesure, enfin, sont alignées verticalement grâce au contexte @context{Score}. +de mesure, enfin, sont alignées verticalement grâce au contexte @code{Score}. En revanche, dans une musique polymétrique, par exemple mélant une portée à 3/4 et une autre à 4/4, les barres de mesures n'ont plus à être alignées : il faut alors -modifier les comportement par défaut des contextes @context{Score} et @context{Staff}. +modifier les comportement par défaut des contextes @code{Score} et @code{Staff}. Dans une partition très simple, les contextes sont créés implicitement, et peuvent être ignorés. Mais lorsqu'il s'agit de morceaux plus amples -- entendons par là tout @@ -607,7 +607,7 @@ musique = @{ c4 c4 @} ponctuation = @{ s4-. s4-> @} @end example -En les envoyant toutes deux dans le même contexte @context{Voice}, on les combine : +En les envoyant toutes deux dans le même contexte @code{Voice}, on les combine : @example << @@ -648,13 +648,13 @@ Cette variante sert à des expressions musicales qui peuvent être interprétée plusieurs niveaux. Par exemple, une commande telle que @code{\applyOutput} (voir @c FIXME: broken link @c @ruser{Running a function on all layout objects}) : si elle n'est pas associée avec -@code{\context}, elle s'applique par défaut dans le contexte @context{Voice}. +@code{\context}, elle s'applique par défaut dans le contexte @code{Voice}. @example \applyOutput #'@var{Contexte} #@var{fonction} % s'applique dans le contexte Voice @end example -Pour l'appliquer au contexte @context{Score} ou @context{Staff}, il faut utiliser : +Pour l'appliquer au contexte @code{Score} ou @code{Staff}, il faut utiliser : @example \applyOutput #'Score #@var{fonction} @@ -667,17 +667,17 @@ Pour l'appliquer au contexte @context{Score} ou @context{Staff}, il faut utilise @node Engravers explained @subsection Engravers explained -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Modifying context properties @subsection Modifying context properties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Adding and removing engravers @subsection Adding and removing engravers -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Extending the templates @@ -886,10 +886,10 @@ celloMusic = \relative c { @node Four-part SATB vocal score @subsection Four-part SATB vocal score -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Building a score from scratch @subsection Building a score from scratch -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/fr/user/input.itely b/Documentation/fr/user/input.itely index 196df08b3c..32c0fc7765 100644 --- a/Documentation/fr/user/input.itely +++ b/Documentation/fr/user/input.itely @@ -9,68 +9,130 @@ @c \version "2.11.51" -@c Translators: Jean-Charles Malahieude - -@node Input syntax -@chapter Input syntax - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Input files:: -* Common syntax issues TODO name?:: -* Other stuffs TODO move?:: -@end menu -@node Input files -@section Input files - -UNTRANSLATED NODE: IGNORE ME - -@menu -* File structure:: -* A single music expression:: -* Multiple scores in a book:: -* Extracting fragments of notation:: -* Including LilyPond files:: -* Text encoding:: -* Different editions from one source:: -@end menu -@node File structure -@subsection File structure +@c Translators: Jean-Charles Malahieude, Valentin Villenave + +@node General input and output +@chapter General input and output + +@untranslated + + +@menu +* Input structure:: +* Titles and headers:: +* Working with input files:: +* Controlling output:: +* MIDI output:: +@end menu + +@node Input structure +@section Input structure + +@untranslated + + +@menu +* Structure of a score:: +* Multiple scores in a book:: +* File structure:: +@end menu -UNTRANSLATED NODE: IGNORE ME +@node Structure of a score +@subsection Structure of a score -@node A single music expression -@subsection A single music expression +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Multiple scores in a book @subsection Multiple scores in a book -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node File structure +@subsection File structure + +@untranslated + + +@node Titles and headers +@section Titles and headers + +@untranslated + + +@menu +* Creating titles:: +* Custom titles:: +* Reference to page numbers:: +* Table of contents:: +@end menu -@node Extracting fragments of notation -@subsection Extracting fragments of notation +@node Creating titles +@subsection Creating titles -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node Custom titles +@subsection Custom titles + +@untranslated + + +@node Reference to page numbers +@subsection Reference to page numbers + +@untranslated + + +@node Table of contents +@subsection Table of contents + +@untranslated + + +@node Working with input files +@section Working with input files + +@untranslated + + +@menu +* Including LilyPond files:: +* Different editions from one source:: +* Text encoding:: +* Displaying LilyPond notation:: +@end menu @node Including LilyPond files @subsection Including LilyPond files -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Text encoding -@subsection Text encoding - -UNTRANSLATED NODE: IGNORE ME @node Different editions from one source @subsection Different editions from one source +@untranslated + + +@menu +* Using variables:: +* Using tags:: +@end menu + +@node Using variables +@unnumberedsubsubsec Using variables + +@untranslated + + +@node Using tags +@unnumberedsubsubsec Using tags @funindex \tag @cindex tag - + La commande @code{\tag} affecte un nom à des expressions musicales. Les expressions ainsi balisées pourront être filtrées par la suite. Ce mécanisme permet d'obtenir différentes versions à partir d'une même @@ -79,7 +141,7 @@ source musicale. Dans l'exemple qui suit, nous obtenons deux versions du même extrait, l'une pour le conducteur, l'autre pour l'instrumentiste, et qui comportera les ornements. - + @example c1 << @@ -94,22 +156,29 @@ c1 c1 @end example +@noindent Ce principe peut s'appliquer aux articulations, textes, etc. Il -suffit de positionner +suffit de positionner + @example -\tag #@var{votre-balise} @end example + +@noindent avant l'articulation, comme ici : + @example c1-\tag #'part ^4 @end example +@noindent Ceci définira une note avec une indication de doigté conditionnelle. - + @cindex keepWithTag @cindex removeWithTag C'est grâce aux commandes @code{\keepWithTag} et @code{\removeWithTag} que vous filtrerez les expressions balisées. Par exemple : + @example << @var{de la musique} @@ -117,6 +186,8 @@ que vous filtrerez les expressions balisées. Par exemple : \keepWithTag #'part @var{de la musique} >> @end example + +@noindent donnerait : @lilypondfile[ragged-right,quote]{tag-filter.ly} @@ -125,7 +196,7 @@ Les arguments de la commande @code{\tag} doivent être un symbole (tel que @code{#'score} ou @code{#'part}), suivi d'une expression musicale. Vous pouvez utiliser de multiples balises dans un morceau en saisissant plusieurs @code{\tag}. - + @example \tag #'original-part \tag #'transposed-part @dots{} @end example @@ -143,60 +214,129 @@ Lorsqu'elles comportent des silences, ceux-ci ne seront pas fusionnés si vous imprimez une partition avec les deux sections balisées. -@node Common syntax issues TODO name? -@section Common syntax issues TODO name? +@node Text encoding +@subsection Text encoding -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu -* Controlling direction:: -* Distances and measurements MAYBE MOVE:: -@end menu -@node Controlling direction -@subsection Controlling direction +@node Displaying LilyPond notation +@subsection Displaying LilyPond notation -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Distances and measurements MAYBE MOVE -@subsection Distances and measurements MAYBE MOVE -UNTRANSLATED NODE: IGNORE ME +@node Controlling output +@section Controlling output -@node Other stuffs TODO move? -@section Other stuffs TODO move? +@untranslated -UNTRANSLATED NODE: IGNORE ME -@menu -* Displaying LilyPond notation:: -* Skipping corrected music:: -* context list FIXME:: -* another thing FIXME:: -* Input modes FIXME:: +@menu +* Extracting fragments of music:: +* Skipping corrected music:: @end menu -@node Displaying LilyPond notation -@subsection Displaying LilyPond notation +@node Extracting fragments of music +@subsection Extracting fragments of music + +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Skipping corrected music @subsection Skipping corrected music -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node MIDI output +@section MIDI output + +@untranslated -@node context list FIXME -@subsection context list FIXME -UNTRANSLATED NODE: IGNORE ME +@menu +* Creating MIDI files:: +* MIDI block:: +* What goes into the MIDI output?:: +* Repeats in MIDI:: +* Controlling MIDI dynamics:: +@end menu + +@node Creating MIDI files +@subsection Creating MIDI files + +@untranslated + + +@unnumberedsubsubsec Instrument names +@node MIDI block +@subsection MIDI block + +@untranslated + + +@node What goes into the MIDI output? +@subsection What goes into the MIDI output? + +@untranslated + + +@unnumberedsubsubsec Supported in MIDI +@unnumberedsubsubsec Unsupported in MIDI + +@node Repeats in MIDI +@subsection Repeats in MIDI + +@cindex reprises développées +@funindex \unfoldRepeats + +Au prix de quelques réglages, les reprises de toutes sortes peuvent être +rendues dans le fichier MIDI. Il suffit pour cela de recourir à la +fonction @code{\unfoldRepeats}, qui développe toutes les reprises. En +d'autre termes, @code{\unfoldRepeats} transforme toutes les reprises +en reprises de type @code{unfold}. + + +@lilypond[quote,verbatim,fragment,line-width=8.0\cm] +\unfoldRepeats { + \repeat tremolo 8 {c'32 e' } + \repeat percent 2 { c''8 d'' } + \repeat volta 2 {c'4 d' e' f'} + \alternative { + { g' a' a' g' } + {f' e' d' c' } + } +} +\bar "|." +@end lilypond + + +Lorsque l'on veut utiliser @code{\unfoldRepeats} seulement pour le rendu +MIDI, il faut établir deux blocs @code{\score} : un pour le MIDI, avec +des reprises explicites, et l'autre pour la partition, avec des reprises +notées sous forme de barres de reprise, de trémolo ou de symboles de +pourcentage. Par exemple + +@example +\score @{ + @var{..musique..} + \layout @{ .. @} +@} +\score @{ + \unfoldRepeats @var{..musique..} + \midi @{ .. @} +@} +@end example + -@node another thing FIXME -@subsection another thing FIXME +@node Controlling MIDI dynamics +@subsection Controlling MIDI dynamics -UNTRANSLATED NODE: IGNORE ME +@untranslated -@node Input modes FIXME -@subsection Input modes FIXME -UNTRANSLATED NODE: IGNORE ME +@unnumberedsubsubsec Dynamic marks +@unnumberedsubsubsec Overall MIDI volume +@unnumberedsubsubsec Equalizing different instruments (i) +@unnumberedsubsubsec Equalizing different instruments (ii) diff --git a/Documentation/fr/user/install.itely b/Documentation/fr/user/install.itely index 7c7de7d1d8..a180700bd1 100644 --- a/Documentation/fr/user/install.itely +++ b/Documentation/fr/user/install.itely @@ -55,9 +55,7 @@ mingw - Windows x86 @node Compiling from source @section Compiling from source -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @iftex Toute cette section ne sera pas traduite, car la compilation de LilyPond demande de maîtriser un minimum l'anglais ; reportez-vous donc à diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/user/introduction.itely index 6de37214c5..cee96e0341 100644 --- a/Documentation/fr/user/introduction.itely +++ b/Documentation/fr/user/introduction.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-kearning.tely @ignore - Translation of GIT committish: 27af34a245b02a6b89c9af3becefcfe676b2e19d + Translation of GIT committish: 4706bf2d0cccc915834cd9c063999cb38d2e78e8 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -11,6 +11,7 @@ @c Translators: Ludovic Sardain, John Mandereau @c Translation checkers: Jean-Charles Malahieude, Jean-Yves Baudais +@c Translation status: post-GDP @node Introduction @@ -316,7 +317,7 @@ haut (droite). \new Score \with { \override SpacingSpanner #'spacing-increment = #3 \override TimeSignature #'transparent = ##t -} \relative { +} \relative c' { \stemDown 4_>-\arpeggio \override Arpeggio #'direction = #RIGHT \stemUp 4^>-\arpeggio @@ -439,9 +440,9 @@ pour les têtes de notes, le graveur de têtes de note \include "engraver-example.ily" \score { - \topVoice - \layout { - \context { + \topVoice + \layout { + \context { \Voice \remove "Stem_engraver" \remove "Phrasing_slur_engraver" @@ -449,8 +450,8 @@ pour les têtes de notes, le graveur de têtes de note \remove "Script_engraver" \remove "Beam_engraver" \remove "Auto_beam_engraver" - } - \context { + } + \context { \Staff \remove "Accidental_engraver" \remove "Key_engraver" @@ -459,8 +460,8 @@ pour les têtes de notes, le graveur de têtes de note \remove "Time_signature_engraver" \remove "Staff_symbol_engraver" \consists "Pitch_squash_engraver" - } -} + } + } } @end lilypond @@ -592,7 +593,7 @@ notation de plus haut niveau. @seealso -Program reference: @rinternals{Contexts}. +Référence du programme: @rinternals{Contexts}. @lilypond[quote,ragged-right] \include "engraver-example.ily" @@ -645,7 +646,7 @@ de petits fragments de musique pour en former de plus grands, on peut exprimer de la musique plus complexe. Par exemple @lilypond[quote,verbatim,fragment,relative=1] -c4 +f4 @end lilypond @noindent @@ -739,7 +740,76 @@ La notation polyphonique et la musique pour piano peuvent également être générées. L'exemple suivant associe quelques constructions plus exotiques : -@lilypondfile[quote,ragged-right]{screech-boink.ly} +@lilypond[quote] +\header { + title = "Screech and boink" + subtitle = "Random complex notation" + composer = "Han-Wen Nienhuys" +} + +\score { + \context PianoStaff << + \new Staff = "up" { + \time 4/8 + \key c \minor + << { + \revert Stem #'direction + \change Staff = down + \set subdivideBeams = ##t + g16.[ + \change Staff = up + c'''32 + \change Staff = down + g32 + \change Staff = up + c'''32 + \change Staff = down + g16] + \change Staff = up + \stemUp + \set followVoice = ##t + c'''32([ b''16 a''16 gis''16 g''32)] + } \\ { + s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + } \\ { + s4 \autoBeamOff d''8.. f''32 + } \\ { + s4 es''4 + } >> + } + + \new Staff = "down" { + \clef bass + \key c \minor + \set subdivideBeams = ##f + \override Stem #'french-beaming = ##t + \override Beam #'thickness = #0.3 + \override Stem #'thickness = #4.0 + g'16[ b16 fis16 g16] + << \makeClusters { + as16 + + + } \\ { + \override Staff.Arpeggio #'arpeggio-direction =#down + 4\arpeggio + } + >> } + >> + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 60 8) + } + } + \layout { + \context { + \Staff + \consists Horizontal_bracket_engraver + } + } +} +@end lilypond Les extraits exposés ici ont tous été écrits à la main, mais ce n'est pas une obligation. Puisque le moteur de formatage est en grande @@ -764,33 +834,21 @@ musique et du texte dans les documents. Cette partie présente les différents volumes de la documentation. @c leave these lines wrapping around. It's some texinfo 4.12 thing. -gp +@c This is actually a limitation of texi2html. -jm @menu -* About the Learning Manual (LM):: introduction à LilyPond, ce volume - explique en profondeur comment créer de la notation. +* About the Learning Manual (LM):: introduction à LilyPond, ce manuel explique aux débutants la création de partitions. -* About the Music Glossary (MG):: ce volume explique de nombreux termes - musicaux et en donne la traduction dans d'autres langues. +* About the Music Glossary (MG):: ce document explique de nombreux termes musicaux et en donne la traduction dans d'autres langues. -* About the Notation Reference (NR):: ce volume représente le cœur de - la documentation. Il fournit des informations détaillées sur la - manière de créer de la notation. La lecture de cet ouvrage requiert - une bonne compréhension des concepts exposés dans le manuel - d'initiation. +* About the Notation Reference (NR):: ce manuel représente la partie la plus volumineuse de la documentation. Il fournit tous les détails sur la création de notation musicale. La lecture de cet ouvrage requiert une bonne compréhension des concepts exposés dans le manuel d'initiation. -* About the Application Usage (AU):: ce volume traite des différentes - composantes de LilyPond ainsi que des particularités selon les - environements. +* About the Application Usage (AU):: ce manuel aborde l'exécution des programmes LilyPond et les particularités dépendant du système d'exploitation. -* About the Snippet List (SL):: ce volume constitue une collection - d'extraits réalisés avec LilyPond. +* About the Snippet List (SL):: ce document rassemble une collection d'extraits de code LilyPond. -* About the Internals Reference (IR):: ce volume est la source - d'information sur le fonctionnement interne de LilyPond. Il constitue - la base des ressources nécessaires à l'élaboration de retouches. +* About the Internals Reference (IR):: ce manuel constitue une source d'information sur le fonctionnement interne de LilyPond. C'est une référence complète pour l'élaboration de retouches. -* Other documentation:: d'autres sources de documentation sont - disponibles, telles que les notes d'actualité et les archives des - listes de diffusion. +* Other documentation:: d'autres sources de documentation sont disponibles, telles que les notes de nouveautés et les archives des listes de diffusion. @end menu @@ -805,29 +863,25 @@ de manière linéaire. @itemize @item -@ref{Introduction} : -le pourquoi du comment de LilyPond. +@ref{Introduction} : le pourquoi du comment de LilyPond. @item -@ref{Tutorial} : -introduction en douceur à la typographie musicale. -Les utilisateurs débutants sont invités à commencer ici. +@ref{Tutorial} : introduction en douceur à la typographie musicale. +Les utilisateurs débutants sont invités à commencer par ce chapitre. @item -@ref{Fundamental concepts} : -concepts généraux du format de fichier @code{ly} spécifique à -LilyPond. Si vous n'êtes pas certain de l'endroit où placer une -commande, lisez ce chapitre ! +@ref{Fundamental concepts} : concepts généraux du format de fichier +@code{ly} spécifique à LilyPond. Si vous n'êtes pas certain de +l'endroit où placer une commande, lisez ce chapitre ! @item -@ref{Tweaking output} : -introduction aux retouches de gravure avec LilyPond. +@ref{Tweaking output} : introduction aux retouches de gravure avec +LilyPond. @item -@ref{Working on LilyPond projects} : -utilisations pratiques de LilyPond, et conseils -afin d'éviter les problèmes les plus courants. À lire absolument avant -de se lancer dans des travaux d'envergure. +@ref{Working on LilyPond projects} : utilisation pratique de LilyPond, +conseils généraux, prévention et résolution des problèmes les plus +courants. À lire avant de se lancer dans des travaux d'envergure ! @end itemize @@ -837,16 +891,14 @@ vos besoins : @itemize @item -@ref{Templates} -de pièces LilyPond. Copiez et collez un modèle -dans un fichier, ajoutez les notes, et c'est prêt ! +@ref{Templates} de pièces LilyPond. Copiez et collez un modèle dans +un fichier, ajoutez les notes, et c'est prêt ! @item -@ref{Scheme tutorial} : -courte introduction à Scheme, le langage de programmation -utilisé dans les fonctions de musique. Ces quelques lignes vous -aideront à construire des retouches avancées ; nombre d'utilisateurs n'ont -jamais touché à Scheme. +@ref{Scheme tutorial} : courte introduction à Scheme, le langage de +programmation utilisé dans les fonctions de musique. Ces quelques +lignes vous aideront à construire des retouches avancées ; nombre +d'utilisateurs n'ont jamais touché à Scheme. @end itemize @@ -854,21 +906,17 @@ jamais touché à Scheme. @node About the Music Glossary (MG) @unnumberedsubsec About the Music Glossary (MG) -@itemize @cindex jargon @cindex terminologie @cindex langues étrangères @cindex langue -@cindex langag +@cindex langage -@ref{Top,Music Glossary,,music-glossary} : explication des termes -musicaux et traduction dans diverses langues. Il est -également disponible au format PDF. -Si vous n'êtes pas familier avec la notation musicale ou la -terminologie, il est conseillé de consulter le glossaire, notamment -pour les parties non encore traduites de la documentation. - -@end itemize +@ref{Top,Music Glossary,,music-glossary,Glossaire musical} : +explication des termes musicaux et traduction dans diverses langues. +Si vous n'êtes pas familier avec la notation et la terminologie +musicales, il est conseillé de consulter le glossaire, notamment pour +les parties non encore traduites de la documentation. @node About the Notation Reference (NR) @@ -876,105 +924,103 @@ pour les parties non encore traduites de la documentation. Ce volume détaille toutes les commandes LilyPond produisant une notation musicale. La lecture de cet ouvrage requiert une bonne compréhension des -concepts exposés dans le manuel d'apprentissage. +concepts exposés dans le manuel d'initiation. @itemize +@c Normalement, il est impossible d'utiliser deux points en français, +@c car une référence externe doit se terminer par un signe de +@c ponctuation dans la format Info. Cependant, Info +@c n'internationalise pas encore des documents Info, donc nous n'en +@c avons rien à faire pour l'instant. -jm @item -@ruser{Musical notation} : -sujets groupés par type de notation. Cette partie -détaille la notation de base, qui sera utile dans la plupart des -projets de partition. +@ruser{Musical notation} : cette partie décrit la notation de base, +qui sera utile dans la plupart des projets de partition. Les sujets +sont groupés par type de notation. @item -@ruser{Specialist notation} : -sujets groupés par type de notation. Cette partie détaille -des spécificités concernant certains instruments ou la voix. +@ruser{Specialist notation} : cette partie détaille des éléments de +notation spécifiques à certains instruments ou styles. Les sujets +sont groupés par type de notation. @item -@ruser{Input syntax} : -informations généralistes quant aux fichiers LilyPond et -comment contrôler les sorties. +@ruser{General input and output} : informations générales sur les +fichiers source LilyPond et le contrôle des sorties. @item -@ruser{Spacing issues} : -sujets affectant la sortie globale, comme sélectionner -la taille de papier ou spécifier les sauts de page. +@ruser{Spacing issues} : différents aspects de l'espacement selon les +axes et échelles, par exemple la sélection de la taille de papier, ou +la gestion des sauts de page. @item -@ruser{Changing defaults} : -comment, grace aux retouches, obtenir de Lilypond -presque tout ce que vous désirez. +@ruser{Changing defaults} : ce chapitre est une référence des +différentes formes de retouches, qui permettent d'obtenir de Lilypond +(presque) tout ce que vous désirez. @item -@ruser{Interfaces for programmers} : -comment créer des fonctions de musique à l'aide de Scheme. +@ruser{Interfaces for programmers} :.création de fonctions de musique +à l'aide de Scheme. @end itemize -Ce volume contient aussi des annexes que vous pouvez consulter au gré de -vos besoins : +Les annexes de ce manuel contiennent entre autres des tableaux de +référence pratiques. @itemize @item -@ruser{Literature list} : -choix de livres de référence utiles pour ceux qui veulent -en savoir plus sur la notation et la gravure. +@ruser{Literature list} : choix de livres de référence, pour en savoir +plus sur la notation et la gravure. @item -@ruser{Notation manual tables} : -ensemble de tableaux montrant les noms d'accord, les -instruments MIDI, les noms de couleur, et la police Feta. +@ruser{Notation manual tables} : tableaux montrant les noms d'accord, +les instruments MIDI, les noms de couleur, et la police Feta. @item -@ruser{Cheat sheet} : -référence pratique des commandes LilyPond les plus courantes. +@ruser{Cheat sheet} : référence pratique des commandes LilyPond les +plus courantes. @item -@ruser{LilyPond command index} : -index de toutes les @code{\commandes} LilyPond. +@ruser{LilyPond command index} : index de toutes les @code{\commandes} +LilyPond. @item -@ruser{LilyPond index} : -un index complet. +@ruser{LilyPond index} : un index complet. @end itemize + @node About the Application Usage (AU) @unnumberedsubsec About the Application Usage (AU) -Ce volume explique l'exécution du programme et l'intégration de +Ce manuel explique l'exécution des programmes et l'intégration de partitions LilyPond dans d'autres programmes. @itemize @item -@rprogram{Install} : -comment installer de LilyPond, et pour ceux que cela intéresse, -comment le compiler. +@rprogram{Install} : installation --- et éventuellement compilation --- +de LilyPond. @item -@rprogram{Setup} : -comment configurer votre ordinateur pour une utilisation optimale -de LilyPond, y compris avec certains éditeurs de tecte. +@rprogram{Setup} : configuration de votre système pour une utilisation +optimale de LilyPond, comprenant l'utilisation d'environnements +adaptés pour certains éditeurs de tecte. @item -@rprogram{Running LilyPond} : -comment lancer LilyPond et ses programmes auxiliaires. De -plus, cette partie explique comment effectuer la mise à jour de fichiers -source écrits avec d'anciennes versions de LilyPond. +@rprogram{Running LilyPond} : exécution de LilyPond et de ses +programmes auxiliaires. De plus, cette partie explique comment +effectuer la mise à jour de fichiers source écrits avec d'anciennes +versions de LilyPond. @item -@rprogram{LilyPond-book} : -comment créer des documents intégrant des exemples musicaux, -comme ce manuel. +@rprogram{LilyPond-book} : création de documents intégrant des +extraits musicaux, comme ce manuel. @item -@rprogram{Converting from other formats} : -comment exécuter les programmes de conversion. Ces programmes sont -livrés avec le paquetage LilyPond, et convertissent divers formats -musicaux vers le format @code{.ly}. +@rprogram{Converting from other formats} : utilisation des programmes +de conversion. Ces programmes sont livrés avec le paquetage LilyPond, +et convertissent divers formats de musique vers le format @code{.ly}. @end itemize @@ -985,44 +1031,41 @@ musicaux vers le format @code{.ly}. @cindex snippets @cindex LSR -@c FIXME: check on kainhofer. -@ref{Top,LilyPond Snippet List,,lilypond-snippets} : +@ref{Top,LilyPond Snippet List,,lilypond-snippets,Exemples de code} : il s'agit d'une sélection de petits exemples montrant des trucs, astuces et fonctionnalités particulières de LilyPond, issus de -@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}, abrégé -sous la forme de LSR. Ils sont dans le domaine public. +@uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository} +(LSR). Tous ces exemples sont dans le domaine public. -Notez bien que cette annexe n'est en aucune manière un mirroir du LSR. -Dans la mesure où le LSR repose sur une version stable de LilyPond, un -exemple qui illustrerait de nouvelles fonctionnalités de la version de -développement devrait y être ajouté isolément. C'est la raison pour -laquelle vous le trouverez alors dans le répertoire @file{input/new/} -des sources de LilyPond. +Notez bien que cette annexe n'est en aucune manière un miroir ou même +une partie du LSR. Dans la mesure où le LSR repose sur une version +stable de LilyPond, les exemples illustrant des fonctionnalités +introduites dans la dernière version de développement ne peuvent y +figurer ; c'est pourquoi vous les trouverez dans le répertoire +@file{input/new/} des sources de LilyPond. La liste des exemples correspondant à chacun des sous-chapitres du -Manuel de notation est accessible par un lien au paragraphe +manuel de notation est accessible par des liens dans le paragraphe @strong{Voir aussi}. @node About the Internals Reference (IR) @unnumberedsubsec About the Internals Reference (IR) -@c zzz - -@itemize +@cindex retoucher +@cindex variables +@cindex propriétés +@cindex lilypond-internals +@cindex documentation du fonctionnement interne +@cindex Scheme +@cindex étendre lilypond +@cindex index -@item -La -@iftex -référence du programme -@end iftex -@ifnottex -@ref{Top,Internals Reference,,lilypond-internals} -@end ifnottex -est un ensemble de pages HTML étroitement liées entre elles, qui -documente les moindres petits détails de chaque classe, objet et -fonction de LilyPond. Cette documentation est produite directement à -partir des définitions de formatage utilisées. +@ref{Top,Internals Reference,,lilypond-internals,Référence des +propriétés internes} : c'est un ensemble de pages HTML étroitement +liées entre elles, qui documente les moindres petits détails de chaque +classe, objet et fonction de LilyPond. Cette documentation est +produite directement à partir des définitions de formatage utilisées. Presque toutes les fonctions de formatage utilisées en interne sont directement disponibles pour l'utilisateur. Par exemple, toutes les @@ -1030,41 +1073,47 @@ variables qui contrôlent les épaisseurs, les distances etc., peuvent être modifiées dans les fichiers d'entrée. Il y a un grand nombre d'options de formatage, et elles sont toutes décrites dans ce document. Chaque section du manuel de notation a un paragraphe @b{Voir -aussi} qui renvoie à la documentation générée automatiquement. Dans la +aussi}, qui renvoie à la documentation générée automatiquement. Dans la documentation au format HTML, ces paragraphes disposent de liens cliquables. -@end itemize - @node Other documentation @unnumberedsubsec Other documentation -FIXME: most of this should go higher up. Discuss News, mailist -archives, ...? +Pour finir, présentons d'autres précieuses sources de documentation. -There are a number of other places which may be very valuable. +@itemize -Lorsque vous serez un utilisateur expérimenté, vous pourrez consulter le -manuel comme une référence : il y a un index complet@footnote{Si vous -cherchez quelque chose sans le trouver dans la documentation, c'est un -bogue. Dans ce cas, merci d'envoyer un rapport de bogue.}, mais le -manuel est aussi disponible en -@iftex -une seule grande page, -@end iftex -@ifhtml -@uref{source/Documentation/user/lilypond-big-page.html, une seule grande -page}, -@end ifhtml -ce qui facilite la recherche avec la fonction adéquate de votre -navigateur. - -Dans tous les documents HTML qui incluent des fragments musicaux, -le code Lilypond utilisé pour produire l'image est accessible par un -clic sur l'image. - -L'emplacement des fichiers de documentation mentionnés ici peut varier +@item Nouveautés : ce document résume les changements importants et +les nouvelles fonctionalités de LilyPond depuis la dernière version +stable. + +@item @uref{http://lists.gnu.org/archive/html/lilypond-user/, Les +archives de la liste lilypond-user} : c'est un dépôt archivant les +courriels qui ont été envoyés à la liste anglophone des utilisateurs. +Beaucoup de questions sont apparues plusieurs fois sur la liste, il y +a donc des chances que si vous avez une question, la réponse puisse +être dans ces archives. +@c DIV specific +@uref{http://lists.gnu.org/archive/html/lilypond-user-fr/,Les archives +de la liste francophone} ne sont pas aussi bien fournies, mais vous +pouvez toujours y chercher des conversations passées sur les +traductions, et si vous avez de la chance une réponse à une question. +@c END DIV + +@item @uref{http://lists.gnu.org/archive/html/lilypond-devel/, Les +archives de la liste lilypond-devel} : les courriels envoyés à la +liste des développeurs y sont archivés. Les sujets de discussion sont +plus techniques ; si vous voulez vous renseigner sur l'histoire du +développement ou si vous avez une question très technique, tentez +votre chance en cherchant dans ces archives. + +@item Fragments de musique au cours du texte : dans tous les documents +HTML qui incluent des fragments musicaux, le code LilyPond utilisé +pour produire l'image est accessible par un clic sur l'image. + +@item L'emplacement des fichiers de documentation mentionnés ici peut varier d'un système à l'autre. De temps en temps, ce manuel fait référence aux fichiers d'exemple et d'initialisation. Tout au long de ce manuel, nous donnons les emplacements des fichiers d'entrée relativement au @@ -1077,16 +1126,4 @@ fichiers d'initialisation, par exemple @file{scm/@/lily@/.scm}, ou @file{ly/@/engraver@/-init@/.ly}, se trouvent généralement dans le répértoire @file{/usr/@/share/@/lilypond/}. -@cindex retoucher -@cindex variables -@cindex propriétés -@cindex lilypond-internals -@cindex documentation du fonctionnement interne -@cindex Scheme -@cindex étendre lilypond -@cindex index - -Pour finir, ce manuel et les autres sont disponibles en ligne, à la -fois aux formats PDF et HTML, à partir du site Web, accessible -à l'adresse @uref{http://@/www@/.lilypond@/.org/}. - +@end itemize diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely index 827d26eeeb..7ddfc90c05 100644 --- a/Documentation/fr/user/keyboards.itely +++ b/Documentation/fr/user/keyboards.itely @@ -36,9 +36,7 @@ @node References for keyboards @subsubsection References for keyboards -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -93,7 +91,7 @@ par définir les portées @end example -avant d'insérer une mélodie au moyen d'un contexte @context{Voice} : +avant d'insérer une mélodie au moyen d'un contexte @code{Voice} : @example \context Staff = bas @@ -316,9 +314,7 @@ Dans ce manuel : @ref{Ties} @qq{laissez vibrer}. @node Discant symbols @subsubsection Discant symbols -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml diff --git a/Documentation/fr/user/lilypond-book.itely b/Documentation/fr/user/lilypond-book.itely index 00c9381d60..b55983b47a 100644 --- a/Documentation/fr/user/lilypond-book.itely +++ b/Documentation/fr/user/lilypond-book.itely @@ -1,32 +1,33 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node LilyPond-book @chapter @command{lilypond-book}: Integrating text and music -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * An example of a musicological document:: * Integrating music and text:: * Music fragment options:: * Invoking lilypond-book:: * Filename extensions:: * Alternate methods of mixing text and music:: -@end menu +@end menu + @node An example of a musicological document @section An example of a musicological document -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Input @subheading Processing @@ -34,33 +35,39 @@ UNTRANSLATED NODE: IGNORE ME @node Integrating music and text @section Integrating music and text -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * LaTeX:: * Texinfo:: * HTML:: * DocBook:: -@end menu +@end menu + @node LaTeX @subsection @LaTeX{} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Texinfo @subsection Texinfo -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node HTML @subsection HTML -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node DocBook @subsection DocBook -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Common conventions @subheading Including a LilyPond file @@ -69,12 +76,14 @@ UNTRANSLATED NODE: IGNORE ME @node Music fragment options @section Music fragment options -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Invoking lilypond-book @section Invoking @command{lilypond-book} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subheading Format-specific instructions @subsubheading @LaTeX{} @@ -83,34 +92,38 @@ UNTRANSLATED NODE: IGNORE ME @node Filename extensions @section Filename extensions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Alternate methods of mixing text and music @section Alternative methods of mixing text and music -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Many quotes from a large score:: * Inserting LilyPond output into OpenOffice.org:: * Inserting LilyPond output into other programs:: -@end menu +@end menu + @node Many quotes from a large score @subsection Many quotes from a large score -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Inserting LilyPond output into OpenOffice.org @subsection Inserting LilyPond output into OpenOffice.org -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Inserting LilyPond output into other programs @subsection Inserting LilyPond output into other programs -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/lilypond.tely b/Documentation/fr/user/lilypond.tely index d6d18eb4ad..d0ee0bce5d 100644 --- a/Documentation/fr/user/lilypond.tely +++ b/Documentation/fr/user/lilypond.tely @@ -1,6 +1,6 @@ \input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @ignore - Translation of GIT committish: 080373e092844b50b53959679eaf9dcb4ea1fd76 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -147,8 +147,7 @@ ligne de ce manuel, ainsi qu'une documentation supplémentaire. @menu * Musical notation:: notation générale. * Specialist notation:: notation à usage spécifique. -* Input syntax:: généralités sur les fichiers sources. -* Non-musical notation:: aspects autres que la notation musicale. +* General input and output:: généralités sur les fichiers sources et les sorties. * Spacing issues:: mise en page de la musique sur le papier. * Changing defaults:: ajustement de la gravure. * Interfaces for programmers:: utilisation avancée. @@ -172,7 +171,6 @@ Annexes @include specialist.itely @include input.itely -@include non-music.itely @include spacing.itely @include changing-defaults.itely diff --git a/Documentation/fr/user/literature.itely b/Documentation/fr/user/literature.itely index ff8a2b2771..36c1d35780 100644 --- a/Documentation/fr/user/literature.itely +++ b/Documentation/fr/user/literature.itely @@ -1,21 +1,18 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Literature list @appendix Literature list -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi index 8c60d92155..78c4e03c1d 100644 --- a/Documentation/fr/user/macros.itexi +++ b/Documentation/fr/user/macros.itexi @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5 + Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -10,9 +10,11 @@ @c ***** Displaying text ***** -@c we need this since @q{\} doesn't work with makeinfo 4.8 -- -@c say @q{@value{backslash}} instead -@set backslash \ +@c we need this since @q{\} doesn't work with makeinfo 4.11 -- +@c say @q{@bs} instead +@macro bs +\\ +@end macro @c to get decent quotes in `foo' and ``foo'' @c these need to be split up so that "@qq{foo}." looks nice. :( @@ -67,6 +69,15 @@ @end macro @end ifdocbook +@ifhtml +@macro warning{TEXT} +@cartouche +@b{Note :} \TEXT\ +@end cartouche +@end macro +@end ifhtml + +@ifnothtml @macro warning{TEXT} @quotation @quotation @@ -76,6 +87,7 @@ @end quotation @end quotation @end macro +@end ifnothtml @ifnotinfo @macro notation{TEXT} @@ -148,18 +160,6 @@ @end macro -@c obsolete, remove when translation is fully updated -@macro context{TEXT} -@vindex \TEXT\ -@code{\TEXT\}@c should use rinternals -@end macro - -@c obsolete, remove when translation is fully updated -@macro refcommand{TEXT} -@vindex \TEXT\ -@code{\TEXT\} -@end macro - @macro lydoctitle {TEXT} @emph{\TEXT\} @@ -175,31 +175,41 @@ @c **** Links and references **** @c Definitions for references: -@c @rinternals @c @rglos -@c @rprogram -@c @ruser @c @rlearning +@c @ruser +@c @rprogram @c @rlsr +@c @rinternals +@c all these also have a @...named version, which allows to specify the +@c displayed text for the reference as second argument -@ifhtml -@c ***** HTML ***** + +@c ***** HTML + bigpage is a special case (other manual names), all other +@c formats are treated similarly + +@ifnottex @ifset bigpage -@macro rinternals{TEXT} +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes} +@ref{\TEXT\,,,music-glossary-big-page,Glossaire} @end macro -@macro rglos{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary-big-page,Glossaire} +@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossaire} @end macro -@macro rprogram{TEXT} +@macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme} +@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manuel d'initiation} @end macro @macro ruser{TEXT} @@ -207,39 +217,53 @@ @ref{\TEXT\,,,lilypond-big-page,Manuel de notation} @end macro -@macro rlearning{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation} +@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Manuel de notation} @end macro -@macro rlsr{TEXT} +@macro rprogram{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code} +@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme} @end macro -@end ifset +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Manuel d'utilisation du programme} +@end macro +@macro rlsr{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code} +@end macro -@ifclear bigpage +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Exemples de code} +@end macro @macro rinternals{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} +@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes} @end macro -@macro rglos{TEXT} +@macro rinternalsnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossaire} +@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes} @end macro -@macro rprogram{TEXT} +@end ifset + + +@ifclear bigpage + +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme} +@ref{\TEXT\,,,music-glossary,Glossaire} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Manuel de notation} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire} @end macro @macro rlearning{TEXT} @@ -247,27 +271,19 @@ @ref{\TEXT\,,,lilypond-learning,Manuel d'initiation} @end macro -@macro rlsr{TEXT} +@macro rlearningnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-snippets,Exemples de code} +@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manuel d'initiation} @end macro -@end ifclear - -@end ifhtml - - -@ifdocbook -@c ***** DOCBOOK-XML ***** - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} +@ref{\TEXT\,,,lilypond,Manuel de notation} @end macro -@macro rglos{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossaire} +@ref{\TEXT\,,\DISPLAY\,lilypond,Manuel de notation} @end macro @macro rprogram{TEXT} @@ -275,92 +291,100 @@ @ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme} @end macro -@macro ruser{TEXT} +@macro rprogramnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Manuel de notation} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Manuel d'utilisation du programme} @end macro -@macro rlearning{TEXT} +@macro rlsr{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation} +@ref{\TEXT\,,,lilypond-snippets,Exemples de code} @end macro -@macro rlsr{TEXT} +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code} +@end macro + +@macro rinternals{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-snippets,Exemples de code} +@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} @end macro -@end ifdocbook +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes} +@end macro +@end ifclear -@ifinfo -@c **** INFO **** +@end ifnottex -@macro rinternals{NAME} -@vindex \NAME\ -@inforef{\NAME\,,lilypond-internals,Référence des propriétés internes} -@end macro -@macro rglos{NAME} -@vindex \NAME\ -@inforef{\NAME\,,music-glossary,Glossaire} -@end macro +@c **** TEX **** +@iftex -@macro rprogram{TEXT} +@macro rglos{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme} +@ref{\TEXT\,,,music-glossary,Glossaire} @end macro -@macro ruser{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Manuel de notation} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire} @end macro @macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation} +@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Exemples de code} +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation} @end macro -@end ifinfo - - -@c **** TEX **** -@iftex - -@macro rinternals{TEXT} +@macro ruser{TEXT} @vindex \TEXT\ -@code{\TEXT\} +@ref{\TEXT\,,,lilypond.fr,Manuel de notation} @end macro -@macro rglos {TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Glossaire} +@ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation} @end macro @macro rprogram{TEXT} +@vindex \TEXT\ @ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme} @end macro -@macro ruser{TEXT} -@ref{\TEXT\,,,lilypond.fr,Manuel de notation} -@end macro - -@macro rlearning{TEXT} -@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation} +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Exemples de code} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code} +@end macro + +@macro rinternals{TEXT} +@vindex \TEXT\ +@code{\TEXT\} +@end macro + +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@code{\DISPLAY\} +@end macro + @end iftex -@c Commands specific to translated docs +@c **** Macros specific to translated docs **** @c ugh, cannot set/define global variable 'translationof' in some way? @iftex @@ -381,3 +405,14 @@ Cette section n'est pas encore encore traduite, veuillez vous reporter à la documentation correspondante en anglais. @end macro + +@ifhtml +@macro untranslated +UNTRANSLATED NODE: IGNORE ME +@end macro +@end ifhtml + +@ifnothtml +@macro untranslated +@end macro +@end ifnothtml diff --git a/Documentation/fr/user/non-music.itely b/Documentation/fr/user/non-music.itely deleted file mode 100644 index 6a87611174..0000000000 --- a/Documentation/fr/user/non-music.itely +++ /dev/null @@ -1,143 +0,0 @@ -@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- -@c This file is part of lilypond.tely -@ignore - Translation of GIT committish: 33ba8d40c3493011a4b39ab8b1369701f8013bd6 - - When revising a translation, copy the HEAD committish of the - version that you are working on. See TRANSLATION for details. -@end ignore - -@c \version "2.11.51" - -@c Translators: Valentin Villenave -@c Translation checkers: Jean-Charles Malahieude - -@node Non-musical notation -@chapter Non-musical notation - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Titles and headers:: -* MIDI output:: -* other midi:: -@end menu - -@node Titles and headers -@section Titles and headers - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Creating titles:: -* Custom titles:: -* Reference to page numbers:: -* Table of contents:: -@end menu - -@node Creating titles -@subsection Creating titles - -UNTRANSLATED NODE: IGNORE ME - -@node Custom titles -@subsection Custom titles - -UNTRANSLATED NODE: IGNORE ME - -@node Reference to page numbers -@subsection Reference to page numbers - -UNTRANSLATED NODE: IGNORE ME - -@node Table of contents -@subsection Table of contents - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI output -@section MIDI output - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Creating MIDI files:: -* MIDI block:: -* MIDI instrument names:: -* What goes into the MIDI? FIXME:: -@end menu - -@node Creating MIDI files -@subsection Creating MIDI files - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI block -@subsection MIDI block - -UNTRANSLATED NODE: IGNORE ME - -@node MIDI instrument names -@subsection MIDI instrument names - -UNTRANSLATED NODE: IGNORE ME - -@node What goes into the MIDI? FIXME -@subsection What goes into the MIDI? FIXME - -UNTRANSLATED NODE: IGNORE ME - -@menu -* Repeats and MIDI:: -@end menu - -@node Repeats and MIDI -@unnumberedsubsubsec Repeats and MIDI - -@cindex reprises développées -@funindex \unfoldRepeats - -Au prix de quelques réglages, les reprises de toutes sortes peuvent être -rendues dans le fichier MIDI. Il suffit pour cela de recourir à la -fonction @code{\unfoldRepeats}, qui développe toutes les reprises. En -d'autre termes, @code{\unfoldRepeats} transforme toutes les reprises -en reprises de type @code{unfold}. - - -@lilypond[quote,verbatim,fragment,line-width=8.0\cm] -\unfoldRepeats { - \repeat tremolo 8 {c'32 e' } - \repeat percent 2 { c''8 d'' } - \repeat volta 2 {c'4 d' e' f'} - \alternative { - { g' a' a' g' } - {f' e' d' c' } - } -} -\bar "|." -@end lilypond - - -Lorsque l'on veut utiliser @code{\unfoldRepeats} seulement pour le rendu -MIDI, il faut établir deux blocs @code{\score} : un pour le MIDI, avec -des reprises explicites, et l'autre pour la partition, avec des reprises -notées sous forme de barres de reprise, de trémolo ou de symboles de -pourcentage. Par exemple - -@example -\score @{ - @var{..musique..} - \layout @{ .. @} -@} -\score @{ - \unfoldRepeats @var{..musique..} - \midi @{ .. @} -@} -@end example - - -@node other midi -@section other midi - -UNTRANSLATED NODE: IGNORE ME - diff --git a/Documentation/fr/user/notation-appendices.itely b/Documentation/fr/user/notation-appendices.itely index 7a42e9b9c0..fee2c8fae1 100644 --- a/Documentation/fr/user/notation-appendices.itely +++ b/Documentation/fr/user/notation-appendices.itely @@ -32,17 +32,17 @@ @node Chord name chart @appendixsec Chord name chart -UNTRANSLATED NODE: IGNORE ME +@untranslated @node MIDI instruments @appendixsec MIDI instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @node List of colors @appendixsec List of colors -UNTRANSLATED NODE: IGNORE ME +@untranslated @subsubheading Normal colors @subsubheading X color names @@ -53,12 +53,12 @@ UNTRANSLATED NODE: IGNORE ME @node The Feta font @appendixsec The Feta font -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Note head styles @appendixsec Note head styles -UNTRANSLATED NODE: IGNORE ME +@untranslated @ignore Vous pouvez utiliser les commandes suivantes au sein d'un bloc @@ -113,22 +113,22 @@ Voici la liste exhaustive des symboles : @node All context properties @appendixsec All context properties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Layout properties @appendixsec Layout properties -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Identifiers @appendixsec Identifiers -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Scheme functions @appendixsec Scheme functions -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/fr/user/notation.itely b/Documentation/fr/user/notation.itely index 31a97efb7e..7d97550106 100644 --- a/Documentation/fr/user/notation.itely +++ b/Documentation/fr/user/notation.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 9c6e7a4df574fb28fa9043e585c97a20ca13f10b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/user/percussion.itely index b5b1a75103..5ce10829ae 100644 --- a/Documentation/fr/user/percussion.itely +++ b/Documentation/fr/user/percussion.itely @@ -38,7 +38,7 @@ montrer le rythme d'une mélodie. @subsubsection References for percussion -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Basic percussion notation diff --git a/Documentation/fr/user/pitches.itely b/Documentation/fr/user/pitches.itely index da5dc12ebb..fdf73a4530 100644 --- a/Documentation/fr/user/pitches.itely +++ b/Documentation/fr/user/pitches.itely @@ -24,28 +24,33 @@ et les options de gravure. * Writing pitches:: * Changing multiple pitches:: * Displaying pitches:: -* Note heads:: +* Note heads:: @end menu @node Writing pitches @subsection Writing pitches -Cette section +Cette section explique la manière d'indiquer les hauteurs de note. Il +y a deux modes d'indiquer l'octave des notes : le mode absolu, et le +mode relatif. Le dernier est le plus pratique lors de la saisie d'un +fichier source au clavier de l'ordinateur. @menu -* Normal pitches:: +* Absolute octave entry:: +* Relative octave entry:: * Accidentals:: -* Cautionary accidentals:: -* Micro tones:: * Note names in other languages:: @end menu -@node Normal pitches -@unnumberedsubsubsec Normal pitches +@node Absolute octave entry +@unnumberedsubsubsec Absolute octave entry @cindex noms de note @cindex hauteurs +@cindex absolues, hauteurs +@cindex absolues, octaves +@cindex octaves absolues La hauteur s'écrit --- à moins de préciser une autre langue --- avec la notation anglaise, en utilisant les lettres @code{a} à @code{g}. @@ -81,7 +86,91 @@ c, c,, e, g d,, d, d c Il existe une autre méthode pour préciser à quelle octave se situe la note à graver ; cette méthode demande moins d'indications d'octave -(@code{'} ou @code{,}) --- voir @ref{Relative octaves}. +(@code{'} ou @code{,}) --- voir @ref{Relative octave entry}. + + +@node Relative octave entry +@unnumberedsubsubsec Relative octave entry + +@cindex relatif +@cindex indication d'octave relative +@funindex \relative + +On spécifie les octaves en ajoutant @code{'} et @code{,} aux noms de +hauteurs. En recopiant de la musique, on a vite fait de mettre une note +à la mauvaise octave, et ce genre d'erreur est difficile à retrouver. +Le mode d'écriture \relative prévient ces erreurs dans la mesure où +elles deviennent beaucoup plus évidentes : une seule erreur décale le +reste de la pièce à une mauvaise octave. + + +@example +\relative @var{startpitch} @var{musicexpr} +@end example + +@noindent +ou + +@example +\relative @var{musicexpr} +@end example + +@noindent +@code{c'} est utilisé par défaut si aucune hauteur de départ n'est +définie. + +L'octave des notes mentionnées dans @var{musicexpr} va être calculée de +la manière suivante : si aucun signe de changement d'octave n'est +utilisé, l'intervalle de base entre la note actuelle et la précédente +sera toujours au plus d'une quarte. Cet intervalle est déterminé sans +tenir compte des altérations ; ainsi un @code{fisis} après un +@code{ceses} sera placé au-dessus du @code{ceses}. En d'autres termes, +une quarte doublement augmentée demeure considérée comme un intervavlle +plus petit qu'une quinte diminuée, bien que la quarte doublement +augmentée soit de sept demi-tons et la quinte diminuée de seulement six +demi-tons. + +Les signes de changement d'octave @code{'} et @code{,} peuvent être +ajoutés pour hausser ou baisser la note d'une octave supplémentaire. +Lorsque l'on entre en mode @code{\relative}, une hauteur absolue de +départ peut être spécifiée, et agira dès lors comme si elle précédait la +première note de @var{musicexpr}. Si aucune hauteur de départ n'est +spécifiée, le do central sert de point de départ. + +Voici le mode \relative en action. +@lilypond[quote,fragment,ragged-right,verbatim] +\relative c'' { + b c d c b c bes a +} +@end lilypond + +On utilise les signes de changement d'octave pour les intervalles +dépassant la quarte. + +@lilypond[quote,ragged-right,fragment,verbatim] +\relative c'' { + c g c f, c' a, e'' +} +@end lilypond + +Si l'expression précédente est un accord, c'est la première note de +l'accord qui détermine l'emplacement de la première note du prochain +accord. + +@lilypond[quote,ragged-right,fragment,verbatim] +\relative c' { + c + + +} +@end lilypond + +La hauteur après @code{\relative} contient un nom de note. + +La conversion en mode \relative n'affectera pas les sections @code{\transpose}, +@code{\chordmode} ou @code{\relative} situées dans son argument. Pour +utiliser \relative dans de la musique transposée, un code +@code{\relative} additionnel doit être placé dans @code{\transpose}. @node Accidentals @@ -141,7 +230,29 @@ Référence du programme : @rinternals{LedgerLineSpanner}, @rinternals{NoteHead}. -@node Cautionary accidentals +@unnumberedsubsubsec Micro tones + +@cindex quarts de ton +@cindex demi-bémols, demi-dièses + +Les demi-bémols et demi-dièses s'écrivent en ajoutant respectivement +@code{-eh} et @code{-ih}. Voici une série de dos altérés en hauteurs +croissantes : + +@lilypond[verbatim,ragged-right,quote,relative=2,fragment] +\set Staff.extraNatural = ##f +ceseh ceh cih cisih +@end lilypond + +Les micro-intervalles sont aussi exportés dans le fichier MIDI. + +@knownissues + +Il n'y a pas de standard universellement accepté pour noter le bémol et +demi (qui abaisse la hauteur trois quarts de ton), le symbole de +LilyPond n'est donc conforme à aucun standard. + + @unnumberedsubsubsec Cautionary accidentals @cindex altération, de précaution @@ -170,30 +281,6 @@ L'impression automatique des altérations peut être affinée de plusieurs manières. Pour plus d'information, voir @ref{Automatic accidentals}. -@node Micro tones -@unnumberedsubsubsec Micro tones - -@cindex quarts de ton -@cindex demi-bémols, demi-dièses - -Les demi-bémols et demi-dièses s'écrivent en ajoutant respectivement -@code{-eh} et @code{-ih}. Voici une série de dos altérés en hauteurs -croissantes : - -@lilypond[verbatim,ragged-right,quote,relative=2,fragment] -\set Staff.extraNatural = ##f -ceseh ceh cih cisih -@end lilypond - -Les micro-intervalles sont aussi exportés dans le fichier MIDI. - -@knownissues - -Il n'y a pas de standard universellement accepté pour noter le bémol et -demi (qui abaisse la hauteur trois quarts de ton), le symbole de -LilyPond n'est donc conforme à aucun standard. - - @node Note names in other languages @unnumberedsubsubsec Note names in other languages @@ -261,97 +348,12 @@ espanol.ly do re mi fa sol la sib si @subsection Changing multiple pitches @menu -* Relative octaves:: -* Octave check:: +* Octave checks:: * Transpose:: @end menu -@node Relative octaves -@unnumberedsubsubsec Relative octaves - -@cindex relatif -@cindex indication d'octave relative -@funindex \relative - -On spécifie les octaves en ajoutant @code{'} et @code{,} aux noms de -hauteurs. En recopiant de la musique, on a vite fait de mettre une note -à la mauvaise octave, et ce genre d'erreur est difficile à retrouver. -Le mode d'écriture \relative prévient ces erreurs dans la mesure où -elles deviennent beaucoup plus évidentes : une seule erreur décale le -reste de la pièce à une mauvaise octave. - - -@example -\relative @var{startpitch} @var{musicexpr} -@end example - -@noindent -ou - -@example -\relative @var{musicexpr} -@end example - -@noindent -@code{c'} est utilisé par défaut si aucune hauteur de départ n'est -définie. - -L'octave des notes mentionnées dans @var{musicexpr} va être calculée de -la manière suivante : si aucun signe de changement d'octave n'est -utilisé, l'intervalle de base entre la note actuelle et la précédente -sera toujours au plus d'une quarte. Cet intervalle est déterminé sans -tenir compte des altérations ; ainsi un @code{fisis} après un -@code{ceses} sera placé au-dessus du @code{ceses}. En d'autres termes, -une quarte doublement augmentée demeure considérée comme un intervavlle -plus petit qu'une quinte diminuée, bien que la quarte doublement -augmentée soit de sept demi-tons et la quinte diminuée de seulement six -demi-tons. - -Les signes de changement d'octave @code{'} et @code{,} peuvent être -ajoutés pour hausser ou baisser la note d'une octave supplémentaire. -Lorsque l'on entre en mode @code{\relative}, une hauteur absolue de -départ peut être spécifiée, et agira dès lors comme si elle précédait la -première note de @var{musicexpr}. Si aucune hauteur de départ n'est -spécifiée, le do central sert de point de départ. - -Voici le mode \relative en action. -@lilypond[quote,fragment,ragged-right,verbatim] -\relative c'' { - b c d c b c bes a -} -@end lilypond - -On utilise les signes de changement d'octave pour les intervalles -dépassant la quarte. - -@lilypond[quote,ragged-right,fragment,verbatim] -\relative c'' { - c g c f, c' a, e'' -} -@end lilypond - -Si l'expression précédente est un accord, c'est la première note de -l'accord qui détermine l'emplacement de la première note du prochain -accord. - -@lilypond[quote,ragged-right,fragment,verbatim] -\relative c' { - c - - -} -@end lilypond - -La hauteur après @code{\relative} contient un nom de note. - -La conversion en mode \relative n'affectera pas les sections @code{\transpose}, -@code{\chordmode} ou @code{\relative} situées dans son argument. Pour -utiliser \relative dans de la musique transposée, un code -@code{\relative} additionnel doit être placé dans @code{\transpose}. - - -@node Octave check -@unnumberedsubsubsec Octave check +@node Octave checks +@unnumberedsubsubsec Octave checks @cindex vérification d'octave @@ -503,6 +505,8 @@ musique apparaissant dans un @code{\transpose}. * Key signature:: * Ottava brackets:: * Instrument transpositions:: +* Automatic accidentals:: +* Ambitus:: @end menu @node Clef @@ -769,6 +773,455 @@ c'4^"en sol" ... @end example +@node Automatic accidentals +@unnumberedsubsubsec Automatic accidentals +@cindex Altérations accidentelles automatiques + +Une fonction a été créée pour regrouper les règles suivant lesquelles +s'impriment les altérations. Elle s'invoque de la manière suivante : + +@funindex set-accidental-style +@example +#(set-accidental-style 'REGLE) +@end example + +@c TODO: check the context stuff below +@c -does it *really* work? +@c -the default contexts as specified in +@c scm/music-function.scm seem to be different -vv + +Cette fonction prend pour argument le nom de la règle d'altérations, +auquel peut s'ajouter, comme argument facultatif, le contexte +devant être affecté : + +@example +#(set-accidental-style 'REGLE #('CONTEXTE#)) +@end example + +Si aucun contexte n'est spécifié, le contexte @code{Staff} sera affecté ; +cependant on peut souhaiter l'appliquer au contexte @code{Voice} en lieu +et place. + +Les régles d'altérations suivantes sont possibles : + +@table @code +@item default +C'est la règle d'impression par défaut, qui se rapporte à l'usage +en vigueur au XVIIIème siècle : les altérations accidentelles sont valables toute +une mesure, et uniquement à leur propre octave. + + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + %#(set-accidental-style 'default) + \musicA } + \context Staff = "down"{ + %#(set-accidental-style 'default) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'default" }}} +} +@end lilypond + +@item voice +En principe, LilyPond se souvient de toutes les altérations présentes sur la +portée (contexte Staff). Avec cette règle, cependant, les altérations sont indépendantes +pour chacune des voix. + + +@example + \new Staff << + #(set-accidental-style 'voice) + @{ @dots{} @} + >> +@end example + +De ce fait, les altérations d'une voix sont ignorées dans les autres voix, +ce qui peut donner lieu à un résultat malencontreux. Dans l'exemple suivant, +il est difficile de dire si le deuxième @samp{la} est dièse ou naturel. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'voice) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'voice) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'voice" }}} +} +@end lilypond + +La règle @code{voice} n'est à envisager que dans le cas de voix devant être lues par +des musiciens différents. S'il s'agit d'un @q{conducteur}, ou d'une portée destinée +à un seul musicien, il vaut mieux utiliser @code{modern} ou @code{modern-cautionary}. + + +@item modern +@funindex modern style accidentals +Cette règle est la plus courante au XXème siècle. Les altérations accidentelles +sont imprimées comme avec le style @code{default}, mais lorsqu'une note non-altérée +apparaît à une octave différente, ou bien dans la mesure suivante, des bécarres de précaution +sont ajoutés. Dans l'exemple suivant, notez ainsi les deux bécarres dans la +deuxième mesure de la main droite. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'modern) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'modern) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'modern" }}} +} +@end lilypond + +@item @code{modern-cautionary} +@funindex modern-cautionary +Cette règle est équivalente à @code{modern}, mais les bécarres de précaution sont +imprimés de façon particulière : soit plus petits, soit (par défaut) entre parenthèses. +Il est possible de le définir au moyen de la propriété @code{cautionary-style} +pour l'objet @rinternals{AccidentalSuggestion}. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'modern-cautionary) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'modern-cautionary) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'modern-cautionary" }}} +} +@end lilypond + +@funindex modern-voice +@item modern-voice +Cette règle sert aux altérations dans de la musique polyphonique destinée +autant à des musiciens différents qu'à quelqu'un qui lirait l'ensemble des voix. +Les altérations sont imprimées voix par voix, mais les autres voix, dans le même +contexte @rinternals{Staff}, en @emph{tiennent compte} cette fois. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'modern-voice) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'modern-voice) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'modern-voice" }}} +} +@end lilypond + +@funindex modern-voice-cautionary +@item modern-voice-cautionary +Cette régle est similaire à la précédente, mais les altérations de précautions +(celles que n'aurait pas ajoutées @code{voice}), sont imprimées de façon +particulière. On retrouve donc toutes les altérations qu'imprimerait +@code{default}, mais certaines sont considérées comme étant @qq{de précaution}. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'modern-voice-cautionary) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'modern-voice-cautionary) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'modern-voice-cautionary" }}} +} +@end lilypond + +@item piano +@funindex piano accidentals +Cette règle est adaptée aux contextes GrandStaff -- ce qui n'empêche pas de devoir la spécifier +pour chaque portée individuelle au sein du contexte GrandStaff. + +@example +\new GrandStaff @{ << + \new Staff = "up" @{ << + #(set-accidental-style 'piano) + @{ @dots{} @} + >> @} + \new Staff = "down"@{ << + #(set-accidental-style 'piano) + @{ @dots{} @} + >> @} +>> @} +@end example + +Cette règle est communément employée pour les partitions de piano au XXème siècle. +Très similaire à @code{modern} de par son comportement, elle s'en distingue en ce que +les altérations tiennent compte des autre portées du contexte @rinternals{GrandStaff} ou +@rinternals{PianoStaff}. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'piano) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'piano) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'piano" }}} +} +@end lilypond + +@item piano-cautionary +@funindex #(set-accidental-style 'piano-cautionary) +Identique à @code{#(set-accidental-style 'piano)}, mais les altérations de précaution +sont imprimées différemment. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'piano-cautionary) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'piano-cautionary) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'piano-cautionary" }}} +} +@end lilypond + +@item no-reset +@funindex no-reset accidental style +C'est la même règle que @code{default}, mais l'effet des altérations accidentelles +ne cesse jamais, même dans les mesures suivantes. +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'no-reset) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'no-reset) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'no-reset" }}} +} +@end lilypond + +@item forget +Tout le contraire de @code{no-reset}: l'effet des altérations cesse aussitôt, +et de ce fait, toutes les altérations, quelque soit leur place dans la mesure, sont +imprimées, en fonction de l'éventuelle armure. + +@lilypond[quote,ragged-right] +musicA = { << \relative { cis'8 fis, d'4 8 f bis4 | cis2. 4 | } \\ + \relative { ais'2 cis, | fis8 b a4 cis2 | } >> } + +musicB = { \clef bass \new Voice { \voiceTwo \relative { < fis, a cis>4 + \change Staff = up cis' \change Staff = down + \change Staff = up dis' | \change Staff = down 4 gis + 2 | } }} + +\score { + \new PianoStaff { + << \context Staff = "up" { + #(set-accidental-style 'forget) + \musicA } + \context Staff = "down"{ + #(set-accidental-style 'forget) + \musicB } >> } + \header { piece = \markup {\fill-line { \fontsize #3 "'forget" }}} +} +@end lilypond +@end table + + +@seealso + +Référence du programme : @rinternals{Accidental_engraver}, +@rinternals{Accidental}, @rinternals{AccidentalSuggestion} et @rinternals{AccidentalPlacement}. + + +@knownissues + +Les notes simultanées sont considérées comme des évènements séquentiels. +Ce qui implique que, dans un accord, les altérations accidentelles seront +imprimées comme si les notes de l'accords apparaissaient une par une, en fonction +de l'ordre dans lequels elles ont été saisies -- ce qui peut poser problème lorsqu'au +sein d'un accord certaines altérations dépendent les unes des autres. +Ce problème est à résoudre manuellement, en insérant des @code{!} et des @code{?} après les notes +concernées. + + +@node Ambitus +@unnumberedsubsubsec Ambitus +@cindex ambitus + +L'@emph{ambitus} est l'amplitude des hauteurs d'une voix donnée dans une +partition. Ce terme peut aussi désigner la tessiture qu'un instrument +est capable d'atteindre. Souvent, cet ambitus est imprimé au début des +partitions vocales, afin que les exécutants puissent voir au premier +coup d'oeil s'ils sont en mesure de tenir la partie en question. + +Pour exprimer l'ambitus d'une pièce, on indique avant la clé deux notes +représentant la hauteur la plus basse et la plus haute. Pour imprimer +cet ambitus, il faut ajouter le graveur @rinternals{Ambitus_engraver} +au contexte @rinternals{Voice}. Ainsi, + +@example +\layout @{ + \context @{ + \Voice + \consists Ambitus_engraver + @} +@} +@end example + +@noindent +donne pour résultat + +@lilypond[quote,ragged-right] +\layout { + \context { + \Staff + \consists Ambitus_engraver + } +} + +\relative \new Staff { + as'' c e2 cis,2 +} +@end lilypond + +Si plusieurs voix se trouvent sur une même portée, on peut attribuer le +graveur @rinternals{Ambitus_engraver} au contexte @rinternals{Staff} +plutôt qu'au contexte @rinternals{Voice} ; l'ambitus affiché sera +alors celui de toutes les voix cumulées, non d'une seule des voix +actives. + +@lilypond[verbatim,ragged-right,quote] +\new Staff \with { + \consists "Ambitus_engraver" +} +<< + \new Voice \with { + \remove "Ambitus_engraver" + } \relative c'' { + \override Ambitus #'X-offset = #-1.0 + \voiceOne + c4 a d e f2 + } + \new Voice \with { + \remove "Ambitus_engraver" + } \relative c' { + \voiceTwo + es4 f g as b2 + } +>> +@end lilypond + +@noindent +Cet exemple met en œuvre une fonctionnalité avancée : + +@example +\override Ambitus #'X-offset = #-1.0 +@end example + +@noindent +Ce réglage déplace l'ambitus vers la gauche. Le même résultat aurait pu +être obtenu avec @code{extra-offset}, mais alors le système de mise en +forme n'aurait pas attribué d'espace supplémentaire pour l'objet +déplacé. + +@seealso + +Référence du programme : @rinternals{Ambitus}, +@rinternals{AmbitusLine}, @rinternals{AmbitusNoteHead}, +@rinternals{AmbitusAccidental}. + +Exemples : @rlsr{Pitches}, @rlsr{Vocal music}. + +@knownissues + +LilyPond ne gère pas les collisions entre plusieurs ambitus présents sur +une même portée. + + @node Note heads @subsection Note heads diff --git a/Documentation/fr/user/programming-interface.itely b/Documentation/fr/user/programming-interface.itely index d451ddd612..dcea5e4f37 100644 --- a/Documentation/fr/user/programming-interface.itely +++ b/Documentation/fr/user/programming-interface.itely @@ -1,184 +1,210 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Interfaces for programmers @chapter Interfaces for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Music functions:: +* Programmer interfaces:: +* Building complicated functions:: +* Markup programmer interface:: +* Contexts for programmers:: +* Scheme procedures as properties:: +@end menu -@menu -* Music functions:: -* Programmer interfaces:: -* Building complicated functions:: -* Markup programmer interface:: -* Contexts for programmers:: -* Scheme procedures as properties:: -@end menu @node Music functions @section Music functions -UNTRANSLATED NODE: IGNORE ME - -@menu -* Overview of music functions:: -* Simple substitution functions:: -* Paired substitution functions:: -* Mathematics in functions:: -* Void functions:: -* Functions without arguments:: -* Overview of available music functions:: -@end menu +@untranslated + + +@menu +* Overview of music functions:: +* Simple substitution functions:: +* Paired substitution functions:: +* Mathematics in functions:: +* Void functions:: +* Functions without arguments:: +* Overview of available music functions:: +@end menu + @node Overview of music functions @subsection Overview of music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Simple substitution functions @subsection Simple substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Paired substitution functions @subsection Paired substitution functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Mathematics in functions @subsection Mathematics in functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Void functions @subsection Void functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Functions without arguments @subsection Functions without arguments -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Overview of available music functions @subsection Overview of available music functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @include identifiers.tely @node Programmer interfaces @section Programmer interfaces -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Input variables and Scheme:: +* Internal music representation:: +@end menu -@menu -* Input variables and Scheme:: -* Internal music representation:: -@end menu @node Input variables and Scheme @subsection Input variables and Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Internal music representation @subsection Internal music representation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Building complicated functions @section Building complicated functions -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Displaying music expressions:: +* Music properties:: +* Doubling a note with slurs (example):: +* Adding articulation to notes (example):: +@end menu -@menu -* Displaying music expressions:: -* Music properties:: -* Doubling a note with slurs (example):: -* Adding articulation to notes (example):: -@end menu @node Displaying music expressions @subsection Displaying music expressions -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music properties @subsection Music properties -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Doubling a note with slurs (example) @subsection Doubling a note with slurs (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Adding articulation to notes (example) @subsection Adding articulation to notes (example) -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Markup programmer interface @section Markup programmer interface -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Markup construction in Scheme:: +* How markups work internally:: +* New markup command definition:: +* New markup list command definition:: +@end menu -@menu -* Markup construction in Scheme:: -* How markups work internally:: -* New markup command definition:: -* New markup list command definition:: -@end menu @node Markup construction in Scheme @subsection Markup construction in Scheme -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node How markups work internally @subsection How markups work internally -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup command definition @subsection New markup command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New markup list command definition @subsection New markup list command definition -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Contexts for programmers @section Contexts for programmers -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Context evaluation:: +* Running a function on all layout objects:: +@end menu -@menu -* Context evaluation:: -* Running a function on all layout objects:: -@end menu @node Context evaluation @subsection Context evaluation -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Running a function on all layout objects @subsection Running a function on all layout objects -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Scheme procedures as properties @section Scheme procedures as properties -UNTRANSLATED NODE: IGNORE ME - +@untranslated --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely index 9b8984ebcb..a45a0ad9a5 100644 --- a/Documentation/fr/user/rhythms.itely +++ b/Documentation/fr/user/rhythms.itely @@ -36,6 +36,7 @@ This section discusses rhythms, durations, and bars. * Augmentation dots:: * Tuplets:: * Scaling durations:: +* Ties:: @end menu @node Durations @@ -308,6 +309,156 @@ b16*4 c4 Dans ce manuel : @ref{Tuplets}. +@node Ties +@subsubsection Ties + +@cindex liaison de prolongation +@funindex ~ + +Une liaison de tenue (ou de prolongation) relie deux notes adjacentes de +même hauteur. Dans les faits, elle prolonge la durée d'une note, et ne +doit donc pas être confondue avec les liaisons d'articulation ou de +phrasé. Une liaison de tenue est indiquée au moyen d'un tilde @samp{~}. + +@lilypond[quote,ragged-right,fragment,verbatim] +e' ~ e' ~ +@end lilypond + + +Quand une liaison de tenue se trouve entre deux accords, toutes les +notes de même hauteur entre ces deux accords sont reliées. S'il n'y en +a aucune, aucune liaison n'est créée. Il est également possible de lier +partiellement deux accords, en mettant les liaisons à l'intérieur des +accords. + +@lilypond[quote,ragged-right,fragment,verbatim,relative=1] + +@end lilypond + + +Une liaison de tenue est un moyen parmi d'autres pour prolonger la durée +d'une note, tout comme les points. L'exemple suivant montre deux +manières de matérialiser exactement la même idée : + + +@lilypond[quote,fragment,ragged-right] +\time 3/4 c'2. c'2 ~ c'4 +@end lilypond + +@noindent +Les liaisons de tenues sont utilisées soit lorsque la note dépasse de la +mesure, soit quand les points ne suffisent pas à donner la bonne durée. +Lorsque l'on utilise ces liaisons, les valeurs rythmiques les plus +longues doivent s'aligner sur les subidivisions de la mesure, comme ici : + +@c KEEP LY +@lilypond[fragment,quote,ragged-right] +\relative { + r8^"oui" c8 ~ c2 r4 | r8^"non" c2 ~ c8 r4 +} +@end lilypond + + +Lorsque l'on doit lier de nombreuses notes sur plusieurs mesures, il +devient plus facile d'avoir recours à la division automatique des notes +--- voir @ref{Automatic note splitting}. Ce procédé divise +automatiquement les notes trop longues, et les lie par-delà les barres +de mesure. + +@funindex \repeatTie +@cindex liaison de prolongation, répétition +@cindex reprises avec alternatives et liaisons de prolongation + +Lorsqu'une mesure de seconde fois après une reprise commence sur une +note liée, la liaison doit être répétée. C'est à cela que sert la +commande @code{\repeatTie} : + +@lilypond[fragment,quote,ragged-right,relative=2] +r \repeatTie +@end lilypond + +@cindex laissez vibrer +@cindex liaison, laissez vibrer +@funindex \laissezVibrer + +Les liaisons @qq{Laissez vibrer} (L.V.) sont utilisées pour le piano, la +harpe, et certains instruments de percussion. Elles indiquent à +l'instrumentiste de laisser sonner la note ou l'accord au lieu de +l'étouffer. Cet effet s'obtient avec la commande @code{\laissezVibrer}. + +@lilypond[fragment,ragged-right,verbatim,relative=1] +\laissezVibrer +@end lilypond + +@commonprop + +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 @emph{vrai} +(@q{t} pour @q{true}). Cette même méthode peut servir, par exemple, à +lier un trémolo à un accord. + +@lilypond[fragment,verbatim,relative=1,ragged-right,quote] +\set tieWaitForNote = ##t +\grace { c16[~ e~ g]~ } 2 +\repeat tremolo 8 { c32~ c'~ } 1 +e8~ c~ a~ f~ 2 +@end lilypond + +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). + +@lilypond[fragment,verbatim,relative=1,ragged-right,quote] +2~ | +\override TieColumn #'tie-configuration = + #'((0.0 . 1) (-2.0 . 1) (-4.0 . 1)) +~ | +@end lilypond + + +@predefined + +@funindex \tieUp +@code{\tieUp}, +@funindex \tieDown +@code{\tieDown}, +@funindex \tieNeutral +@code{\tieNeutral}, +@funindex \tieDotted +@code{\tieDotted}, +@funindex \tieDashed +@code{\tieDashed}, +@funindex \tieSolid +@code{\tieSolid}. + + +@seealso + +Glossaire musical : +@rglos{tie}, +@rglos{laissez vibrer}. + +Dans ce manuel : @ref{Automatic note splitting}. + +Référence du programme : +@rinternals{Tie}, +@rinternals{TieColumn}, +@rinternals{LaissezVibrerTie}, +@rinternals{LaissezVibrerTieColumn}. + + +@knownissues + +Un changement de portée, lorsqu'une liaison de tenue est active, ne +peut produire une liaison oblique. + +Le changement de clé ou d'octave pendant une liaison de tenue produit un +résultat indéfini. Dans ces cas-là, il est préférable d'utiliser un +legato. + + @node Writing rests @subsection Writing rests diff --git a/Documentation/fr/user/running.itely b/Documentation/fr/user/running.itely index bd3ae175bf..208ec73016 100644 --- a/Documentation/fr/user/running.itely +++ b/Documentation/fr/user/running.itely @@ -1,65 +1,91 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Running LilyPond @chapter Running LilyPond -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Normal usage:: * Command-line usage:: * Error messages:: * Updating files with convert-ly:: * Reporting bugs:: -@end menu +@end menu + @node Normal usage @section Normal usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Command-line usage @section Command-line usage -UNTRANSLATED NODE: IGNORE ME +@untranslated + +@menu +* Invoking lilypond:: +* Command line options:: +* Environment variables:: +@end menu + +@node Invoking lilypond @subsection Invoking lilypond + +@untranslated + + +@node Command line options @subsection Command line options + +@untranslated + + +@node Environment variables @subsection Environment variables + +@untranslated + + @node Error messages @section Error messages -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Updating files with convert-ly @section Updating with @command{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @subsection Command line options -@menu +@menu * Problems with convert-ly:: -@end menu +@end menu + @node Problems with convert-ly @subsection Problems with @code{convert-ly} -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Reporting bugs @section Reporting bugs -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/scheme-tutorial.itely b/Documentation/fr/user/scheme-tutorial.itely index 04d308b0f5..43d89abc78 100644 --- a/Documentation/fr/user/scheme-tutorial.itely +++ b/Documentation/fr/user/scheme-tutorial.itely @@ -1,21 +1,28 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Scheme tutorial @appendix Scheme tutorial -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@menu +* Tweaking with Scheme:: +@end menu + +@node Tweaking with Scheme +@appendixsec Tweaking with Scheme + +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely index 2c989a6eaa..44f4ca245c 100644 --- a/Documentation/fr/user/setup.itely +++ b/Documentation/fr/user/setup.itely @@ -1,81 +1,97 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-program.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Setup @chapter Setup -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Setup for specific Operating Systems:: * Text editor support:: * Point and click:: -@end menu +@end menu + @node Setup for specific Operating Systems @section Setup for specific Operating Systems -UNTRANSLATED NODE: IGNORE ME +@untranslated -@menu + +@menu * MacOS X on the command-line:: -@end menu +@end menu + @node MacOS X on the command-line @subsection MacOS X on the command-line -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Text editor support @section Text editor support -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Emacs mode:: * Vim mode:: * jEdit:: * TexShop:: * TextMate:: -@end menu +* LilyKDE:: +@end menu + @node Emacs mode @subsection Emacs mode -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vim mode @subsection Vim mode -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node jEdit @subsection jEdit -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node TexShop @subsection TexShop -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node TextMate @subsection TextMate -UNTRANSLATED NODE: IGNORE ME +@untranslated + + +@node LilyKDE +@subsection LilyKDE + +@untranslated + @node Point and click @section Point and click -UNTRANSLATED NODE: IGNORE ME +@untranslated + --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/user/spacing.itely index 28ff8d8d39..29e0b8ba31 100644 --- a/Documentation/fr/user/spacing.itely +++ b/Documentation/fr/user/spacing.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 964d024dd4f022ba7cd66adc13c0169035d4c4e5 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -9,70 +9,72 @@ @c \version "2.11.51" - @node Spacing issues @chapter Spacing issues -UNTRANSLATED NODE: IGNORE ME -@menu +@menu * Paper and pages:: * Music layout:: -* Displaying spacing:: * Breaks:: * Vertical spacing:: * Horizontal spacing:: -* Page layout MOVED FROM LM:: -@end menu +* Fitting music onto fewer pages:: +@end menu + @node Paper and pages @section Paper and pages -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Paper size:: * Page formatting:: -@end menu +@end menu + @node Paper size @subsection Paper size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page formatting @subsection Page formatting -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Music layout @section Music layout -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Setting the staff size:: * Score layout:: -@end menu +@end menu + @node Setting the staff size @subsection Setting the staff size -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Score layout @subsection Score layout -UNTRANSLATED NODE: IGNORE ME - -@node Displaying spacing -@section Displaying spacing +@untranslated -UNTRANSLATED NODE: IGNORE ME @node Breaks @section Breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Line breaking:: * Page breaking:: * Optimal page breaking:: @@ -80,154 +82,239 @@ UNTRANSLATED NODE: IGNORE ME * Minimal page breaking:: * Explicit breaks:: * Using an extra voice for breaks:: -@end menu +@end menu + @node Line breaking @subsection Line breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Page breaking @subsection Page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page breaking @subsection Optimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Optimal page turning @subsection Optimal page turning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Minimal page breaking @subsection Minimal page breaking -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit breaks @subsection Explicit breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Using an extra voice for breaks @subsection Using an extra voice for breaks -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing @section Vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Vertical spacing inside a system:: * Vertical spacing between systems:: * Explicit staff and system positioning:: * Two-pass vertical spacing:: * Vertical collision avoidance:: -@end menu +@end menu + @node Vertical spacing inside a system @subsection Vertical spacing inside a system -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical spacing between systems @subsection Vertical spacing between systems -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Explicit staff and system positioning @subsection Explicit staff and system positioning -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Two-pass vertical spacing @subsection Two-pass vertical spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Vertical collision avoidance @subsection Vertical collision avoidance -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Horizontal spacing @section Horizontal Spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Horizontal spacing overview:: * New spacing area:: * Changing horizontal spacing:: * Line length:: * Proportional notation:: -@end menu +@end menu + @node Horizontal spacing overview @subsection Horizontal spacing overview -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node New spacing area @subsection New spacing area -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Changing horizontal spacing @subsection Changing horizontal spacing -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Line length @subsection Line length -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node Proportional notation @subsection Proportional notation -UNTRANSLATED NODE: IGNORE ME - -@node Page layout MOVED FROM LM -@section Page layout MOVED FROM LM +@untranslated -UNTRANSLATED NODE: IGNORE ME - -@menu -* Introduction to layout:: -* Global sizes:: -* Line breaks:: -* Page breaks:: -* Fitting music onto fewer pages:: -@end menu -@node Introduction to layout -@subsection Introduction to layout - -UNTRANSLATED NODE: IGNORE ME - -@node Global sizes -@subsection Global sizes - -UNTRANSLATED NODE: IGNORE ME - -@node Line breaks -@subsection Line breaks - -UNTRANSLATED NODE: IGNORE ME - -@node Page breaks -@subsection Page breaks - -UNTRANSLATED NODE: IGNORE ME @node Fitting music onto fewer pages -@subsection Fitting music onto fewer pages +@section Fitting music onto fewer pages -UNTRANSLATED NODE: IGNORE ME +@menu +* Displaying spacing:: +* Changing spacing:: +@end menu +@node Displaying spacing +@subsection Displaying spacing + +@untranslated + + +@node Changing spacing +@subsection Changing spacing + +Parfois, une partition peut se terminer avec seulement +un ou deux systèmes sur la dernière page. Ceci peut être ennuyeux +surtout si vous constatez, en regardant les pages précédentes, qu'il +reste encore beaucoup de place sur celles-ci. + +Si vous vous intéressez aux problèmes de mise en page, +@code{annotate-spacing} peut alors être un outil d'une valeur +inestimable. Cette commande imprime les valeurs +de nombreuses commandes d'espacement concernant la mise en page. +Consultez @ref{Displaying spacing} pour de plus amples informations. À l'aide +des informations données par @code{annotate-spacing}, on peut +voir quelles marges il est souhaitable de modifier afin de résoudre le +problème. + + +En plus d'agir sur les marges, il existe d'autres possibilités +qui permettent de gagner de la place. + +@itemize +@item +Demander à LilyPond de placer les systèmes aussi +près que possible les uns des autres (pour en disposer autant +que possible sur une page), tout en répartissant les systèmes afin +de ne pas laisser de blanc en bas de la dernière page. + +@example +\paper @{ + between-system-padding = #0.1 + between-system-space = #0.1 + ragged-last-bottom = ##f + ragged-bottom = ##f +@} +@end example + +@item +Obliger LilyPond à mettre un certain nombre de systèmes +par page. Par exemple, si LilyPond veut placer onze systèmes dans une page, +vous pouvez l'obliger à n'en mettre que dix. + +@example +\paper @{ + system-count = #10 +@} +@end example + +@item +Supprimer (ou réduire) les objets qui augmentent la hauteur du +système. C'est le cas en particulier de certaines reprises (avec des +alternatives) qui placent des crochets au dessus des portées. Si ces crochets +de reprise se poursuivent sur deux systèmes, ils prendront plus de +place que s'ils sont regroupés sur un même système. + +Un autre exemple : déplacer les nuances qui @qq{débordent} d'un système. + +@lilypond[verbatim,quote,fragment] +\relative c' { + e4 c g\f c + \override DynamicLineSpanner #'padding = #-1.8 + \override DynamicText #'extra-offset = #'( -2.1 . 0) + e4 c g\f c +} +@end lilypond + +@item +Modifier l'espacement vertical avec @code{SpacingSpanner}. Reportez-vous à +@ref{Changing horizontal spacing} pour plus de détails. + +@lilypond[verbatim,quote] +\score { + \relative c'' { + g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 | + g4 e e2 | f4 d d2 | c4 e g g | c,1 | + d4 d d d | d4 e f2 | e4 e e e | e4 f g2 | + g4 e e2 | f4 d d2 | c4 e g g | c,1 | + } + \layout { + \context { + \Score + \override SpacingSpanner + #'base-shortest-duration = #(ly:make-moment 1 4) + } + } +} +@end lilypond + +@end itemize --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. diff --git a/Documentation/fr/user/specialist.itely b/Documentation/fr/user/specialist.itely index 3f356b44f9..f499224199 100644 --- a/Documentation/fr/user/specialist.itely +++ b/Documentation/fr/user/specialist.itely @@ -1,6 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- @ignore - Translation of GIT committish: 9c6e7a4df574fb28fa9043e585c97a20ca13f10b + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -23,6 +23,7 @@ spécifique à certains intruments ou certaines époques. * Wind instruments:: * Chord notation:: * Ancient notation:: +* World music:: @end menu @include vocal.itely @@ -33,3 +34,4 @@ spécifique à certains intruments ou certaines époques. @include wind.itely @include chords.itely @include ancient.itely +@include world.itely diff --git a/Documentation/fr/user/templates.itely b/Documentation/fr/user/templates.itely index 7bb5331ea1..86418b2a12 100644 --- a/Documentation/fr/user/templates.itely +++ b/Documentation/fr/user/templates.itely @@ -1,21 +1,20 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond-learning.tely @ignore - Translation of GIT committish: 3975a6210f49b40850e3f5101aad1ea4b09883f0 + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.11.51" - @node Templates @appendix Templates -UNTRANSLATED NODE: IGNORE ME +@untranslated + -@menu +@menu * Single staff:: * Piano templates:: * String quartet:: @@ -23,11 +22,13 @@ UNTRANSLATED NODE: IGNORE ME * Ancient notation templates:: * Jazz combo:: * lilypond-book templates:: -@end menu +@end menu + @node Single staff @appendixsec Single staff -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec Notes only @appendixsubsec Notes and lyrics @@ -36,7 +37,8 @@ UNTRANSLATED NODE: IGNORE ME @node Piano templates @appendixsec Piano templates -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec Solo piano @appendixsubsec Piano and melody with lyrics @@ -45,14 +47,16 @@ UNTRANSLATED NODE: IGNORE ME @node String quartet @appendixsec String quartet -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec String quartet @appendixsubsec String quartet parts @node Vocal ensembles @appendixsec Vocal ensembles -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec SATB vocal score @appendixsubsec SATB vocal score and automatic piano reduction @@ -60,23 +64,25 @@ UNTRANSLATED NODE: IGNORE ME @node Ancient notation templates @appendixsec Ancient notation templates -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec Transcription of mensural music @appendixsubsec Gregorian transcription template @node Jazz combo @appendixsec Jazz combo -UNTRANSLATED NODE: IGNORE ME +@untranslated + @node lilypond-book templates @appendixsec lilypond-book templates -UNTRANSLATED NODE: IGNORE ME +@untranslated + @appendixsubsec LaTeX @appendixsubsec Texinfo +@appendixsubsec xelatex --- SKELETON FILE -- -When you actually translate this file, please remove these lines as -well as all `UNTRANSLATED NODE: IGNORE ME' lines. +@c -- SKELETON FILE -- diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/user/text.itely index 2a1ad6f481..58b987bb15 100644 --- a/Documentation/fr/user/text.itely +++ b/Documentation/fr/user/text.itely @@ -40,7 +40,6 @@ les insérer directement dans votre fichier LilyPond. Ce fichier devra * Text and line spanners:: * Text spanners:: * Text marks:: -* New dynamic marks:: @end menu @node Text scripts @@ -443,46 +442,6 @@ affectation à chacune des portées : Référence du programme : @rinternals{RehearsalMark}. -@node New dynamic marks -@unnumberedsubsubsec New dynamic marks - -Grâce à la commande @code{make-dynamic-script}, vous pouvez créer de -nouvelles marques textuelles de nuances que vous combinerez -éventuellement avec les signes de nuances. -Notez bien que la police des nuances en contient que les caractères -@code{f,m,p,r,s} and @code{z}. - -Certains composants, tels que les marques de nuances, possèdent des -propriétés particulières et prédéfinies quant à leur police. Lorsque -vous créez du texte en pareille situation, nous vous recommandons -d'utiliser @code{normal-text} pour annuler ces propriétés. Voir -@ref{Text markup commands} pour plus de détails. - -@cindex make-dynamic-script - -@lilypond[quote,verbatim,ragged-right] -sfzp = #(make-dynamic-script "sfzp") -\relative c' { - c4 c c\sfzp c -} -@end lilypond - -@cindex Nuances éditoriales -@cindex Nuances, entre parenthèses - -Vous pouvez aussi encadrer les nuances entre parenthèses ou entre -crochets. Ceci est souvent utilisé pour ajouter des nuances propres à -une édition donnée. - -@lilypond[quote,verbatim,ragged-right] -rndf = \markup{ \center-align {\line { \bold{\italic (} - \dynamic f \bold{\italic )} }} } -boxf = \markup{ \bracket { \dynamic f } } -{ c'1_\rndf c'1_\boxf } -@end lilypond - - - @node Formatting text @subsection Formatting text diff --git a/Documentation/fr/user/tutorial.itely b/Documentation/fr/user/tutorial.itely index 0604b0ba43..de949423e6 100644 --- a/Documentation/fr/user/tutorial.itely +++ b/Documentation/fr/user/tutorial.itely @@ -1,7 +1,7 @@ @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- @c This file is part of lilypond.tely @ignore - Translation of GIT committish: 71b67137f76fa4e8aede58299630369f616004d9 + Translation of GIT committish: 0b3b41414fa52672d7d9416c265cd8d0568eef13 When revising a translation, copy the HEAD committish of the version that you are working on. See TRANSLATION for details. @@ -10,35 +10,27 @@ @c \version "2.11.51" @ignore -Tutorial guidelines: +Tutorial guidelines: (different from policy.txt!) - unless you have a really good reason, use either - @l ilypond[quote,ragged-right,verbatim] - or - @l ilypond[quote,ragged-right,verbatim,fragment,relative=2] - (without spaces) - Don't use any other relative=X commands (make it a non-fragment - example), and don't use fragment without relative=2. -- use "aes" and "ees" instead of "as" and "aes". I know it's not - correct Dutch naming, but let's not confuse people with this until - we get to the Basic notation chapter. -@end ignore + @lilypond[verbatim,quote] + or + @lilypond[verbatim,quote,relative=2] + Don't use any other relative=X commands. +- use "aes" and "ees" instead of "as" and "es". I know it's not + correct Dutch naming, but let's not confuse people with this + until we get to the Basic notation chapter. -@c old info that will probably be removed. -@c TODO: -@c * more details about running lilypond; error messages, -@c compiling/viewing (emacs?) -@c * where to go from First steps+More basics? +- Add "Music Glossary: @rglos{foo}" to the *top* of the relevant + portions of the tutorial. -@c wherever possible, do not include index entries here; the -@c index should point to stuff in the reference manual. -gp +@end ignore -@c Your first LilyPond score in 10 minutes? @c Translators: Nicolas Grandclaude, Ludovic Sardain, Gauvain Pocentek @c Translation checkers: Jean-Charles Malahieude, Valentin Villenave, John Mandereau - +@c Translation status: post-GDP @node Tutorial @chapter Tutorial @@ -48,28 +40,6 @@ par LilyPond, qui vous permettra de faire fonctionner le logiciel pour produire une partition. Après ce premier contact, nous verrons comment créer des partitions utilisant une notation musicale courante. -@ifhtml -Beaucoup de gens apprennent à utiliser les programmes en les essayant -et en bidouillant avec. C'est également possible avec LilyPond. Si -vous cliquez sur une image dans la version HTML de ce manuel, vous -verrez exactement le code LilyPond utilisé pour générer cette image. -Essayez sur cette image : - -@c no verbatim here -@c KEEP LY -@lilypond[quote,ragged-right] -\relative c'' { - c-\markup { \bold \huge { Cliquez ici. } } -} -@end lilypond - -En copiant et en collant tout le code de l'extrait ly dans un fichier -test, vous aurez un modèle de base pour faire vos expériences. Si vous -apprenez de cette façon, vous aurez probablement envie d'imprimer ou de -garder un lien vers l'@ruser{Cheat sheet}, tableau qui répertorie les -commandes usuelles pour une consultation rapide. -@end ifhtml - @menu * First steps:: * Single staff notation:: @@ -82,22 +52,28 @@ commandes usuelles pour une consultation rapide. @node First steps @section First steps -Cette section présente sommairement la façon de travailler avec LilyPond. +Cette section présente les aspects élémentaires de l'utilisation de +LilyPond. @menu * Compiling a file:: * Simple notation:: * Working on text files:: -* How to read the tutorial:: +* How to read the manual:: @end menu @node Compiling a file @subsection Compiling a file -Le premier exemple montre comment débuter avec LilyPond. Pour créer -une partition, on écrit un fichier de texte qui décrit la notation -musicale. Par exemple, si l'on écrit +@cindex compilation + +Pour créer une partition avec LilyPond, on écrit un fichier texte, +appelé fichier source, qui décrit la notation musicale. La +@emph{compilation} de ce fichier source par LilyPond produit un +fichier graphique imprimable, et si on le désire un fichier MIDI qui +peut être joué par un séquenceur. Voici un premier exemple simple de +fichier source LilyPond. @example @{ @@ -106,10 +82,11 @@ musicale. Par exemple, si l'on écrit @end example @noindent -le résultat ressemblera à +Le compilation de cette partition donnera quelque chose de sembable à +l'image ci-dessous. @c in this case we don't want verbatim -@lilypond[quote,ragged-right] +@lilypond[quote] { c' e' g' e' } @@ -118,53 +95,68 @@ le résultat ressemblera à @c DIV specific Il est aussi possible d'utiliser les noms de notes français @samp{do re mi fa sol la si}, en insérant au début du fichier la ligne -@samp{\include "italiano.ly"} +@samp{\include "italiano.ly"}. @c END DIV -@emph{Attention :} tout extrait de code LilyPond doit être entouré -d'une @{paire d'accolades@}. De plus, pour éviter toute ambiguïté, il -est préférable d'entourer les accolades par des espaces ou retours à -la ligne. Bien que certains exemples de ce manuel ne comportent pas -d'accolades, ne les oubliez pas dans vos partitions ! +@warning{Tout extrait de code LilyPond doit être entouré d'une +@strong{@{ paire d'accolades @}}. De plus, pour éviter toute +ambiguïté, il est préférable d'entourer les accolades par des espaces +ou retours à la ligne. Bien que certains exemples de ce manuel ne +comportent pas d'accolades, ne les oubliez pas dans vos partitions ! +Pour plus d'informations sur l'affichage des exemples de cette +documentation, consultez @ref{How to read the manual}.} + @cindex casse, prise en compte de -De plus, LilyPond est sensible à la casse. @code{ @{ c d e @} } est -un code valide ; @code{ @{ C D E @} } produira un message d'erreur. +@cindex prise en compte de la casse +@cindex sensibilité à la casse +De plus, LilyPond est @strong{sensible à la casse} : le code +@w{@code{@{ c d e @}}} est valide, alors que @w{@code{@{ C D E @}}} +produira un message d'erreur. -@sp 1 +@smallspace @subheading Entering music and viewing output +@cindex fichier PDF +@cindex PDF +@cindex partition, lire +@cindex lire la partition + Dans cette section nous expliquerons quelles commandes exécuter et -comment voir ou imprimer le résultat de LilyPond. +comment voir ou imprimer le résultat produit par LilyPond. + +Notez qu'il existe plusieurs éditeurs de texte disponibles avec un bon +support de LilyPond ; consultez @rprogram{Text editor support}. + +@warning{Le premier démarrage de LilyPond peut prendre une minute ou +deux, afin de faire la liste des polices du système. LilyPond démarre +en principe plus rapidement lors des exécutions suivantes.} + @subsubheading MacOS X Si vous double-cliquez sur @code{LilyPond.app}, un fichier d'exemple s'ouvrira. Sauvegardez-le, par exemple, sous @file{test.ly} sur votre -bureau, et traitez-le ensuite avec la commande du menu @samp{Compile > -Typeset File}. Le fichier PDF résultant sera alors affiché sur votre -écran. - -Notez que le premier démarrage peut prendre une minute ou deux, car -toutes les polices système doivent être d'abord analysées. +bureau, puis traitez-le avec la commande de menu @samp{Compile > +Typeset File}. Le fichier PDF résultant sera alors affiché à l'écran. À l'avenir, vous aurez certainement recours aux commandes @qq{Nouveau} ou @qq{Ouvrir}. Vous devez enregistrer votre fichier avant de lancer -la création de la partition. Si une erreur advient pendant le -traitement, vous la trouverez dans la fenêtre @qq{log}. +la gravure de la partition par LilyPond. Si une erreur apparaît +pendant le traitement, vous la trouverez dans la fenêtre @qq{log}. @subsubheading Windows -Sous Windows, lorsque vous double-cliquez sur l'icône LilyPond qui se -trouve sur le Bureau, un fichier d'exemple s'ouvre dans un simple -éditeur de texte. Enregistrez-le, par exemple en tant que -@file{test.ly} sur votre Bureau, puis double-cliquez sur son icône -(qui montre une note de musique) pour le traiter. Après quelques -secondes, vous obtiendrez un fichier @file{test.pdf} sur votre Bureau, -fichier que vous pourrez ouvrir pour voir la partition imprimée. Une -autre méthode pour lancer le traitement du fichier @file{test.ly} est -de le glisser avec votre souris sur l'icône de LilyPond. +Sous Windows, double-cliquez sur l'icône LilyPond qui se trouve sur le +bureau, un fichier d'exemple s'ouvre dans un simple éditeur de texte. +Enregistrez-le, par exemple en tant que @file{test.ly} sur le bureau, +puis double-cliquez sur son icône (qui montre une note de musique) +pour le traiter. Après quelques secondes, vous obtiendrez un fichier +@file{test.pdf} sur le bureau, fichier que vous pourrez ouvrir pour +voir la partition gravée. Une autre méthode pour lancer le traitement +du fichier @file{test.ly} est de le glisser avec votre souris sur +l'icône de LilyPond. Pour modifier un fichier @file{.ly} existant, faites un clic droit dessus et sélectionnez @qq{Éditer la source}. Pour partir d'un @@ -173,26 +165,12 @@ utilisez la commande @qq{New} du menu @qq{File}. En double-cliquant sur le fichier, vous obtiendrez, en plus du fichier PDF, un fichier @file{.log} qui récapitule les opérations que LilyPond -a effectuées sur votre fichier. Si une erreur survient, c'est ce -fichier qu'il vous faudra étudier. - -Notez qu'il existe d'autres éditeurs de texte, certains disposant d'un -meilleur support pour LilyPond ; reportez-vous à @rprogram{Text editor support}. +a effectuées sur votre fichier. Si une erreur survient, vous en +trouverez les détails dans ce fichier. -@subsubheading Unix +@subsubheading UNIX - -Commencez par ouvrir une fenêtre de terminal et un éditeur de -texte. Par exemple, vous pouvez ouvrir un xterm et exécuter -@code{joe}. @footnote{Il existe des fichiers de macros pour les fans -de VIM et un -@code{LilyPond-mode} pour les fans d'Emacs. S'ils ne sont pas -encore installés, consultez le fichier @file{INSTALL.txt}. L'outil -d'édition le plus facile d'utilisation est de loin -@file{LilyPondTool}. Vous trouverez plus d'informations dans -@rprogram{Text editor support}.} Dans votre -éditeur, entrez le texte suivant et sauvegardez le fichier sous -@file{test.ly} +Créez un fichier texte @file{test.ly} qui contient @verbatim { @@ -201,83 +179,87 @@ d'édition le plus facile d'utilisation est de loin @end verbatim @noindent -Pour traiter @file{test.ly}, procédez comme ceci : +Pour traiter @file{test.ly}, entrez la commande suivante dans un +terminal : @example lilypond test.ly @end example @noindent -Vous verrez quelque chose ressemblant à : +Vous verrez quelque chose ressemblant à @example lilypond test.ly -GNU LilyPond 2.10.0 -Processing `test.ly' -Parsing... -Interpreting music... [1] -Preprocessing graphical objects... -Calculating line breaks... [2] -Layout output to `test.ps'... -Converting to `test.pdf'... +GNU LilyPond @version{} +Traitement de « test.ly » +Analyse... +Interprétation en cours de la musique... +Pré-traitement des éléments graphiques... +Détermination du nombre optimal de pages... +Répartition de la musique sur une page... +Dessin des systèmes... +Sortie mise en page vers « test.ps »... +Conversion à « ./test.pdf »... @end example @c DIV specific -Suivant votre installation, ces messages peuvent être traduits. -@c END DIV - -@cindex fichier PDF -@cindex visionnage de la musique - @noindent -De tout cela résulte un fichier @file{test.pdf}, que vous pouvez imprimer -ou visualiser avec les outils standards de votre système -d'exploitation. @footnote{Si votre système ne dispose pas des outils -nécessaires, vous pouvez essayer -@uref{http://@/www@/.cs@/.wisc@/.edu/@/~ghost/,Ghostscript}, un -programme pour afficher et imprimer librement les fichiers PDF et PostScript.} +Suivant votre installation, ces messages peuvent être traduits ou +non. +@c END DIV @node Simple notation @subsection Simple notation -Il y a certains éléments graphiques que LilyPond ajoute +Il y a certains éléments graphiques de notation que LilyPond ajoute automatiquement. Dans l'exemple suivant, nous n'avons fourni que quatre hauteurs, mais LilyPond a ajouté une clé, un chiffre de mesure et du rythme. -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] { c' e' g' e' } @end lilypond @noindent -Ce comportement peut être modifié, mais dans bien des cas ces -attributions automatiques s'avèrent utiles. +Ces valeurs automatiques simplifient la saisie du code source dans +bien des cas ; nous verrons plus loin comment les indiquer +explicitement. -@subheading Pitches -Le moyen le plus simple d'entrer des notes est d'utiliser le mode -@code{\relative}. Avec ce mode, l'@rglos{interval} entre la note et -celle qui la précède est supposé inférieur ou égal à une -@rglos{fourth}. Commençons par entrer la partition la plus -élémentaire qui soit, une @rglos{scale}. +@subheading Hauteurs -@lilypond[quote,ragged-right,verbatim] +Glossaire musical : @rglos{pitch}, @rglos{interval}, +@rglos{scale}, @rglos{middle C}, @rglos{octave}, +@rglos{accidental}. + +Le moyen le plus simple d'entrer des notes est d'utiliser le mode +d'octaves relatives, ou mode @code{\relative}. Dans ce mode, l'octave +de chaque note est sélectionnée automatiquement de façon à ce qu'elle +soit la plus proche possible de la note précédente, c'est-à-dire de +façon à ce que l'intervalle avec la note précédente soit au plus d'une +quarte. Commençons par saisir une partition très simple, à savoir une +gamme. + +@lilypond[verbatim,quote] +% set the starting point to middle C \relative c' { c d e f g a b c } @end lilypond -La note de départ est @rglos{middle C}. Chacune des notes qui suivent -est à moins d'une quarte de la note précédente --- en d'autres termes, -le premier @samp{c} est le do central, entre la clé de sol et -la clé de fa, puis est suivi par le ré le plus proche, et ainsi de -suite. On peut bien sûr créer des mélodies d'intervalles plus étendus : +La note de départ est le @notation{do central}. Chacune des notes qui +suivent est placée à l'octave la plus proche de la note précédente --- +en d'autres termes, le premier @samp{c} est le do central, entre la +clé de sol et la clé de fa, puis est suivi par le ré le plus proche, +et ainsi de suite. On peut bien sûr créer des mélodies avec de plus +grands intervalles, toujours avec le mode @code{\relative} : -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c' { d f a g c b f d @@ -285,16 +267,51 @@ suite. On peut bien sûr créer des mélodies d'intervalles plus étendus : @end lilypond @noindent -Comme vous l'aurez remarqué, cet exemple ne commence plus sur le do du -milieu. La première note --- le @samp{d} --- est le ré qui en est le -plus proche. +Remarquez que cet exemple ne commence plus sur le do central : la +première note --- le @samp{d} --- est le ré qui en est le plus proche. + +Dans l'exemple suivant, on remplace @code{c'} dans la commande +@w{@code{\relative c'}} par @code{c''}, afin de calculer l'octave de +la première note par rapport au do situé une octave au-dessus du do +central : + +@lilypond[verbatim,quote] +% one octave above middle C +\relative c'' { + e c a c +} +@end lilypond + +Le mode d'octaves relatives peut être déroutant au début, mais c'est +souvent la façon la plus économique de saisir les hauteurs en +utilisant le clavier de l'ordinateur de façon classique. Détaillons +sur un exemple le calcul des octaves relatives. En partant d'un si +sur la troisième ligne de la clé de sol, un do, un ré ou un mi sans +indication d'octave particulière seront placés juste au-dessus du si, +c'est-à-dire au plus à une quarte ascendante du si, alors qu'un la, un +sol ou un fa seront placés juste en-dessous du si, c'est-à-dire au +plus à une quarte descendante du si. + +@lilypond[verbatim,quote] +\relative c'' { + b c % c is 1 staff space up, so is the c above + b d % d is 2 up or 5 down, so is the d above + b e % e is 3 up or 4 down, so is the e above + b a % a is 6 up or 1 down, so is the a below + b g % g is 5 up or 2 down, so is the g below + b f % f is 4 up or 3 down, so is the f below +} +@end lilypond -Pour ajouter des intervalles supérieurs à une quarte, il suffit -d'indiquer si la note est à l'octave supérieure ou inférieure, en -ajoutant respectivement une apostrophe @code{'} ou une virgule -@code{,} au nom de la note. +Notez que le calcul des octaves relatives @strong{ne dépend pas des +altérations} des notes, dièses bémols ou bécarre. -@lilypond[quote,ragged-right,verbatim] +Pour obtenir des intervalles supérieurs à une quarte, on peut ajouter +des apostrophes @code{'} --- qui font chacune monter la hauteur d'une +octave --- ou des virgules @code{,} --- qui font chacune descendre la +hauteur d'une octave --- au nom de la note. + +@lilypond[verbatim,quote] \relative c'' { a a, c' f, g g'' a,, f' @@ -303,21 +320,29 @@ ajoutant respectivement une apostrophe @code{'} ou une virgule @noindent Pour déplacer une note deux octaves (ou davantage !) plus haut ou plus -bas, il suffit de mettre plusieurs @code{''} ou plusieurs @code{,,} --- +bas, il suffit de mettre deux (ou davantage) de @code{'} ou ou @code{,} --- attention cependant à bien mettre deux apostrophes @code{''}, et non un guillemet @code{"}@tie{}! C'est de cette même manière que l'on peut modifier la valeur de départ de @code{\relative c'}. -@subheading Durations (rhythms) +@subheading Durées et rythme + +Glossaire musical : @rglos{beam}, @rglos{duration}, +@rglos{whole note}, @rglos{half note}, @rglos{quarter note}, +@rglos{dotted note}. -La @rglos{duration} d'une note est indiquée par un nombre -qui suit son nom : @samp{1} pour une @rglos{whole -note}, @samp{2} pour une @rglos{half note}, @samp{4} pour -une @rglos{quarter note} et ainsi de suite. Les hampes sont -ajoutées automatiquement. +La @notation{durée} d'une note est indiquée par un nombre qui suit sa +hauteur : @samp{1} pour une @notation{ronde}, @samp{2} pour une +@notation{blanche}, @samp{4} pour une @notation{noire} et ainsi de +suite. Les @notation{crochets} et @notation{liens} sont ajoutées +automatiquement. -@lilypond[quote,ragged-right,verbatim] +Si aucune durée n'est indiquée pour une note, la dernière durée entrée +est utilisée. En l'absence d'indication de durée, la première note +est une noire. + +@lilypond[verbatim,quote] \relative c'' { a1 a2 a4 a8 a @@ -325,15 +350,10 @@ ajoutées automatiquement. } @end lilypond -@noindent -Si aucune durée n'est indiquée, la dernière durée entrée sera utilisée -pour les notes suivantes. En l'absence d'indication, la première note -est une noire. - -Une @rglos{dotted note} s'obtient en ajoutant un point @samp{.} à -la valeur rythmique. +Une @notation{note pointée} s'obtient en ajoutant un point @code{.} à +la valeur rythmique. Le point doit être précédé d'un nombre de durée. -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c'' { a a a4. a8 a8. a16 a a8. a8 a4. @@ -341,12 +361,14 @@ la valeur rythmique. @end lilypond -@subheading Rests +@subheading Silences + +Glossaire musical : @rglos{rest}. -On saisit un @rglos{rest} tout comme une note, mais avec le -caractère @samp{r}. +On saisit un @notation{silence} tout comme une note, mais avec la +lettre @samp{r}. -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c'' { a r r2 r8 a r4 r4. r8 @@ -354,12 +376,14 @@ caractère @samp{r}. @end lilypond -@subheading Time signature +@subheading Métrique -La @rglos{time signature} peut être définie à l'aide de la commande -@code{\time} : +Glossaire musical : @rglos{time signature}. -@lilypond[quote,ragged-right,verbatim] +La @notation{métrique}, aussi appelée @notation{chiffre de mesure}, +peut être définie à l'aide de la commande @code{\time} : + +@lilypond[verbatim,quote] \relative c'' { \time 3/4 a4 a a @@ -373,9 +397,12 @@ La @rglos{time signature} peut être définie à l'aide de la commande @subheading Clef -La @rglos{clef} peut être définie à l'aide de la commande @code{\clef} : +Glossaire musical : @rglos{clef}. + +La @notation{clef} peut être définie à l'aide de la commande +@code{\clef} : -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c' { \clef treble c1 @@ -389,11 +416,12 @@ La @rglos{clef} peut être définie à l'aide de la commande @code{\clef} : @end lilypond -@subheading All together +@subheading Tout ensemble -Voici un bref exemple qui montre tous ces éléments ensemble : +Voici un bref exemple qui rassemble tous les éléments que nous déjà +vus : -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c, { \time 3/4 \clef bass @@ -403,35 +431,29 @@ Voici un bref exemple qui montre tous ces éléments ensemble : @end lilypond @seealso -@quotation -@table @asis -@item Entrer des hauteurs et des durées -voir @ruser{Pitches} and @ruser{Durations}. -@item Les silences -voir @ruser{Rests}. -@item Les chiffres de mesure et autres commandes de métrique -voir @ruser{Time signature}. -@item Les clés -voir @ruser{Clef}. -@end table -@end quotation + +Manuel de notation : @ruser{Writing pitches}, +@ruser{Writing rhythms}, @ruser{Writing rests}, +@ruser{Time signature}, @ruser{Clef}. @node Working on text files @subsection Working on text files Le traitement des fichiers source de LilyPond est semblable à celui du -code de nombreux langages de programmation répandus : la casse est prise +code de nombreux langages de programmation. La casse est prise en compte, et les caractères considérés comme espaces ont généralement peu d'importance. Les expressions sont délimitées par des accolades @{ @}, et les commentaires par @code{%} ou @code{%@{ ... %@}}. Si cette phrase vous paraît incompréhensible, ne vous en faites pas ! -Tous ces termes vont être expliqués : +Expliquons tous ces termes : @itemize @cindex casse, prise en compte de +@cindex prise en compte de la casse +@cindex sensibilité à la casse @item @strong{La casse} : LilyPond est sensible à la casse, c'est à dire qu'une lettre capitale n'a pas la même valeur qu'une lettre minuscule. Les notes, par @@ -450,9 +472,10 @@ c d @end example @noindent -Bien sûr, ce dernier exemple est difficile à lire. Une bonne habitude +Bien sûr, ce dernier exemple est illisible. Une bonne habitude à prendre est d'indenter les blocs de code avec soit des tabulations soit des doubles espaces : + @example @{ c d e @@ -462,30 +485,42 @@ soit des doubles espaces : @item @strong{Expressions musicales} : Tout morceau saisi dans LilyPond doit être placé entre @strong{@{ accolades @}}. Ces caractères indiquent à LilyPond que ce bloc de -texte est une et une seule expression musicale, tout comme les -parenthèses @samp{()} en mathématiques. Il est préférable, pour -éviter toute ambiguïté, d'entourer tous ces crochets d'espaces, à -moins qu'ils se trouvent au début ou à la fin d'une ligne. +texte représente une et une seule expression musicale, tout comme les +parenthèses @samp{()} en mathématiques. Pour éviter toute ambiguïté, +il est préférable d'entourer ces accolades d'espaces ou de retours à +la ligne. -Une fonction --- @code{\relative @{ @}} par exemple --- compte -également comme une seule expression musicale. +Un appel de fonction --- @w{@code{\relative @{ @}}} par exemple --- +compte également comme une seule expression musicale. -@cindex commentaires +@cindex commentaire @cindex commentaire de fin de ligne @cindex commentaire-bloc +@cindex bloc de commentaire @item @strong{Les commentaires} : -Un commentaire est une indication pour tout lecteur humain d'un -fichier de musique ; il est ignoré par l'ordinateur, et n'a donc aucun -effet sur la partition imprimée. On distingue deux types de -commentaires : -@itemize @bullet -@item la ligne de commentaire, introduite par le symbole @samp{%} : -tout ce qui suit ce symbole sur cette ligne sera ignoré. -@item le bloc de commentaire, qui peut être de plusieurs lignes voire -de toute une section : tout ce qui se trouve entre @code{%@{} et -@code{%@}} est ignoré. Les blocs de commentaires ne peuvent s'imbriquer. -@end itemize -Le fragment suivant met en évidence quelques usages possibles des commentaires : +un commentaire est une indication pour tout lecteur humain d'un +fichier source de musique ; il est ignoré par l'ordinateur, et n'a +donc aucun effet sur la partition imprimée. On distingue deux types +de commentaires. Le commentaire de fin de ligne, introduit par le +symbole @samp{%} : tout ce qui suit ce symbole sur la même ligne sera +ignoré. Par convention, un commentaire qui occupe une ligne entière +se place juste @emph{au-dessus} de la ligne à laquelle il fait +référence. + +@example +a4 a a a +% ce commentaire fait référence aux sis +b2 b +@end example + +Le bloc de commentaire, qui peut occuper plusieurs lignes voire toute +une section : tout ce qui se trouve entre @code{%@{} et @code{%@}} est +ignoré. Les blocs de commentaires ne peuvent s'imbriquer, ce qui +signifie que vous ne pouvez pas placer un commentaire-bloc à +l'intérieur d'un autre commentaire-bloc. Si jamais vous essayez, vous +verrez que la première occurence de @code{%@}} terminera @qq{les +@emph{deux} commentaires-blocs}. Le fragment suivant met en évidence +quelques usages possibles des commentaires : @example % voici les notes de "ah vous dirai-je maman" @@ -496,263 +531,278 @@ Le fragment suivant met en évidence quelques usages possibles des commentaires seront ignorées, car elles se trouvent dans un bloc de commentaire. - g g f f e e d d c2 + f f e e d d c2 %@} @end example @end itemize -Vous trouverez plus d'astuces pour organiser vos fichiers LilyPond dans -@ref{Suggestions for writing LilyPond files}. -@node How to read the tutorial -@subsection How to read the tutorial +@node How to read the manual +@subsection How to read the manual Comme nous l'avons vu dans @ref{Working on text files}, un code -LilyPond doit être encadré par des @{ @} ou bien par @code{\relative -c'' @{ ... @}} afin d'être compris. Cependant, dans la suite de ce +LilyPond doit être encadré par des accolades @{ @} ou bien par +@code{\relative c'' @{ ... @}}. Cependant, dans la suite de ce manuel, la plupart des exemples ne feront pas apparaître ces signes. -Si vous consultez la documentation au format HTML, et que vous -souhaitez voir la source exacte d'un exemple, il vous suffit de -cliquer sur l'image. Si vous ne disposez pas de la version HTML, il -vous est possible de simplement copier et coller le code affiché, mais -@strong{à condition} d'ajouter @code{\relative c'' @{ @}} de la façon -suivante : +Pour reproduire les exemples, vous pouvez copier et coller le code +affiché, mais @strong{à condition} d'ajouter @code{\relative c'' @{ +@}} de la façon suivante : @example \relative c'' @{ - ... collez ici votre exemple... + ...collez ici votre exemple... @} @end example -Pourquoi avoir omis les accolades ? La plupart des exemples de ce +Pourquoi avoir omis les accolades ? La plupart des exemples de ce manuel peuvent être insérés au milieu d'un morceau de musique plus long. Il n'y a donc aucune raison d'ajouter @code{\relative c'' @{ -@}} à ces exemples --- en effet, il n'est pas possible d'insérer un -@code{\relative} à l'intérieur d'un autre @code{\relative}. Il vous -serait donc devenu impossible de copier un bref exemple de la -documentation et de le coller dans une pièce de votre cru. +@}} à ces exemples --- en effet, il n'est pas possible d'insérer une +expression @code{\relative} à l'intérieur d'un autre expression +@code{\relative}. Si nous mettions tous nos exemples dans une +expression @code{\relative}, vous ne pourriez plus copier un bref +exemple de la documentation pour le coller dans vos pièces. + + +@subheading Exemples cliquables + +Beaucoup de gens apprennent à utiliser les programmes en les essayant +et en bidouillant avec. C'est également possible avec LilyPond. Si +vous cliquez sur une image dans la version HTML de ce manuel, vous +verrez exactement le code LilyPond utilisé pour générer cette image. +Essayez sur cette image : + +@c no verbatim here +@c KEEP LY +@lilypond[quote,ragged-right] +\relative c'' { + c-\markup { \bold \huge { Cliquez ici. } } +} +@end lilypond + +En copiant-collant le code à partir du commentaire @qq{ly snippet} +vers un fichier test, vous aurez un modèle de base pour faire vos +expériences. Pour obtenir une gravure à l'identique, copiez tout le +code à partir de @qq{Start cut-&-pastable section}. + +@c No longer in the text in English, but should we really +@c remove this? --jm +@ignore +Si vous apprenez de cette façon, vous aurez probablement envie +d'imprimer ou de garder un lien vers @ruser{Cheat sheet}, tableau +qui répertorie les commandes usuelles pour une consultation rapide. +@end ignore + +@seealso + +Vous trouverez plus de conseils pour construire des fichiers source +dans @ref{Suggestions for writing LilyPond input files}. Cependant, +lors d'une première lecture il est préférable de terminer d'abord la +lecture du tutoriel. + @node Single staff notation @section Single staff notation Cette section présente la notation courante dont on a besoin pour -écrire une seule voix sur une seule portée. +écrire une voix sur une portée. @menu -* Relative note names:: * Accidentals and key signatures:: * Ties and slurs:: * Articulation and dynamics:: +* Adding text:: * Automatic and manual beams:: * Advanced rhythmic commands:: @end menu -@node Relative note names -@subsection Relative note names - -Comme nous l'avons vu dans @ref{Simple notation}, LilyPond calcule la -hauteur de chaque note en fonction de la précédente@footnote{Il existe -un autre mode de saisie des hauteurs, le mode @ref{Absolute note -names}, mais en pratique il est bien plus aisé et sûr d'avoir recours -au mode de hauteurs relatives.}. Si aucune indication supplémentaire -d'octaviation n'est ajoutée, il en concluera que chaque hauteur est -située à une quarte au plus de la note précédente. - -Lilypond tient compte des intervalles induits par les noms des notes ---- en d'autres termes, une quarte augmentée n'est @emph{pas} -équivalente à une quinte diminuée. Ainsi, si l'on part d'un Do, un Fa -dièse sera placé au-dessus, tandis qu'un Sol bémol sera placé -au-dessous. - -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] -c2 fis -c2 ges -@end lilypond - -@seealso -@quotation -@table @asis -@item Les hauteurs de note relatives -voir @ruser{Relative octaves}. -@item Les vérifications d'octaves -voir @ruser{Octave check}. -@end table -@end quotation - - - @node Accidentals and key signatures @subsection Accidentals and key signatures @subheading Accidentals -Dans la notation par défaut, un @rglos{sharp} s'obtient en ajoutant -@samp{is} au nom de la note, et un @rglos{flat} en ajoutant @samp{es}. -Comme vous pouvez vous y attendre, un double dièse ou double bémol est -alors obtenu en ajoutant @samp{isis} ou @samp{eses}@footnote{Cette -syntaxe est dérivée de la convention de dénomination des notes dans -les langues nordiques et germaniques, comme l'allemand ou le -hollandais.}. +Glossaire musical : @rglos{sharp}, @rglos{flat}, @rglos{double sharp}, +@rglos{double flat}, @rglos{accidental}. + +Dans la notation par défaut, on obtient un @notation{dièse} en +ajoutant @code{is} au nom de la note, et un @notation{bémol} en +ajoutant @code{es}. Comme vous pouvez vous y attendre, un double +dièse ou double bémol s'obtiennent en ajoutant @code{isis} ou +@code{eses}. Cette syntaxe est dérivée de la convention de +dénomination des notes dans les langues nordiques et germaniques, +comme l'allemand ou le hollandais. @c DIV specific -Cependant, si vous utilisez la commande @samp{\include "italiano.ly"} +Cependant, si vous utilisez la commande @code{\include "italiano.ly"} pour entrer les noms de notes français au lieu des noms hollandais, il -faudra ajouter un @samp{d} pour un dièse, et un @samp{b} pour un -bémol. Le double dièse et le double bémol s'obtiennent en ajoutant -respectivement @samp{dd} et @samp{bb} +faudra ajouter un @code{d} pour obtenir un dièse, et un @code{b} pour +un bémol. Le double dièse et le double bémol s'obtiennent en ajoutant +respectivement @code{dd} et @code{bb}. Pour en savoir plus sur les +autres langues disponibles, consultez @ruser{Note names in other +languages}. @c END DIV -Pour en savoir plus sur les autres langues disponibles, voir @ruser{Note -names in other languages}. - -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] cis1 ees fisis, aeses @end lilypond -@cindex armure, définition de +@cindex armure, définition de l' +@cindex armure, altérations à l' +@cindex altérations à l'armure @subheading Key signatures L'armure est déterminée par la commande @code{\key}, suivie d'une -hauteur puis de @code{\major} (majeur) ou @code{\minor} (mineur) : +hauteur puis de @code{\major} (majeur) ou @code{\minor} (mineur). -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key d \major a1 \key c \minor a @end lilypond -@sp 1 +@smallspace @subheading Warning: key signatures and pitches -La combinaison de l'armure et des hauteurs de note --- y compris les -altérations --- permet à LilyPond de déterminer dans quel cas afficher -les altérations accidentelles. L'armure n'affecte que les altérations -@emph{imprimées}, et non les hauteurs réelles ! Cette fonctionnalité -est souvent source de confusion pour les nouveaux utilisateurs, aussi -expliquons-la en détail. - -LilyPond fait une nette distinction entre le contenu musical et la -mise en forme. L'altération d'une note --- bémol, bécarre ou dièse ---- fait partie de sa hauteur, et relève donc du contenu musical. La -présence ou non d'une altération accidentelle --- un @emph{signe} -bémol, bécarre ou dièse --- devant la note correspondante est une -question qui relève de la mise en page. Mettre en page une partition -se fait selon des règles ; les altérations accidentelles seront donc -automatiquement imprimées suivant ces règles. Les hauteurs de note, -en revanche, relèvent de ce que vous voulez entendre ; et, dans la -mesure où la musique que vous entrez est censée être celle que vous -voulez entendre, LilyPond (qui n'est chargé que de la gravure) ne les +Glossaire musical : @rglos{accidental}, @rglos{key signature}, +@rglos{pitch}, @rglos{flat}, @rglos{natural}, @rglos{sharp}, +@rglos{transposition}. + +La combinaison de l'@notation{armure} et des hauteurs de note --- y +compris les altérations --- permet à LilyPond de déterminer dans quel +cas imprimer des @notation{altérations accidentelles}. L'armure +n'affecte que les altérations @emph{imprimées}, et non les hauteurs +réelles ! Cette fonctionnalité est souvent source de confusion pour +les nouveaux utilisateurs, aussi expliquons-la en détail. + +LilyPond fait une distinction nette entre le contenu musical et la +mise en forme. L'altération d'une note --- @notation{bémol}, +@notation{bécarre} ou @notation{dièse} --- fait partie de sa hauteur, +et relève donc du contenu musical. La gravure ou non d'une altération +accidentelle --- un @emph{signe} bémol, bécarre ou dièse --- devant la +note correspondante est une question qui relève de la mise en forme. +La gravure une partition suit des règles, en particulier des règles +d'indication des altérations accidentelles. Les hauteurs de note, en +revanche, relèvent de ce que vous voulez entendre ; et, dans la mesure +où la musique que vous entrez est censée être celle que vous voulez +entendre, LilyPond, qui n'est chargé que de la gravure, ne les choisira pas à votre place. Dans cet exemple, -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key d \major d cis fis @end lilypond @noindent aucune note n'a d'altération accidentelle, et pourtant vous devrez -entrer le @samp{is} pour les notes @code{cis} et @code{fis}. +entrer le @code{is} pour les notes @code{cis} et @code{fis}. -Le code @samp{e} ne veut pas dire @qq{Imprimez-moi un point noir sur +Le code @code{e} ne veut pas dire @qq{Imprimez-moi un point noir sur la première ligne de la portée.} Cela signifie plutôt : @qq{Ici se -trouve une note dont la hauteur est un mi naturel.} Avec l'armure de -la bémol majeur, ce mi sera flanqué d'un bécarre accidentel : +trouve une note dont la hauteur est un mi naturel.} Avec une armure +de la bémol majeur, ce mi est flanqué d'un bécarre accidentel : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \key aes \major e @end lilypond -Ajouter explicitement toutes les altérations requiert un peu plus -d'effort dans la phase de saisie, mais la transposition en sera -grandement facilitée. De plus les altérations accidentelles peuvent -être imprimées suivant plusieurs conventions. Regardez -@ruser{Automatic accidentals} pour connaître les différentes manières -dont les altérations accidentelles peuvent être imprimées, suivant les -règles que vous choisirez. +Ajouter explicitement toutes les altérations demande un peu plus +d'effort dans la phase de saisie, mais cela facilite grandement la +@notation{transposition}. De plus, les altérations accidentelles +peuvent ainsi être imprimées suivant plusieurs conventions. Pour +connaître les différentes manières dont les altérations accidentelles +peuvent être imprimées, consultez @ruser{Automatic accidentals}. @seealso -@quotation -@table @asis -@item Les altérations -voir @ruser{Accidentals} and @ruser{Automatic accidentals}. -@item Les armures -voir @ruser{Key signature}. -@end table -@end quotation +Manuel de notation : @ruser{Note names in other languages}, +@ruser{Accidentals}, @ruser{Automatic accidentals}, +@ruser{Key signature}. + +Glossaire musical : @rglos{Pitch names}. @node Ties and slurs @subsection Ties and slurs @cindex liaisons de prolongation +@cindex liaisons de tenue +@cindex prolongation, liaisons de +@cindex durée, liaisons de +@cindex tenue, liaisons de @subheading Ties -Une @rglos{tie}@footnote{parfois aussi appelée liaison de -tenue} se crée en ajoutant un tilde @samp{~} à la première note liée. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +Glossaire musical : @rglos{tie}. + +Pour créer une liaison de prolongation@footnote{parfois aussi appelée +liaison de tenue}, on ajoute un tilde @code{~} à la première note +liée. + +@lilypond[verbatim,quote,relative=2] g4~ g c2~ c4 ~ c8 a8 ~ a2 @end lilypond @cindex liaisons d'articulation +@cindex articulation, liaisons d' @subheading Slurs @c Le terme de "slur" a deux sens en français : articulation et phrasé. @c Je garde ici le terme "legato", tel qu'il apparaît dans le texte original, @c car c'est celui qui me semble le plus couramment employé. -Une @rglos{slur} d'articulation (ou @qq{legato}) peut englober -plusieurs notes. Les notes de départ et d'arrivée reçoivent -respectivement un signe @samp{(} et @samp{)}. +Glossaire musical : @rglos{slur}. + +Une liaison d'articulation ou @emph{legato} peut englober +plusieurs notes. Les notes de départ et d'arrivée sont suivies +respectivement d'un signe @samp{(} et @samp{)}. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] d4( c16) cis( d e c cis d) e( d4) @end lilypond @cindex liaisons de phrasé +@cindex phrasé, liaisons de +@cindex legato @subheading Phrasing slurs De plus longues liaisons, dites de phrasé, sont délimitées par @code{\(} et @code{\)}. Il est possible d'avoir en même temps des legatos et des phrasés, mais pas plusieurs liaisons de phrasé ou de legato à la fois. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] a8(\( ais b c) cis2 b'2 a4 cis,\) @end lilypond -@sp 1 +@smallspace -@cindex liaisons de phrasé et de prolongation, différences +@cindex liaisons d'articulation et de prolongation, différences @subheading Warnings: slurs vs. ties +Glossaire musical : @rglos{articulation}, @rglos{slur}, @rglos{tie}. + Une liaison d'articulation ou de phrasé ressemble à une liaison de -tenue, mais n'a pas la même signification. Alors qu'une liaison de -tenue ne peut relier que deux notes de même hauteur, le legato indique -une articulation de plusieurs notes, éventuellement nombreuses. Les -liaisons de tenue peuvent être enchâssées dans un legato ou un phrasé. +prolongation, mais n'a pas la même signification. Alors qu'une +liaison de prolongation ne peut relier que deux notes de même hauteur, +le legato indique une articulation de plusieurs notes, éventuellement +en grand nombre. Les liaisons de tenue peuvent être enchâssées dans +un legato ou un phrasé. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] c2~( c8 fis fis4 ~ fis2 g2) @end lilypond @seealso -@quotation -@table @asis -@item @ruser{Ties}, -@item @ruser{Slurs}, -@item @ruser{Phrasing slurs}. -@end table -@end quotation +Manuel de notation : @ruser{Ties}, @ruser{Slurs}, +@ruser{Phrasing slurs}. @node Articulation and dynamics @subsection Articulation and dynamics @@ -762,38 +812,47 @@ c2~( c8 fis fis4 ~ fis2 g2) @cindex staccato @subheading Articulations -Des @rglos{articulation}s peuvent être ajoutées à une note, au moyen -d'un tiret @samp{-} suivi d'un caractère : +Glossaire musical : @rglos{articulation}. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +Des @notation{articulations} peuvent être ajoutées à une note, au moyen +d'un tiret @code{-} suivi d'un caractère : + +@lilypond[verbatim,quote,relative=2] c-. c-- c-> c-^ c-+ c-_ @end lilypond @cindex doigtés @subheading Fingerings + +Glossaire musical : @rglos{fingering}. + De même, des indications de doigté peuvent être ajoutées à une note en utilisant un tiret (@samp{-}) et le chiffre à écrire : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] c-3 e-5 b-2 a-1 @end lilypond Articulations et doigtés sont habituellement placés automatiquement, -mais vous pouvez spécifier une direction en utilisant @samp{^} (en haut) -ou @samp{_} (en bas). Vous pouvez aussi utiliser plusieurs -articulations sur la même note. Dans la plupart des cas, cependant, il -est mieux de laisser LilyPond déterminer l'emplacement de +mais vous pouvez indiquer une direction en utilisant @samp{^} (en +haut) ou @samp{_} (en bas). Vous pouvez aussi utiliser plusieurs +articulations sur la même note. Dans la plupart des cas, cependant, +il est bon de laisser LilyPond déterminer l'emplacement de l'articulation. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] c_-^1 d^. f^4_2-> e^-_+ @end lilypond @subheading Dynamics -Les signes de nuances sont obtenus en ajoutant à la note les noms des nuances, -précédées d'un anti-slash @samp{\} : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +Glossaire musical : @rglos{dynamics}, @rglos{crescendo}, +@rglos{decrescendo}. + +On obtient un signe de @notation{nuance} en ajoutant à la note les +lettres du signe, précédées d'un anti-slash @samp{\} : + +@lilypond[verbatim,quote,relative=2] c\ff c\mf c\p c\pp @end lilypond @@ -804,52 +863,81 @@ c\ff c\mf c\p c\pp @c Pluriel des termes musicaux italiens : @c selon Littré, plutôt à la française (en "-os" qu'en "-i") -Crescendos et decrescendos débutent avec les commandes @code{\<} et -@code{\>}. Ils se terminent soit par une nuance d'arrivée, par exemple -@code{\f}, soit par la commande @code{\!} : +@notation{Crescendos} et @notation{decrescendos} débutent avec les +commandes @code{\<} et @code{\>}. Ils se terminent soit par une +nuance d'arrivée, par exemple @code{\f}, soit par la commande +@code{\!} : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] c2\< c2\ff\> c2 c2\! @end lilypond @seealso -@quotation -@table @asis -@item @ruser{Articulations}. -@item @ruser{Fingering instructions}. -@item @ruser{Dynamics}. -@end table -@end quotation + +Manuel de notation : @ruser{Articulations and ornamentations}, +@ruser{Fingering instructions}, @ruser{Dynamics}. + + +@node Adding text +@subsection Adding text + +On peut ajouter du texte à une partition : + +@lilypond[verbatim,quote,relative=2] +c1^"espr" a_"legato" +@end lilypond + +Pour mettre en forme du texte, on utilise la commande @code{markup} : + +@lilypond[verbatim,quote,relative=2] +c1^\markup{ \bold espr} +a1_\markup{ + \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p +} +@end lilypond + +@seealso + +Manuel de notation : @ruser{Writing text}. @node Automatic and manual beams @subsection Automatic and manual beams @cindex ligatures manuelles -Toutes les @rglos{beam} sont dessinées automatiquement : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +Glossaire musical : @rglos{beam}. + +Toutes les barres de ligature sont dessinées automatiquement : + +@lilypond[verbatim,quote,relative=2] a8 ais d ees r d c16 b a8 @end lilypond @noindent Lorsqu'on n'aime pas la manière dont les notes sont automatiquement groupées, il est possible de les ligaturer manuellement, en marquant la -première note à attacher d'un @samp{[} et la dernière d'un @samp{]}. +première note à attacher d'un crochet ouvrant @code{[} et la dernière +d'un crochet fermant @code{]}. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] a8[ ais] d[ ees r d] a b @end lilypond +Pour désactiver les barres de ligature automatqiues pour des passages +entiers, utilisez la commande @code{\autoBeamOff}, et utilisez +@code{\autoBeamOn} pour les réactiver. + +@lilypond[verbatim,quote,relative=2] +\autoBeamOff +a8 c b4 d8. c16 b4 +\autoBeamOn +a8 c b4 d8. c16 b4 +@end lilypond + @seealso -@quotation -@table @asis -@item Groupements de notes et ligatures automatiques -voir @ruser{Automatic beams}. -@item Groupements et ligatures manuels -voir @ruser{Manual beams}. -@end table -@end quotation + +Manuel de notation : @ruser{Automatic beams}, @ruser{Manual beams}. @node Advanced rhythmic commands @@ -860,11 +948,13 @@ voir @ruser{Manual beams}. @cindex mesure incomplète @subheading Partial measure -Une levée (ou @rglos{anacrusis}) est entrée avec la commande -@code{\partial}, suivie d'une durée : @code{\partial 4} est une levée -d'une noire et @code{\partial 8} d'une croche. +Glossaire musical : @rglos{anacrusis}. + +On crée une levée (ou anacrouse) avec la commande @code{\partial}, +suivie d'une durée : @code{\partial 4} produit une levée d'une noire +et @code{\partial 8} d'une croche. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] \partial 8 f8 c2 d @end lilypond @@ -872,13 +962,17 @@ f8 c2 d @cindex nolets @cindex triolets @subheading Tuplets -Les nolets sont créés avec la commande @code{\times}, qui prend deux -arguments : une fraction et une expression musicale. La durée des notes -de l'expression musicale est multipliée par la fraction. Par exemple -les notes d'un triolet durent les deux tiers du temps de leur notation -réelle, cette fraction est donc de 2/3 pour les triolets : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +Glossaire musical : @rglos{note value}, @rglos{triplet}. + +Les @notation{nolets} sont créés avec la commande @code{\times}, qui +prend deux arguments : une fraction et une expression musicale. La +durée des notes de l'expression musicale est multipliée par la +fraction. Par exemple les notes d'un @notation{triolet} durent les +deux tiers de la durée de leur notation réelle, cette fraction est +donc de 2/3 pour les triolets : + +@lilypond[verbatim,quote,relative=2] \times 2/3 { f8 g a } \times 2/3 { c r c } \times 2/3 { f,8 g16[ a g a] } @@ -888,46 +982,43 @@ réelle, cette fraction est donc de 2/3 pour les triolets : @cindex notes d'ornement @cindex ornementation @cindex appoggiature +@cindex acciaccature @subheading Grace notes -Des notes d'ornement sont produites par la commande @code{\grace}, mais -aussi en préfixant une expression musicale avec le mot-clé -@code{\appoggiatura} ou @code{\acciaccatura} : +Glossaire musical : @rglos{grace notes}, @rglos{acciaccatura}, +@rglos{appoggiatura}. + +Des @notation{notes d'ornement} s'obtiennent en appliquant la commande +@code{\grace}, @code{\appoggiatura} ou @code{\acciaccatura} à une +expression musicale : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] c2 \grace { a32[ b] } c2 c2 \appoggiatura b16 c2 c2 \acciaccatura b16 c2 @end lilypond @seealso -@quotation -@table @asis -@item Notes d'ornement -voir @ruser{Grace notes}, -@item nolets -voir @ruser{Tuplets}, -@item levées -voir @ruser{Upbeats}. -@end table -@end quotation + +Manuel de notation : @ruser{Grace notes}, @ruser{Tuplets}, +@ruser{Upbeats}. @node Multiple notes at once @section Multiple notes at once -Cette section traite des situations où l'on a plus d'une note à la fois -: plusieurs instruments, plusieurs portées pour un même instrument (le -piano, par exemple), et les accords. +Cette section traite de situations où l'on a plus d'une note à la fois : +plusieurs instruments, plusieurs voix ou portées pour un même +instrument (le piano, par exemple), et les accords. -La polyphonie, en théorie musicale, est la notion d'une musique -constituée de plusieurs voix ; dans lilypond, ce terme désigne les -situations où il y a plus d'une voix sur une même portée. +En théorie musicale, la polyphonie désigne une musique constituée de +plusieurs voix ; dans LilyPond, ce terme désigne les situations où il +y a plus d'une voix sur une même portée. @menu * Music expressions explained:: * Multiple staves:: -* Piano staves:: +* Staff groups:: * Combining notes into chords:: * Single staff polyphony:: @end menu @@ -936,45 +1027,78 @@ situations où il y a plus d'une voix sur une même portée. @node Music expressions explained @subsection Music expressions explained +@cindex expression musicale + Dans les fichiers source LilyPond, la musique est représentée par ce qu'on appelle des @emph{expressions musicales}. En soi, une seule note -peut constituer une expression musicale, si tant est qu'elle soit -correctement encadrée : +peut constituer une expression musicale : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] a4 @end lilypond Mettre un groupe de notes entre accolades crée une nouvelle expression -musicale : +musicale, appelée @emph{expression musicale composée}. En voici un +exemple avec deux notes : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] { a4 g4 } @end lilypond -Placer une séquence d'expressions musicales --- des notes par exemple ---- entre accolades signifie qu'elles doivent être jouées +La mise entre accolades d'une séquence d'expressions musicales --- des +notes par exemple --- signifie qu'elles doivent être jouées successivement, les unes après les autres. Le résultat est une expression, qui peut elle-même être regroupée séquentiellement avec d'autres expressions. Ici, l'expression de l'exemple précédent est combinée à deux notes : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] { { a4 g } f g } @end lilypond +@cindex expression +@subheading Analogy: mathematical expressions + +Ce mécanisme est similaire aux formules mathématiques : une grosse +formule est créée en assemblant plusieurs petites formules. De telles +formules sont appelées expressions, elles ont une définition +récursive, de telle sorte que vous pouvez fabriquer des expressions +arbitrairement longues et complexes. Par exemple : + +@example +1 + +1 + 2 + +(1 + 2) * 3 + +((1 + 2) * 3) / (4 * 5) +@end example + +Ceci est une suite d'expressions, où chacune est contenue dans la +suivante. Les expressions les plus simples sont les nombres, et de +plus grandes expressions sont produites en combinant des expressions +avec des opérateurs --- comme @samp{+}, @samp{*} et @samp{/} --- et +des parenthèses. Tout comme les expressions mathématiques, les +expressions musicales peuvent être imbriquées avec une profondeur +arbitraire, ce qui est nécessaire pour des partitions complexes comme +de la musique polyphonique. + + @subheading Simultaneous music expressions: multiple staves -Cette technique est utile pour de la musique polyphonique. Pour entrer -une musique avec plusieurs voix ou plusieurs portées, nous pouvons aussi -combiner en parallèle les expressions. Deux voix qui doivent être -jouées en même temps, sont entrées comme une combinaison simultanée de -deux expressions. Une expression musicale @q{simultanée} est formée en -entourant les expressions entre @code{<<} et @code{>>}. Dans l'exemple -suivant, trois expressions (contenant chacune deux notes distinctes) -sont combinées simultanément. +Glossaire musical : @rglos{polyphony}. -@lilypond[quote,ragged-right,verbatim] +Cette technique est utile pour de la musique @notation{polyphonique}. +Pour entrer une musique avec plusieurs voix ou plusieurs portées, nous +pouvons aussi combiner @emph{en parallèle} les expressions : deux voix +qui doivent être jouées en même temps, sont entrées comme une +combinaison simultanée de deux expressions. Une expression musicale +@qq{simultanée} est formée en entourant les expressions entre @code{<<} +et @code{>>}. Dans l'exemple suivant, trois expressions (contenant +chacune deux notes distinctes) sont combinées simultanément. + +@lilypond[verbatim,quote] \relative c'' { << { a4 g } @@ -984,74 +1108,46 @@ sont combinées simultanément. } @end lilypond -Notez que nous avons ici indenté chaque niveau du fichier d'entrée avec -un nombre d'espaces différent. LilyPond se moque de l'espace qu'il peut -y avoir (ou pas) au début d'une ligne, mais en indentant votre code vous -le rendrez bien plus facile à lire pour les humains. +Notez que nous avons ici indenté chaque niveau du fichier d'entrée +avec un nombre d'espaces différent. LilyPond se moque --- ou presque +--- de l'espace qu'il peut y avoir ou non au début d'une ligne, mais +un code bien indenté est bien plus lisible par des humains. -@strong{Attention} : chaque note saisie est relative à la précédente, -mais pas au @code{c''} de la commande @code{\relative} de départ. +@warning{la hauteur de chaque note saisie est relative à la précédente, +mais pas au @code{c''} de la commande @code{\relative} de départ.} @subheading Simultaneous music expressions: single staff -Pour déterminer le nombre de portées, LilyPond regarde le premier -élément autre qu'une accolade. Si c'est une seule note, il y a une -portée ; si c'est une expression simultanée, il y aura plus d'une -portée. +Pour déterminer le nombre de portées, LilyPond regarde le début +de la première expression. Si c'est une seule note, une seule portée +est produite ; si c'est une expression simultanée, plusieurs portées +sont produites. -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c'' { c2 <> << { e f } { c <> } >> } @end lilypond -@cindex expression -@cindex expression musicale -@subheading Analogy: mathematical expressions - -Ce mécanisme est similaire au formules mathématiques : une grosse -formule est créée en assemblant plusieurs petites formules. Ces types -de formules, appelées expressions, ont une définition récursive, de -telle sorte que vous pouvez fabriquer des expressions arbitrairement -longues et complexes. Par exemple, - -@example -1 - -1 + 2 - -(1 + 2) * 3 - -((1 + 2) * 3) / (4 * 5) -@end example - -Ceci est une suite d'expressions, où chacune est contenue dans la -suivante. Les expressions les plus simples sont les nombres, et de plus -grandes expressions sont produites en combinant des expressions avec des -opérateurs --- comme @samp{+}, @samp{*} et @samp{/} --- et des -parenthèses. Tout comme les expressions mathématiques, les expressions -musicales peuvent être imbriquées avec une profondeur arbitraire, ce qui -est nécessaire pour de la musique complexe comme des partitions -polyphoniques. - @node Multiple staves @subsection Multiple staves -Comme nous l'avons vu dans @ref{Music expressions explained}, un fichier -d'entrée LilyPond est fait d'expressions musicales. Si la partition -commence par plusieurs expressions simultanées, LilyPond créera -plusieurs portées. Cependant, il est plus facile de voir ce qu'il -advient si l'on crée explicitement chacune des portées. +Comme nous l'avons vu dans @ref{Music expressions explained}, un +fichier d'entrée LilyPond est fait d'expressions musicales. Si la +partition commence par plusieurs expressions simultanées, LilyPond +créera plusieurs portées. Cependant, il est plus facile de prévoir le +nombre de portées si on les crée explicitement, ce que nous allons +voir. -Pour créer plus d'une portée, chaque partie de la musique constituant -une portée est entrée en la faisant précéder de @code{\new Staff}. Ces -éléments @code{Staff} sont ensuite combinés en parallèle avec @code{<<} -et @code{>>}, comme ceci : +Pour créer plus d'une portée, on ajoute @code{\new Staff} au début de +chaque partie de la musique constituant une portée. Ces éléments +@code{Staff} sont ensuite combinés en parallèle avec @code{<<} et +@code{>>}, comme ci-dessous. -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c'' { << \new Staff { \clef treble c } @@ -1066,46 +1162,53 @@ contexte de notation est un environnement dans lequel les événements musicaux --- comme les notes ou les commandes @code{\clef} --- sont interprétés. Pour des pièces simples, ces contextes sont créés automatiquement. Pour des pièces plus complexes, il est préférable de -spécifier explicitement les contextes. Cela assure que chaque fragment -aura sa propre portée. +spécifier explicitement les contextes, afin de s'assurer que chaque +fragment aura sa propre portée. -Il existe différents types de contextes. Les contextes @code{Staff} -(portée), @code{Voice} (voix) et @code{Score} (partition) gèrent la +Il existe différents types de contextes. Les contextes @code{Score} +(partition), @code{Staff} (portée) et @code{Voice} (voix) gèrent la notation de la mélodie, alors que @code{Lyrics} gère les paroles et -@code{ChordNames} imprime le nom des accords. +@code{ChordNames} imprime des noms d'accords. -En termes de syntaxe, faire précéder une expression musicale de -@code{\new} crée une plus grosse expression musicale. En reprenant la -comparaison, cela ressemble au signe @qq{moins} en mathématiques. La -formule @math{(4+5)} est une expression, donc @math{-(4+5)} est une plus -grosse expression. +En termes de syntaxe, ajouter @code{\new} devant une expression +musicale crée une plus grande expression musicale. En reprenant la +comparaison précédente, cela ressemble au signe @emph{moins} en +mathématiques. La formule @math{(4+5)} est une expression, donc +@math{-(4+5)} est une plus grande expression. Les chiffres de métrique indiqués sur une portée affectent toutes les -autres portées@footnote{Ce comportement peut être modifié si nécessaire, -voir @ruser{Polymetric notation}.}. En revanche l'armure d'une portée -n'affecte @emph{pas} les autres portées. - -@lilypond[quote,ragged-right,verbatim] +autres portées@footnote{Ce comportement peut être modifié si +nécessaire, voir @ruser{Polymetric notation}.}. En revanche l'armure +d'une portée n'affecte @emph{pas} les autres portées. Ces +caractéristiques par défaut se justifient par le fait que +l'utilisation d'instruments transpositeurs est bien plus fréquente que +la musique polyrythmique. + +@lilypond[verbatim,quote] \relative c'' { << - \new Staff { \clef treble \time 3/4 c } - \new Staff { \clef bass \key d \major c,, } + \new Staff { \clef treble \key d \major \time 3/4 c } + \new Staff { \clef bass c,, } >> } @end lilypond +@node Staff groups +@subsection Staff groups +@cindex portée double +@cindex portée pour piano +@cindex piano, portée pour +@cindex clavier, portée pour -@node Piano staves -@subsection Piano staves +Glossaire musical : @rglos{brace}. -@cindex changement de portée manuel -@cindex voix changeant manuellement de portée -La musique pour piano s'écrit sur deux portées reliées par une accolade. -Imprimer ce type de portée revient au même que dans l'exemple de musique -polyphonique de @ref{Multiple staves}, mais maintenant cette expression -entière doit être interprétée dans un contexte @code{PianoStaff} : +La musique pour piano s'écrit sur deux portées reliées par une +@notation{accolade}. La gravure de ce type de portée est semblable à +l'exemple de musique polyphonique de @ref{Multiple staves}, mais +maintenant cette expression entière est interprétée dans un contexte +@code{PianoStaff} : @example \new PianoStaff << @@ -1116,7 +1219,7 @@ entière doit être interprétée dans un contexte @code{PianoStaff} : Voici un bref exemple : -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] \relative c'' { \new PianoStaff << \new Staff { \time 2/4 c4 e g g, } @@ -1126,32 +1229,37 @@ Voici un bref exemple : @end lilypond @seealso -@quotation -Voir @ruser{Keyboard instruments}. -@end quotation + +Manuel de notation : @ruser{Keyboard instruments}, +@ruser{Displaying staves}. @node Combining notes into chords @subsection Combining notes into chords -@cindex accords -Des accords peuvent être produits en entourant les hauteurs de notes -par des angles gauche et droit --- @samp{<} et @samp{>} --- +@cindex accords, notes simultanées -@lilypond[quote,fragment,verbatim,relative=2,fragment] +Glossaire musical : @rglos{chord}. + +Nous avons vu précédemment comment combiner des notes simultanément, +en les encadrant par des angles doubles @code{<<} et @code{>>}. Pour +produire des accords simples, c'est-à-dire une superposition de notes +de même durée, on encadre les hauteurs de notes par des angles simples +@code{<} et @code{>}, et on écrit la durée juste après. + +@lilypond[verbatim,quote,relative=2] r4 4 2 @end lilypond -Vous pouvez combiner les indications comme les liaisons et les ligatures -de croches avec les accords. Ils doivent cependant être placés en -dehors des angles : +Beaucoup d'éléments de notation que l'on peut attacher à une note +simple, comme une liaison, un crochet indiquat un début ou fin de +lien, un signe d'articulation, peuvent être également attachés à un +accord : il faut ajouter ces indications après les hauteurs et la +durée, donc @emph{à l'extérieur} des angles. -@lilypond[quote,fragment,verbatim,relative=2,fragment] +@lilypond[verbatim,quote,relative=2] r4 8[ ]~ 2 -@end lilypond - -@lilypond[quote,fragment,verbatim,relative=2,fragment] -r4 8\>( 4 \!) +r4 8( \> 4 \!) @end lilypond @@ -1166,12 +1274,11 @@ a ses propre hampes@footnote{familièrement appelées queues de note.}, liaisons et ligatures, la voix supérieure ayant les hampes vers le haut, la voix inférieure vers le bas. -Ce type de partition est réalisé en entrant chaque voix comme une -séquence (avec @code{@{...@}}), en combinant simultanément les voix et -en les séparant par @code{\\} : - +On réalise ce type de partition en entrant chaque voix comme une +séquence, @emph{i.e.} avec @code{@{...@}}, puis en combinant +simultanément les voix et en les séparant par @code{\\}. -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] << { a4 g2 f4~ f4 } \\ { r4 g4 f2 f4 } @@ -1181,10 +1288,10 @@ en les séparant par @code{\\} : Pour l'écriture de musique polyphonique, les silences invisibles s'avèrent bien pratiques : ce sont des silences qui ne s'impriment pas. Ils sont utiles pour remplir des voix qui, temporairement, ne jouent -rien. On peut voir ici le même exemple avec un silence invisible -(@code{s}) à la place d'un silence normal (@code{r}) : +rien. Voici le même exemple que ci-dessus, avec un silence invisible +@code{s} à la place d'un silence normal @code{r} : -@lilypond[quote,ragged-right,verbatim,fragment,relative=2] +@lilypond[verbatim,quote,relative=2] << { a4 g2 f4~ f4 } \\ { s4 g4 f2 f4 } @@ -1194,7 +1301,7 @@ rien. On peut voir ici le même exemple avec un silence invisible @noindent Là encore, ces expressions peuvent s'imbriquer arbitrairement : -@lilypond[quote,fragment,verbatim,relative=2,fragment] +@lilypond[verbatim,quote,relative=2] << \new Staff << { a4 g2 f4~ f4 } \\ @@ -1209,9 +1316,8 @@ Là encore, ces expressions peuvent s'imbriquer arbitrairement : @end lilypond @seealso -@quotation -Voir @ruser{Basic polyphony}. -@end quotation + +Manuel de notation : @ruser{Simultaneous notes}. @node Songs @@ -1220,185 +1326,391 @@ Voir @ruser{Basic polyphony}. Cette section présente l'écriture vocale et les partitions de variété. @menu -* Printing lyrics:: -* A lead sheet:: +* Setting simple songs:: +* Aligning lyrics to a melody:: +* Lyrics to multiple staves:: @end menu -@node Printing lyrics -@subsection Printing lyrics +@node Setting simple songs +@subsection Setting simple songs @cindex paroles @cindex chansons -Prenons une mélodie toute simple : -@lilypond[quote,ragged-right,verbatim] +Glossaire musical : @rglos{lyrics}. + +Prenons une mélodie toute simple, la comptine @emph{Girls and boys +come out to play}. + +@lilypond[verbatim,quote] \relative c'' { - a4 e c8 e r4 - b2 c4( d) + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 } @end lilypond -Des paroles peuvent être associées à ces notes, en les combinant avec la -commande @code{\addlyrics}. Les paroles sont entrées en séparant chaque -syllable par un espace : +Des @notation{paroles} peuvent être associées à ces notes, en les +combinant avec la commande @code{\addlyrics}. On entre les paroles en +séparant chaque syllable par un espace : -@lilypond[quote,ragged-right,verbatim] +@lilypond[verbatim,quote] << \relative c'' { - a4 e c8 e r4 - b2 c4( d) + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 + } + \addlyrics { + Girls and boys come out to play, } - \addlyrics { One day this shall be free } >> @end lilypond +Remarquez les accolades embrassant la musique et celles embrassant les +paroles, ainsi que les angles doubles encadrant toute la pièce ; ces +derniers indiquent simplement que la musique et les paroles se +produisent en même temps. + + +@node Aligning lyrics to a melody +@subsection Aligning lyrics to a melody + @cindex mélisme @cindex ligne d'extension -Cette mélodie se termine sur un @rglos{melisma}, c'est-à-dire qu'une -seule syllable (@qq{free}) correspond à plus d'une note. Ceci est -indiqué avec une @emph{ligne d'extension}. Elle est entrée avec deux -caractères souligné (@code{_}), c'est-à-dire : +@cindex trait d'union (paroles) +@cindex caractère souligné (paroles) +Glossaire musical : @rglos{melisma}, @rglos{extender line}. -@lilypond[quote,ragged-right,verbatim] +La ligne suivante de la comptine précédente est @emph{The moon doth +shine as bright as day}. Ajoutons-la au code. + +@lilypond[verbatim,quote] << \relative c'' { - a4 e c8 e r4 - b2 c4( d) + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 + g8 a4 b8 c b a d4 b8 g4. + } + \addlyrics { + Girls and boys come out to play, + The moon doth shine as bright as day; } - \addlyrics { One day this shall be free __ } >> @end lilypond -De la même manière, les séparations syllabiques d'un mot peuvent être -entrées avec deux tirets (@code{-}), ce qui produit un tiret centré -entre les deux syllabes : +Remarquez que les paroles ajoutées ne s'alignent pas bien avec les +notes. Le mot @emph{shine} devrait être chanté sur deux notes au lieu +d'une. On appelle ceci un @notation{mélisme} : il s'agit d'une seule +syllabe chantée sur plus d'une note. Il existe plusieurs façons +d'étaler une sylabe sur plusieurs notes, la plus simple étant de lier +les notes du mélisme. Pour les détails, consultez @ref{Ties and +slurs}. -@c no ragged-right here because otherwise the hypens get lost. -@lilypond[quote,verbatim] +@lilypond[verbatim,quote] << - \relative c' { - \time 2/4 - f4 f c c + \relative c'' { + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 + g8 a4 b8 c( b) a d4 b8 g4. + } + \addlyrics { + Girls and boys come out to play, + The moon doth shine as bright as day; } - \addlyrics { A -- le -- gri -- a } >> @end lilypond -@seealso -@quotation -Plus de possibilités, comme celle d'ajouter plusieurs lignes de paroles -en dessous d'une même mélodie sont exposées dans @ruser{Vocal music}. -@end quotation +Les paroles sont maintenant correctement alignées, mais les liens de +croche automatiques ne conviennent pas pour les notes au-dessus de +@emph{shine as}. On peut les corriger en ajoutant des liens de croche +manuels, pour ceci consultez @ref{Automatic and manual beams}. +@lilypond[verbatim,quote] +<< + \relative c'' { + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 + g8 a4 b8 c([ b]) a d4 b8 g4. + } + \addlyrics { + Girls and boys come out to play, + The moon doth shine as bright as day; + } +>> +@end lilypond -@node A lead sheet -@subsection A lead sheet +Au lieu d'utiliser une liaison, on peut indiquer le mélisme dans les +paroles en insérant un caractère souligné @code{_} pour chaque note du +mélisme sauf la première. -@cindex partition de chanson -@cindex chanson, partition complète -@cindex accords, noms -@cindex noms d'accords +@lilypond[verbatim,quote] +<< + \relative c'' { + \key g \major + \time 6/8 + d4 b8 c4 a8 d4 b8 g4 + g8 a4 b8 c[ b] a d4 b8 g4. + } + \addlyrics { + Girls and boys come out to play, + The moon doth shine _ as bright as day; + } +>> +@end lilypond -En musique de variété, il est courant d'indiquer l'accompagnement par le -nom des accords. De tels accords peuvent être entrés comme les notes : +Si une syllabe s'étend sur un grand nombre de notes ou une note très +longue, on représente souvent le mélisme par un @notation{trait de +prolongation}, qu'on entre avec @code{__}. L'exemple suivant montre +les trois premières mesures de la plainte de Didon, extraite de +@emph{Didon et Énée} de Purcell. -@lilypond[quote,ragged-right,verbatim] -\chordmode { c2 f4. g8 } +@lilypond[verbatim,quote] +<< + \relative c'' { + \key g \minor + \time 3/2 + g2 a bes bes( a) + b c4.( bes8 a4. g8 fis4.) g8 fis1 + } + \addlyrics { + When I am laid, + am laid __ in earth, + } +>> @end lilypond -Maintenant, chaque hauteur est lue comme la base de l'accord à la place -de la note. Ce mode est activé avec @code{\chordmode}. D'autres -accords peuvent être créés en ajoutant des modificateurs après deux -points. L'exemple suivant montre quelques modificateurs usuels : +Aucun exemple jusqu'à présent n'a utilisé de mots de plus d'une +syllabe. Dans des paroles, de tels mots sont écrits en syllabes +séparées par des traits d'union. Avec LilyPond, on utilise deux +tirets pour produire un trait d'union centré entre deux syllabes. +L'exemple suivant montre tout ce que nous avons vu jusqu'à maintenant +sur l'alignement de paroles à une mélodie. -@lilypond[quote,verbatim,ragged-right] -\chordmode { c2 f4:m g4:maj7 gis1:dim7 } +@c no ragged-right here because otherwise the hyphens get lost, +@c but the example is long enough to avoid looking strange. +@lilypond[verbatim,quote,noragged-right] +<< + \relative c' { + \key g \major + \time 3/4 + \partial 4 + d4 g4 g a8( b) g4 g4 + b8( c) d4 d e4 c2 + } + \addlyrics { + A -- way in a __ man -- ger, + no __ crib for a bed, __ + } +>> @end lilypond -Pour la musique improvisée, les accords ne sont pas imprimés sur des -portées mais comme des lignes à part entière. Ceci s'obtient en -utilisant @code{\chords} à la place de @code{\chordmode}. La même -syntaxe sera utilisée que dans le cas de@code{\chordmode}, mais le rendu -des notes interviendra dans un contexte @code{ChordNames}, avec le -résultat suivant : - -@lilypond[quote,verbatim,ragged-right] -\chords { c2 f4.:m g4.:maj7 gis8:dim7 } +Avec certaines paroles, en particulier en italien, il se produit la +situation inverse : il peut y avoir plusieurs syllabes sur une seule +note. On réalise ceci avec LilyPond grâce à un caractère souligné +@code{_} sans espace entre les syllabes, ou alors en groupant les +syllabes avec des guillemets. L'exemple suivant est extrait de l'air +de Figaro @emph{Largo al factotum}, dans @emph{Figaro} de Rossini, où +la syllabe @emph{al} est chantée sur la même note que @emph{go}. + +@c no ragged-right here because otherwise the hyphens get lost, +@c but the example is long enough to avoid looking strange. +@lilypond[verbatim,quote,noragged-right] +<< + \relative c' { + \clef bass + \key c \major + \time 6/8 + c4.~ c8 d b c([ d]) b c d b c + } + \addlyrics { + Lar -- go_al fac -- to -- tum del -- la cit -- tà + } +>> @end lilypond -@cindex partition de chanson -@cindex chanson, partition complète -Une fois assemblés, les accords, paroles et mélodie forment une -partition de chanson : +@seealso + +Manuel de notation : @ruser{Vocal music}. + -@lilypond[quote,verbatim,ragged-right] +@node Lyrics to multiple staves +@subsection Lyrics to multiple staves + +La méthode simple d'ajout de paroles avec @code{\addlyrics} peut être +également utilisée pour placer des paroles sous plusieurs portées. +L'exemple suivant est extrait de @emph{Judas Macchabée} de Händel. + +@lilypond[verbatim,quote] << - \chords { c2 g:sus4 f e } \relative c'' { - a4 e c8 e r4 - b2 c4( d) + \key f \major + \time 6/8 + \partial 8 + c8 c([ bes]) a a([ g]) f f'4. b, c4.~ c4 + } + \addlyrics { + Let flee -- cy flocks the hills a -- dorn, __ + } + \relative c' { + \key f \major + \time 6/8 + \partial 8 + r8 r4. r4 c8 a'([ g]) f f([ e]) d e([ d]) c bes'4 + } + \addlyrics { + Let flee -- cy flocks the hills a -- dorn, } - \addlyrics { One day this shall be free __ } >> @end lilypond +Pour produire des partitions plus complexes ou plus longues que cet +exemple simple, il est vivement conseillé de séparer la structure de +la partition des notes et paroles, grâce à des variables. Ceci sera +détaillé plus loin dans @ref{Organizing pieces with variables}. @seealso -@quotation -Une liste complète de modificateurs et d'autres options de mise en forme -se trouve à la section @ruser{Chord notation}. -@end quotation + +Manuel de notation : @ruser{Vocal music}. + @node Final touches @section Final touches -L'ultime section de ce tutoriel montre comment ajouter une touche finale -à des morceaux simples, et consititue une introduction au reste du -manuel. +L'ultime section de ce tutoriel montre comment ajouter une touche +finale à des morceaux simples, et constitue une introduction au reste +du manuel. @menu +* Organizing pieces with variables:: * Version number:: * Adding titles:: * Absolute note names:: -* Organizing pieces with identifiers:: * After the tutorial:: -* How to read the manual:: @end menu +@node Organizing pieces with variables +@subsection Organizing pieces with variables + +Lorsque l'on combine tous les éléments étudiés précédemment pour +écrire des partitions plus longues, les expressions musicales prennent +de l'ampleur et, dans le cas des pièces polyphoniques, deviennent +profondément imbriquées, jusqu'au point où il devient difficile de se +repérer dans le fichier source. Cet inconvénient peut être résolu par +l'utilisation de @emph{variables}. + +En utilisant des variables, parfois appelées identificateurs ou +macros, on peut scinder des expressions musicales complexes en des +expressions plus simples. Une variable se définit comme suit : + +@example +musiqueToto = @{ @dots{} @} +@end example + +Le contenu de l'expression musicale @code{musiqueToto} pourra être +utilisé plus loin en faisant précéder son nom d'un anti-slash, +c'est-à-dire @code{\musiqueToto}, tout comme n'importe quelle commande +LilyPond. Toute variable doit être définie @emph{avant} son +utilisation dans une autre expression musicale. + +@lilypond[verbatim,quote] +violin = \new Staff { + \relative c'' { + a4 b c b + } +} +cello = \new Staff { + \relative c { + \clef bass + e2 d + } +} +{ + << + \violin + \cello + >> +} +@end lilypond + +@noindent +Le nom d'une variable ne doit comporter que des caractères +alphabétiques non accentués, aucun nombre ni tiret ne sont autorisés. + +On peut utiliser une variable déjà définie autant de fois que l'on +veut, y compris dans la définition d'une nouvelle variable ; par +exemple, cela peut servir à saisir un motif qu'une seule fois, même +s'il se répète un grand nombre de fois dans la pièce. + +@lilypond[verbatim,quote] +tripletA = \times 2/3 { c,8 e g } +barA = { \tripletA \tripletA \tripletA \tripletA } + +\relative c'' { + \barA \barA +} +@end lilypond + +Il est possible d'utiliser des variables de types variés. Par exemple, + +@example +width = 4.5\cm +name = "Wendy" +aFivePaper = \paper @{ paperheight = 21.0 \cm @} +@end example + +En fonction de son contenu, un identificateur peut être utilisé à +différents endroits. L'exemple suivant utilise les variable définies +ci-dessus. + +@example +\paper @{ + \aFivePaper + line-width = \width +@} +@{ c4^\name @} +@end example + + @node Version number @subsection Version number @cindex versions La déclaration @code{\version} stipule le numéro de la version de -LilyPond pour laquelle le fichier a été écrit, +LilyPond pour laquelle le fichier a été écrit : @example \version @w{"@version{}"} @end example @noindent -que l'on place par convention en début de fichier. +Par convention, on place cette instruction en début de fichier. -Cette annotation permet de faciliter les prochaines mises à jour de -LilyPond. Les changements dans la syntaxe sont gérés avec un programme -spécial, @file{convert-ly} --- voir @rprogram{Updating files with convert-ly} ---- et il utilise @code{\version} pour déterminer les règles de -conversion à appliquer au fichier. +Cette instruction permet de faciliter les mises à jour futures de +LilyPond. Les changements de syntaxe au fil des versions sont gérés +avec un programme dédié, @command{convert-ly}, qui utilise la valeur +de @code{\version} pour déterminer les règles de conversion à +appliquer au fichier source. Pour plus d'informations, consultez voir +@rprogram{Updating files with convert-ly}. @node Adding titles @subsection Adding titles -Les informations bibliographiques (nom du morceau, du compositeur, etc) -sont entrées dans un bloc séparé, le bloc d'en-tête (@code{\header}), -qui existe indépendamment des expressions musicales principales. Le -bloc @code{\header} est habituellement placé en début de fichier. +On indique les informations bibliographiques --- nom du morceau, du +compositeur, numéro d'opus... --- dans un bloc à part, le bloc +d'en-tête @code{\header}, qui existe indépendamment de l'expression +musicale principale. Le bloc @code{\header} est habituellement placé +en début de fichier, après le numéro de version. @example -\version "2.11.51" +\version @w{"@version{}"} \header @{ title = "Symphonie" composer = "Moi" @@ -1406,28 +1718,30 @@ bloc @code{\header} est habituellement placé en début de fichier. @} @{ - @dots{} music @dots{} + @dots{} la musique @dots{} @} @end example -Quand le fichier est traité, le titre et le compositeur sont imprimés en -haut de la partition. Vous trouverez plus d'informations sur les titres -à @ruser{Creating titles}. + +Quand LilyPond traite le fichier, le titre et le compositeur sont +imprimés au début de la partition. Vous trouverez plus d'informations +sur les titres à la section @ruser{Creating titles}. + @node Absolute note names @subsection Absolute note names -Jusqu'ici nous n'avons utilisé que le mode @code{\relative} pour définir -les hauteurs de notes. Si c'est effectivement le moyen le plus simple -d'entrer la majeure partie de votre musique, il existe une autre façon -de procéder : le mode des hauteurs absolues. +Jusqu'ici nous n'avons utilisé que le mode @code{\relative} pour +définir les hauteurs de notes. Si c'est souvent le moyen le plus +simple de saisir la musique au clavier, il existe une autre façon de +procéder : le mode de hauteurs absolues. Si vous omettez la commande @code{\relative}, LilyPond considérera -toutes les hauteurs comme des hauteurs absolues. Un @code{c'} sera -toujours un do du milieu, un @code{b} sera toujours une note au-dessous -du précédent, et un @code{g,} sera toujours la note la plus grave dans -la portée de clé de fa. +toutes les hauteurs comme des hauteurs absolues. Un @code{c'} désigne +toujours le do central, un @code{b} se situe une seconde en dessous +du do central, et un @code{g,} est situé sur la première ligne de +la portée en clé de fa. -@lilypond[quote,verbatim,ragged-right] +@lilypond[verbatim,quote] { \clef bass c' b g, g, @@ -1437,7 +1751,7 @@ la portée de clé de fa. Voici une gamme sur 4 octaves : -@lilypond[quote,verbatim,ragged-right] +@lilypond[verbatim,quote] { \clef bass c, d, e, f, @@ -1452,10 +1766,11 @@ Voici une gamme sur 4 octaves : } @end lilypond -Comme vous pouvez le voir, il faut beaucoup d'apostrophes pour écrire de -la musique dans un registre aigu. Regardez cet extrait de Mozart : +Comme vous pouvez le voir, il faut beaucoup d'apostrophes pour écrire +de la musique dans un registre aigu, comme le montre cet extrait de +Mozart. -@lilypond[quote,verbatim,ragged-right] +@lilypond[verbatim,quote] { \key a \major \time 6/8 @@ -1464,11 +1779,12 @@ la musique dans un registre aigu. Regardez cet extrait de Mozart : } @end lilypond -Toutes ces apostrophes rendent le fichier moins lisible, et c'est donc -une source d'erreurs. En mode @code{\relative}, le même exemple devient -bien plus facile à lire : +Toutes ces apostrophes rendent le fichier moins lisible, et surtout il +est très probable d'oublier au moins une apostrophe au cours de la +frappe. En mode @code{\relative}, le même exemple devient bien plus +facile à lire et à saisir. -@lilypond[quote,verbatim,ragged-right] +@lilypond[verbatim,quote] \relative c'' { \key a \major \time 6/8 @@ -1478,120 +1794,39 @@ bien plus facile à lire : @end lilypond Si d'aventure vous faites une erreur d'octaviation, le mode -@code{\relative} la rendra frappante --- toutes les notes suivantes -seront placées à la mauvaise octave. En mode de hauteurs absolues, une -erreur isolée ne serait pas auntant visible, et donc aussi facile à -dénicher. +@code{\relative} la mettra en évidence : toutes les notes suivantes +seront placées à la mauvaise octave. En mode de hauteurs absolues, +une erreur isolée ne serait pas autant visible, donc serait plus +difficile à dénicher. -Cependant, le mode de hauteurs absolues reste utile pour les musiques où -les intervalles sont étendus, surtout pour les fichiers LilyPond créés -par ordinateur. - - -@node Organizing pieces with identifiers -@subsection Organizing pieces with identifiers - -Lorsque l'on combine tous les éléments étudiés plus haut pour produire -des fichiers plus volumineux, les blocs @code{\score} deviennent -beaucoup plus gros parce que les expressions musicales sont plus longues -et, dans le cas des pièces polyphoniques, profondément imbriquées. De -telles expressions imposantes finissent par devenir peu maniables. Cet -inconvénient peut être résolu par l'utilisation -d'@emph{identificateurs}. - -En utilisant ces identificateurs, que l'on pourrait aussi appeler -variables ou macros, il est possible de découper des expressions -musicales complexes. Un identificateur se définit comme suit : - -@example -MusiqueToto = @{ @dots{} @} -@end example - -Le contenu de l'expression musicale @code{MusiqueToto} pourra être -utilisé plus loin en faisant précéder son nom d'un anti-slash, -c'est-à-dire @code{\MusiqueToto}, juste comme n'importe quelle commande -LilyPond. Tous les identificateurs doivent être définis @emph{avant} -l'expression musicale principale. - -@lilypond[quote,verbatim,ragged-right] -violin = \new Staff { \relative c'' { - a4 b c b -}} -cello = \new Staff { \relative c { - \clef bass - e2 d -}} -{ - << - \violin - \cello - >> -} -@end lilypond - -@noindent -Le nom d'un identificateur ne doit comporter que des caractères -alphabétiques non accentués, aucun nombre ni tiret. - -Il est possible d'utiliser des variables de types variés. Par exemple, - -@example -width = 4.5\cm -name = "Wendy" -aFivePaper = \paper @{ paperheight = 21.0 \cm @} -@end example - -En fonction de son contenu, un identificateur peut être utilisé à -différents endroits. L'exemple suivant utilise la variable ci-dessus : - -@example -\paper @{ - \aFivePaper - line-width = \width -@} -@{ c4^\name @} -@end example +Cependant, le mode de hauteurs absolues reste utile pour les musiques +où les intervalles sont étendus, et plus encore pour les fichiers +LilyPond créés par des programmes. @node After the tutorial @subsection After the tutorial -Après avoir parcouru ce tutoriel, vous devriez vous essayer à écrire un -morceau ou deux. Commencez par copier l'un des @ref{Templates} types et -ajoutez-y des notes. Si vous voulez employer une notation que vous -n'avez pas trouvé dans le tutoriel, consultez la référence de notation, -en commençant par la @ruser{Musical notation}. Si vous désirez écrire pour -un ensemble instrumental non couvert par les @ref{Templates}, lisez la -section @ref{Extending the templates}. - -Après avoir écrit quelques pièces courtes, lisez les chapitres 3 à 5 du -manuel d'apprentissage. Rien ne s'oppose à ce que vous consultiez dès à -présent les autres chapitres, bien sûr ! Néanmoins, le reste du manuel -de l'utilisateur part du principe que vous avez déjà bien assimilé la -syntaxe de LilyPond. Vous pouvez toujours survoler le reste du manuel, -et y revenir plus tard après avoir acquis de l'expérience. - -@node How to read the manual -@subsection How to read the manual - -Comme nous l'avons déjà vu dans @ref{How to read the tutorial}, de -nombreux exemples du tutoriel n'ont pas fait apparaître -@code{\relative c'' @{ ... @}} dans l'extrait de code affiché. - -Dans le reste du manuel, les exemples utilisés sont encore beaucoup plus -souples : parfois il leur manque le @code{\relative c'' @{ ... @}}, -mais d'autres fois ils ont recours à une autre hauteur de référence, -telle que @code{c'} ou @code{c,,}), et dans certains cas c'est même -l'exemple entier qui est en mode de hauteurs absolues ! Cependant, de -telles ambiguïtés ne se trouvent que dans des contextes où les hauteurs -n'ont que peu d'importance. Dans tous les exemples où elles en ont, le -mode @code{\relative} ou absolu @code{@{ @}} est explicitement spécifié. - -Si vous ne vous y retrouvez toujours pas pour savoir quel code LilyPond -produit précisément tel ou tel exemple, consultez la version HTML de ce -manuel si ce n'est pas déjà le cas, et cliquez sur l'image de la -partition. La source exacte utilisée pour générer ce manuel s'affichera -alors. - -Pour en savoir plus sur l'organisation de la suite de ce manuel, -reportez-vous à @ref{About the documentation}. +Après avoir parcouru ce tutoriel, vous devriez essayer d'écrire un +morceau ou deux. Commencez par copier l'un des modèles types et +ajoutez-y des notes --- consultez les @ref{Templates}. Si vous voulez +employer une notation que vous n'avez pas trouvé dans le tutoriel, +consultez le manuel de notation, en commençant par la @ruser{Musical +notation}. Si vous désirez écrire pour un ensemble instrumental non +couvert par les modèles, lisez la section @ref{Extending the +templates}. + +Après avoir écrit quelques pièces courtes, lisez les chapitres 3 à 5 +du manuel d'initiation. Rien ne s'oppose à ce que vous consultiez dès +à présent ces chapitres, bien sûr ! Néanmoins, le reste du manuel +d'initiation part du principe que vous avez déjà bien assimilé la +syntaxe de base de LilyPond. Vous pouvez toujours survoler ces +chapitres 3 à 5, et y revenir plus tard après avoir acquis de +l'expérience. + +Si vous ne l'avez pas encore fait, lisez @ref{About the +documentation}. Les sources de documentation et d'information sur +LilyPond sont vastes, il est normal pour un débutant de ne pas savoir +où chercher ; si vous passez quelques minutes à lire attentivement +cette section, vous vous épargnerez certainement la frustration causée +par des heures de recherche infructueuses. diff --git a/Documentation/fr/user/tweaks.itely b/Documentation/fr/user/tweaks.itely index 4bd2d67920..e8bf011654 100644 --- a/Documentation/fr/user/tweaks.itely +++ b/Documentation/fr/user/tweaks.itely @@ -20,18 +20,138 @@ LilyPond offre de nombreuses possibilités de réglages, permettant de modifier quasiment chaque élément de votre partition. @menu -* Moving objects:: -* Fixing overlapping notation:: +* Tweaking basics:: +* The Internals Reference manual:: +* Appearance of objects:: +* Placement of objects:: +* Collisions of objects:: * Common tweaks:: -* Default files:: -* Fitting music onto fewer pages:: -* Advanced tweaks with Scheme:: -* Avoiding tweaks with slower processing:: +* Further tweaking:: +@end menu + +@node Tweaking basics +@section Tweaking basics + +@untranslated + +@menu +* Introduction to tweaks:: +* Objects and interfaces:: +* Naming conventions of objects and properties:: +* Tweaking methods:: +@end menu + +@node Introduction to tweaks +@subsection Introduction to tweaks + +@untranslated + +@node Objects and interfaces +@subsection Objects and interfaces + +@untranslated + +@node Naming conventions of objects and properties +@subsection Naming conventions of objects and properties + +@untranslated + +@node Tweaking methods +@subsection Tweaking methods + +@untranslated + +@node The Internals Reference manual +@section The Internals Reference manual + +@untranslated + +@menu +* Properties of layout objects:: +* Properties found in interfaces:: +* Types of properties:: @end menu +@node Properties of layout objects +@subsection Properties of layout objects + +@untranslated + +@node Properties found in interfaces +@subsection Properties found in interfaces + +@untranslated + +@node Types of properties +@subsection Types of properties + +@untranslated + +@node Appearance of objects +@section Appearance of objects + +@untranslated + +@menu +* Visibility and color of objects:: +* Size of objects:: +* Length and thickness of objects:: +@end menu + +@node Visibility and color of objects +@subsection Visibility and color of objects + +@untranslated + +@node Size of objects +@subsection Size of objects + +@untranslated + +@node Length and thickness of objects +@subsection Length and thickness of objects + +@untranslated + +@node Placement of objects +@section Placement of objects + +@untranslated + +@menu +* Automatic behavior:: +* Within-staff objects:: +* Outside staff objects:: +@end menu + +@node Automatic behavior +@subsection Automatic behavior + +@untranslated + +@node Within-staff objects +@subsection Within-staff objects + +@untranslated + +@node Outside staff objects +@subsection Outside staff objects + +@untranslated + + +@node Collisions of objects +@section Collisions of objects + + +@menu +* Moving objects:: +* Fixing overlapping notation:: +* Real music example:: +@end menu @node Moving objects -@section Moving objects +@subsection Moving objects Aussi surprenant que cela puisse paraître, LilyPond n'est pas parfait. Certains éléments sur la partition peuvent se chevaucher, ce qui est @@ -177,7 +297,7 @@ Dans ce même manuel : @ruser{The \override command}, @ref{Common tweaks}. @node Fixing overlapping notation -@section Fixing overlapping notation +@subsection Fixing overlapping notation Dans la section @ref{Moving objects}, nous avons vu comment déplacer un objet @code{TextScript}. Ce même procédé peut être @@ -220,6 +340,13 @@ les plus communs : @end multitable +@node Real music example +@subsection Real music example + +@untranslated + + +@c DEPRECATED SECTION @node Common tweaks @section Common tweaks @@ -355,8 +482,29 @@ l'unité staff-space. Pour de plus amples informations, consultez les sections correspondantes de la Référence du programme. -@node Default files -@section Default files +@node Further tweaking +@section Further tweaking + +@menu +* Other uses for tweaks:: +* Using variables for tweaks:: +* Other sources of information:: +* Avoiding tweaks with slower processing:: +* Advanced tweaks with Scheme:: +@end menu + +@node Other uses for tweaks +@subsection Other uses for tweaks + +@untranslated + +@node Using variables for tweaks +@subsection Using variables for tweaks + +@untranslated + +@node Other sources of information +@subsection Other sources of information La Référence du programme contient beaucoup d'informations sur LilyPond. Cependant vous pouvez en découvrir @@ -392,99 +540,22 @@ intéressants. En effet les fichiers du type @file{ly/property-init.ly} ou encore @file{ly/declarations-init.ly} déterminent toutes les définitions avancées communes. -@node Fitting music onto fewer pages -@section Fitting music onto fewer pages - -Parfois, une partition peut se terminer avec seulement -un ou deux systèmes sur la dernière page. Ceci peut être ennuyeux -surtout si vous constatez, en regardant les pages précédentes, qu'il -reste encore beaucoup de place sur celles-ci. - -Si vous vous intéressez aux problèmes de mise en page, -@code{annotate-spacing} peut alors être un outil d'une valeur -inestimable. Cette commande imprime les valeurs -de nombreuses commandes d'espacement concernant la mise en page. -Consultez @ruser{Displaying spacing} pour de plus amples informations. À l'aide -des informations données par @code{annotate-spacing}, on peut -voir quelles marges il est souhaitable de modifier afin de résoudre le -problème. - - -En plus d'agir sur les marges, il existe d'autres possibilités -qui permettent de gagner de la place. - -@itemize -@item -Demander à LilyPond de placer les systèmes aussi -près que possible les uns des autres (pour en disposer autant -que possible sur une page), tout en répartissant les systèmes afin -de ne pas laisser de blanc en bas de la dernière page. - -@example -\paper @{ - between-system-padding = #0.1 - between-system-space = #0.1 - ragged-last-bottom = ##f - ragged-bottom = ##f -@} -@end example +@node Avoiding tweaks with slower processing +@subsection Avoiding tweaks with slower processing -@item -Obliger LilyPond à mettre un certain nombre de systèmes -par page. Par exemple, si LilyPond veut placer onze systèmes dans une page, -vous pouvez l'obliger à n'en mettre que dix. +LilyPond peut effectuer des vérifications supplémentaires lors du +traitement des fichiers, cependant le rendu nécessitera alors plus de +temps. En contrepartie, il y aura moins d'ajustements manuels à réaliser. + @example -\paper @{ - system-count = #10 -@} +%% Ceci sert à s'assurer que les indications textuelles resteront à l'intérieur des marges de la page. +\override Score.PaperColumn #'keep-inside-line = ##t @end example -@item -Supprimer (ou réduire) les objets qui augmentent la hauteur du -système. C'est le cas en particulier de certaines reprises (avec des -alternatives) qui placent des crochets au dessus des portées. Si ces crochets -de reprise se poursuivent sur deux systèmes, ils prendront plus de -place que s'ils sont regroupés sur un même système. - -Un autre exemple : déplacer les nuances qui @qq{débordent} d'un système. - -@lilypond[verbatim,quote,fragment] -\relative c' { - e4 c g\f c - \override DynamicLineSpanner #'padding = #-1.8 - \override DynamicText #'extra-offset = #'( -2.1 . 0) - e4 c g\f c -} -@end lilypond - -@item -Modifier l'espacement vertical avec @code{SpacingSpanner}. Reportez-vous à -@ruser{Changing horizontal spacing} pour plus de détails. - -@lilypond[verbatim,quote] -\score { - \relative c'' { - g4 e e2 | f4 d d2 | c4 d e f | g4 g g2 | - g4 e e2 | f4 d d2 | c4 e g g | c,1 | - d4 d d d | d4 e f2 | e4 e e e | e4 f g2 | - g4 e e2 | f4 d d2 | c4 e g g | c,1 | - } - \layout { - \context { - \Score - \override SpacingSpanner - #'base-shortest-duration = #(ly:make-moment 1 4) - } - } -} -@end lilypond - -@end itemize - @node Advanced tweaks with Scheme -@section Advanced tweaks with Scheme +@subsection Advanced tweaks with Scheme Nous avons déjà vu comment le résultat obtenu avec LilyPond peut être largement personnalisé à l'aide de commandes comme @@ -541,16 +612,3 @@ pattern = #(define-music-function (parser location x y) (ly:music? ly:music?) } @end lilypond - -@node Avoiding tweaks with slower processing -@section Avoiding tweaks with slower processing - -LilyPond peut effectuer des vérifications supplémentaires lors du -traitement des fichiers, cependant le rendu nécessitera alors plus de -temps. En contrepartie, il y aura moins d'ajustements manuels à réaliser. - - -@example -%% Ceci sert à s'assurer que les indications textuelles resteront à l'intérieur des marges de la page. -\override Score.PaperColumn #'keep-inside-line = ##t -@end example diff --git a/Documentation/fr/user/unfretted-strings.itely b/Documentation/fr/user/unfretted-strings.itely index 6f92d1380d..75c145c513 100644 --- a/Documentation/fr/user/unfretted-strings.itely +++ b/Documentation/fr/user/unfretted-strings.itely @@ -27,7 +27,7 @@ l'écriture pour les cordes frottées. @node Common notation for unfretted strings @subsection Common notation for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for unfretted strings:: @@ -36,12 +36,12 @@ UNTRANSLATED NODE: IGNORE ME @node References for unfretted strings @subsubsection References for unfretted strings -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bowed instruments @subsection Bowed instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for bowed strings:: @@ -64,7 +64,7 @@ par @code{\harmonic}. @node Plucked instruments @subsection Plucked instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Harp:: @@ -73,5 +73,5 @@ UNTRANSLATED NODE: IGNORE ME @node Harp @subsubsection Harp -UNTRANSLATED NODE: IGNORE ME +@untranslated diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely index 588874f818..2d14d152f0 100644 --- a/Documentation/fr/user/vocal.itely +++ b/Documentation/fr/user/vocal.itely @@ -572,9 +572,7 @@ alors prolonger vous-même les syllabes concernées. @node Skipping notes @subsubsection Skipping notes -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -613,9 +611,7 @@ Référence du programme : @rinternals{LyricExtender}, @node Lyrics and repeats @subsubsection Lyrics and repeats -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -711,9 +707,7 @@ lyr = \lyricmode { I like my cat! } @node Chants @subsubsection Chants -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml @@ -764,9 +758,7 @@ dans le bloc @code{\layout}. @node Centering lyrics between staves @subsubsection Centering lyrics between staves -@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml +@untranslated @ifnothtml @englishref @end ifnothtml diff --git a/Documentation/fr/user/wind.itely b/Documentation/fr/user/wind.itely index 31a39de7ff..4b0b5c89ad 100644 --- a/Documentation/fr/user/wind.itely +++ b/Documentation/fr/user/wind.itely @@ -15,7 +15,7 @@ @node Wind instruments @section Wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Common notation for wind instruments:: @@ -25,7 +25,7 @@ UNTRANSLATED NODE: IGNORE ME @node Common notation for wind instruments @subsection Common notation for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * References for wind instruments:: @@ -35,17 +35,17 @@ UNTRANSLATED NODE: IGNORE ME @node References for wind instruments @subsubsection References for wind instruments -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Half-holes @subsubsection Half-holes -UNTRANSLATED NODE: IGNORE ME +@untranslated @node Bagpipes @subsection Bagpipes -UNTRANSLATED NODE: IGNORE ME +@untranslated @menu * Bagpipe definitions:: diff --git a/Documentation/fr/user/working.itely b/Documentation/fr/user/working.itely index 7086f337b4..7196704fa8 100644 --- a/Documentation/fr/user/working.itely +++ b/Documentation/fr/user/working.itely @@ -21,13 +21,13 @@ ces astuces peuvent vous paraître évidentes, mais vous ne perdrez tout de même pas votre temps à lire ce chapitre. @menu -* Suggestions for writing LilyPond files:: +* Suggestions for writing LilyPond input files:: * When things don't work:: * Scores and parts:: @end menu -@node Suggestions for writing LilyPond files -@section Suggestions for writing LilyPond files +@node Suggestions for writing LilyPond input files +@section Suggestions for writing LilyPond input files Maintenant vous êtes prêt à travailler sur de plus gros fichiers LilyPond --- des pièces entières, et plus seulement les petits @@ -81,7 +81,7 @@ années auparavant. L'utilitaire @command{convert-ly} demande que vous spécifiiez la version de LilyPond vous utilisiez alors. @item @strong{Ajoutez des contrôles}: @ruser{Bar check}, @ruser{Octave -check} et @ruser{Barnumber check}. Si vous avez ajouté des contrôles de +checks} et @ruser{Barnumber check}. Si vous avez ajouté des contrôles de loin en loin, et que vous faites une erreur, vous pourrez la retrouver plus rapidement. @qq{De loin en loin}, qu'est-ce à dire ? Cela dépend de la complexité de la musique. Pour de la musique très @@ -208,9 +208,9 @@ Vous comprendrez combien cela peut être utile pour écrire de la musique minimaliste : @lilypond[quote,verbatim,ragged-right] -fragA = \relative c'' { a4 a8. b16 } -fragB = \relative c'' { a8. gis16 ees4 } -violin = \new Staff { \fragA \fragA \fragB \fragA } +fragmentA = \relative c'' { a4 a8. b16 } +fragmentB = \relative c'' { a8. gis16 ees4 } +violin = \new Staff { \fragmentA \fragmentA \fragmentB \fragmentA } \score { { \violin diff --git a/Documentation/fr/user/world.itely b/Documentation/fr/user/world.itely new file mode 100644 index 0000000000..ba94ae2443 --- /dev/null +++ b/Documentation/fr/user/world.itely @@ -0,0 +1,73 @@ +@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*- +@c This file is part of lilypond.tely +@ignore + Translation of GIT committish: 6bcad9cdc487270910758b1ee39cf3c8aee1015e + + When revising a translation, copy the HEAD committish of the + version that you are working on. See TRANSLATION for details. +@end ignore + + +@node World music +@section World music + +@untranslated + + +@menu +* Arabic music:: +@end menu + +@node Arabic music +@subsection Arabic music + +@untranslated + + +@menu +* References for Arabic music:: +* Arabic note names :: +* Arabic key signatures:: +* Arabic time signatures:: +* Arabic music example:: +* Further reading:: +@end menu + +@node References for Arabic music +@unnumberedsubsubsec References for Arabic music + +@untranslated + + +@node Arabic note names +@unnumberedsubsubsec Arabic note names + +@untranslated + + +@node Arabic key signatures +@unnumberedsubsubsec Arabic key signatures + +@untranslated + + +@node Arabic time signatures +@unnumberedsubsubsec Arabic time signatures + +@untranslated + + +@node Arabic music example +@unnumberedsubsubsec Arabic music example + +@untranslated + + +@node Further reading +@unnumberedsubsubsec Further reading + +@untranslated + + + +@c -- SKELETON FILE -- diff --git a/Documentation/index.html.in b/Documentation/index.html.in index fd431f3037..05de5724b0 100644 --- a/Documentation/index.html.in +++ b/Documentation/index.html.in @@ -50,11 +50,13 @@
  • Music Glossary (MG) -(in one big page ~ 1 Mb, +(in one big page ~ 500 kB, in PDF)
    (for non-English users) @@ -79,14 +81,14 @@ in PDF)
  • Notation Reference (NR) -(in one big page ~ 4 Mb, +(in one big page ~ 4 MB, in PDF)
    (writing music in LilyPond)
  • Internals Reference (IR) - (in one big page ~ 1 Mb) + (in one big page ~ 1 MB)
    (definitions for tweaking) @@ -102,7 +104,7 @@ in PDF)
    (how to install and run the program)
  • Snippets List (SL) -(in one big page, +(in one big page ~ 2MB, in PDF)
    (Short tricks, tips, and examples) @@ -118,12 +120,10 @@ in PDF)
  • Learning Manual (LM) +(in one big page ~ 1.5 MB, +in PDF)
    (start here)
    • diff --git a/Documentation/po/de.po b/Documentation/po/de.po index f1b0922d4c..9328116fbd 100644 --- a/Documentation/po/de.po +++ b/Documentation/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-20 09:14+0200\n" +"POT-Creation-Date: 2008-08-11 18:05+0200\n" "PO-Revision-Date: 2008-05-05 19:25+0300\n" "Last-Translator: Till Rettig \n" "Language-Team: de\n" @@ -65,78 +65,88 @@ msgstr "" #: translations-status.py:56 #, fuzzy +msgid "Section titles" +msgstr "Titel erstellen" + +#: translations-status.py:57 +#, python-format +msgid "

    Last updated %s

    \n" +msgstr "" + +#: translations-status.py:58 +#, fuzzy msgid "Translators" msgstr "Transposition" -#: translations-status.py:56 +#: translations-status.py:58 msgid "Translation checkers" msgstr "" -#: translations-status.py:57 +#: translations-status.py:59 #, fuzzy msgid "Translated" msgstr "Transposition" -#: translations-status.py:57 +#: translations-status.py:59 msgid "Up to date" msgstr "" -#: translations-status.py:58 +#: translations-status.py:60 #, fuzzy msgid "Other info" msgstr "Mehr Information" -#: translations-status.py:60 +#: translations-status.py:62 #, fuzzy msgid "no" msgstr "normal" -#: translations-status.py:61 +#: translations-status.py:63 #, fuzzy msgid "not translated" msgstr "Banjo-Tabulaturen" -#: translations-status.py:63 +#: translations-status.py:65 #, python-format msgid "partially (%(p)d %%)" msgstr "" -#: translations-status.py:65 +#: translations-status.py:67 #, python-format msgid "partially translated (%(p)d %%)" msgstr "" -#: translations-status.py:66 translations-status.py:68 +#: translations-status.py:68 translations-status.py:70 msgid "yes" msgstr "" -#: translations-status.py:67 +#: translations-status.py:69 #, fuzzy msgid "translated" msgstr "transparent (durchsichtig)" -#: translations-status.py:68 translations-status.py:69 +#: translations-status.py:70 translations-status.py:71 msgid "up to date" msgstr "" -#: translations-status.py:70 +#: translations-status.py:72 #, fuzzy msgid "partially" msgstr "Wiederholungen" -#: translations-status.py:71 +#: translations-status.py:73 msgid "partially up to date" msgstr "" -#: translations-status.py:72 +#: translations-status.py:74 msgid "N/A" msgstr "" -#: translations-status.py:73 +#: translations-status.py:75 msgid "pre-GDP" msgstr "" -#: translations-status.py:74 +#: translations-status.py:76 msgid "post-GDP" msgstr "" @@ -236,15 +246,19 @@ msgstr "Einleitung" #. @node in Documentation/user/introduction.itely #. @section in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @section in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @section in Documentation/es/user/introduction.itely msgid "Background" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Engraving" @@ -253,9 +267,9 @@ msgstr "Notensatz" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Automated engraving" @@ -264,9 +278,9 @@ msgstr "Automatisierter Notensatz" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "What symbols to engrave?" @@ -275,9 +289,9 @@ msgstr "Welche Symbole?" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Music representation" @@ -286,9 +300,9 @@ msgstr "Die Darstellung der Musik" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Example applications" @@ -308,44 +322,72 @@ msgstr "Andere Dokumentation" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #, fuzzy msgid "About the Learning Manual (LM)" msgstr "Handbuch zum Lernen (LH)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Music Glossary (MG)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #, fuzzy msgid "About the Notation Reference (NR)" msgstr "Notationsreferenz (NR)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Application Usage (AU)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Snippet List (SL)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #, fuzzy msgid "About the Internals Reference (IR)" msgstr "Die Referenz der Programminterna" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #, fuzzy msgid "Other documentation" msgstr "Andere Dokumentation" -#. Documentation/user/tutorial.itely:226 (comment) +#. Documentation/user/tutorial.itely:225 (comment) msgid "set the starting point to middle C" msgstr "" @@ -353,49 +395,50 @@ msgstr "" msgid "one octave above middle C" msgstr "" -#. Documentation/user/tutorial.itely:271 (comment) +#. Documentation/user/tutorial.itely:272 (comment) msgid "c is 1 staff space up, so is the c above" msgstr "" -#. Documentation/user/tutorial.itely:272 (comment) +#. Documentation/user/tutorial.itely:273 (comment) msgid "d is 2 up or 5 down, so is the d above" msgstr "" -#. Documentation/user/tutorial.itely:273 (comment) +#. Documentation/user/tutorial.itely:274 (comment) msgid "e is 3 up or 4 down, so is the e above" msgstr "" -#. Documentation/user/tutorial.itely:274 (comment) +#. Documentation/user/tutorial.itely:275 (comment) msgid "a is 6 up or 1 down, so is the a below" msgstr "" -#. Documentation/user/tutorial.itely:275 (comment) +#. Documentation/user/tutorial.itely:276 (comment) msgid "g is 5 up or 2 down, so is the g below" msgstr "" -#. Documentation/user/tutorial.itely:276 (comment) +#. Documentation/user/tutorial.itely:277 (comment) msgid "f is 4 up or 3 down, so is the f below" msgstr "" -#. Documentation/user/tutorial.itely:1525 (variable) +#. Documentation/user/tutorial.itely:1551 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) msgid "violin" msgstr "Geige" -#. Documentation/user/tutorial.itely:1528 (variable) +#. Documentation/user/tutorial.itely:1556 (variable) msgid "cello" msgstr "Cello" -#. Documentation/user/tutorial.itely:1551 (variable) +#. Documentation/user/tutorial.itely:1581 (variable) msgid "tripletA" msgstr "TrioleA" -#. Documentation/user/tutorial.itely:1552 (variable) +#. Documentation/user/tutorial.itely:1582 (variable) msgid "barA" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely msgid "foo" msgstr "" @@ -455,6 +498,7 @@ msgid "Windows" msgstr "Windows" #. @subsubheading in Documentation/user/tutorial.itely +#. @subsubheading in Documentation/fr/user/tutorial.itely #. @subsubheading in Documentation/es/user/tutorial.itely msgid "UNIX" msgstr "UNIX" @@ -473,7 +517,6 @@ msgstr "Einfache Notation" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/pitches.itely #. @section in Documentation/user/pitches.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/pitches.itely #. @section in Documentation/fr/user/pitches.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -486,6 +529,7 @@ msgid "Pitches" msgstr "Tonhöhen" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "pitch" @@ -515,19 +559,20 @@ msgid "middle C" msgstr "eingestrichenes C" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "octave" msgstr "Oktave" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "accidental" msgstr "Versetzungszeichen" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "Durations (rhythms)" @@ -548,6 +593,7 @@ msgid "duration" msgstr "Tondauer" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "whole note" @@ -577,15 +623,14 @@ msgstr "punktierte Note" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rests" msgstr "Pausen" @@ -598,15 +643,14 @@ msgstr "Pause" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time signature" msgstr "Taktangabe" @@ -640,7 +684,6 @@ msgid "clef" msgstr "Notenschlüssel" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "All together" @@ -727,6 +770,7 @@ msgstr "B" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -735,6 +779,7 @@ msgstr "Doppelkreuz" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -749,6 +794,7 @@ msgid "Key signatures" msgstr "Tonartbezeichnungen (Vorzeichen)" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "key signature" @@ -774,12 +820,14 @@ msgid "Warning: key signatures and pitches" msgstr "Warnung: Tonartbezeichnungen und Tonhöhen" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "natural" msgstr "Auflösungszeichen" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "transposition" @@ -787,6 +835,7 @@ msgstr "Transposition" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -808,8 +857,8 @@ msgstr "Bindebögen und Legatobögen" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely @@ -822,6 +871,7 @@ msgstr "Bindebögen" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/tutorial.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -830,7 +880,7 @@ msgstr "Bindebogen" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -854,7 +904,7 @@ msgstr "Legatobogen" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -900,8 +950,6 @@ msgstr "Artikulationszeichen und Lautstärke" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/expressive.itely @@ -917,6 +965,7 @@ msgid "Fingerings" msgstr "Fingersatz" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "fingering" @@ -925,7 +974,7 @@ msgstr "Fingersatz" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/user/tweaks.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -940,6 +989,7 @@ msgid "Dynamics" msgstr "Dynamik" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "dynamics" @@ -947,6 +997,7 @@ msgstr "Dynamik" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -955,6 +1006,7 @@ msgstr "Crescendo" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -963,6 +1015,8 @@ msgstr "Decrescendo" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1011,18 +1065,19 @@ msgstr "Auftakt" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Tuplets" msgstr "Andere rhythmische Aufteilungen" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1031,6 +1086,7 @@ msgstr "Notenwert" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1042,18 +1098,19 @@ msgstr "Triole" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Grace notes" msgstr "Verzierungen" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "grace notes" @@ -1061,6 +1118,7 @@ msgstr "Verzierungen" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "acciaccatura" @@ -1068,6 +1126,7 @@ msgstr "Vorschlag" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "appoggiatura" @@ -1111,6 +1170,7 @@ msgstr "Gleichzeitige musikalische Ausdrücke: mehrere Notensysteme" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1137,6 +1197,8 @@ msgstr "Mehrere Notensysteme" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1146,6 +1208,7 @@ msgstr "Notensysteme gruppieren" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/staff.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "brace" @@ -1165,6 +1228,7 @@ msgstr "Noten zu Akkorden verbinden" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely #. @rglos in Documentation/user/chords.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/es/user/chords.itely @@ -1198,6 +1262,8 @@ msgstr "Lieder" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsubsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1212,6 +1278,7 @@ msgid "Setting simple songs" msgstr "Einfache Lieder setzen" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "lyrics" @@ -1221,6 +1288,8 @@ msgstr "Gesangtext" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1242,6 +1311,7 @@ msgid "melisma" msgstr "Melisma" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "extender line" @@ -1249,6 +1319,8 @@ msgstr "Fülllinie" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1269,6 +1341,8 @@ msgstr "Letzter Schliff" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1321,15 +1395,15 @@ msgid "After the tutorial" msgstr "Nach der Übung" #. Documentation/user/fundamental.itely:352 (variable) -#. Documentation/user/vocal.itely:1054 (variable) -#. Documentation/user/vocal.itely:1096 (variable) +#. Documentation/user/vocal.itely:1165 (variable) +#. Documentation/user/vocal.itely:1207 (variable) msgid "melody" msgstr "" #. Documentation/user/fundamental.itely:353 (variable) -#. Documentation/user/vocal.itely:879 (variable) -#. Documentation/user/vocal.itely:1059 (variable) -#. Documentation/user/vocal.itely:1100 (variable) +#. Documentation/user/vocal.itely:989 (variable) +#. Documentation/user/vocal.itely:1170 (variable) +#. Documentation/user/vocal.itely:1211 (variable) msgid "text" msgstr "Text" @@ -1357,16 +1431,16 @@ msgid "Main voice" msgstr "Hauptstimme" #. Documentation/user/fundamental.itely:687 (comment) -#. Documentation/user/simultaneous.itely:481 (comment) -#. Documentation/user/simultaneous.itely:503 (comment) -#. Documentation/user/simultaneous.itely:527 (comment) +#. Documentation/user/simultaneous.itely:593 (comment) +#. Documentation/user/simultaneous.itely:618 (comment) +#. Documentation/user/simultaneous.itely:645 (comment) msgid "Bar 1" msgstr "Takt 1" #. Documentation/user/fundamental.itely:698 (comment) -#. Documentation/user/simultaneous.itely:485 (comment) -#. Documentation/user/simultaneous.itely:507 (comment) -#. Documentation/user/simultaneous.itely:533 (comment) +#. Documentation/user/simultaneous.itely:598 (comment) +#. Documentation/user/simultaneous.itely:623 (comment) +#. Documentation/user/simultaneous.itely:651 (comment) msgid "Bar 2" msgstr "Takt 2" @@ -1416,6 +1490,7 @@ msgid "Initiate second voice" msgstr "" #. Documentation/user/fundamental.itely:1012 (comment) +#. Documentation/user/fundamental.itely:1074 (comment) msgid "Set stems, etc, down" msgstr "" @@ -1425,6 +1500,7 @@ msgid "Initiate third voice" msgstr "Die dritte Stimme beginnen" #. Documentation/user/fundamental.itely:1018 (comment) +#. Documentation/user/fundamental.itely:1080 (comment) msgid "Set stems, etc, up" msgstr "" @@ -1432,18 +1508,10 @@ msgstr "" msgid "Initiate first voice" msgstr "" -#. Documentation/user/fundamental.itely:1074 (comment) -msgid "set stems, etc down" -msgstr "" - -#. Documentation/user/fundamental.itely:1080 (comment) -msgid "set stems, etc up" -msgstr "" - #. Documentation/user/fundamental.itely:1187 (variable) #. Documentation/user/fundamental.itely:2497 (variable) -#. Documentation/user/tweaks.itely:3156 (variable) -#. Documentation/user/simultaneous.itely:521 (variable) +#. Documentation/user/tweaks.itely:3168 (variable) +#. Documentation/user/simultaneous.itely:639 (variable) msgid "global" msgstr "" @@ -1469,42 +1537,41 @@ msgid "TimeKey" msgstr "" #. Documentation/user/fundamental.itely:1239 (variable) -#. Documentation/user/tweaks.itely:3157 (variable) msgid "SopMusic" msgstr "" #. Documentation/user/fundamental.itely:1240 (variable) -#. Documentation/user/tweaks.itely:3158 (variable) +#. Documentation/user/tweaks.itely:3170 (variable) msgid "AltoMusic" msgstr "" #. Documentation/user/fundamental.itely:1241 (variable) -#. Documentation/user/tweaks.itely:3159 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) msgid "TenorMusic" msgstr "" #. Documentation/user/fundamental.itely:1242 (variable) -#. Documentation/user/tweaks.itely:3160 (variable) +#. Documentation/user/tweaks.itely:3172 (variable) msgid "BassMusic" msgstr "" #. Documentation/user/fundamental.itely:1243 (variable) -#. Documentation/user/tweaks.itely:3161 (variable) +#. Documentation/user/tweaks.itely:3173 (variable) msgid "VerseOne" msgstr "" #. Documentation/user/fundamental.itely:1245 (variable) -#. Documentation/user/tweaks.itely:3162 (variable) +#. Documentation/user/tweaks.itely:3174 (variable) msgid "VerseTwo" msgstr "" #. Documentation/user/fundamental.itely:1247 (variable) -#. Documentation/user/tweaks.itely:3163 (variable) +#. Documentation/user/tweaks.itely:3175 (variable) msgid "VerseThree" msgstr "" #. Documentation/user/fundamental.itely:1249 (variable) -#. Documentation/user/tweaks.itely:3164 (variable) +#. Documentation/user/tweaks.itely:3176 (variable) msgid "VerseFour" msgstr "StropheVier" @@ -1546,7 +1613,7 @@ msgstr "" #. Documentation/user/fundamental.itely:1589 (comment) #, fuzzy -msgid "start single compound music expression" +msgid "start of single compound music expression" msgstr "Score ist ein (einziger) zusammengesetzter musikalischer Ausdruck" #. Documentation/user/fundamental.itely:1590 (comment) @@ -1598,8 +1665,9 @@ msgid "end of LH voice one notes" msgstr "" #. Documentation/user/fundamental.itely:1611 (comment) -msgid "end of first LH voice" -msgstr "" +#, fuzzy +msgid "end of LH voice one" +msgstr "An Noten angehängt" #. Documentation/user/fundamental.itely:1612 (comment) msgid "create LH voice two" @@ -1646,14 +1714,13 @@ msgid "make note heads larger" msgstr "Notenköpfe vergrößern" #. Documentation/user/fundamental.itely:1914 (comment) -msgid "return to default size" -msgstr "" - #. Documentation/user/fundamental.itely:2007 (comment) -msgid "return to original size" +msgid "return to default size" msgstr "" #. Documentation/user/fundamental.itely:2274 (variable) +#. Documentation/user/fundamental.itely:2498 (variable) +#. Documentation/user/input.itely:907 (variable) msgid "sopranoMusic" msgstr "SopranNoten" @@ -1665,15 +1732,13 @@ msgstr "" msgid "celloMusic" msgstr "" -#. Documentation/user/fundamental.itely:2498 (variable) -msgid "sopMusic" -msgstr "" - #. Documentation/user/fundamental.itely:2502 (variable) -msgid "sopWords" -msgstr "" +#, fuzzy +msgid "sopranoWords" +msgstr "SopranNoten" #. Documentation/user/fundamental.itely:2505 (variable) +#. Documentation/user/input.itely:908 (variable) msgid "altoMusic" msgstr "AltNoten" @@ -1682,6 +1747,7 @@ msgid "altoWords" msgstr "" #. Documentation/user/fundamental.itely:2510 (variable) +#. Documentation/user/input.itely:909 (variable) msgid "tenorMusic" msgstr "" @@ -1690,6 +1756,7 @@ msgid "tenorWords" msgstr "" #. Documentation/user/fundamental.itely:2515 (variable) +#. Documentation/user/input.itely:910 (variable) msgid "bassMusic" msgstr "" @@ -1742,8 +1809,9 @@ msgid "end PianoStaff context" msgstr "Klaviersystem beenden" #. Documentation/user/fundamental.itely:2748 (comment) -msgid "end PedalOrgan Staff" -msgstr "" +#, fuzzy +msgid "end PedalOrgan Staff context" +msgstr "Klaviersystem beenden" #. Documentation/user/fundamental.itely:2750 (comment) msgid "end Score context" @@ -2022,176 +2090,182 @@ msgstr "" msgid "Revert thickness of all following slurs to default of 1.2" msgstr "" -#. Documentation/user/tweaks.itely:1257 (comment) +#. Documentation/user/tweaks.itely:1265 (comment) msgid "Don't print clefs in this staff" msgstr "" -#. Documentation/user/tweaks.itely:1259 (comment) +#. Documentation/user/tweaks.itely:1267 (comment) msgid "Don't print time signatures in this staff" msgstr "Keine Taktangabe in diesem System" -#. Documentation/user/tweaks.itely:1320 (comment) +#. Documentation/user/tweaks.itely:1328 (comment) msgid "Reduce all font sizes by ~24%" msgstr "" -#. Documentation/user/tweaks.itely:1376 (comment) +#. Documentation/user/tweaks.itely:1384 (comment) msgid "Reduce stem length and line spacing to match" msgstr "" -#. Documentation/user/tweaks.itely:1750 (comment) -#. Documentation/user/tweaks.itely:1811 (comment) +#. Documentation/user/tweaks.itely:1758 (comment) +#. Documentation/user/tweaks.itely:1819 (comment) msgid "Set details for later Text Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1753 (comment) -#. Documentation/user/tweaks.itely:1814 (comment) +#. Documentation/user/tweaks.itely:1761 (comment) +#. Documentation/user/tweaks.itely:1822 (comment) msgid "Place dynamics above staff" msgstr "" -#. Documentation/user/tweaks.itely:1755 (comment) -#. Documentation/user/tweaks.itely:1818 (comment) +#. Documentation/user/tweaks.itely:1763 (comment) +#. Documentation/user/tweaks.itely:1826 (comment) msgid "Start Ottava Bracket" msgstr "Beginn der Oktavierungsklammer" -#. Documentation/user/tweaks.itely:1758 (comment) -#. Documentation/user/tweaks.itely:1765 (comment) -#. Documentation/user/tweaks.itely:1821 (comment) -#. Documentation/user/tweaks.itely:1828 (comment) +#. Documentation/user/tweaks.itely:1766 (comment) +#. Documentation/user/tweaks.itely:1773 (comment) +#. Documentation/user/tweaks.itely:1829 (comment) +#. Documentation/user/tweaks.itely:1836 (comment) msgid "Add Dynamic Text" msgstr "" -#. Documentation/user/tweaks.itely:1760 (comment) -#. Documentation/user/tweaks.itely:1823 (comment) +#. Documentation/user/tweaks.itely:1768 (comment) +#. Documentation/user/tweaks.itely:1831 (comment) msgid "Add Dynamic Line Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1762 (comment) -#. Documentation/user/tweaks.itely:1825 (comment) +#. Documentation/user/tweaks.itely:1770 (comment) +#. Documentation/user/tweaks.itely:1833 (comment) msgid "Add Text Script" msgstr "Textbeschriftung hinzufügen" -#. Documentation/user/tweaks.itely:1767 (comment) -#. Documentation/user/tweaks.itely:1830 (comment) +#. Documentation/user/tweaks.itely:1775 (comment) +#. Documentation/user/tweaks.itely:1838 (comment) msgid "Stop Ottava Bracket" msgstr "Ende der Oktavierungsklammer" -#. Documentation/user/tweaks.itely:1816 (comment) +#. Documentation/user/tweaks.itely:1824 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "" -#. Documentation/user/tweaks.itely:1872 (comment) +#. Documentation/user/tweaks.itely:1880 (comment) msgid "Cause notes to space out to accommodate text" msgstr "" -#. Documentation/user/tweaks.itely:1890 (comment) +#. Documentation/user/tweaks.itely:1898 (comment) msgid "This markup is short enough to fit without collision" msgstr "" -#. Documentation/user/tweaks.itely:1894 (comment) +#. Documentation/user/tweaks.itely:1902 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "" -#. Documentation/user/tweaks.itely:1898 (comment) -#. Documentation/user/tweaks.itely:1903 (comment) +#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1911 (comment) msgid "Turn off collision avoidance" msgstr "Abschalten der automatischen Vermeidung von Zusammenstößen" -#. Documentation/user/tweaks.itely:1905 (comment) +#. Documentation/user/tweaks.itely:1913 (comment) msgid "and turn on textLengthOn" msgstr "und Textlänge berücksichtigen" -#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1914 (comment) msgid "Spaces at end are honored" msgstr "" -#. Documentation/user/tweaks.itely:2009 (comment) +#. Documentation/user/tweaks.itely:2017 (comment) msgid "Extend width by 1 staff space" msgstr "" -#. Documentation/user/tweaks.itely:2275 (comment) +#. Documentation/user/tweaks.itely:2283 (comment) msgid "This will not work, see below:" msgstr "" -#. Documentation/user/tweaks.itely:2279 (comment) +#. Documentation/user/tweaks.itely:2287 (comment) msgid "This works:" msgstr "" -#. Documentation/user/tweaks.itely:2324 (variable) +#. Documentation/user/tweaks.itely:2332 (variable) msgid "naturalplusflat" msgstr "AuflösungB" -#. Documentation/user/tweaks.itely:2359 (comment) +#. Documentation/user/tweaks.itely:2367 (comment) msgid "Extend width by 1 unit" msgstr "" -#. Documentation/user/tweaks.itely:2361 (comment) +#. Documentation/user/tweaks.itely:2369 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" -#. Documentation/user/tweaks.itely:2639 (variable) -#. Documentation/user/tweaks.itely:2690 (variable) -#. Documentation/user/tweaks.itely:2752 (variable) -#. Documentation/user/tweaks.itely:2823 (variable) -#. Documentation/user/tweaks.itely:2885 (variable) -#. Documentation/user/tweaks.itely:2940 (variable) +#. Documentation/user/tweaks.itely:2647 (variable) +#. Documentation/user/tweaks.itely:2698 (variable) +#. Documentation/user/tweaks.itely:2760 (variable) +#. Documentation/user/tweaks.itely:2831 (variable) +#. Documentation/user/tweaks.itely:2893 (variable) +#. Documentation/user/tweaks.itely:2948 (variable) msgid "rhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2644 (comment) -#. Documentation/user/tweaks.itely:2695 (comment) -#. Documentation/user/tweaks.itely:2759 (comment) -#. Documentation/user/tweaks.itely:2832 (comment) -#. Documentation/user/tweaks.itely:2894 (comment) +#. Documentation/user/tweaks.itely:2652 (comment) +#. Documentation/user/tweaks.itely:2703 (comment) +#. Documentation/user/tweaks.itely:2767 (comment) +#. Documentation/user/tweaks.itely:2840 (comment) +#. Documentation/user/tweaks.itely:2902 (comment) msgid "Start polyphonic section of four voices" msgstr "" -#. Documentation/user/tweaks.itely:2657 (variable) -#. Documentation/user/tweaks.itely:2708 (variable) -#. Documentation/user/tweaks.itely:2772 (variable) -#. Documentation/user/tweaks.itely:2847 (variable) -#. Documentation/user/tweaks.itely:2911 (variable) -#. Documentation/user/tweaks.itely:2968 (variable) +#. Documentation/user/tweaks.itely:2665 (variable) +#. Documentation/user/tweaks.itely:2716 (variable) +#. Documentation/user/tweaks.itely:2780 (variable) +#. Documentation/user/tweaks.itely:2855 (variable) +#. Documentation/user/tweaks.itely:2919 (variable) +#. Documentation/user/tweaks.itely:2976 (variable) msgid "lhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2898 (comment) -#. Documentation/user/tweaks.itely:2955 (comment) +#. Documentation/user/tweaks.itely:2906 (comment) +#. Documentation/user/tweaks.itely:2963 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" -#. Documentation/user/tweaks.itely:2901 (comment) -#. Documentation/user/tweaks.itely:2958 (comment) +#. Documentation/user/tweaks.itely:2909 (comment) +#. Documentation/user/tweaks.itely:2966 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "" -#. Documentation/user/tweaks.itely:2953 (comment) +#. Documentation/user/tweaks.itely:2961 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "" -#. Documentation/user/tweaks.itely:3081 (comment) -#. Documentation/user/tweaks.itely:3100 (comment) +#. Documentation/user/tweaks.itely:3089 (comment) +#. Documentation/user/tweaks.itely:3108 (comment) msgid "Visible tempo marking" msgstr "" -#. Documentation/user/tweaks.itely:3085 (comment) -#. Documentation/user/tweaks.itely:3104 (comment) +#. Documentation/user/tweaks.itely:3093 (comment) +#. Documentation/user/tweaks.itely:3112 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "" -#. Documentation/user/tweaks.itely:3088 (comment) -#. Documentation/user/tweaks.itely:3107 (comment) +#. Documentation/user/tweaks.itely:3096 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) msgid "New tempo for next section" msgstr "" -#. Documentation/user/tweaks.itely:3147 (variable) -msgid "emph" +#. Documentation/user/tweaks.itely:3159 (variable) +msgid "emphasize" msgstr "" -#. Documentation/user/tweaks.itely:3151 (variable) -msgid "norm" +#. Documentation/user/tweaks.itely:3163 (variable) +#, fuzzy +msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3373 (comment) +#. Documentation/user/tweaks.itely:3169 (variable) +#, fuzzy +msgid "SopranoMusic" +msgstr "SopranNoten" + +#. Documentation/user/tweaks.itely:3385 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "" @@ -2476,8 +2550,8 @@ msgid "Tying notes across voices" msgstr "Noten zwischen unterschiedlichen Stimmen überbinden" #. @subheading in Documentation/user/tweaks.itely -#. @subheading in Documentation/es/user/tweaks.itely -msgid "Simulating a fermata" +#, fuzzy +msgid "Simulating a fermata in MIDI" msgstr "Eine Fermate simulieren" #. @node in Documentation/user/tweaks.itely @@ -2521,11 +2595,11 @@ msgid "hornNotes" msgstr "HornNoten" #. Documentation/user/working.itely:212 (variable) -msgid "fragA" +msgid "fragmentA" msgstr "" #. Documentation/user/working.itely:213 (variable) -msgid "fragB" +msgid "fragmentB" msgstr "" #. Documentation/user/working.itely:226 (variable) @@ -2533,7 +2607,7 @@ msgid "dolce" msgstr "" #. Documentation/user/working.itely:227 (variable) -#. Documentation/user/working.itely:273 (variable) +#. Documentation/user/working.itely:276 (variable) #. Documentation/user/scheme-tutorial.itely:235 (variable) #. Documentation/user/programming-interface.itely:100 (variable) msgid "padText" @@ -2543,11 +2617,11 @@ msgstr "AbstandText" msgid "fthenp" msgstr "" -#. Documentation/user/working.itely:310 (variable) +#. Documentation/user/working.itely:313 (variable) msgid "mpdolce" msgstr "" -#. Documentation/user/working.itely:312 (variable) +#. Documentation/user/working.itely:315 (variable) #. Documentation/user/scheme-tutorial.itely:256 (variable) #. Documentation/user/programming-interface.itely:134 (variable) msgid "tempoMark" @@ -2566,6 +2640,8 @@ msgstr "An LilyPond-Projekten arbeiten" #. @node in Documentation/user/working.itely #. @section in Documentation/user/working.itely +#. @node in Documentation/fr/user/working.itely +#. @section in Documentation/fr/user/working.itely msgid "Suggestions for writing LilyPond input files" msgstr "Vorschläge, wie LilyPond-Eingabe-Dateien geschrieben werden sollen" @@ -2892,6 +2968,7 @@ msgid "Texinfo" msgstr "Texinfo" #. @appendixsubsec in Documentation/user/templates.itely +#. @appendixsubsec in Documentation/fr/user/templates.itely #. @appendixsubsec in Documentation/es/user/templates.itely msgid "xelatex" msgstr "xelatex" @@ -2913,6 +2990,8 @@ msgstr "Scheme-Übung" #. @node in Documentation/user/scheme-tutorial.itely #. @appendixsec in Documentation/user/scheme-tutorial.itely +#. @node in Documentation/fr/user/scheme-tutorial.itely +#. @appendixsec in Documentation/fr/user/scheme-tutorial.itely #. @node in Documentation/es/user/scheme-tutorial.itely #. @appendixsec in Documentation/es/user/scheme-tutorial.itely msgid "Tweaking with Scheme" @@ -3007,6 +3086,7 @@ msgid "Running requirements" msgstr "Voraussetzungen zur Programmbenutzung" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely #, fuzzy msgid "Requirements for building documentation" msgstr "Die Dokumentation übersetzen" @@ -3033,6 +3113,7 @@ msgid "Compiling for multiple platforms" msgstr "Für mehrere Plattformen kompilieren" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely #, fuzzy msgid "Compiling outside the source tree" msgstr "Aus den Quellen übersetzen" @@ -3040,12 +3121,15 @@ msgstr "Aus den Quellen übersetzen" #. @node in Documentation/user/install.itely #. @subsection in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/es/user/install.itely -#. @unnumberedsubsubsec in Documentation/de/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @subsection in Documentation/de/user/install.itely msgid "Building documentation" msgstr "Die Dokumentation übersetzen" #. @node in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely #, fuzzy msgid "Commands for building documentation" msgstr "Die Dokumentation übersetzen" @@ -3055,7 +3139,7 @@ msgstr "Die Dokumentation übersetzen" #. @node in Documentation/es/user/install.itely #. @subsection in Documentation/es/user/install.itely #. @node in Documentation/de/user/install.itely -#. @subsection in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Building documentation without compiling LilyPond" msgstr "Die Dokumentation übersetzen ohne LilyPond zu kompilieren" @@ -3200,6 +3284,13 @@ msgstr "TexShop" msgid "TextMate" msgstr "TextMate" +#. @node in Documentation/user/setup.itely +#. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely +msgid "LilyKDE" +msgstr "" + #. @node in Documentation/user/setup.itely #. @section in Documentation/user/setup.itely #. @node in Documentation/fr/user/setup.itely @@ -3246,8 +3337,11 @@ msgstr "Benutzung auf der Kommandozeile" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Invoking lilypond" msgstr "lilypond aufrufen" @@ -3255,10 +3349,13 @@ msgstr "lilypond aufrufen" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely #. @subheading in Documentation/user/lilypond-book.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely #. @subheading in Documentation/fr/user/lilypond-book.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely #. @subheading in Documentation/es/user/lilypond-book.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely #. @subheading in Documentation/de/user/lilypond-book.itely msgid "Command line options" @@ -3266,8 +3363,11 @@ msgstr "Optionen auf der Kommandozeile" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Environment variables" msgstr "Umgebungsvariablen" @@ -3634,19 +3734,24 @@ msgstr "Index der LilyPond-Befehle" msgid "Musical notation" msgstr "Musikalische Notation" -#. Documentation/user/pitches.itely:615 (variable) -msgid "mus" -msgstr "Noten" +#. Documentation/user/pitches.itely:651 (variable) +#. Documentation/user/input.itely:997 (variable) +#. Documentation/user/input.itely:1016 (variable) +#. Documentation/user/input.itely:1053 (variable) +#. Documentation/user/input.itely:1068 (variable) +#, fuzzy +msgid "music" +msgstr "Notation von Gesang" -#. Documentation/user/pitches.itely:979 (comment) +#. Documentation/user/pitches.itely:1027 (comment) msgid "not strictly necessary, but a good reminder" msgstr "" -#. Documentation/user/pitches.itely:1068 (variable) +#. Documentation/user/pitches.itely:1119 (variable) msgid "musicA" msgstr "" -#. Documentation/user/pitches.itely:1082 (variable) +#. Documentation/user/pitches.itely:1133 (variable) msgid "musicB" msgstr "" @@ -3919,122 +4024,135 @@ msgstr "" msgid "Print a breve rest" msgstr "" -#. Documentation/user/rhythms.itely:653 (comment) +#. Documentation/user/rhythms.itely:654 (comment) msgid "This is valid input, but does nothing" msgstr "" -#. Documentation/user/rhythms.itely:679 (comment) -msgid "Rest bars contracted to single bar" +#. Documentation/user/rhythms.itely:680 (comment) +#. Documentation/user/rhythms.itely:733 (comment) +msgid "Rest measures contracted to single measure" msgstr "" -#. Documentation/user/rhythms.itely:728 (comment) +#. Documentation/user/rhythms.itely:729 (comment) msgid "Default behavior" msgstr "Standart" -#. Documentation/user/rhythms.itely:732 (comment) -msgid "Rest measures contracted to single measure" -msgstr "" - -#. Documentation/user/rhythms.itely:735 (comment) +#. Documentation/user/rhythms.itely:736 (comment) msgid "Rest measures expanded" msgstr "" -#. Documentation/user/rhythms.itely:768 (comment) +#. Documentation/user/rhythms.itely:769 (comment) msgid "This fails, as the wrong object name is specified" msgstr "" -#. Documentation/user/rhythms.itely:771 (comment) +#. Documentation/user/rhythms.itely:772 (comment) msgid "This is correct and works" msgstr "" -#. Documentation/user/rhythms.itely:917 (comment) +#. Documentation/user/rhythms.itely:919 (comment) msgid "Default style" msgstr "Standardstil" -#. Documentation/user/rhythms.itely:920 (comment) +#. Documentation/user/rhythms.itely:922 (comment) msgid "Change to numeric style" msgstr "" -#. Documentation/user/rhythms.itely:924 (comment) +#. Documentation/user/rhythms.itely:926 (comment) msgid "Revert to default style" msgstr "" -#. Documentation/user/rhythms.itely:1127 (comment) +#. Documentation/user/rhythms.itely:1129 (comment) msgid "Show all bar numbers" msgstr "Alle Taknummern anzeigen" -#. Documentation/user/rhythms.itely:1183 (comment) +#. Documentation/user/rhythms.itely:1193 (comment) msgid "Create 9/8 split into 2/4 + 5/8" msgstr "" -#. Documentation/user/rhythms.itely:1184 (variable) +#. Documentation/user/rhythms.itely:1194 (variable) msgid "tsMarkup" msgstr "Taktangabe" -#. Documentation/user/rhythms.itely:1261 (comment) +#. Documentation/user/rhythms.itely:1274 (comment) msgid "Now each staff has its own time signature." msgstr "" -#. Documentation/user/rhythms.itely:1458 (comment) +#. Documentation/user/rhythms.itely:1480 (comment) msgid "Set beam sub-group length to an eighth note" msgstr "" -#. Documentation/user/rhythms.itely:1461 (comment) +#. Documentation/user/rhythms.itely:1483 (comment) msgid "Set beam sub-group length to a sixteenth note" msgstr "" +#. Documentation/user/rhythms.itely:1615 (comment) +msgid "end 1/16 beams for all time signatures at the 1/16 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1619 (comment) +msgid "end 1/32 beams for all time signatures at the 1/16 moment" +msgstr "" + #. Documentation/user/rhythms.itely:1629 (comment) +msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1658 (comment) +msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1671 (comment) msgid "this won't revert it!" msgstr "" -#. Documentation/user/rhythms.itely:1631 (comment) +#. Documentation/user/rhythms.itely:1673 (comment) msgid "this will" msgstr "" -#. Documentation/user/rhythms.itely:1804 (comment) +#. Documentation/user/rhythms.itely:1852 (comment) msgid "revert to non-feathered beams" msgstr "in nichtgespreizte Balken zurückverwandeln" -#. Documentation/user/rhythms.itely:2025 (comment) -#. Documentation/user/rhythms.itely:2041 (comment) +#. Documentation/user/rhythms.itely:2081 (comment) +#. Documentation/user/rhythms.itely:2097 (comment) msgid "Permit first bar number to be printed" msgstr "" -#. Documentation/user/rhythms.itely:2042 (comment) -#. Documentation/user/rhythms.itely:2090 (comment) +#. Documentation/user/rhythms.itely:2098 (comment) +#. Documentation/user/rhythms.itely:2146 (comment) msgid "Print a bar number every second measure" msgstr "" -#. Documentation/user/rhythms.itely:2058 (comment) +#. Documentation/user/rhythms.itely:2114 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "" -#. Documentation/user/rhythms.itely:2062 (comment) -#. Documentation/user/rhythms.itely:2088 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) +#. Documentation/user/rhythms.itely:2144 (comment) msgid "Increase the size of the bar number by 2" msgstr "" -#. Documentation/user/rhythms.itely:2066 (comment) +#. Documentation/user/rhythms.itely:2122 (comment) msgid "Draw a box round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2071 (comment) +#. Documentation/user/rhythms.itely:2127 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2093 (comment) +#. Documentation/user/rhythms.itely:2149 (comment) msgid "Center-align bar numbers" msgstr "Taktnummern zentrieren" -#. Documentation/user/rhythms.itely:2096 (comment) +#. Documentation/user/rhythms.itely:2152 (comment) msgid "Right-align bar numbers" msgstr "Taktnummern rechtsbündig" -#. Documentation/user/rhythms.itely:2194 (variable) +#. Documentation/user/rhythms.itely:2255 (variable) msgid "pipeSymbol" msgstr "" -#. Documentation/user/rhythms.itely:2565 (variable) +#. Documentation/user/rhythms.itely:2626 (variable) #. @rglos in Documentation/user/rhythms.itely msgid "cadenza" msgstr "Kadenz" @@ -4064,11 +4182,11 @@ msgstr "Rhythmen eingeben" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Durations" msgstr "Tondauern" @@ -4100,15 +4218,16 @@ msgstr "Polymetrie" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Scaling durations" msgstr "Tondauern skalieren" #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely msgid "laissez vibrer" msgstr "Laissez-vibrer-Bögen" @@ -4126,14 +4245,9 @@ msgstr "Pausen eingeben" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely -#. @node in Documentation/es/user/rhythms.itely -#. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely -msgid "Skips" -msgstr "Überspringen von Zeichen" +#, fuzzy +msgid "Invisible rests" +msgstr "Pausen Alter Musik" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely @@ -4160,33 +4274,33 @@ msgstr "Rhythmen anzeigen lassen" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Upbeats" msgstr "Auftakte" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Unmetered music" msgstr "Musik ohne Metrum" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Polymetric notation" msgstr "Polymetrische Notation" @@ -4201,22 +4315,22 @@ msgstr "Metrum" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic note splitting" msgstr "Automatische Aufteilung von Noten" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Showing melody rhythms" msgstr "Melodierhythmus anzeigen" @@ -4234,11 +4348,11 @@ msgstr "Balken" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic beams" msgstr "Automatische Balken" @@ -4249,29 +4363,29 @@ msgstr "Automatische Balken" #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Setting automatic beam behavior" msgstr "Einstellung von automatischen Balken" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Manual beams" msgstr "Manuelle Balken" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Feathered beams" msgstr "Gespreizte Balken" @@ -4289,22 +4403,22 @@ msgstr "Takte" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar lines" msgstr "Taktlinien" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar numbers" msgstr "Taktzahlen" @@ -4318,11 +4432,11 @@ msgstr "Takt- und Taktzahlüberprüfung" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rehearsal marks" msgstr "Übungszeichen" @@ -4340,42 +4454,54 @@ msgstr "Besondere rhythmische Fragen" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Aligning to cadenzas" msgstr "An Kadenzen ausrichten" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time administration" msgstr "Verwaltung der Zeiteinheiten" -#. Documentation/user/expressive.itely:332 (variable) -#. Documentation/user/expressive.itely:377 (variable) +#. Documentation/user/expressive.itely:390 (variable) +#. Documentation/user/expressive.itely:458 (variable) msgid "moltoF" msgstr "" -#. Documentation/user/expressive.itely:348 (variable) -msgid "roundf" +#. Documentation/user/expressive.itely:411 (variable) +#. Documentation/user/expressive.itely:441 (variable) +msgid "roundF" msgstr "" -#. Documentation/user/expressive.itely:350 (variable) -msgid "boxf" +#. Documentation/user/expressive.itely:413 (variable) +#. Documentation/user/expressive.itely:445 (variable) +msgid "boxF" msgstr "" -#. Documentation/user/expressive.itely:364 (variable) +#. Documentation/user/expressive.itely:428 (variable) msgid "sfzp" msgstr "" +#. Documentation/user/expressive.itely:446 (variable) +#, fuzzy +msgid "roundFdynamic" +msgstr "Dynamik" + +#. Documentation/user/expressive.itely:447 (variable) +#, fuzzy +msgid "boxFdynamic" +msgstr "Dynamik" + #. @node in Documentation/user/expressive.itely #. @section in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely @@ -4399,7 +4525,9 @@ msgid "Attached to notes" msgstr "An Noten angehängt" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely msgid "Articulations and ornamentations" @@ -4426,9 +4554,9 @@ msgid "portato" msgstr "Portato" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely -#. @node in Documentation/fr/user/text.itely -#. @unnumberedsubsubsec in Documentation/fr/user/text.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely #. @node in Documentation/de/user/expressive.itely @@ -4448,7 +4576,7 @@ msgid "Curves" msgstr "Bögen" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4459,7 +4587,7 @@ msgid "Breath marks" msgstr "Atemzeichen" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4491,7 +4619,7 @@ msgid "Lines" msgstr "Linien" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4507,7 +4635,7 @@ msgid "glissando" msgstr "Glissando" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4523,7 +4651,7 @@ msgid "arpeggio" msgstr "Arpeggio" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4538,18 +4666,10 @@ msgstr "Triller" msgid "trill" msgstr "Triller" -#. Documentation/user/repeats.itely:237 (comment) -#. Documentation/user/repeats.itely:277 (comment) -msgid "FIXME: I can't believe this is right." -msgstr "" - -#. Documentation/user/repeats.itely:297 (comment) -msgid "FIXME: broken" -msgstr "" - -#. Documentation/user/repeats.itely:298 (comment) -msgid "\\set Score.repeatCommands = #(list (list 'volta voltaChorus ) )" -msgstr "" +#. Documentation/user/repeats.itely:298 (variable) +#, fuzzy +msgid "voltaAdLib" +msgstr "Volta-Klammer" #. @node in Documentation/user/repeats.itely #. @section in Documentation/user/repeats.itely @@ -4569,7 +4689,7 @@ msgid "Long repeats" msgstr "Wiederholungen eingeben" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Normal repeats" @@ -4586,14 +4706,14 @@ msgid "volta" msgstr "Volta-Klammer" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Manual repeat marks" msgstr "Manuelle Wiederholungszeichen" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Written-out repeats" @@ -4609,7 +4729,7 @@ msgid "Short repeats" msgstr "Kurze Wiederholungen" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely #. @node in Documentation/de/user/repeats.itely @@ -4628,7 +4748,7 @@ msgid "simile" msgstr "kleiner" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/fr/user/repeats.itely #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely #. @node in Documentation/es/user/repeats.itely @@ -4638,17 +4758,17 @@ msgstr "kleiner" msgid "Tremolo repeats" msgstr "Tremolo-Wiederholung" -#. Documentation/user/simultaneous.itely:352 (variable) +#. Documentation/user/simultaneous.itely:482 (variable) #, fuzzy msgid "instrumentOne" msgstr "Instrumentenbezeichnungn" -#. Documentation/user/simultaneous.itely:360 (variable) +#. Documentation/user/simultaneous.itely:490 (variable) #, fuzzy msgid "instrumentTwo" msgstr "Blasinstrumente" -#. Documentation/user/simultaneous.itely:539 (comment) +#. Documentation/user/simultaneous.itely:657 (comment) msgid "Bar 3 ..." msgstr "" @@ -4675,20 +4795,20 @@ msgid "Single voice" msgstr "Eine einzelne Stimme" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Chorded notes" msgstr "Noten mit Akkorden" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Clusters" @@ -4712,18 +4832,34 @@ msgid "Multiple voices" msgstr "Mehrere Stimmen" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +#, fuzzy +msgid "Single-staff polyphony" +msgstr "Mehrstimmigkeit in einem System" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +#, fuzzy +msgid "Voice styles" +msgstr "Zeilenstile" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Collision resolution" msgstr "Auflösung von Zusammenstößen" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Automatic part combining" @@ -4741,54 +4877,46 @@ msgid "part" msgstr "Wiederholungen" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Writing music in parallel" msgstr "Musik parallel notieren" -#. Documentation/user/staff.itely:534 (comment) -msgid "Set here the overrides for the staff " -msgstr "" - -#. Documentation/user/staff.itely:538 (comment) -msgid "Revert to the default" -msgstr "" - -#. Documentation/user/staff.itely:604 (comment) +#. Documentation/user/staff.itely:536 (comment) msgid "No time signature in the ossia staff" msgstr "" -#. Documentation/user/staff.itely:726 (comment) +#. Documentation/user/staff.itely:678 (comment) msgid "To use the setting globally, uncomment the following line:" msgstr "" -#. Documentation/user/staff.itely:727 (comment) +#. Documentation/user/staff.itely:679 (comment) msgid "\\override VerticalAxisGroup #'remove-first = ##t" msgstr "" -#. Documentation/user/staff.itely:735 (comment) +#. Documentation/user/staff.itely:687 (comment) msgid "" "To use the setting globally, comment this line, uncomment the line above" msgstr "" -#. Documentation/user/staff.itely:1105 (variable) +#. Documentation/user/staff.itely:1079 (variable) msgid "smaller" msgstr "kleiner" -#. Documentation/user/staff.itely:1119 (comment) +#. Documentation/user/staff.itely:1094 (comment) msgid "setup a context for cue notes." msgstr "" -#. Documentation/user/staff.itely:1161 (variable) +#. Documentation/user/staff.itely:1135 (variable) msgid "picc" msgstr "picc" -#. Documentation/user/staff.itely:1169 (variable) +#. Documentation/user/staff.itely:1143 (variable) msgid "cbsn" msgstr "" @@ -4815,7 +4943,7 @@ msgid "Displaying staves" msgstr "Systeme anzeigen lassen" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Instantiating new staves" msgstr "Neue Notensysteme erstellen" @@ -4828,7 +4956,7 @@ msgid "staves" msgstr "Systeme" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Grouping staves" msgstr "Systeme gruppieren" @@ -4841,7 +4969,7 @@ msgid "grand staff" msgstr "Akkolade" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Deeper nested staff groups" msgstr "Tief verschachtelte Notensysteme" @@ -4851,7 +4979,7 @@ msgid "Modifying single staves" msgstr "Einzelne Systeme verändern" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4870,7 +4998,7 @@ msgid "ledger line" msgstr "Hilfslinie" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Ossia staves" msgstr "Ossia-Systeme" @@ -4879,7 +5007,7 @@ msgid "Frenched staff" msgstr "Verkleinerte Systeme" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4901,7 +5029,7 @@ msgid "Writing parts" msgstr "Orchesterstimmen erstellen" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4928,18 +5056,22 @@ msgid "metronome mark" msgstr "Metronombezeichnung" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely #. @node in Documentation/es/user/staff.itely #. @subsubsection in Documentation/es/user/staff.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely #. @node in Documentation/de/user/staff.itely #. @unnumberedsubsubsec in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Instrument names" msgstr "Instrumentenbezeichnungn" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4950,7 +5082,7 @@ msgid "Quoting other voices" msgstr "Stichnoten" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4960,7 +5092,7 @@ msgstr "Stichnoten" msgid "Formatting cue notes" msgstr "Stichnoten formatieren" -#. Documentation/user/editorial.itely:288 (comment) +#. Documentation/user/editorial.itely:323 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "" @@ -5066,7 +5198,7 @@ msgstr "Außerhalb des Notensystems" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5077,7 +5209,7 @@ msgstr "Erklärungen in Ballonform" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5087,8 +5219,8 @@ msgstr "Gitternetzlinien" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5096,7 +5228,7 @@ msgstr "Gitternetzlinien" msgid "Analysis brackets" msgstr "Analyseklammern" -#. Documentation/user/text.itely:403 (variable) +#. Documentation/user/text.itely:410 (variable) #, fuzzy msgid "allegro" msgstr "kleiner" @@ -5191,13 +5323,17 @@ msgstr "Textbeschriftung (Einleitung)" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely -msgid "Common markup commands" +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely +msgid "Selecting font and font size" msgstr "Überblick über die wichtigsten Textbeschriftungsbefehle" #. @node in Documentation/user/text.itely #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Text alignment" msgstr "Textausrichtung" @@ -5205,6 +5341,8 @@ msgstr "Textausrichtung" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Graphic notation inside markup" msgstr "Graphische Notation innerhalb einer Textbeschriftung" @@ -5212,6 +5350,8 @@ msgstr "Graphische Notation innerhalb einer Textbeschriftung" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Music notation inside markup" msgstr "Musikalische Notation innerhalb einer Textbeschriftung" @@ -5219,6 +5359,8 @@ msgstr "Musikalische Notation innerhalb einer Textbeschriftung" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Multi-page markup" msgstr "Textbeschriftung über mehrere Seiten" @@ -5228,6 +5370,8 @@ msgstr "Textbeschriftung über mehrere Seiten" #. @subsection in Documentation/fr/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsection in Documentation/de/user/text.itely msgid "Fonts" msgstr "Schriftarten" @@ -5235,6 +5379,8 @@ msgstr "Schriftarten" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Entire document fonts" msgstr "Schriftart des gesamten Dokuments" @@ -5242,6 +5388,8 @@ msgstr "Schriftart des gesamten Dokuments" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Single entry fonts" msgstr "Schriftarten für einen Eintrag" @@ -5256,57 +5404,63 @@ msgstr "Schriftarten für einen Eintrag" msgid "Specialist notation" msgstr "Spezielle Notation" -#. Documentation/user/vocal.itely:720 (variable) -msgid "voice" +#. Documentation/user/vocal.itely:450 (comment) +msgid "not recommended: left aligns syllables " msgstr "" -#. Documentation/user/vocal.itely:727 (variable) -msgid "lyr" -msgstr "Text" +#. Documentation/user/vocal.itely:453 (comment) +#, fuzzy +msgid "wrong: durations needed" +msgstr "Tondauern skalieren" -#. Documentation/user/vocal.itely:933 (comment) -msgid "{" +#. Documentation/user/vocal.itely:456 (comment) +msgid "correct" msgstr "" -#. Documentation/user/vocal.itely:946 (comment) -msgid "applies to " +#. Documentation/user/vocal.itely:786 (variable) +msgid "voice" msgstr "" -#. Documentation/user/vocal.itely:952 (comment) -msgid "}" +#. Documentation/user/vocal.itely:793 (variable) +msgid "lyr" +msgstr "Text" + +#. Documentation/user/vocal.itely:1056 (comment) +msgid "applies to " msgstr "" -#. Documentation/user/vocal.itely:1114 (comment) -msgid "moves the column off the left margin; can be removed if" +#. Documentation/user/vocal.itely:1225 (comment) +msgid "moves the column off the left margin; " msgstr "" -#. Documentation/user/vocal.itely:1115 (comment) -msgid "space on the page is tight" +#. Documentation/user/vocal.itely:1226 (comment) +msgid "can be removed if space on the page is tight" msgstr "" -#. Documentation/user/vocal.itely:1123 (comment) -#. Documentation/user/vocal.itely:1141 (comment) +#. Documentation/user/vocal.itely:1234 (comment) +#. Documentation/user/vocal.itely:1252 (comment) msgid "adds vertical spacing between verses" msgstr "Vertikaler Abstand zwischen Strophen" -#. Documentation/user/vocal.itely:1131 (comment) -msgid "adds horizontal spacing between columns; if they are" -msgstr "" +#. Documentation/user/vocal.itely:1242 (comment) +#, fuzzy +msgid "adds horizontal spacing between columns; " +msgstr "Vertikaler Abstand zwischen Strophen" -#. Documentation/user/vocal.itely:1132 (comment) -msgid "still too close, add more pairs until the result " +#. Documentation/user/vocal.itely:1243 (comment) +msgid "if they are still too close, add more pairs " msgstr "" -#. Documentation/user/vocal.itely:1133 (comment) -msgid "looks good" +#. Documentation/user/vocal.itely:1244 (comment) +msgid "until the result looks good" msgstr "" -#. Documentation/user/vocal.itely:1149 (comment) -msgid "gives some extra space on the right margin; can" +#. Documentation/user/vocal.itely:1260 (comment) +msgid "gives some extra space on the right margin; " msgstr "" -#. Documentation/user/vocal.itely:1150 (comment) -msgid "be removed if page space is tight" +#. Documentation/user/vocal.itely:1261 (comment) +msgid "can be removed if page space is tight" msgstr "" #. @node in Documentation/user/vocal.itely @@ -5326,6 +5480,8 @@ msgstr "Notation von Gesang" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Common notation for vocals" msgstr "Übliche Notation für Gesang" @@ -5335,6 +5491,8 @@ msgstr "Übliche Notation für Gesang" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "References for vocal music" msgstr "Referenz für Musiktexte" @@ -5377,6 +5535,8 @@ msgstr "Automatische Silbendauer" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Manual syllable durations" msgstr "Manuelle Silbendauer" @@ -5386,6 +5546,8 @@ msgstr "Manuelle Silbendauer" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple syllables to one note" msgstr "Mehrere Silben zu einer Note" @@ -5395,6 +5557,8 @@ msgstr "Mehrere Silben zu einer Note" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple notes to one syllable" msgstr "Mehrere Noten zu einer Silbe" @@ -5404,6 +5568,8 @@ msgstr "Mehrere Noten zu einer Silbe" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Skipping notes" msgstr "Noten überspringen" @@ -5424,6 +5590,8 @@ msgstr "Unterstrichen und Trennstriche" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Lyrics and repeats" msgstr "Gesangtext und Wiederholungen" @@ -5433,6 +5601,8 @@ msgstr "Gesangtext und Wiederholungen" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Placement of lyrics" msgstr "Positionierung von Gesangtext" @@ -5464,6 +5634,8 @@ msgstr "Text unabhängig von den Noten" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Chants" msgstr "Hymnen" @@ -5473,6 +5645,8 @@ msgstr "Hymnen" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Spacing out syllables" msgstr "Silben platzieren" @@ -5482,6 +5656,8 @@ msgstr "Silben platzieren" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Centering lyrics between staves" msgstr "Gesangtext zwischen Systemen zentrieren" @@ -5491,6 +5667,8 @@ msgstr "Gesangtext zwischen Systemen zentrieren" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Stanzas" msgstr "Strophen" @@ -5511,6 +5689,8 @@ msgstr "Strophennummern hinzufügen" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding dynamics marks to stanzas" msgstr "Lautstärkebezeichnung zu Strophen hinzufügen" @@ -5520,6 +5700,8 @@ msgstr "Lautstärkebezeichnung zu Strophen hinzufügen" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding singers' names to stanzas" msgstr "Sängernamen zu Strophen hinzufügen" @@ -5529,16 +5711,20 @@ msgstr "Sängernamen zu Strophen hinzufügen" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Stanzas with different rhythms" msgstr "Strophen mit unterschiedlichem Rhythmus" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Ignoring melismata" msgstr "Melismen ignorieren" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Switching to an alternative melody" msgstr "Zu einer alternativen Melodie umschalten" @@ -5564,10 +5750,22 @@ msgstr "Die Strophen am Ende ausdrucken" msgid "Printing stanzas at the end in multiple columns" msgstr "Die Strophen am Ende in mehreren Spalten drucken" -#. Documentation/user/keyboards.itely:162 (comment) +#. Documentation/user/keyboards.itely:175 (comment) msgid "keep staff alive" msgstr "" +#. Documentation/user/keyboards.itely:373 (comment) +msgid "stems may overlap the other staff" +msgstr "" + +#. Documentation/user/keyboards.itely:375 (comment) +msgid "extend the stems to reach other other staff" +msgstr "" + +#. Documentation/user/keyboards.itely:377 (comment) +msgid "do not print extra flags" +msgstr "" + #. @node in Documentation/user/keyboards.itely #. @section in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely @@ -5591,7 +5789,7 @@ msgid "Common notation for keyboards" msgstr "Übliche Notation für Tasteninstrumente" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5602,7 +5800,7 @@ msgid "References for keyboards" msgstr "Referenz für Tasteninstrumente" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5613,7 +5811,7 @@ msgid "Changing staff manually" msgstr "Notensysteme manuell verändern" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5624,7 +5822,7 @@ msgid "Changing staff automatically" msgstr "Automatischer Systemwechsel" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5635,7 +5833,7 @@ msgid "Staff-change lines" msgstr "Stimmführungslinien" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5657,7 +5855,7 @@ msgid "Piano" msgstr "Klavier" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5679,7 +5877,7 @@ msgid "Accordion" msgstr "Akkordion" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5702,40 +5900,103 @@ msgstr "Bundlose Saiteninstrumente" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Common notation for unfretted strings" msgstr "Übliche Notation für nichtgebundene Saiteninstrumente" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "References for unfretted strings" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Bowed instruments" msgstr "Streichinstrumente" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely #, fuzzy msgid "References for bowed strings" msgstr "Referenz für gebundene Saiteninstrumente" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Plucked instruments" msgstr "Zupfinstrumente" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "Harp" msgstr "Harfe" -#. Documentation/user/fretted-strings.itely:159 (variable) +#. Documentation/user/fretted-strings.itely:210 (variable) #, fuzzy msgid "melodia" msgstr "Melisma" +#. Documentation/user/fretted-strings.itely:376 (comment) +msgid "A chord for ukelele" +msgstr "" + +#. Documentation/user/fretted-strings.itely:665 (variable) +#. Documentation/user/fretted-strings.itely:684 (variable) +#. Documentation/user/fretted-strings.itely:713 (variable) +#. Documentation/user/fretted-strings.itely:738 (variable) +#. Documentation/user/fretted-strings.itely:762 (variable) +#. Documentation/user/fretted-strings.itely:798 (variable) +#, fuzzy +msgid "mychords" +msgstr "Akkorde" + +#. Documentation/user/fretted-strings.itely:688 (variable) +#, fuzzy +msgid "mychordlist" +msgstr "Akkorde" + +#. Documentation/user/fretted-strings.itely:785 (comment) +msgid "add a new chord shape" +msgstr "" + +#. Documentation/user/fretted-strings.itely:789 (comment) +msgid "add some new chords based on the power chord shape" +msgstr "" + #. @node in Documentation/user/fretted-strings.itely #. @section in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely @@ -5749,111 +6010,139 @@ msgstr "Saiteninstrumente mit Bünden" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Common notation for fretted strings" msgstr "Übliche Notation für gebundene Saiteninstrumente" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "References for fretted strings" msgstr "Referenz für gebundene Saiteninstrumente" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "String number indications" msgstr "Seitennummerbezeichnung" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Default tablatures" msgstr "Standardtabulaturen" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Custom tablatures" msgstr "Angepasste Tabulaturen" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Fret diagrams" +#, fuzzy +msgid "Fret diagram markups" msgstr "Bund-Diagramme" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Right hand fingerings" +#, fuzzy +msgid "Predefined fret diagrams" +msgstr "Vordefinierte Optimierungen" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +#, fuzzy +msgid "Automatic fret diagrams" +msgstr "Automatische Balken" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +#, fuzzy +msgid "Right-hand fingerings" msgstr "Fingersatz der rechten Hand" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Guitar" msgstr "Gitarre" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Guitar tablatures" -msgstr "Gitarren-Tabulaturen" +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Indicating position and barring" +msgstr "Position und Barret anzeigen" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Indicating position and barring" -msgstr "Position und Barret anzeigen" +msgid "Indicating harmonics and dampened notes" +msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Banjo" msgstr "Banjo" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Banjo tablatures" msgstr "Banjo-Tabulaturen" -#. Documentation/user/percussion.itely:120 (variable) -#. Documentation/user/percussion.itely:300 (variable) +#. Documentation/user/percussion.itely:214 (variable) +#. Documentation/user/percussion.itely:394 (variable) msgid "up" msgstr "" -#. Documentation/user/percussion.itely:121 (variable) -#. Documentation/user/percussion.itely:301 (variable) +#. Documentation/user/percussion.itely:215 (variable) +#. Documentation/user/percussion.itely:395 (variable) msgid "down" msgstr "" @@ -5870,44 +6159,56 @@ msgstr "Schlagzeug" #. @node in Documentation/user/percussion.itely #. @subsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsection in Documentation/de/user/percussion.itely msgid "Common notation for percussion" msgstr "Übliche Notation für Schlagzeug" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "References for percussion" msgstr "Referenz für Schlagzeug" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Basic percussion notation" msgstr "Grundlagen der Schlagzeugnotation" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Percussion staves" msgstr "Schlagzeugsysteme" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Ghost notes" msgstr "Geisternoten" @@ -5924,77 +6225,89 @@ msgstr "Blasinstrumente" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely #, fuzzy msgid "Common notation for wind instruments" msgstr "Übliche Notation für nichtgebundene Saiteninstrumente" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "References for wind instruments" msgstr "Referenz für Blasinstrumente" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Half-holes" msgstr "Halbgeschlossene Löcher" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely msgid "Bagpipes" msgstr "Dudelsack" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe definitions" msgstr "Dudelsack-Defintionen" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe example" msgstr "Dudelsack-Beispiele" -#. Documentation/user/chords.itely:599 (variable) +#. Documentation/user/chords.itely:651 (variable) #, fuzzy msgid "myChords" msgstr "Akkorde" -#. Documentation/user/chords.itely:709 (comment) -msgid "FIXME: broken." -msgstr "" - -#. Documentation/user/chords.itely:710 (comment) -msgid "<6\\\\>" -msgstr "" - -#. Documentation/user/chords.itely:857 (comment) -#. Documentation/user/chords.itely:878 (comment) +#. Documentation/user/chords.itely:974 (comment) +#. Documentation/user/chords.itely:995 (comment) msgid "Put notes on same Staff as figures" msgstr "" -#. Documentation/user/chords.itely:955 (comment) +#. Documentation/user/chords.itely:1054 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" -#. Documentation/user/chords.itely:967 (comment) +#. Documentation/user/chords.itely:1066 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "" -#. Documentation/user/chords.itely:969 (comment) -msgid "\\repeat unfold 4 {<6 4->16. <6 4->32}" -msgstr "" - #. @node in Documentation/user/chords.itely #. @section in Documentation/user/chords.itely #. @node in Documentation/fr/user/chords.itely @@ -6002,45 +6315,66 @@ msgstr "" #. @node in Documentation/es/user/chords.itely #. @section in Documentation/es/user/chords.itely #. @node in Documentation/de/user/chords.itely +#. @section in Documentation/de/user/chords.itely msgid "Chord notation" msgstr "Notation von Akkorden" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely #, fuzzy msgid "Chord mode" msgstr "Akkord-Modus" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Chord mode overview" msgstr "Akkord-Modus" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Common chords" msgstr "Moderne Akkorde" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Extended and altered chords" msgstr "Noten und Akkordbezeichnungen" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely #, fuzzy msgid "Displaying chords" msgstr "Tonhöhen anzeigen lassen" @@ -6058,42 +6392,58 @@ msgstr "Akkordbezeichnungen drucken" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Customizing chord names" msgstr "Akkordbezeichnungen eingeben" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Figured bass" msgstr "Generalbass" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Introduction to figured bass" msgstr "Grundlagen des Bezifferten Basses" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Entering figured bass" msgstr "Eingabe von Zahlen" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely #, fuzzy msgid "Displaying figured bass" msgstr "Tonhöhen anzeigen lassen" @@ -6111,163 +6461,187 @@ msgstr "Notation von alter Musik" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Introduction to ancient notation" msgstr "Einführung in die Notation Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient notation supported" msgstr "Notation von Alter Musik, die unterstützt wird" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Alternative note signs" msgstr "Alternative Notenzeichen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient note heads" msgstr "Notenköpfe Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient accidentals" msgstr "Versetzungszeichen Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient rests" msgstr "Pausen Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient clefs" msgstr "Schlüssel Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient flags" msgstr "Fähnchen Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient time signatures" msgstr "Taktangaben Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Additional note signs" msgstr "Zusätzliche Notenzeichen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient articulations" msgstr "Artikulationszeichen Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Custodes" msgstr "Custodes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Divisiones" msgstr "Divisiones" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ligatures" msgstr "Ligaturen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "White mensural ligatures" msgstr "Weiße Mensuralligaturen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Gregorian square neumes ligatures" msgstr "Ligaturen der gregorianischen Quadratnotation" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Pre-defined contexts" msgstr "Vordefinierte Umgebungen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely #, fuzzy msgid "Gregorian chant contexts" msgstr "Gregorianische Gesangs-Kontexte" @@ -6275,58 +6649,191 @@ msgstr "Gregorianische Gesangs-Kontexte" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensural contexts" msgstr "Mensural-Kontexte" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Transcribing ancient music" msgstr "Transkription Alter Musik" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient and modern from one source" msgstr "Alte und moderne Edition aus einer Quelldatei" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely -msgid "Incipits" +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely +msgid "Incipits" msgstr "Incipite" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensurstriche layout" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Transcribing Gregorian chant" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Editorial markings" msgstr "Herausgeberische Anmerkungen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Annotational accidentals" msgstr "Vorgeschlagene Versetzungszeichen" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Baroque rhythmic notation" msgstr "Notation barocker Rhythmen" -#. Documentation/user/input.itely:497 (comment) +#. @node in Documentation/user/world.itely +#. @section in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @section in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @section in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @section in Documentation/de/user/world.itely +#, fuzzy +msgid "World music" +msgstr "Notation von Gesang" + +#. @node in Documentation/user/world.itely +#. @subsection in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @subsection in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @subsection in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @subsection in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic music" +msgstr "Rhythmische Musik" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "References for Arabic music" +msgstr "Referenz für Musiktexte" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic note names" +msgstr "Absolute Notenbezeichnungen" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic key signatures" +msgstr "Tonartbezeichnung" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic time signatures" +msgstr "Taktangaben Alter Musik" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic music example" +msgstr "Beispiele aus dem Leben" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Further reading" +msgstr "Weitere Optimierungen" + +#. Documentation/user/input.itely:494 (comment) msgid "not printed" msgstr "" +#. Documentation/user/input.itely:911 (variable) +#, fuzzy +msgid "allLyrics" +msgstr "Gesangtext" + #. @node in Documentation/user/input.itely #. @chapter in Documentation/user/input.itely #. @node in Documentation/fr/user/input.itely @@ -6335,17 +6842,29 @@ msgstr "" #. @chapter in Documentation/es/user/input.itely #. @node in Documentation/de/user/input.itely #. @chapter in Documentation/de/user/input.itely -msgid "Input syntax" -msgstr "Die Eingabe-Syntax" +msgid "General input and output" +msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely #, fuzzy msgid "Input structure" msgstr "Die Dateistruktur" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Structure of a score" msgstr "" @@ -6373,61 +6892,67 @@ msgstr "Die Dateistruktur" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Titles and headers" msgstr "Titel" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating titles" msgstr "Titel erstellen" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Custom titles" msgstr "Eigene Titel" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Reference to page numbers" msgstr "Verweis auf die Seitenzahlen" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Table of contents" msgstr "Inhaltsverzeichnis" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely #, fuzzy msgid "Working with input files" msgstr "Arbeiten an Eingabe-Dateien" @@ -6454,6 +6979,30 @@ msgstr "LilyPond-Dateien einfügen" msgid "Different editions from one source" msgstr "Verschiedene Editionen aus einer Quelldatei" +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Using variables" +msgstr "Variablen für Optimierungen einsetzen" + +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Using tags" +msgstr "Systeme verstecken" + #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely #. @node in Documentation/fr/user/input.itely @@ -6478,12 +7027,24 @@ msgstr "LilyPond-Notation anzeigen" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely #, fuzzy msgid "Controlling output" msgstr "Richtungskontrolle" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely #, fuzzy msgid "Extracting fragments of music" msgstr "Notationsfragmente extrahieren" @@ -6501,119 +7062,153 @@ msgstr "Korrigierte Musik überspringen" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "MIDI output" msgstr "MIDI-Ausgabe" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating MIDI files" msgstr "MIDI-Dateien erstellen" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "MIDI block" msgstr "Der MIDI-Block" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "MIDI instrument names" -msgstr "MIDI-Instrumentenbezeichnungen" +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +msgid "What goes into the MIDI output?" +msgstr "" -#. @node in Documentation/user/input.itely -#. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "What goes into the MIDI? FIXME" +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Supported in MIDI" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Unsupported in MIDI" msgstr "" #. @node in Documentation/user/input.itely -#. @subsubsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @unnumberedsubsubsec in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsubsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsubsection in Documentation/de/user/non-music.itely -msgid "Repeats and MIDI" +#. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +#, fuzzy +msgid "Repeats in MIDI" msgstr "Wiederholungen und MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely -msgid "other midi" -msgstr "Weiter Midi-Probleme" - -#. Documentation/user/spacing.itely:671 (comment) +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +#, fuzzy +msgid "Controlling MIDI dynamics" +msgstr "Richtungskontrolle" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Dynamic marks" +msgstr "Neue Lautstärkezeichen" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Overall MIDI volume" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (i)" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (ii)" +msgstr "" + +#. Documentation/user/spacing.itely:684 (comment) msgid "this does nothing" msgstr "" -#. Documentation/user/spacing.itely:672 (comment) +#. Documentation/user/spacing.itely:685 (comment) msgid "a break here would work" msgstr "" -#. Documentation/user/spacing.itely:673 (comment) +#. Documentation/user/spacing.itely:686 (comment) msgid "as does this break" msgstr "" -#. Documentation/user/spacing.itely:685 (comment) +#. Documentation/user/spacing.itely:698 (comment) msgid "now the break is allowed" msgstr "" -#. Documentation/user/spacing.itely:1438 (comment) +#. Documentation/user/spacing.itely:1460 (comment) msgid "this time the text will be closer to the staff" msgstr "" -#. Documentation/user/spacing.itely:1440 (comment) -msgid "by setting outside-staff-priority to a non-number, we" +#. Documentation/user/spacing.itely:1462 (comment) +msgid "by setting outside-staff-priority to a non-number, " msgstr "" -#. Documentation/user/spacing.itely:1441 (comment) +#. Documentation/user/spacing.itely:1463 (comment) #, fuzzy -msgid "disable the automatic collision avoidance" +msgid "we disable the automatic collision avoidance" msgstr "Vermeidung von vertikalen Zusammenstößen" -#. Documentation/user/spacing.itely:1444 (comment) +#. Documentation/user/spacing.itely:1466 (comment) msgid "now they will collide" msgstr "" -#. Documentation/user/spacing.itely:1469 (comment) +#. Documentation/user/spacing.itely:1491 (comment) msgid "the markup is too close to the following note" msgstr "" -#. Documentation/user/spacing.itely:1472 (comment) +#. Documentation/user/spacing.itely:1494 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "" @@ -6694,17 +7289,6 @@ msgstr "Die Notensystemgröße einstellen" msgid "Score layout" msgstr "Partiturlayout" -#. @node in Documentation/user/spacing.itely -#. @section in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @section in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @section in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @section in Documentation/de/user/spacing.itely -msgid "Displaying spacing" -msgstr "Abstände anzeigen lassen" - #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely #. @node in Documentation/fr/user/spacing.itely @@ -6930,25 +7514,18 @@ msgstr "Proportionale Notation" #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely +#. @node in Documentation/fr/user/tweaks.itely +#. @section in Documentation/fr/user/tweaks.itely #. @node in Documentation/fr/user/spacing.itely #. @section in Documentation/fr/user/spacing.itely #. @node in Documentation/es/user/spacing.itely #. @section in Documentation/es/user/spacing.itely +#. @node in Documentation/de/user/tweaks.itely +#. @section in Documentation/de/user/tweaks.itely #. @node in Documentation/de/user/spacing.itely #. @section in Documentation/de/user/spacing.itely -msgid "Page layout MOVED FROM LM" -msgstr "Seitenlayout" - -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Introduction to layout" -msgstr "Einfürung in das Layout" +msgid "Fitting music onto fewer pages" +msgstr "Die Musik auf weniger Seiten zwingen" #. @node in Documentation/user/spacing.itely #. @subsection in Documentation/user/spacing.itely @@ -6958,8 +7535,8 @@ msgstr "Einfürung in das Layout" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Global sizes" -msgstr "Globale Größenangabe" +msgid "Displaying spacing" +msgstr "Abstände anzeigen lassen" #. @node in Documentation/user/spacing.itely #. @subsection in Documentation/user/spacing.itely @@ -6969,34 +7546,17 @@ msgstr "Globale Größenangabe" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Line breaks" -msgstr "Zeilenumbrüche" +#, fuzzy +msgid "Changing spacing" +msgstr "Horizontale Abstände verändern" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Page breaks" -msgstr "Seitenumbrüche" +#. Documentation/user/changing-defaults.itely:1947 (comment) +msgid "Remove bar line at the end of the current line" +msgstr "" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/tweaks.itely -#. @section in Documentation/fr/user/tweaks.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/tweaks.itely -#. @section in Documentation/de/user/tweaks.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Fitting music onto fewer pages" -msgstr "Die Musik auf weniger Seiten zwingen" +#. Documentation/user/changing-defaults.itely:1993 (comment) +msgid "Try to remove all key signatures" +msgstr "" #. @node in Documentation/user/changing-defaults.itely #. @chapter in Documentation/user/changing-defaults.itely @@ -7020,6 +7580,34 @@ msgstr "Standardeinstellungen verändern" msgid "Interpretation contexts" msgstr "Interpretationsumgebungen" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Score - the master of all contexts" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Top-level contexts - staff containers" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Intermediate-level contexts - staves" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Bottom-level contexts - voices" +msgstr "" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -7068,6 +7656,8 @@ msgstr "Umgebungen aneinander ausrichten" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Explaining the Internals Reference" msgstr "Die Referenz der Programminterna" @@ -7109,6 +7699,8 @@ msgstr "Die Grob-Eigenschaften" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Naming conventions" msgstr "Definitionen" @@ -7117,6 +7709,8 @@ msgstr "Definitionen" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Modifying properties" msgstr "Umgebungs-Eignschaften verändern" @@ -7125,18 +7719,22 @@ msgstr "Umgebungs-Eignschaften verändern" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Overview of modifying properties" msgstr "Überblick über musikalische Funktionen" #. @node in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "The \\set command" msgstr "Der \\override-Befehl" #. @subsection in Documentation/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "The @code{\\set} command" msgstr "Der \\override-Befehl" @@ -7151,7 +7749,7 @@ msgstr "Der \\override-Befehl" #. @subsection in Documentation/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\override} command" msgstr "Der \\override-Befehl" @@ -7184,6 +7782,8 @@ msgstr "Objekte, die mit der Eingabe verbunden sind" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Useful concepts and properties" msgstr "Alle Kontexteigenschaften" @@ -7192,6 +7792,8 @@ msgstr "Alle Kontexteigenschaften" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Input modes" msgstr "Quelldateien" @@ -7200,6 +7802,8 @@ msgstr "Quelldateien" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Direction and placement" msgstr "Richtung und Platzierung kontrollieren" @@ -7208,6 +7812,8 @@ msgstr "Richtung und Platzierung kontrollieren" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Distances and measurements" msgstr "Abstände und Maßeinheiten" @@ -7216,6 +7822,8 @@ msgstr "Abstände und Maßeinheiten" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Spanners" msgstr "Text mit Verbindungslinien" @@ -7224,6 +7832,8 @@ msgstr "Text mit Verbindungslinien" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Common properties" msgstr "Übliche Veränderungen der Einstellungen" @@ -7237,6 +7847,46 @@ msgstr "Übliche Veränderungen der Einstellungen" msgid "Controlling visibility of objects" msgstr "Die Sichtbarkeit von Objekten kontrollieren" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Removing the stencil" +msgstr "Einzelne Systeme verändern" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Making objects transparent" +msgstr "Verschieben von Objekten" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Painting objects white" +msgstr "Verschieben von Objekten" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Using break-visibility" +msgstr "break-visibility (unsichtbar machen)" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Special considerations" +msgstr "Besonderheiten bei der Texteingabe" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely @@ -7250,6 +7900,8 @@ msgstr "Zeilenstile" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Rotating objects" msgstr "Verschieben von Objekten" @@ -7258,6 +7910,8 @@ msgstr "Verschieben von Objekten" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Aligning objects" msgstr "Umgebungen aneinander ausrichten" @@ -7266,6 +7920,8 @@ msgstr "Umgebungen aneinander ausrichten" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Advanced tweaks" msgstr "Fortgeschrittene Optimierungen mit Scheme" @@ -7285,6 +7941,8 @@ msgstr "Vertikale Gruppierung der grafischen Objekte („grob“s)" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Modifying ends of spanners" msgstr "Einzelne Systeme verändern" @@ -7293,26 +7951,22 @@ msgstr "Einzelne Systeme verändern" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "Modifying stencils" msgstr "Einzelne Systeme verändern" #. @node in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#, fuzzy -msgid "old The \\override command" -msgstr "Der \\override-Befehl" - -#. @section in Documentation/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy -msgid "old The @code{\\override} command" -msgstr "Der \\override-Befehl" +msgid "Modifying shapes" +msgstr "Einzelne Systeme verändern" #. @node in Documentation/user/changing-defaults.itely #. @section in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely #. @node in Documentation/de/user/changing-defaults.itely #. @section in Documentation/de/user/changing-defaults.itely msgid "Discussion of specific tweaks" @@ -7320,8 +7974,8 @@ msgstr "Erklärung von speziellen Optimierungen" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely #, fuzzy msgid "old Contexts explained" msgstr "Was sind Umgebungen?" @@ -7642,18 +8296,24 @@ msgstr "Scheme-Vorgänge als Eigenschaften" #. @node in Documentation/user/programming-interface.itely #. @section in Documentation/user/programming-interface.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @section in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "TODO moved into scheme" msgstr "" #. @node in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of \\tweak" msgstr "Scheme-Code anstelle von \\tweak verwenden" #. @subsection in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Scheme-Code anstelle von @code{\tweak} verwenden" @@ -7661,8 +8321,10 @@ msgstr "Scheme-Code anstelle von @code{\tweak} verwenden" #. @subsection in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Schwierige Korrekturen" @@ -7699,6 +8361,18 @@ msgstr "Notationsübersicht" msgid "Chord name chart" msgstr "Liste der Akkordbezeichnungen" +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +#, fuzzy +msgid "Common chord modifiers" +msgstr "Moderne Akkorde" + +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +#, fuzzy +msgid "Predefined fretboard diagrams" +msgstr "Vordefinierte Befehle" + #. @node in Documentation/user/notation-appendices.itely #. @appendixsec in Documentation/user/notation-appendices.itely #. @node in Documentation/fr/user/notation-appendices.itely @@ -7853,38 +8527,28 @@ msgstr "GNU LilyPond -- Das Handbuch zum Lernen" msgid "Commonly tweaked properties" msgstr "Übliche Veränderungen der Einstellungen" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Manuel de l'utilisateur" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel d'apprentissage" -msgstr "" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Hauteurs" +msgstr "Cluster" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel de référence" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Durées et rythme" msgstr "" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Annexes" -msgstr "" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Silences" +msgstr "Linien" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Utilisation du programme" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Métrique" msgstr "" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Autre documentation" -msgstr "Andere Dokumentation" - -#. @subsubheading in Documentation/fr/user/tutorial.itely -#. @subsubheading in Documentation/de/user/tutorial.itely -msgid "Unix" -msgstr "Unix" - -#. @rglos in Documentation/fr/user/tutorial.itely -msgid "fourth" -msgstr "Quarte" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Tout ensemble" +msgstr "Vokalensemble" #. @node in Documentation/fr/user/tutorial.itely #. @subsection in Documentation/fr/user/tutorial.itely @@ -7893,35 +8557,9 @@ msgstr "Quarte" msgid "Working on text files" msgstr "Arbeiten an Text-Dateien" -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "How to read the tutorial" -msgstr "Wie soll man die Übung lesen" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Relative note names" -msgstr "Relative Notenbezeichnungen" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Piano staves" -msgstr "Klaviersysteme" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Printing lyrics" -msgstr "Eingabe von Gesangtext" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "A lead sheet" -msgstr "Ein Song-Blatt" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Organizing pieces with identifiers" -msgstr "Stücke durch Bezeichner organisieren" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Exemples cliquables" +msgstr "" #. @node in Documentation/fr/user/fundamental.itely #. @section in Documentation/fr/user/fundamental.itely @@ -7946,15 +8584,6 @@ msgstr "Übliche Optimierungen" msgid "Default files" msgstr "Standarddateien" -#. @node in Documentation/fr/user/working.itely -#. @section in Documentation/fr/user/working.itely -#. @node in Documentation/es/user/working.itely -#. @section in Documentation/es/user/working.itely -#. @node in Documentation/de/user/working.itely -#. @section in Documentation/de/user/working.itely -msgid "Suggestions for writing LilyPond files" -msgstr "Vorschläge, wie LilyPond-Dateien geschrieben werden sollen" - #. @node in Documentation/fr/user/working.itely #. @subsection in Documentation/fr/user/working.itely #. @node in Documentation/es/user/working.itely @@ -7969,8 +8598,9 @@ msgid "GNU LilyPond --- utilisation des programmes" msgstr "GNU LilyPond -- Die Programmbenutzung" #. @top in Documentation/fr/user/lilypond.tely -msgid "GNU LilyPond --- le système de gravure musicale" -msgstr "GNU LilyPond -- Das Notensatzprogramm" +#, fuzzy +msgid "GNU LilyPond --- manuel de notation" +msgstr "GNU LilyPond -- Das Handbuch zum Lernen" #. @node in Documentation/fr/user/pitches.itely #. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely @@ -8008,49 +8638,51 @@ msgid "Octave check" msgstr "Oktavenüberprüfung" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Augmentation dots" msgstr "Punktierung" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely +#. @node in Documentation/es/user/rhythms.itely +#. @subsubsection in Documentation/es/user/rhythms.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely +msgid "Skips" +msgstr "Überspringen von Zeichen" + +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Multi measure rests" msgstr "Mehrtaktige Pausen" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar check" msgstr "Taktüberprüfung" # # #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Barnumber check" msgstr "Taktzahlüberprüfung" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Proportional notation (introduction)" msgstr "Proportionale Notation (Einleitung)" -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely -#. @node in Documentation/de/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely -msgid "Laissez vibrer ties" -msgstr "Laissez-vibrer-Bögen" - #. @node in Documentation/fr/user/repeats.itely #. @subsection in Documentation/fr/user/repeats.itely msgid "Writing repeats" @@ -8118,7 +8750,7 @@ msgid "System start delimiters" msgstr "Klammern am Systemanfang" #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely msgid "Blank music sheet" msgstr "Ein leeres Notenblatt" @@ -8129,15 +8761,11 @@ msgstr "Text und Linien" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Nested scores" msgstr "Geschachtelte Systeme" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Page wrapping text" msgstr "Text über mehrere Seiten" @@ -8158,207 +8786,32 @@ msgstr "" msgid "The piano staff" msgstr "Das Klaviersystem" -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @subsection in Documentation/fr/user/unfretted-strings.itely -msgid "Orchestral strings sections" -msgstr "Notation von Orchestermusik" - -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsubsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely -msgid "Artificial harmonics (strings)" -msgstr "Flageolett" - -#. @node in Documentation/fr/user/fretted-strings.itely -#. @subsection in Documentation/fr/user/fretted-strings.itely -msgid "Guitar sections" -msgstr "Notation für Guitarre" - #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Tablatures basic" -msgstr "Grundlagen der Tabulatur" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Fret diagrams" +msgstr "Bund-Diagramme" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Non-guitar tablatures" -msgstr "Nicht-Gitarren-Tabulaturen" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Right hand fingerings" +msgstr "Fingersatz der rechten Hand" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Other guitar issues" -msgstr "Weitere Gitarrenprobleme" - -#. @node in Documentation/fr/user/percussion.itely -#. @subsection in Documentation/fr/user/percussion.itely -msgid "Percussion sections" -msgstr "Notation für Schlagzeug" - -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely -msgid "Entering percussion" -msgstr "Schlagzeugnotation" - -#. @node in Documentation/fr/user/wind.itely -#. @subsection in Documentation/fr/user/wind.itely -#. @node in Documentation/es/user/wind.itely -#. @subsection in Documentation/es/user/wind.itely -#. @node in Documentation/de/user/wind.itely -#. @subsection in Documentation/de/user/wind.itely -msgid "Bagpipe" -msgstr "Dudelsack" - -#. @node in Documentation/fr/user/chords.itely -#. @subsection in Documentation/fr/user/chords.itely -msgid "Chords sections" -msgstr "Notation von Akkorden" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Entering chord names" -msgstr "Akkordbezeichnungen eingeben" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Chords mode" -msgstr "Akkord-Modus" - -#. @node in Documentation/fr/user/ancient.itely -#. @subsection in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @subsection in Documentation/de/user/ancient.itely -msgid "Ancient TODO" -msgstr "Alte Musik" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Gregorian Chant contexts" -msgstr "Gregorianische Gesangs-Kontexte" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Musica ficta accidentals" -msgstr "Musica-ficta-Versetzungszeichen" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Input files" -msgstr "Quelldateien" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "A single music expression" -msgstr "Ein einzelner musikalischer Ausdruck" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Extracting fragments of notation" -msgstr "Notationsfragmente extrahieren" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Common syntax issues TODO name?" -msgstr "Übliche Syntax-Probleme" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -msgid "Controlling direction" -msgstr "Richtungskontrolle" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Distances and measurements MAYBE MOVE" -msgstr "Abstände und Maßeinheiten" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Other stuffs TODO move?" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "context list FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "another thing FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Input modes FIXME" -msgstr "" - -#. @node in Documentation/fr/user/non-music.itely -#. @chapter in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @chapter in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @chapter in Documentation/de/user/non-music.itely -msgid "Non-musical notation" -msgstr "Nichtmusikalische Notation" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Guitar tablatures" +msgstr "Gitarren-Tabulaturen" #. @node in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely @@ -8367,22 +8820,16 @@ msgstr "Automatische Notation" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Changing context properties on the fly" msgstr "Umgebungseigenschaften lokal ändern" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Layout tunings within contexts" msgstr "Layouteinstellungen mit Umgebungen" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Constructing a tweak" msgstr "Eine Korrektur konstruieren" @@ -8406,34 +8853,22 @@ msgstr "" msgid "Advertencias y problemas conocidos" msgstr "" -#. @subheading in Documentation/es/user/introduction.itely -msgid "Learning Manual (LM)" -msgstr "Handbuch zum Lernen (LH)" - -#. @subheading in Documentation/es/user/introduction.itely -msgid "Notation Reference (NR)" -msgstr "Notationsreferenz (NR)" - -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Appendices" -msgstr "Anhang" - -#. @subheading in Documentation/es/user/introduction.itely -#. @subheading in Documentation/de/user/introduction.itely -msgid "Program usage" -msgstr "Programmbenutzung" - -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Other information" -msgstr "Mehr Information" - #. @node in Documentation/es/user/tweaks.itely #. @subsection in Documentation/es/user/tweaks.itely msgid "Automatic behaviour" msgstr "Automatisches Verhalten" +#. @subheading in Documentation/es/user/tweaks.itely +msgid "Simulating a fermata" +msgstr "Eine Fermate simulieren" + +#. @node in Documentation/es/user/working.itely +#. @section in Documentation/es/user/working.itely +#. @node in Documentation/de/user/working.itely +#. @section in Documentation/de/user/working.itely +msgid "Suggestions for writing LilyPond files" +msgstr "Vorschläge, wie LilyPond-Dateien geschrieben werden sollen" + #. @rglos in Documentation/es/user/working.itely #, fuzzy msgid "baritone" @@ -8454,30 +8889,24 @@ msgstr "" msgid "Writing long repeats" msgstr "Lange Wiederholungen eingeben" -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @subsection in Documentation/de/user/unfretted-strings.itely -msgid "Orchestral strings TODO" -msgstr "Streicher" - #. @rglos in Documentation/es/user/chords.itely msgid " " msgstr "" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Controlling direction and placement" -msgstr "Richtung und Platzierung kontrollieren" +#. @node in Documentation/es/user/ancient.itely +#. @subsection in Documentation/es/user/ancient.itely +msgid "Ancient TODO" +msgstr "Alte Musik" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "When to add a -" -msgstr "Wann ein - hinzugefügt wird" +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Gregorian Chant contexts" +msgstr "Gregorianische Gesangs-Kontexte" + +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Musica ficta accidentals" +msgstr "Musica-ficta-Versetzungszeichen" #. @top in Documentation/de/user/lilypond-learning.tely msgid "GNU LilyPond -- Handbuch zum Lernen" @@ -8495,6 +8924,22 @@ msgstr "Handbuch zum Lernen (LH)" msgid "Notation reference" msgstr "Notationsreferenz (NR)" +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Appendices" +msgstr "Anhang" + +#. @subheading in Documentation/de/user/introduction.itely +msgid "Program usage" +msgstr "Programmbenutzung" + +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Other information" +msgstr "Mehr Information" + +#. @subsubheading in Documentation/de/user/tutorial.itely +msgid "Unix" +msgstr "Unix" + #. @rglos in Documentation/de/user/tutorial.itely msgid "legato" msgstr "Legato" @@ -8512,118 +8957,223 @@ msgstr "GNU LilyPond -- Programmbenutzung" msgid "GNU LilyPond -- Das Notationsprogramm" msgstr "GNU LilyPond -- Das Notationsprogramm" +#. @node in Documentation/de/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely +msgid "Laissez vibrer ties" +msgstr "Laissez-vibrer-Bögen" + #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Chords" msgstr "Akkorde" -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely -msgid "Font selection" -msgstr "Auswahl der Schriftart" +msgid "Up:" +msgstr "Nach oben:" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Simple lyrics" -msgstr "Einfache Gesangstexte" +msgid "Next:" +msgstr "Weiter:" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Another way of entering lyrics" -msgstr "Eine andere Art, den Text einzugeben" +msgid "Previous:" +msgstr "Zurück:" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Assigning more than one syllable to a single note" -msgstr "Mehr als eine Strophe an einer Note ausrichten" +msgid "Appendix " +msgstr "Anhang " -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "More than one note on a single syllable" -msgstr "Mehr als eine Note für eine einzelne Silbe" +msgid "Footnotes" +msgstr "Fußnoten" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Vocals and variables" -msgstr "Gesangstexte und Bezeichner" +msgid "Table of Contents" +msgstr "Inhaltsverzeichnis" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Flexibility in placement" -msgstr "Flexibilität bei der Positionierung" +#, fuzzy +#~ msgid "Microtones in MIDI" +#~ msgstr "Mikrotöne" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Lyrics to multiple notes of a melisma" -msgstr "Text zu mehreren Noten eines Melismas" +#~ msgid "Input files" +#~ msgstr "Quelldateien" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Switching the melody associated with a lyrics line" -msgstr "Die Melodie, die mit einer Textzeile verbunden ist, umschalten" +#~ msgid "A single music expression" +#~ msgstr "Ein einzelner musikalischer Ausdruck" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Spacing vocals" -msgstr "Abstände im Gesangstext" +#~ msgid "Extracting fragments of notation" +#~ msgstr "Notationsfragmente extrahieren" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Spacing lyrics" -msgstr "Textabstände" +#~ msgid "Common syntax issues TODO name?" +#~ msgstr "Übliche Syntax-Probleme" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "More about stanzas" -msgstr "Mehr über Strophen" +#~ msgid "Controlling direction" +#~ msgstr "Richtungskontrolle" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding dynamics marks" -msgstr "Lautstärkebezeichnung hinzufügen" +#~ msgid "Distances and measurements MAYBE MOVE" +#~ msgstr "Abstände und Maßeinheiten" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding singer names" -msgstr "Sängernamen hinzufügen" +#~ msgid "Non-musical notation" +#~ msgstr "Nichtmusikalische Notation" -#. @node in Documentation/de/user/fretted-strings.itely -#. @subsection in Documentation/de/user/fretted-strings.itely -msgid "Guitar TODO" -msgstr "Gitarre" +#~ msgid "MIDI instrument names" +#~ msgstr "MIDI-Instrumentenbezeichnungen" -#. @node in Documentation/de/user/percussion.itely -#. @subsection in Documentation/de/user/percussion.itely -msgid "TODO percussion node fix" -msgstr "" +#~ msgid "Repeats and MIDI" +#~ msgstr "Wiederholungen und MIDI" + +#~ msgid "other midi" +#~ msgstr "Weiter Midi-Probleme" + +#~ msgid "Page layout MOVED FROM LM" +#~ msgstr "Seitenlayout" + +#~ msgid "Introduction to layout" +#~ msgstr "Einfürung in das Layout" + +#~ msgid "Global sizes" +#~ msgstr "Globale Größenangabe" + +#~ msgid "Line breaks" +#~ msgstr "Zeilenumbrüche" + +#~ msgid "Page breaks" +#~ msgstr "Seitenumbrüche" + +#~ msgid "Input syntax" +#~ msgstr "Die Eingabe-Syntax" + +#~ msgid "Controlling direction and placement" +#~ msgstr "Richtung und Platzierung kontrollieren" + +#~ msgid "When to add a -" +#~ msgstr "Wann ein - hinzugefügt wird" -#. @section in Documentation/de/user/chords.itely #, fuzzy -msgid "Chords notation" -msgstr "Notation von Akkorden" +#~ msgid "old The \\override command" +#~ msgstr "Der \\override-Befehl" -#. @node in Documentation/de/user/chords.itely -#. @subsection in Documentation/de/user/chords.itely -msgid "TODO chords fix" -msgstr "" +#, fuzzy +#~ msgid "old The @code{\\override} command" +#~ msgstr "Der \\override-Befehl" -msgid "Up:" -msgstr "Nach oben:" +#~ msgid "Font selection" +#~ msgstr "Auswahl der Schriftart" -msgid "Next:" -msgstr "Weiter:" +#~ msgid "Simple lyrics" +#~ msgstr "Einfache Gesangstexte" -msgid "Previous:" -msgstr "Zurück:" +#~ msgid "Another way of entering lyrics" +#~ msgstr "Eine andere Art, den Text einzugeben" -msgid "Appendix " -msgstr "Anhang " +#~ msgid "Assigning more than one syllable to a single note" +#~ msgstr "Mehr als eine Strophe an einer Note ausrichten" -msgid "Footnotes" -msgstr "Fußnoten" +#~ msgid "More than one note on a single syllable" +#~ msgstr "Mehr als eine Note für eine einzelne Silbe" -msgid "Table of Contents" -msgstr "Inhaltsverzeichnis" +#~ msgid "Vocals and variables" +#~ msgstr "Gesangstexte und Bezeichner" + +#~ msgid "Flexibility in placement" +#~ msgstr "Flexibilität bei der Positionierung" + +#~ msgid "Lyrics to multiple notes of a melisma" +#~ msgstr "Text zu mehreren Noten eines Melismas" + +#~ msgid "Switching the melody associated with a lyrics line" +#~ msgstr "Die Melodie, die mit einer Textzeile verbunden ist, umschalten" + +#~ msgid "Spacing vocals" +#~ msgstr "Abstände im Gesangstext" + +#~ msgid "Spacing lyrics" +#~ msgstr "Textabstände" + +#~ msgid "More about stanzas" +#~ msgstr "Mehr über Strophen" + +#~ msgid "Adding dynamics marks" +#~ msgstr "Lautstärkebezeichnung hinzufügen" + +#~ msgid "Adding singer names" +#~ msgstr "Sängernamen hinzufügen" + +#~ msgid "mus" +#~ msgstr "Noten" + +#~ msgid "Autre documentation" +#~ msgstr "Andere Dokumentation" + +#~ msgid "fourth" +#~ msgstr "Quarte" + +#~ msgid "How to read the tutorial" +#~ msgstr "Wie soll man die Übung lesen" + +#~ msgid "Relative note names" +#~ msgstr "Relative Notenbezeichnungen" + +#~ msgid "Piano staves" +#~ msgstr "Klaviersysteme" + +#~ msgid "Printing lyrics" +#~ msgstr "Eingabe von Gesangtext" + +#~ msgid "A lead sheet" +#~ msgstr "Ein Song-Blatt" + +#~ msgid "Organizing pieces with identifiers" +#~ msgstr "Stücke durch Bezeichner organisieren" + +#~ msgid "GNU LilyPond --- le système de gravure musicale" +#~ msgstr "GNU LilyPond -- Das Notensatzprogramm" + +#~ msgid "Orchestral strings sections" +#~ msgstr "Notation von Orchestermusik" + +#~ msgid "Artificial harmonics (strings)" +#~ msgstr "Flageolett" + +#~ msgid "Guitar sections" +#~ msgstr "Notation für Guitarre" + +#~ msgid "Tablatures basic" +#~ msgstr "Grundlagen der Tabulatur" + +#~ msgid "Non-guitar tablatures" +#~ msgstr "Nicht-Gitarren-Tabulaturen" + +#~ msgid "Other guitar issues" +#~ msgstr "Weitere Gitarrenprobleme" + +#~ msgid "Percussion sections" +#~ msgstr "Notation für Schlagzeug" + +#~ msgid "Entering percussion" +#~ msgstr "Schlagzeugnotation" + +#~ msgid "Bagpipe" +#~ msgstr "Dudelsack" + +#~ msgid "Chords sections" +#~ msgstr "Notation von Akkorden" + +#~ msgid "Entering chord names" +#~ msgstr "Akkordbezeichnungen eingeben" + +#~ msgid "Chords mode" +#~ msgstr "Akkord-Modus" + +#~ msgid "Learning Manual (LM)" +#~ msgstr "Handbuch zum Lernen (LH)" + +#~ msgid "Notation Reference (NR)" +#~ msgstr "Notationsreferenz (NR)" + +#~ msgid "Orchestral strings TODO" +#~ msgstr "Streicher" + +#~ msgid "Guitar TODO" +#~ msgstr "Gitarre" + +#, fuzzy +#~ msgid "Chords notation" +#~ msgstr "Notation von Akkorden" #~ msgid "church rests" #~ msgstr "Kirchenpausen" @@ -8656,10 +9206,6 @@ msgstr "Inhaltsverzeichnis" #~ msgid "dashPlus" #~ msgstr "dashPlus" -#, fuzzy -#~ msgid "music" -#~ msgstr "Notation von Gesang" - #~ msgid "Common notation" #~ msgstr "Übliche Notation" @@ -8747,9 +9293,6 @@ msgstr "Inhaltsverzeichnis" #~ msgid "Overview of text entry" #~ msgstr "Überblick über Textbeschriftungsbefehle" -#~ msgid "Special text concerns" -#~ msgstr "Besonderheiten bei der Texteingabe" - #~ msgid "Bagpipe sections" #~ msgstr "Notation von Musik für Dudelsack" @@ -8785,9 +9328,6 @@ msgstr "Inhaltsverzeichnis" #~ msgid "Educational use" #~ msgstr "Pädagogische Verwendung" -#~ msgid "Predefined tweaks" -#~ msgstr "Vordefinierte Optimierungen" - #~ msgid "The three methods of tweaking" #~ msgstr "Die drei Korrektur-Methoden" @@ -8803,9 +9343,6 @@ msgstr "Inhaltsverzeichnis" #~ msgid "Connecting notes" #~ msgstr "Noten verbinden" -#~ msgid "Rhythmic music" -#~ msgstr "Rhythmische Musik" - #~ msgid "Other instrument specific notation" #~ msgstr "Notation für verschiedene Instrumente" diff --git a/Documentation/po/es.po b/Documentation/po/es.po index 932d72f70c..80b7fb712c 100644 --- a/Documentation/po/es.po +++ b/Documentation/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-30 11:15+0200\n" +"POT-Creation-Date: 2008-08-11 18:05+0200\n" "PO-Revision-Date: 2008-07-30 11:34+0200\n" "Last-Translator: Francisco Vila \n" "Language-Team: Español\n" @@ -427,6 +427,7 @@ msgid "barA" msgstr "compasA" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely msgid "foo" msgstr "bla" @@ -486,6 +487,7 @@ msgid "Windows" msgstr "Windows" #. @subsubheading in Documentation/user/tutorial.itely +#. @subsubheading in Documentation/fr/user/tutorial.itely #. @subsubheading in Documentation/es/user/tutorial.itely msgid "UNIX" msgstr "UNIX" @@ -504,7 +506,6 @@ msgstr "Notación sencilla" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/pitches.itely #. @section in Documentation/user/pitches.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/pitches.itely #. @section in Documentation/fr/user/pitches.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -517,6 +518,7 @@ msgid "Pitches" msgstr "Alturas" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "pitch" @@ -546,19 +548,20 @@ msgid "middle C" msgstr "Do central" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "octave" msgstr "octava" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "accidental" msgstr "alteración accidental" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "Durations (rhythms)" @@ -579,6 +582,7 @@ msgid "duration" msgstr "duración" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "whole note" @@ -608,7 +612,6 @@ msgstr "figura con puntillo" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely #. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -629,7 +632,6 @@ msgstr "silencio" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely #. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -671,7 +673,6 @@ msgid "clef" msgstr "clave" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "All together" @@ -758,6 +759,7 @@ msgstr "bemol" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -766,6 +768,7 @@ msgstr "doble sostenido" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -780,6 +783,7 @@ msgid "Key signatures" msgstr "Armaduras" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "key signature" @@ -805,12 +809,14 @@ msgid "Warning: key signatures and pitches" msgstr "Advertencia: armaduras y alturas" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "natural" msgstr "becuadro" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "transposition" @@ -818,6 +824,7 @@ msgstr "transposición" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -839,8 +846,8 @@ msgstr "Ligaduras de unión y de expresión" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely @@ -853,6 +860,7 @@ msgstr "Ligaduras de unión" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/tutorial.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -931,8 +939,6 @@ msgstr "Articulaciones y matices dinámicos" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/expressive.itely @@ -948,6 +954,7 @@ msgid "Fingerings" msgstr "Digitaciones" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "fingering" @@ -971,6 +978,7 @@ msgid "Dynamics" msgstr "Matices dinámicos" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "dynamics" @@ -978,6 +986,7 @@ msgstr "matices dinámicos" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -986,6 +995,7 @@ msgstr "crescendo" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -994,6 +1004,8 @@ msgstr "decrescendo" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1054,6 +1066,7 @@ msgstr "Grupos especiales" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1062,6 +1075,7 @@ msgstr "figura" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1085,6 +1099,7 @@ msgstr "Notas de adorno" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "grace notes" @@ -1092,6 +1107,7 @@ msgstr "notas de adorno" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "acciaccatura" @@ -1099,6 +1115,7 @@ msgstr "acciaccatura" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "appoggiatura" @@ -1142,6 +1159,7 @@ msgstr "Expresiones musicales simultáneas: varios pentagramas" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1168,6 +1186,8 @@ msgstr "Varios pentagramas" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1177,6 +1197,7 @@ msgstr "Grupos de pentagramas" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/staff.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "brace" @@ -1196,6 +1217,7 @@ msgstr "Combinar notas para formar acordes" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely #. @rglos in Documentation/user/chords.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/es/user/chords.itely @@ -1229,6 +1251,8 @@ msgstr "Canciones" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsubsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1243,6 +1267,7 @@ msgid "Setting simple songs" msgstr "Elaborar canciones sencillas" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "lyrics" @@ -1252,6 +1277,8 @@ msgstr "letra" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1273,6 +1300,7 @@ msgid "melisma" msgstr "melisma" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "extender line" @@ -1280,6 +1308,8 @@ msgstr "línea extensora" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1300,6 +1330,8 @@ msgstr "Retoques finales" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1352,15 +1384,15 @@ msgid "After the tutorial" msgstr "Más allá del tutorial" #. Documentation/user/fundamental.itely:352 (variable) -#. Documentation/user/vocal.itely:1154 (variable) -#. Documentation/user/vocal.itely:1196 (variable) +#. Documentation/user/vocal.itely:1165 (variable) +#. Documentation/user/vocal.itely:1207 (variable) msgid "melody" msgstr "melodia" #. Documentation/user/fundamental.itely:353 (variable) -#. Documentation/user/vocal.itely:978 (variable) -#. Documentation/user/vocal.itely:1159 (variable) -#. Documentation/user/vocal.itely:1200 (variable) +#. Documentation/user/vocal.itely:989 (variable) +#. Documentation/user/vocal.itely:1170 (variable) +#. Documentation/user/vocal.itely:1211 (variable) msgid "text" msgstr "texto" @@ -1468,7 +1500,7 @@ msgstr "Iniciar la primera voz" #. Documentation/user/fundamental.itely:1187 (variable) #. Documentation/user/fundamental.itely:2497 (variable) -#. Documentation/user/tweaks.itely:3160 (variable) +#. Documentation/user/tweaks.itely:3168 (variable) #. Documentation/user/simultaneous.itely:639 (variable) msgid "global" msgstr "global" @@ -1499,37 +1531,37 @@ msgid "SopMusic" msgstr "MusicaSoprano" #. Documentation/user/fundamental.itely:1240 (variable) -#. Documentation/user/tweaks.itely:3162 (variable) +#. Documentation/user/tweaks.itely:3170 (variable) msgid "AltoMusic" msgstr "MusicaAlto" #. Documentation/user/fundamental.itely:1241 (variable) -#. Documentation/user/tweaks.itely:3163 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) msgid "TenorMusic" msgstr "MusicaTenor" #. Documentation/user/fundamental.itely:1242 (variable) -#. Documentation/user/tweaks.itely:3164 (variable) +#. Documentation/user/tweaks.itely:3172 (variable) msgid "BassMusic" msgstr "MusicaBajo" #. Documentation/user/fundamental.itely:1243 (variable) -#. Documentation/user/tweaks.itely:3165 (variable) +#. Documentation/user/tweaks.itely:3173 (variable) msgid "VerseOne" msgstr "EstrofaUno" #. Documentation/user/fundamental.itely:1245 (variable) -#. Documentation/user/tweaks.itely:3166 (variable) +#. Documentation/user/tweaks.itely:3174 (variable) msgid "VerseTwo" msgstr "EstrofaDos" #. Documentation/user/fundamental.itely:1247 (variable) -#. Documentation/user/tweaks.itely:3167 (variable) +#. Documentation/user/tweaks.itely:3175 (variable) msgid "VerseThree" msgstr "EstrofaTres" #. Documentation/user/fundamental.itely:1249 (variable) -#. Documentation/user/tweaks.itely:3168 (variable) +#. Documentation/user/tweaks.itely:3176 (variable) msgid "VerseFour" msgstr "EstrofaCuatro" @@ -2033,185 +2065,188 @@ msgstr "Aumentar solamente el grosor de la ligadura siguiente" #. Documentation/user/tweaks.itely:668 (comment) msgid "Revert thickness of all following slurs to default of 1.2" -msgstr "Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" +msgstr "" +"Devolver el grosor de las ligaduras siguientes al valor predeterminado 1.2" -#. Documentation/user/tweaks.itely:1257 (comment) +#. Documentation/user/tweaks.itely:1265 (comment) msgid "Don't print clefs in this staff" msgstr "No imprimir la clave en este pentagrama" -#. Documentation/user/tweaks.itely:1259 (comment) +#. Documentation/user/tweaks.itely:1267 (comment) msgid "Don't print time signatures in this staff" msgstr "No imprimir el compás en este pentagrama" -#. Documentation/user/tweaks.itely:1320 (comment) +#. Documentation/user/tweaks.itely:1328 (comment) msgid "Reduce all font sizes by ~24%" msgstr "Reducir el tamaño de la fuente en un 24% aprox." -#. Documentation/user/tweaks.itely:1376 (comment) +#. Documentation/user/tweaks.itely:1384 (comment) msgid "Reduce stem length and line spacing to match" -msgstr "Reducir la longitud de la plica y el espaciado de la línea en coincidencia" +msgstr "" +"Reducir la longitud de la plica y el espaciado de la línea en coincidencia" -#. Documentation/user/tweaks.itely:1750 (comment) -#. Documentation/user/tweaks.itely:1811 (comment) +#. Documentation/user/tweaks.itely:1758 (comment) +#. Documentation/user/tweaks.itely:1819 (comment) msgid "Set details for later Text Spanner" msgstr "Establecer ajustes para el extensor de texto ulterior" -#. Documentation/user/tweaks.itely:1753 (comment) -#. Documentation/user/tweaks.itely:1814 (comment) +#. Documentation/user/tweaks.itely:1761 (comment) +#. Documentation/user/tweaks.itely:1822 (comment) msgid "Place dynamics above staff" msgstr "Situar la dinámica por encima" # fuzzy. FVD -#. Documentation/user/tweaks.itely:1755 (comment) -#. Documentation/user/tweaks.itely:1818 (comment) +#. Documentation/user/tweaks.itely:1763 (comment) +#. Documentation/user/tweaks.itely:1826 (comment) msgid "Start Ottava Bracket" msgstr "Inicio del corchete de octava" -#. Documentation/user/tweaks.itely:1758 (comment) -#. Documentation/user/tweaks.itely:1765 (comment) -#. Documentation/user/tweaks.itely:1821 (comment) -#. Documentation/user/tweaks.itely:1828 (comment) +#. Documentation/user/tweaks.itely:1766 (comment) +#. Documentation/user/tweaks.itely:1773 (comment) +#. Documentation/user/tweaks.itely:1829 (comment) +#. Documentation/user/tweaks.itely:1836 (comment) msgid "Add Dynamic Text" msgstr "Añadir indicación dinámica textual" -#. Documentation/user/tweaks.itely:1760 (comment) -#. Documentation/user/tweaks.itely:1823 (comment) +#. Documentation/user/tweaks.itely:1768 (comment) +#. Documentation/user/tweaks.itely:1831 (comment) msgid "Add Dynamic Line Spanner" msgstr "Añadir indicación dinámica de extensión de línea" -#. Documentation/user/tweaks.itely:1762 (comment) -#. Documentation/user/tweaks.itely:1825 (comment) +#. Documentation/user/tweaks.itely:1770 (comment) +#. Documentation/user/tweaks.itely:1833 (comment) msgid "Add Text Script" msgstr "Guiones de texto" -#. Documentation/user/tweaks.itely:1767 (comment) -#. Documentation/user/tweaks.itely:1830 (comment) +#. Documentation/user/tweaks.itely:1775 (comment) +#. Documentation/user/tweaks.itely:1838 (comment) msgid "Stop Ottava Bracket" msgstr "Detener el corchete de octava" -#. Documentation/user/tweaks.itely:1816 (comment) +#. Documentation/user/tweaks.itely:1824 (comment) msgid "Place following Ottava Bracket below Text Spanners" -msgstr "Situar el corchete de octava ulterior por debajo de los extensores de texto" +msgstr "" +"Situar el corchete de octava ulterior por debajo de los extensores de texto" -#. Documentation/user/tweaks.itely:1872 (comment) +#. Documentation/user/tweaks.itely:1880 (comment) msgid "Cause notes to space out to accommodate text" msgstr "Ocasionar que las notas se espacíen para adecuarse al texto" -#. Documentation/user/tweaks.itely:1890 (comment) +#. Documentation/user/tweaks.itely:1898 (comment) msgid "This markup is short enough to fit without collision" msgstr "Este marcado es corto y cabe sin colisionar" -#. Documentation/user/tweaks.itely:1894 (comment) +#. Documentation/user/tweaks.itely:1902 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "Este es muy largo y se desplaza hacia arriba" -#. Documentation/user/tweaks.itely:1898 (comment) -#. Documentation/user/tweaks.itely:1903 (comment) +#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1911 (comment) msgid "Turn off collision avoidance" msgstr "Desactivar el detector de colisiones" -#. Documentation/user/tweaks.itely:1905 (comment) +#. Documentation/user/tweaks.itely:1913 (comment) msgid "and turn on textLengthOn" msgstr "y activar textLengthOn" -#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1914 (comment) msgid "Spaces at end are honored" msgstr "Los espacios al final se respetan" -#. Documentation/user/tweaks.itely:2009 (comment) +#. Documentation/user/tweaks.itely:2017 (comment) msgid "Extend width by 1 staff space" msgstr "Aumentar la anchura en un espacio de pentagrama" -#. Documentation/user/tweaks.itely:2275 (comment) +#. Documentation/user/tweaks.itely:2283 (comment) msgid "This will not work, see below:" msgstr "Esto no va a funcionar, véase más abajo:" -#. Documentation/user/tweaks.itely:2279 (comment) +#. Documentation/user/tweaks.itely:2287 (comment) msgid "This works:" msgstr "Esto sí funciona:" -#. Documentation/user/tweaks.itely:2324 (variable) +#. Documentation/user/tweaks.itely:2332 (variable) msgid "naturalplusflat" msgstr "becuadro_y_bemol" -#. Documentation/user/tweaks.itely:2359 (comment) +#. Documentation/user/tweaks.itely:2367 (comment) msgid "Extend width by 1 unit" msgstr "Aumentar la anchura en una unidad" -#. Documentation/user/tweaks.itely:2361 (comment) +#. Documentation/user/tweaks.itely:2369 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "Alinear los matices a dos unidades por encima del pentagrama" -#. Documentation/user/tweaks.itely:2639 (variable) -#. Documentation/user/tweaks.itely:2690 (variable) -#. Documentation/user/tweaks.itely:2752 (variable) -#. Documentation/user/tweaks.itely:2823 (variable) -#. Documentation/user/tweaks.itely:2885 (variable) -#. Documentation/user/tweaks.itely:2940 (variable) +#. Documentation/user/tweaks.itely:2647 (variable) +#. Documentation/user/tweaks.itely:2698 (variable) +#. Documentation/user/tweaks.itely:2760 (variable) +#. Documentation/user/tweaks.itely:2831 (variable) +#. Documentation/user/tweaks.itely:2893 (variable) +#. Documentation/user/tweaks.itely:2948 (variable) msgid "rhMusic" msgstr "Musica_m_der" -#. Documentation/user/tweaks.itely:2644 (comment) -#. Documentation/user/tweaks.itely:2695 (comment) -#. Documentation/user/tweaks.itely:2759 (comment) -#. Documentation/user/tweaks.itely:2832 (comment) -#. Documentation/user/tweaks.itely:2894 (comment) +#. Documentation/user/tweaks.itely:2652 (comment) +#. Documentation/user/tweaks.itely:2703 (comment) +#. Documentation/user/tweaks.itely:2767 (comment) +#. Documentation/user/tweaks.itely:2840 (comment) +#. Documentation/user/tweaks.itely:2902 (comment) msgid "Start polyphonic section of four voices" msgstr "Inicio de la sección polifónica de cuatro voces" -#. Documentation/user/tweaks.itely:2657 (variable) -#. Documentation/user/tweaks.itely:2708 (variable) -#. Documentation/user/tweaks.itely:2772 (variable) -#. Documentation/user/tweaks.itely:2847 (variable) -#. Documentation/user/tweaks.itely:2911 (variable) -#. Documentation/user/tweaks.itely:2968 (variable) +#. Documentation/user/tweaks.itely:2665 (variable) +#. Documentation/user/tweaks.itely:2716 (variable) +#. Documentation/user/tweaks.itely:2780 (variable) +#. Documentation/user/tweaks.itely:2855 (variable) +#. Documentation/user/tweaks.itely:2919 (variable) +#. Documentation/user/tweaks.itely:2976 (variable) msgid "lhMusic" msgstr "Muslca_m_izq" -#. Documentation/user/tweaks.itely:2898 (comment) -#. Documentation/user/tweaks.itely:2955 (comment) +#. Documentation/user/tweaks.itely:2906 (comment) +#. Documentation/user/tweaks.itely:2963 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" "Sacar el Do blanca de la columna principal de notas para que la fusión " "funcione" -#. Documentation/user/tweaks.itely:2901 (comment) -#. Documentation/user/tweaks.itely:2958 (comment) +#. Documentation/user/tweaks.itely:2909 (comment) +#. Documentation/user/tweaks.itely:2966 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "La plica del Re blanca debe estar hacia abajo para permitir la fusión" -#. Documentation/user/tweaks.itely:2953 (comment) +#. Documentation/user/tweaks.itely:2961 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "Recolocar el Do blanca a la derecha de la nota fundida" -#. Documentation/user/tweaks.itely:3081 (comment) -#. Documentation/user/tweaks.itely:3100 (comment) +#. Documentation/user/tweaks.itely:3089 (comment) +#. Documentation/user/tweaks.itely:3108 (comment) msgid "Visible tempo marking" msgstr "Indicación metronómica visible" -#. Documentation/user/tweaks.itely:3085 (comment) -#. Documentation/user/tweaks.itely:3104 (comment) +#. Documentation/user/tweaks.itely:3093 (comment) +#. Documentation/user/tweaks.itely:3112 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "Indicación metronómica invisible para prolongar el calderón en el MIDI" -#. Documentation/user/tweaks.itely:3088 (comment) -#. Documentation/user/tweaks.itely:3107 (comment) +#. Documentation/user/tweaks.itely:3096 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) msgid "New tempo for next section" msgstr "Tempo nuevo para la sección siguiente" -#. Documentation/user/tweaks.itely:3151 (variable) +#. Documentation/user/tweaks.itely:3159 (variable) msgid "emphasize" msgstr "enfatizar" -#. Documentation/user/tweaks.itely:3155 (variable) +#. Documentation/user/tweaks.itely:3163 (variable) msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3161 (variable) +#. Documentation/user/tweaks.itely:3169 (variable) msgid "SopranoMusic" msgstr "musicaSoprano" -#. Documentation/user/tweaks.itely:3377 (comment) +#. Documentation/user/tweaks.itely:3385 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Truco para obtener color a partir del procedimiento color-notehead" @@ -2436,7 +2471,8 @@ msgstr "la propiedad padding (relleno)" #. @subheading in Documentation/user/tweaks.itely #. @subheading in Documentation/es/user/tweaks.itely msgid "left-padding and right-padding" -msgstr "left-padding y right-padding (relleno por la izquierda y por la derecha)" +msgstr "" +"left-padding y right-padding (relleno por la izquierda y por la derecha)" #. @subheading in Documentation/user/tweaks.itely #. @subheading in Documentation/es/user/tweaks.itely @@ -2551,7 +2587,7 @@ msgid "dolce" msgstr "dolce" #. Documentation/user/working.itely:227 (variable) -#. Documentation/user/working.itely:273 (variable) +#. Documentation/user/working.itely:276 (variable) #. Documentation/user/scheme-tutorial.itely:235 (variable) #. Documentation/user/programming-interface.itely:100 (variable) msgid "padText" @@ -2561,11 +2597,11 @@ msgstr "textoRelleno" msgid "fthenp" msgstr "f_luego_p" -#. Documentation/user/working.itely:310 (variable) +#. Documentation/user/working.itely:313 (variable) msgid "mpdolce" msgstr "mpdolce" -#. Documentation/user/working.itely:312 (variable) +#. Documentation/user/working.itely:315 (variable) #. Documentation/user/scheme-tutorial.itely:256 (variable) #. Documentation/user/programming-interface.itely:134 (variable) msgid "tempoMark" @@ -2584,6 +2620,8 @@ msgstr "Trabajar en proyectos de LilyPond" #. @node in Documentation/user/working.itely #. @section in Documentation/user/working.itely +#. @node in Documentation/fr/user/working.itely +#. @section in Documentation/fr/user/working.itely msgid "Suggestions for writing LilyPond input files" msgstr "Sugerencias para escribir archivos de entrada de LilyPond" @@ -2910,6 +2948,7 @@ msgid "Texinfo" msgstr "Texinfo" #. @appendixsubsec in Documentation/user/templates.itely +#. @appendixsubsec in Documentation/fr/user/templates.itely #. @appendixsubsec in Documentation/es/user/templates.itely msgid "xelatex" msgstr "xelatex" @@ -2931,6 +2970,8 @@ msgstr "Tutorial de Scheme" #. @node in Documentation/user/scheme-tutorial.itely #. @appendixsec in Documentation/user/scheme-tutorial.itely +#. @node in Documentation/fr/user/scheme-tutorial.itely +#. @appendixsec in Documentation/fr/user/scheme-tutorial.itely #. @node in Documentation/es/user/scheme-tutorial.itely #. @appendixsec in Documentation/es/user/scheme-tutorial.itely msgid "Tweaking with Scheme" @@ -3025,6 +3066,7 @@ msgid "Running requirements" msgstr "Requisitos para la ejecución" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Requirements for building documentation" msgstr "Requisitos para construir la documentación" @@ -3050,18 +3092,22 @@ msgid "Compiling for multiple platforms" msgstr "Compilar para distintas plataformas" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Compiling outside the source tree" msgstr "Compilar fuera del árbol del código fuente" #. @node in Documentation/user/install.itely #. @subsection in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/es/user/install.itely -#. @unnumberedsubsubsec in Documentation/de/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @subsection in Documentation/de/user/install.itely msgid "Building documentation" msgstr "Construir la documentación" #. @node in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Commands for building documentation" msgstr "Instrucciones para construir la documentación" @@ -3070,7 +3116,7 @@ msgstr "Instrucciones para construir la documentación" #. @node in Documentation/es/user/install.itely #. @subsection in Documentation/es/user/install.itely #. @node in Documentation/de/user/install.itely -#. @subsection in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Building documentation without compiling LilyPond" msgstr "Construir la documentación sin compilar LilyPond" @@ -3217,6 +3263,8 @@ msgstr "TextMate" #. @node in Documentation/user/setup.itely #. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely msgid "LilyKDE" msgstr "LilyKDE" @@ -3266,8 +3314,11 @@ msgstr "Utilización desde la línea de órdenes" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Invoking lilypond" msgstr "Invocar a LilyPond" @@ -3275,10 +3326,13 @@ msgstr "Invocar a LilyPond" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely #. @subheading in Documentation/user/lilypond-book.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely #. @subheading in Documentation/fr/user/lilypond-book.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely #. @subheading in Documentation/es/user/lilypond-book.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely #. @subheading in Documentation/de/user/lilypond-book.itely msgid "Command line options" @@ -3286,8 +3340,11 @@ msgstr "Opciones de la línea de órdenes" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Environment variables" msgstr "Variables de entorno" @@ -3654,7 +3711,7 @@ msgstr "Índice de instrucciones de LilyPond" msgid "Musical notation" msgstr "Notación musical" -#. Documentation/user/pitches.itely:615 (variable) +#. Documentation/user/pitches.itely:651 (variable) #. Documentation/user/input.itely:997 (variable) #. Documentation/user/input.itely:1016 (variable) #. Documentation/user/input.itely:1053 (variable) @@ -3662,15 +3719,15 @@ msgstr "Notación musical" msgid "music" msgstr "musica" -#. Documentation/user/pitches.itely:979 (comment) +#. Documentation/user/pitches.itely:1027 (comment) msgid "not strictly necessary, but a good reminder" msgstr "no es imprescindible pero es bueno recordarlo" -#. Documentation/user/pitches.itely:1068 (variable) +#. Documentation/user/pitches.itely:1119 (variable) msgid "musicA" msgstr "musicaA" -#. Documentation/user/pitches.itely:1082 (variable) +#. Documentation/user/pitches.itely:1133 (variable) msgid "musicB" msgstr "musicaB" @@ -4009,7 +4066,8 @@ msgstr "Establecer longitud de barra del subgrupo a semicorchea" #. Documentation/user/rhythms.itely:1615 (comment) msgid "end 1/16 beams for all time signatures at the 1/16 moment" -msgstr "finalizar barras de semicorchea para todos los compases en el momento 1/16" +msgstr "" +"finalizar barras de semicorchea para todos los compases en el momento 1/16" #. Documentation/user/rhythms.itely:1619 (comment) msgid "end 1/32 beams for all time signatures at the 1/16 moment" @@ -4017,11 +4075,15 @@ msgstr "finalizar barras de fusa para todos los compases en el momento 1/16" #. Documentation/user/rhythms.itely:1629 (comment) msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" -msgstr "finalizar barras para cualquier duración en el compás de 5/8, en el momento 2/8" +msgstr "" +"finalizar barras para cualquier duración en el compás de 5/8, en el momento " +"2/8" #. Documentation/user/rhythms.itely:1658 (comment) msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" -msgstr "deshacer regla de finalizar barras de semicorchea en compás 4/4 en el momento 1/4" +msgstr "" +"deshacer regla de finalizar barras de semicorchea en compás 4/4 en el " +"momento 1/4" #. Documentation/user/rhythms.itely:1671 (comment) msgid "this won't revert it!" @@ -4047,7 +4109,8 @@ msgstr "Imprimir el número de compás cada dos compases" #. Documentation/user/rhythms.itely:2114 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" -msgstr "No poner números de compás al final de la línea, pero sí en otros lugares" +msgstr "" +"No poner números de compás al final de la línea, pero sí en otros lugares" #. Documentation/user/rhythms.itely:2118 (comment) #. Documentation/user/rhythms.itely:2144 (comment) @@ -4150,6 +4213,7 @@ msgid "Scaling durations" msgstr "Escalar las duraciones" #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely msgid "laissez vibrer" msgstr "laissez vibrer" @@ -4396,23 +4460,37 @@ msgstr "Alinear con una cadenza" msgid "Time administration" msgstr "Gestión del tiempo" -#. Documentation/user/expressive.itely:337 (variable) -#. Documentation/user/expressive.itely:383 (variable) +#. Documentation/user/expressive.itely:390 (variable) +#. Documentation/user/expressive.itely:458 (variable) msgid "moltoF" msgstr "moltoF" -#. Documentation/user/expressive.itely:353 (variable) -msgid "roundf" +#. Documentation/user/expressive.itely:411 (variable) +#. Documentation/user/expressive.itely:441 (variable) +#, fuzzy +msgid "roundF" msgstr "f_redondo" -#. Documentation/user/expressive.itely:355 (variable) -msgid "boxf" +#. Documentation/user/expressive.itely:413 (variable) +#. Documentation/user/expressive.itely:445 (variable) +#, fuzzy +msgid "boxF" msgstr "f_caja" -#. Documentation/user/expressive.itely:370 (variable) +#. Documentation/user/expressive.itely:428 (variable) msgid "sfzp" msgstr "sfzp" +#. Documentation/user/expressive.itely:446 (variable) +#, fuzzy +msgid "roundFdynamic" +msgstr "matices dinámicos" + +#. Documentation/user/expressive.itely:447 (variable) +#, fuzzy +msgid "boxFdynamic" +msgstr "matices dinámicos" + #. @node in Documentation/user/expressive.itely #. @section in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely @@ -4437,6 +4515,8 @@ msgstr "Adosado a las notas" #. @node in Documentation/user/expressive.itely #. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely msgid "Articulations and ornamentations" @@ -4464,8 +4544,8 @@ msgstr "portato" #. @node in Documentation/user/expressive.itely #. @unnumberedsubsubsec in Documentation/user/expressive.itely -#. @node in Documentation/fr/user/text.itely -#. @unnumberedsubsubsec in Documentation/fr/user/text.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely #. @node in Documentation/de/user/expressive.itely @@ -4576,7 +4656,7 @@ msgstr "Trinos" msgid "trill" msgstr "trino" -#. Documentation/user/repeats.itely:257 (variable) +#. Documentation/user/repeats.itely:298 (variable) msgid "voltaAdLib" msgstr "voltaAdLib" @@ -4787,47 +4867,40 @@ msgstr "parte" msgid "Writing music in parallel" msgstr "Escribir música en paralelo" -#. Documentation/user/staff.itely:569 (comment) -msgid "Set here the overrides for the staff " -msgstr "Establecer aquí las sobreescrituras para el pentagrama" - -#. Documentation/user/staff.itely:573 (comment) -msgid "Revert to the default" -msgstr "Devolver al valor predeterminado" - -#. Documentation/user/staff.itely:650 (comment) +#. Documentation/user/staff.itely:536 (comment) msgid "No time signature in the ossia staff" msgstr "El ossia no tiene compás" -#. Documentation/user/staff.itely:783 (comment) +#. Documentation/user/staff.itely:678 (comment) msgid "To use the setting globally, uncomment the following line:" msgstr "" "Para emplear el ajuste globalmente, quite el comentario de la línea " "siguiente:" -#. Documentation/user/staff.itely:784 (comment) +#. Documentation/user/staff.itely:679 (comment) msgid "\\override VerticalAxisGroup #'remove-first = ##t" msgstr "\\override VerticalAxisGroup #'remove-first = ##t" -#. Documentation/user/staff.itely:792 (comment) -msgid "To use the setting globally, comment this line, uncomment the line above" +#. Documentation/user/staff.itely:687 (comment) +msgid "" +"To use the setting globally, comment this line, uncomment the line above" msgstr "" "Para emplear el ajuste globalmente, comente esta línea, descomente la " "anterior" -#. Documentation/user/staff.itely:1185 (variable) +#. Documentation/user/staff.itely:1079 (variable) msgid "smaller" msgstr "menor" -#. Documentation/user/staff.itely:1200 (comment) +#. Documentation/user/staff.itely:1094 (comment) msgid "setup a context for cue notes." msgstr "preparar un contexto para las notas guía" -#. Documentation/user/staff.itely:1241 (variable) +#. Documentation/user/staff.itely:1135 (variable) msgid "picc" msgstr "fltin" -#. Documentation/user/staff.itely:1249 (variable) +#. Documentation/user/staff.itely:1143 (variable) msgid "cbsn" msgstr "cbjo" @@ -4971,10 +5044,13 @@ msgstr "indicación metronómica" #. @unnumberedsubsubsec in Documentation/user/input.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely #. @node in Documentation/es/user/staff.itely #. @subsubsection in Documentation/es/user/staff.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely #. @node in Documentation/de/user/staff.itely #. @unnumberedsubsubsec in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Instrument names" msgstr "Nombres de instrumentos" @@ -5000,9 +5076,10 @@ msgstr "Citar otras voces" msgid "Formatting cue notes" msgstr "Formateo de las notas de aviso" -#. Documentation/user/editorial.itely:288 (comment) +#. Documentation/user/editorial.itely:323 (comment) msgid "this is deliberate nonsense; note that the stems remain black" -msgstr "esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" +msgstr "" +"esto no tiene sentido, intencionalmente. Observe que las plicas siguen negras" #. @node in Documentation/user/editorial.itely #. @section in Documentation/user/editorial.itely @@ -5106,7 +5183,7 @@ msgstr "Fuera del pentagrama" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5117,7 +5194,7 @@ msgstr "Globos de ayuda" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5127,8 +5204,8 @@ msgstr "Líneas de rejilla" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5136,7 +5213,7 @@ msgstr "Líneas de rejilla" msgid "Analysis brackets" msgstr "Corchetes de análisis" -#. Documentation/user/text.itely:403 (variable) +#. Documentation/user/text.itely:410 (variable) msgid "allegro" msgstr "allegro" @@ -5231,7 +5308,9 @@ msgstr "Introducción al marcado de texto" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely -msgid "Common markup commands" +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely +msgid "Selecting font and font size" msgstr "Instrucciones de marcado de texto más usuales" # fuzzy. FVD @@ -5239,6 +5318,8 @@ msgstr "Instrucciones de marcado de texto más usuales" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Text alignment" msgstr "Alineación de texto" @@ -5246,6 +5327,8 @@ msgstr "Alineación de texto" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Graphic notation inside markup" msgstr "Notación gráfica dentro de elementos de marcado" @@ -5253,6 +5336,8 @@ msgstr "Notación gráfica dentro de elementos de marcado" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Music notation inside markup" msgstr "Notación musical dentro de elementos de marcado" @@ -5260,6 +5345,8 @@ msgstr "Notación musical dentro de elementos de marcado" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Multi-page markup" msgstr "Elementos de marcado de varias páginas" @@ -5269,6 +5356,8 @@ msgstr "Elementos de marcado de varias páginas" #. @subsection in Documentation/fr/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsection in Documentation/de/user/text.itely msgid "Fonts" msgstr "Tipografías" @@ -5276,6 +5365,8 @@ msgstr "Tipografías" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Entire document fonts" msgstr "Fuentes tipográficas del documento completo" @@ -5283,6 +5374,8 @@ msgstr "Fuentes tipográficas del documento completo" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Single entry fonts" msgstr "Fuentes de un solo elemento" @@ -5297,48 +5390,61 @@ msgstr "Fuentes de un solo elemento" msgid "Specialist notation" msgstr "Notación especializada" -#. Documentation/user/vocal.itely:800 (variable) +#. Documentation/user/vocal.itely:450 (comment) +msgid "not recommended: left aligns syllables " +msgstr "" + +#. Documentation/user/vocal.itely:453 (comment) +#, fuzzy +msgid "wrong: durations needed" +msgstr "Escalar las duraciones" + +#. Documentation/user/vocal.itely:456 (comment) +msgid "correct" +msgstr "" + +#. Documentation/user/vocal.itely:786 (variable) msgid "voice" msgstr "voz" -#. Documentation/user/vocal.itely:807 (variable) +#. Documentation/user/vocal.itely:793 (variable) msgid "lyr" msgstr "letra" -#. Documentation/user/vocal.itely:1045 (comment) +#. Documentation/user/vocal.itely:1056 (comment) msgid "applies to " msgstr "se aplica a" -#. Documentation/user/vocal.itely:1214 (comment) +#. Documentation/user/vocal.itely:1225 (comment) msgid "moves the column off the left margin; " msgstr "aleja la columna del margen izquierdo; " -#. Documentation/user/vocal.itely:1215 (comment) +#. Documentation/user/vocal.itely:1226 (comment) msgid "can be removed if space on the page is tight" msgstr "se puede quitar si el espaciado de la página es apretado" -#. Documentation/user/vocal.itely:1223 (comment) -#. Documentation/user/vocal.itely:1241 (comment) +#. Documentation/user/vocal.itely:1234 (comment) +#. Documentation/user/vocal.itely:1252 (comment) msgid "adds vertical spacing between verses" msgstr "añade espaciado vertical entre estrofas" -#. Documentation/user/vocal.itely:1231 (comment) +#. Documentation/user/vocal.itely:1242 (comment) msgid "adds horizontal spacing between columns; " msgstr "añade espaciado horizontal entre columnas; " -#. Documentation/user/vocal.itely:1232 (comment) +#. Documentation/user/vocal.itely:1243 (comment) msgid "if they are still too close, add more pairs " msgstr "si aún están muy juntas, añada más parejas " -#. Documentation/user/vocal.itely:1233 (comment) +#. Documentation/user/vocal.itely:1244 (comment) msgid "until the result looks good" msgstr "hasta que el resultado resulte adecuado" -#. Documentation/user/vocal.itely:1249 (comment) +#. Documentation/user/vocal.itely:1260 (comment) msgid "gives some extra space on the right margin; " msgstr "aplica más separación en el margen derecho; " -#. Documentation/user/vocal.itely:1250 (comment) +#. Documentation/user/vocal.itely:1261 (comment) msgid "can be removed if page space is tight" msgstr "se puede quitar si el espaciado de la página es apretado" @@ -5359,6 +5465,8 @@ msgstr "Música vocal" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Common notation for vocals" msgstr "Notación usual para voces" @@ -5368,6 +5476,8 @@ msgstr "Notación usual para voces" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "References for vocal music" msgstr "Referencias para música vocal" @@ -5410,6 +5520,8 @@ msgstr "Duración automática de las sílabas" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Manual syllable durations" msgstr "Duración manual de las sílabas" @@ -5419,6 +5531,8 @@ msgstr "Duración manual de las sílabas" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple syllables to one note" msgstr "Varias sílabas sobre una nota" @@ -5428,6 +5542,8 @@ msgstr "Varias sílabas sobre una nota" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple notes to one syllable" msgstr "Varias notas sobre una sílaba" @@ -5437,6 +5553,8 @@ msgstr "Varias notas sobre una sílaba" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Skipping notes" msgstr "Saltar notas" @@ -5457,6 +5575,8 @@ msgstr "Líneas de extensión y guiones" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Lyrics and repeats" msgstr "Letras y repeticiones" @@ -5466,6 +5586,8 @@ msgstr "Letras y repeticiones" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Placement of lyrics" msgstr "Colocación de la letra" @@ -5497,6 +5619,8 @@ msgstr "Letra independiente de las notas" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Chants" msgstr "Cantos" @@ -5506,6 +5630,8 @@ msgstr "Cantos" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Spacing out syllables" msgstr "Espaciado de las sílabas" @@ -5515,6 +5641,8 @@ msgstr "Espaciado de las sílabas" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Centering lyrics between staves" msgstr "Centrado de la letra entre pentagramas" @@ -5524,6 +5652,8 @@ msgstr "Centrado de la letra entre pentagramas" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Stanzas" msgstr "Versos" @@ -5544,6 +5674,8 @@ msgstr "Añadir números de verso" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding dynamics marks to stanzas" msgstr "Añadir expresiones dinámicas a los versos" @@ -5553,6 +5685,8 @@ msgstr "Añadir expresiones dinámicas a los versos" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding singers' names to stanzas" msgstr "Añadir el nombre de los cantantes a los versos" @@ -5562,16 +5696,20 @@ msgstr "Añadir el nombre de los cantantes a los versos" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Stanzas with different rhythms" msgstr "Versos con ritmos distintos" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Ignoring melismata" msgstr "Ignorar los melismas" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Switching to an alternative melody" msgstr "Cambio a una melodía alternativa" @@ -5597,19 +5735,19 @@ msgstr "Imprimir los versos al final" msgid "Printing stanzas at the end in multiple columns" msgstr "Imprimir los versos al final en varias columnas" -#. Documentation/user/keyboards.itely:159 (comment) +#. Documentation/user/keyboards.itely:175 (comment) msgid "keep staff alive" msgstr "mantener vivo el pentagrama" -#. Documentation/user/keyboards.itely:333 (comment) +#. Documentation/user/keyboards.itely:373 (comment) msgid "stems may overlap the other staff" msgstr "las plicas pueden superponerse al otro pentagrama" -#. Documentation/user/keyboards.itely:335 (comment) +#. Documentation/user/keyboards.itely:375 (comment) msgid "extend the stems to reach other other staff" msgstr "extender las plicas para que lleguen hasta el otro pentagrama" -#. Documentation/user/keyboards.itely:337 (comment) +#. Documentation/user/keyboards.itely:377 (comment) msgid "do not print extra flags" msgstr "no imprimir corchetes adicionales" @@ -5812,14 +5950,37 @@ msgstr "Instrumentos de cuerda pulsada" msgid "Harp" msgstr "Arpa" -#. Documentation/user/fretted-strings.itely:209 (variable) +#. Documentation/user/fretted-strings.itely:210 (variable) msgid "melodia" msgstr "melodia" -#. Documentation/user/fretted-strings.itely:484 (comment) +#. Documentation/user/fretted-strings.itely:376 (comment) msgid "A chord for ukelele" msgstr "Un acorde de ukelele" +#. Documentation/user/fretted-strings.itely:665 (variable) +#. Documentation/user/fretted-strings.itely:684 (variable) +#. Documentation/user/fretted-strings.itely:713 (variable) +#. Documentation/user/fretted-strings.itely:738 (variable) +#. Documentation/user/fretted-strings.itely:762 (variable) +#. Documentation/user/fretted-strings.itely:798 (variable) +#, fuzzy +msgid "mychords" +msgstr "misAcordes" + +#. Documentation/user/fretted-strings.itely:688 (variable) +#, fuzzy +msgid "mychordlist" +msgstr "misAcordes" + +#. Documentation/user/fretted-strings.itely:785 (comment) +msgid "add a new chord shape" +msgstr "" + +#. Documentation/user/fretted-strings.itely:789 (comment) +msgid "add some new chords based on the power chord shape" +msgstr "" + #. @node in Documentation/user/fretted-strings.itely #. @section in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely @@ -5888,13 +6049,19 @@ msgstr "Tablaturas personalizadas" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -msgid "Automatic fret diagrams" -msgstr "Diagramas de traste automáticos" +msgid "Fret diagram markups" +msgstr "Marcas de diagramas de trastes" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -msgid "Fret diagram markups" -msgstr "Marcas de diagramas de trastes" +#, fuzzy +msgid "Predefined fret diagrams" +msgstr "Diagramas de trastes" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +msgid "Automatic fret diagrams" +msgstr "Diagramas de traste automáticos" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely @@ -5950,13 +6117,13 @@ msgstr "Banjo" msgid "Banjo tablatures" msgstr "Tablaturas de banjo" -#. Documentation/user/percussion.itely:120 (variable) -#. Documentation/user/percussion.itely:300 (variable) +#. Documentation/user/percussion.itely:214 (variable) +#. Documentation/user/percussion.itely:394 (variable) msgid "up" msgstr "arriba" -#. Documentation/user/percussion.itely:121 (variable) -#. Documentation/user/percussion.itely:301 (variable) +#. Documentation/user/percussion.itely:215 (variable) +#. Documentation/user/percussion.itely:395 (variable) msgid "down" msgstr "abajo" @@ -6103,20 +6270,20 @@ msgstr "Definiciones para la gaita" msgid "Bagpipe example" msgstr "Ejemplo de música de gaita" -#. Documentation/user/chords.itely:650 (variable) +#. Documentation/user/chords.itely:651 (variable) msgid "myChords" msgstr "misAcordes" -#. Documentation/user/chords.itely:973 (comment) -#. Documentation/user/chords.itely:994 (comment) +#. Documentation/user/chords.itely:974 (comment) +#. Documentation/user/chords.itely:995 (comment) msgid "Put notes on same Staff as figures" msgstr "Poner las notas en el mismo pentagrama que los números" -#. Documentation/user/chords.itely:1053 (comment) +#. Documentation/user/chords.itely:1054 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "Los extensores aquí son correctos, con el mismo ritmo que el bajo" -#. Documentation/user/chords.itely:1065 (comment) +#. Documentation/user/chords.itely:1066 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Los extensores aquí son incorrectos, aunque la medida es la misma" @@ -6538,41 +6705,93 @@ msgstr "Notación rítmica barroca" #. @node in Documentation/user/world.itely #. @section in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @section in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @section in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @section in Documentation/de/user/world.itely msgid "World music" msgstr "Músicas del mundo" #. @node in Documentation/user/world.itely #. @subsection in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @subsection in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @subsection in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @subsection in Documentation/de/user/world.itely msgid "Arabic music" msgstr "Música árabe" #. @node in Documentation/user/world.itely #. @unnumberedsubsubsec in Documentation/user/world.itely -msgid "Arabic music notation overview" -msgstr "Panorámica de la notación de música árabe" +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "References for Arabic music" +msgstr "Referencias para música árabe" #. @node in Documentation/user/world.itely #. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely msgid "Arabic note names" msgstr "Nombres de nota árabes" #. @node in Documentation/user/world.itely #. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely msgid "Arabic key signatures" msgstr "Armaduras de tonalidad árabes" #. @node in Documentation/user/world.itely #. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely msgid "Arabic time signatures" msgstr "Indicaciones de compás árabes" #. @node in Documentation/user/world.itely -msgid "References for Arabic music" -msgstr "Referencias para música árabe" +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic music example" +msgstr "Ejemplos reales de música" +#. @node in Documentation/user/world.itely #. @unnumberedsubsubsec in Documentation/user/world.itely -msgid "References for arabic music" -msgstr "Referencias para música árabe" +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Further reading" +msgstr "Trucajes adicionales" #. Documentation/user/input.itely:494 (comment) msgid "not printed" @@ -6584,16 +6803,34 @@ msgstr "letraCompleta" #. @node in Documentation/user/input.itely #. @chapter in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @chapter in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @chapter in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @chapter in Documentation/de/user/input.itely msgid "General input and output" msgstr "Entrada y salida generales" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Input structure" msgstr "Estructura del código de entrada" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Structure of a score" msgstr "Estructura de una partitura" @@ -6621,62 +6858,68 @@ msgstr "Estructura del archivo" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Titles and headers" msgstr "Títulos y cabeceras" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating titles" msgstr "Crear títulos" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Custom titles" msgstr "Títulos personalizados" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Reference to page numbers" msgstr "Referencias a números de página" # this is the same translation that babel LaTex package uses . FVD #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Table of contents" msgstr "Índice general" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Working with input files" msgstr "Trabajar sobre los archivos de entrada" @@ -6704,11 +6947,23 @@ msgstr "Distintas ediciones a partir de una misma fuente" #. @node in Documentation/user/input.itely #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Using variables" msgstr "Uso de las variables" #. @node in Documentation/user/input.itely #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Using tags" msgstr "Uso de etiquetas" @@ -6736,11 +6991,23 @@ msgstr "Presentar la notación de LilyPond" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -msgid "Controlling output" -msgstr "Controlar la salida" - -#. @node in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely +msgid "Controlling output" +msgstr "Controlar la salida" + +#. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Extracting fragments of music" msgstr "Extracción de fragmentos de música" @@ -6757,118 +7024,150 @@ msgstr "Saltar la música corregida" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "MIDI output" msgstr "Salida MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating MIDI files" msgstr "Crear archivos MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "MIDI block" msgstr "El bloque MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "What goes into the MIDI output?" msgstr "¿Qué sale por el MIDI?" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Supported in MIDI" msgstr "Contemplado en el MIDI" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Unsupported in MIDI" msgstr "No contemplado en el MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Repeats in MIDI" msgstr "Repeticiones y MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Controlling MIDI dynamics" msgstr "Control de los matices en el MIDI" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Dynamic marks" msgstr "Indicaciones dinámicas" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Overall MIDI volume" msgstr "Volumen maestro MIDI" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Equalizing different instruments (i)" msgstr "Balance entre instrumentos (i)" #. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Equalizing different instruments (ii)" msgstr "Balance entre instrumentos (i)" -#. @node in Documentation/user/input.itely -#. @subsection in Documentation/user/input.itely -msgid "Microtones in MIDI" -msgstr "Microtonos en MIDI" - -#. Documentation/user/spacing.itely:716 (comment) +#. Documentation/user/spacing.itely:684 (comment) msgid "this does nothing" msgstr "esto no hace nada" -#. Documentation/user/spacing.itely:717 (comment) +#. Documentation/user/spacing.itely:685 (comment) msgid "a break here would work" msgstr "un salto aquí funcionaría" -#. Documentation/user/spacing.itely:718 (comment) +#. Documentation/user/spacing.itely:686 (comment) msgid "as does this break" msgstr "como por ejemplo este salto" -#. Documentation/user/spacing.itely:730 (comment) +#. Documentation/user/spacing.itely:698 (comment) msgid "now the break is allowed" msgstr "ahora se permite el salto de línea" -#. Documentation/user/spacing.itely:1492 (comment) +#. Documentation/user/spacing.itely:1460 (comment) msgid "this time the text will be closer to the staff" msgstr "esta vez el texto estará más cerca del pentagrama" -#. Documentation/user/spacing.itely:1494 (comment) +#. Documentation/user/spacing.itely:1462 (comment) msgid "by setting outside-staff-priority to a non-number, " -msgstr "ajustando el valor de outside-staff-priority a algo que no sea un número, " +msgstr "" +"ajustando el valor de outside-staff-priority a algo que no sea un número, " -#. Documentation/user/spacing.itely:1495 (comment) +#. Documentation/user/spacing.itely:1463 (comment) msgid "we disable the automatic collision avoidance" msgstr "desactivamos la evitación automática de colisiones" -#. Documentation/user/spacing.itely:1498 (comment) +#. Documentation/user/spacing.itely:1466 (comment) msgid "now they will collide" msgstr "ahora se producirá la colisión" -#. Documentation/user/spacing.itely:1523 (comment) +#. Documentation/user/spacing.itely:1491 (comment) msgid "the markup is too close to the following note" msgstr "el marcado está demasiado cerca de la nota siguiente" -#. Documentation/user/spacing.itely:1526 (comment) +#. Documentation/user/spacing.itely:1494 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "ajustar outside-staff-horizontal-padding corrige esto" @@ -6949,17 +7248,6 @@ msgstr "Establecer el tamaño del pentagrama" msgid "Score layout" msgstr "Disposición de la partitura" -#. @node in Documentation/user/spacing.itely -#. @section in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @section in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @section in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @section in Documentation/de/user/spacing.itely -msgid "Displaying spacing" -msgstr "Mostrar el espaciado" - #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely #. @node in Documentation/fr/user/spacing.itely @@ -7188,16 +7476,48 @@ msgstr "Notación proporcional" #. @node in Documentation/fr/user/tweaks.itely #. @section in Documentation/fr/user/tweaks.itely #. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely +#. @section in Documentation/fr/user/spacing.itely #. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely +#. @section in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/tweaks.itely #. @section in Documentation/de/user/tweaks.itely #. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely +#. @section in Documentation/de/user/spacing.itely msgid "Fitting music onto fewer pages" msgstr "Encajar la música en menos páginas" +#. @node in Documentation/user/spacing.itely +#. @subsection in Documentation/user/spacing.itely +#. @node in Documentation/fr/user/spacing.itely +#. @subsection in Documentation/fr/user/spacing.itely +#. @node in Documentation/es/user/spacing.itely +#. @subsection in Documentation/es/user/spacing.itely +#. @node in Documentation/de/user/spacing.itely +#. @subsection in Documentation/de/user/spacing.itely +msgid "Displaying spacing" +msgstr "Mostrar el espaciado" + +#. @node in Documentation/user/spacing.itely +#. @subsection in Documentation/user/spacing.itely +#. @node in Documentation/fr/user/spacing.itely +#. @subsection in Documentation/fr/user/spacing.itely +#. @node in Documentation/es/user/spacing.itely +#. @subsection in Documentation/es/user/spacing.itely +#. @node in Documentation/de/user/spacing.itely +#. @subsection in Documentation/de/user/spacing.itely +#, fuzzy +msgid "Changing spacing" +msgstr "Cambiar el espaciado horizontal" + +#. Documentation/user/changing-defaults.itely:1947 (comment) +msgid "Remove bar line at the end of the current line" +msgstr "" + +#. Documentation/user/changing-defaults.itely:1993 (comment) +#, fuzzy +msgid "Try to remove all key signatures" +msgstr "Armaduras de tonalidad árabes" + #. @node in Documentation/user/changing-defaults.itely #. @chapter in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -7220,6 +7540,34 @@ msgstr "Cambiar los valores por omisión" msgid "Interpretation contexts" msgstr "Contextos de interpretación" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Score - the master of all contexts" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Top-level contexts - staff containers" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Intermediate-level contexts - staves" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Bottom-level contexts - voices" +msgstr "" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -7268,6 +7616,8 @@ msgstr "Alinear los contextos" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Explaining the Internals Reference" msgstr "Explicación del Manual de referencia de funcionamiento interno" @@ -7309,6 +7659,8 @@ msgstr "Determinar la propiedad del grob" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Naming conventions" msgstr "Convenciones de nombres" @@ -7316,6 +7668,8 @@ msgstr "Convenciones de nombres" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Modifying properties" msgstr "Modificar las propiedades" @@ -7323,16 +7677,20 @@ msgstr "Modificar las propiedades" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Overview of modifying properties" msgstr "Panorámica de la modificación de las propiedades" #. @node in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely msgid "The \\set command" msgstr "La instrucción \\set" #. @subsection in Documentation/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\set} command" msgstr "La instrucción @code{\\set}" @@ -7346,7 +7704,7 @@ msgstr "La instrucción \\override" #. @subsection in Documentation/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\override} command" msgstr "La instrucción @code{\\override}" @@ -7379,6 +7737,8 @@ msgstr "Objetos conectados con la entrada" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Useful concepts and properties" msgstr "Conceptos y propiedades útiles" @@ -7386,6 +7746,8 @@ msgstr "Conceptos y propiedades útiles" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Input modes" msgstr "Modos de entrada" @@ -7393,6 +7755,8 @@ msgstr "Modos de entrada" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Direction and placement" msgstr "Dirección y posición" @@ -7400,6 +7764,8 @@ msgstr "Dirección y posición" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Distances and measurements" msgstr "Distancias y medidas" @@ -7408,6 +7774,8 @@ msgstr "Distancias y medidas" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Spanners" msgstr "Objetos de extensión" @@ -7415,6 +7783,8 @@ msgstr "Objetos de extensión" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Common properties" msgstr "Propiedades más usuales" @@ -7427,6 +7797,46 @@ msgstr "Propiedades más usuales" msgid "Controlling visibility of objects" msgstr "Control de la visibilidad de los objetos" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Removing the stencil" +msgstr "Modificación de los sellos" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Making objects transparent" +msgstr "Mover objetos" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Painting objects white" +msgstr "Rotación de objetos" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Using break-visibility" +msgstr "break-visibility (visibilidad en el salto)" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Special considerations" +msgstr "Notación especializada" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely @@ -7440,6 +7850,8 @@ msgstr "Estilos de línea" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Rotating objects" msgstr "Rotación de objetos" @@ -7447,6 +7859,8 @@ msgstr "Rotación de objetos" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Aligning objects" msgstr "Alineación de objetos" @@ -7454,6 +7868,8 @@ msgstr "Alineación de objetos" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Advanced tweaks" msgstr "Trucos avanzados" @@ -7472,6 +7888,8 @@ msgstr "Agrupación vertical de objetos gráficos" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying ends of spanners" msgstr "Modificación de los extremos de los extensores" @@ -7479,13 +7897,21 @@ msgstr "Modificación de los extremos de los extensores" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying stencils" msgstr "Modificación de los sellos" +#. @node in Documentation/user/changing-defaults.itely +#. @subsection in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Modifying shapes" +msgstr "Modificación de los sellos" + #. @node in Documentation/user/changing-defaults.itely #. @section in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely #. @node in Documentation/de/user/changing-defaults.itely #. @section in Documentation/de/user/changing-defaults.itely msgid "Discussion of specific tweaks" @@ -7493,8 +7919,8 @@ msgstr "Discusión sobre trucos específicos" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "old Contexts explained" msgstr "antiguo Explicación de los contextos" @@ -7815,18 +8241,24 @@ msgstr "Procedimientos de Scheme como propiedades" #. @node in Documentation/user/programming-interface.itely #. @section in Documentation/user/programming-interface.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @section in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "TODO moved into scheme" msgstr "HACER trasladado al apartado sobre scheme" #. @node in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of \\tweak" msgstr "Usar código de Scheme en lugar de \\tweak" #. @subsection in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Usar código de Scheme en lugar de @code{\\tweak}" @@ -7835,8 +8267,10 @@ msgstr "Usar código de Scheme en lugar de @code{\\tweak}" #. @subsection in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Trucos difíciles" @@ -7878,6 +8312,12 @@ msgstr "Carta de nombres de acordes" msgid "Common chord modifiers" msgstr "Modificadores de acorde más usuales" +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +#, fuzzy +msgid "Predefined fretboard diagrams" +msgstr "Instrucciones predefinidas" + #. @node in Documentation/user/notation-appendices.itely #. @appendixsec in Documentation/user/notation-appendices.itely #. @node in Documentation/fr/user/notation-appendices.itely @@ -8033,14 +8473,28 @@ msgstr "GNU LilyPond --- manual de aprendizaje" msgid "Commonly tweaked properties" msgstr "Propiedades trucadas frecuentemente" -#. @subsubheading in Documentation/fr/user/tutorial.itely -#. @subsubheading in Documentation/de/user/tutorial.itely -msgid "Unix" -msgstr "Unix" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Hauteurs" +msgstr "Racimos (clusters)" -#. @rglos in Documentation/fr/user/tutorial.itely -msgid "fourth" -msgstr "cuarta" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Durées et rythme" +msgstr "" + +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Silences" +msgstr "Líneas" + +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Métrique" +msgstr "" + +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Tout ensemble" +msgstr "Conjuntos vocales" #. @node in Documentation/fr/user/tutorial.itely #. @subsection in Documentation/fr/user/tutorial.itely @@ -8049,35 +8503,9 @@ msgstr "cuarta" msgid "Working on text files" msgstr "Trabajar sobre archivos de texto" -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "How to read the tutorial" -msgstr "Cómo leer el tutorial" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Relative note names" -msgstr "Nombres de nota relativos" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Piano staves" -msgstr "Sistemas de piano" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Printing lyrics" -msgstr "Impresión de la letra" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "A lead sheet" -msgstr "Hojas guía de acordes" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Organizing pieces with identifiers" -msgstr "Organizar las piezas mediante identificadores" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Exemples cliquables" +msgstr "" #. @node in Documentation/fr/user/fundamental.itely #. @section in Documentation/fr/user/fundamental.itely @@ -8102,15 +8530,6 @@ msgstr "Trucos comunes" msgid "Default files" msgstr "Archivos por omisión" -#. @node in Documentation/fr/user/working.itely -#. @section in Documentation/fr/user/working.itely -#. @node in Documentation/es/user/working.itely -#. @section in Documentation/es/user/working.itely -#. @node in Documentation/de/user/working.itely -#. @section in Documentation/de/user/working.itely -msgid "Suggestions for writing LilyPond files" -msgstr "Sugerencias para escribir archivos de LilyPond" - #. @node in Documentation/fr/user/working.itely #. @subsection in Documentation/fr/user/working.itely #. @node in Documentation/es/user/working.itely @@ -8208,13 +8627,6 @@ msgstr "Comprobación del número de compás" msgid "Proportional notation (introduction)" msgstr "Notación proporcional (introducción)" -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely -#. @node in Documentation/de/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely -msgid "Laissez vibrer ties" -msgstr "Ligaduras Laissez vibrer" - #. @node in Documentation/fr/user/repeats.itely #. @subsection in Documentation/fr/user/repeats.itely msgid "Writing repeats" @@ -8282,7 +8694,7 @@ msgid "System start delimiters" msgstr "Delimitadores del comienzo de un sistema" #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely msgid "Blank music sheet" msgstr "Papel de música en blanco" @@ -8294,15 +8706,11 @@ msgstr "Extensiones de texto y de línea" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Nested scores" msgstr "Partituras anidadas" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Page wrapping text" msgstr "Textos que saltan de página" @@ -8351,192 +8759,6 @@ msgstr "Digitaciones de la mano derecha" msgid "Guitar tablatures" msgstr "Tablaturas de guitarra" -#. @node in Documentation/fr/user/input.itely -#. @chapter in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @chapter in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @chapter in Documentation/de/user/input.itely -msgid "Input syntax" -msgstr "Sintaxis de escritura" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Input files" -msgstr "Archivos de entrada" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "A single music expression" -msgstr "Una expresión musical única" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Extracting fragments of notation" -msgstr "Extraer fragmentos de notación" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Common syntax issues TODO name?" -msgstr "Consideraciones usuales de la sintaxis" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -msgid "Controlling direction" -msgstr "Control de la dirección" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Distances and measurements MAYBE MOVE" -msgstr "Distancias y medidas" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Other stuffs TODO move?" -msgstr "Otras consideraciones" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "context list FIXME" -msgstr "lista de contextos" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "another thing FIXME" -msgstr "otra cosa" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Input modes FIXME" -msgstr "Modos de entrada" - -#. @node in Documentation/fr/user/non-music.itely -#. @chapter in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @chapter in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @chapter in Documentation/de/user/non-music.itely -msgid "Non-musical notation" -msgstr "Notación no musical" - -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "MIDI instrument names" -msgstr "Nombres de los instrumentos MIDI" - -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "What goes into the MIDI? FIXME" -msgstr "¿Qué hay dentro del MIDI?" - -#. @node in Documentation/fr/user/non-music.itely -#. @unnumberedsubsubsec in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsubsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsubsection in Documentation/de/user/non-music.itely -msgid "Repeats and MIDI" -msgstr "Las repeticiones y el MIDI" - -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely -msgid "other midi" -msgstr "otros asuntos relacionados con el MIDI" - -#. @node in Documentation/fr/user/spacing.itely -#. @section in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @section in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @section in Documentation/de/user/spacing.itely -msgid "Page layout MOVED FROM LM" -msgstr "Disposición de la página" - -# ?? FVD -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Introduction to layout" -msgstr "Introducción a la disposición" - -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Global sizes" -msgstr "Tamaños globales" - -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Line breaks" -msgstr "Saltos de línea" - -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Page breaks" -msgstr "Saltos de página" - #. @node in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely msgid "Automatic notation" @@ -8544,23 +8766,17 @@ msgstr "Notación automática" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Changing context properties on the fly" msgstr "Cambiar las propiedades de un contexto al vuelo" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Layout tunings within contexts" msgstr "Ajuste fino de la presentación dentro de los contextos" # ?? FVD #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Constructing a tweak" msgstr "Construir un truco" @@ -8593,6 +8809,13 @@ msgstr "Comportamiento automático" msgid "Simulating a fermata" msgstr "Simulación de una fermata" +#. @node in Documentation/es/user/working.itely +#. @section in Documentation/es/user/working.itely +#. @node in Documentation/de/user/working.itely +#. @section in Documentation/de/user/working.itely +msgid "Suggestions for writing LilyPond files" +msgstr "Sugerencias para escribir archivos de LilyPond" + #. @rglos in Documentation/es/user/working.itely msgid "baritone" msgstr "barítono" @@ -8631,28 +8854,6 @@ msgstr "Contextos del Canto Gregoriano" msgid "Musica ficta accidentals" msgstr "Alteraciones de la Musica Ficta" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Controlling direction and placement" -msgstr "Control de la dirección y la posición" - -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "When to add a -" -msgstr "Cuándo añadir un guión" - -#. @node in Documentation/es/user/changing-defaults.itely -msgid "old The \\override command" -msgstr "antiguo La instrucción \\override" - -#. @section in Documentation/es/user/changing-defaults.itely -msgid "old The @code{\\override} command" -msgstr "antiguo La instrucción @code{\\override}" - #. @top in Documentation/de/user/lilypond-learning.tely msgid "GNU LilyPond -- Handbuch zum Lernen" msgstr "" @@ -8681,6 +8882,10 @@ msgstr "Utilización del programa" msgid "Other information" msgstr "Más información" +#. @subsubheading in Documentation/de/user/tutorial.itely +msgid "Unix" +msgstr "Unix" + #. @rglos in Documentation/de/user/tutorial.itely msgid "legato" msgstr "" @@ -8698,97 +8903,143 @@ msgstr "" msgid "GNU LilyPond -- Das Notationsprogramm" msgstr "" +#. @node in Documentation/de/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely +msgid "Laissez vibrer ties" +msgstr "Ligaduras Laissez vibrer" + #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Chords" msgstr "" -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely -msgid "Font selection" -msgstr "" +msgid "Up:" +msgstr "Arriba:" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Simple lyrics" -msgstr "" +msgid "Next:" +msgstr "Siguiente:" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Another way of entering lyrics" -msgstr "" +msgid "Previous:" +msgstr "Anterior:" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Assigning more than one syllable to a single note" -msgstr "" +msgid "Appendix " +msgstr "Apéndice " -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "More than one note on a single syllable" -msgstr "" +msgid "Footnotes" +msgstr "Notas al pie" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Vocals and variables" -msgstr "" +# this is the same translation that babel LaTex package uses . FVD +msgid "Table of Contents" +msgstr "Índice general" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Flexibility in placement" -msgstr "" +#~ msgid "Microtones in MIDI" +#~ msgstr "Microtonos en MIDI" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Lyrics to multiple notes of a melisma" -msgstr "" +#~ msgid "Input files" +#~ msgstr "Archivos de entrada" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Switching the melody associated with a lyrics line" -msgstr "" +#~ msgid "A single music expression" +#~ msgstr "Una expresión musical única" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Spacing vocals" -msgstr "" +#~ msgid "Extracting fragments of notation" +#~ msgstr "Extraer fragmentos de notación" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Spacing lyrics" -msgstr "" +#~ msgid "Common syntax issues TODO name?" +#~ msgstr "Consideraciones usuales de la sintaxis" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "More about stanzas" -msgstr "" +#~ msgid "Controlling direction" +#~ msgstr "Control de la dirección" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding dynamics marks" -msgstr "" +#~ msgid "Distances and measurements MAYBE MOVE" +#~ msgstr "Distancias y medidas" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding singer names" -msgstr "" +#~ msgid "Other stuffs TODO move?" +#~ msgstr "Otras consideraciones" -msgid "Up:" -msgstr "Arriba:" +#~ msgid "context list FIXME" +#~ msgstr "lista de contextos" -msgid "Next:" -msgstr "Siguiente:" +#~ msgid "another thing FIXME" +#~ msgstr "otra cosa" -msgid "Previous:" -msgstr "Anterior:" +#~ msgid "Input modes FIXME" +#~ msgstr "Modos de entrada" -msgid "Appendix " -msgstr "Apéndice " +#~ msgid "Non-musical notation" +#~ msgstr "Notación no musical" -msgid "Footnotes" -msgstr "Notas al pie" +#~ msgid "MIDI instrument names" +#~ msgstr "Nombres de los instrumentos MIDI" -# this is the same translation that babel LaTex package uses . FVD -msgid "Table of Contents" -msgstr "Índice general" +#~ msgid "What goes into the MIDI? FIXME" +#~ msgstr "¿Qué hay dentro del MIDI?" + +#~ msgid "Repeats and MIDI" +#~ msgstr "Las repeticiones y el MIDI" + +#~ msgid "other midi" +#~ msgstr "otros asuntos relacionados con el MIDI" + +#~ msgid "Page layout MOVED FROM LM" +#~ msgstr "Disposición de la página" + +# ?? FVD +#~ msgid "Introduction to layout" +#~ msgstr "Introducción a la disposición" + +#~ msgid "Global sizes" +#~ msgstr "Tamaños globales" + +#~ msgid "Line breaks" +#~ msgstr "Saltos de línea" + +#~ msgid "Page breaks" +#~ msgstr "Saltos de página" + +#~ msgid "Input syntax" +#~ msgstr "Sintaxis de escritura" + +#~ msgid "Controlling direction and placement" +#~ msgstr "Control de la dirección y la posición" + +#~ msgid "When to add a -" +#~ msgstr "Cuándo añadir un guión" + +#~ msgid "old The \\override command" +#~ msgstr "antiguo La instrucción \\override" + +#~ msgid "old The @code{\\override} command" +#~ msgstr "antiguo La instrucción @code{\\override}" + +#~ msgid "Set here the overrides for the staff " +#~ msgstr "Establecer aquí las sobreescrituras para el pentagrama" + +#~ msgid "Revert to the default" +#~ msgstr "Devolver al valor predeterminado" + +#~ msgid "Arabic music notation overview" +#~ msgstr "Panorámica de la notación de música árabe" + +#~ msgid "References for arabic music" +#~ msgstr "Referencias para música árabe" + +#~ msgid "fourth" +#~ msgstr "cuarta" + +#~ msgid "How to read the tutorial" +#~ msgstr "Cómo leer el tutorial" + +#~ msgid "Relative note names" +#~ msgstr "Nombres de nota relativos" + +#~ msgid "Piano staves" +#~ msgstr "Sistemas de piano" + +#~ msgid "Printing lyrics" +#~ msgstr "Impresión de la letra" + +#~ msgid "A lead sheet" +#~ msgstr "Hojas guía de acordes" +#~ msgid "Organizing pieces with identifiers" +#~ msgstr "Organizar las piezas mediante identificadores" diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po index ff19e5f4b2..c9c179870a 100644 --- a/Documentation/po/fr.po +++ b/Documentation/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-20 09:14+0200\n" +"POT-Creation-Date: 2008-08-11 18:05+0200\n" "PO-Revision-Date: 2008-07-16 18:51+0200\n" "Last-Translator: Jean-Charles Malahieude \n" "Language-Team: Français \n" @@ -67,72 +67,82 @@ msgstr "" "manuel en anglais." #: translations-status.py:56 +#, fuzzy +msgid "Section titles" +msgstr "Création de titres" + +#: translations-status.py:57 +#, python-format +msgid "

    Last updated %s

    \n" +msgstr "" + +#: translations-status.py:58 msgid "Translators" msgstr "Traducteurs" -#: translations-status.py:56 +#: translations-status.py:58 msgid "Translation checkers" msgstr "Relecteurs" -#: translations-status.py:57 +#: translations-status.py:59 msgid "Translated" msgstr "Traduit" -#: translations-status.py:57 +#: translations-status.py:59 msgid "Up to date" msgstr "À jour" -#: translations-status.py:58 +#: translations-status.py:60 msgid "Other info" msgstr "Autres informations" -#: translations-status.py:60 +#: translations-status.py:62 msgid "no" msgstr "non" -#: translations-status.py:61 +#: translations-status.py:63 msgid "not translated" msgstr "non traduit" -#: translations-status.py:63 +#: translations-status.py:65 #, python-format msgid "partially (%(p)d %%)" msgstr "partiellement (%(p)d %%)" -#: translations-status.py:65 +#: translations-status.py:67 #, python-format msgid "partially translated (%(p)d %%)" msgstr "partiellement traduit (%(p)d %%)" -#: translations-status.py:66 translations-status.py:68 +#: translations-status.py:68 translations-status.py:70 msgid "yes" msgstr "oui" -#: translations-status.py:67 +#: translations-status.py:69 msgid "translated" msgstr "traduit" -#: translations-status.py:68 translations-status.py:69 +#: translations-status.py:70 translations-status.py:71 msgid "up to date" msgstr "à jour" -#: translations-status.py:70 +#: translations-status.py:72 msgid "partially" msgstr "partiellement" -#: translations-status.py:71 +#: translations-status.py:73 msgid "partially up to date" msgstr "partiellement à jour" -#: translations-status.py:72 +#: translations-status.py:74 msgid "N/A" msgstr "N/A" -#: translations-status.py:73 +#: translations-status.py:75 msgid "pre-GDP" msgstr "pré-GDP" -#: translations-status.py:74 +#: translations-status.py:76 msgid "post-GDP" msgstr "post-GDP" @@ -232,15 +242,19 @@ msgstr "Introduction" #. @node in Documentation/user/introduction.itely #. @section in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @section in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @section in Documentation/es/user/introduction.itely msgid "Background" msgstr "Contexte" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Engraving" @@ -249,9 +263,9 @@ msgstr "Gravure" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Automated engraving" @@ -260,9 +274,9 @@ msgstr "Gravure automatisée" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "What symbols to engrave?" @@ -271,9 +285,9 @@ msgstr "Gravure des symboles musicaux" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Music representation" @@ -282,9 +296,9 @@ msgstr "Représentation de la musique" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Example applications" @@ -303,40 +317,68 @@ msgstr "À propos de la documentation" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Learning Manual (LM)" msgstr "À propos du manuel d'initiation (LM)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Music Glossary (MG)" msgstr "À propos du glossaire musicologique (MG)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Notation Reference (NR)" msgstr "À propos du manuel de notation (NR)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Application Usage (AU)" msgstr "À propos du manuel d'utilisation (AU)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Snippet List (SL)" msgstr "À propos des morceaux choisis (SL)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Internals Reference (IR)" msgstr "À propos des références du programme (IR)" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "Other documentation" msgstr "Autres sources de documentation" -#. Documentation/user/tutorial.itely:226 (comment) +#. Documentation/user/tutorial.itely:225 (comment) msgid "set the starting point to middle C" msgstr "définit le point de départ en référence au do central" @@ -344,51 +386,52 @@ msgstr "définit le point de départ en référence au do central" msgid "one octave above middle C" msgstr "une octave au dessus du do central" -#. Documentation/user/tutorial.itely:271 (comment) +#. Documentation/user/tutorial.itely:272 (comment) msgid "c is 1 staff space up, so is the c above" msgstr "do est à un cran de plus, il sera donc au dessus" -#. Documentation/user/tutorial.itely:272 (comment) +#. Documentation/user/tutorial.itely:273 (comment) msgid "d is 2 up or 5 down, so is the d above" msgstr "ré est à 2 crans de plus ou 5 de moins, il sera donc au dessus" -#. Documentation/user/tutorial.itely:273 (comment) +#. Documentation/user/tutorial.itely:274 (comment) msgid "e is 3 up or 4 down, so is the e above" msgstr "mi est à 3 crans de plus ou 4 de moins, il sera donc au dessus" -#. Documentation/user/tutorial.itely:274 (comment) +#. Documentation/user/tutorial.itely:275 (comment) msgid "a is 6 up or 1 down, so is the a below" msgstr "la est à 6 crans de plus ou 1 de moins, il sera donc en dessous" -#. Documentation/user/tutorial.itely:275 (comment) +#. Documentation/user/tutorial.itely:276 (comment) msgid "g is 5 up or 2 down, so is the g below" msgstr "sol est à 5 crans de plus ou 2 de moins, il sera donc en dessous" -#. Documentation/user/tutorial.itely:276 (comment) +#. Documentation/user/tutorial.itely:277 (comment) msgid "f is 4 up or 3 down, so is the f below" msgstr "fa est à 4 crans de plus ou 3 de moins, il sera donc en dessous" -#. Documentation/user/tutorial.itely:1525 (variable) +#. Documentation/user/tutorial.itely:1551 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) msgid "violin" msgstr "violon" -#. Documentation/user/tutorial.itely:1528 (variable) +#. Documentation/user/tutorial.itely:1556 (variable) msgid "cello" msgstr "cello" -#. Documentation/user/tutorial.itely:1551 (variable) +#. Documentation/user/tutorial.itely:1581 (variable) msgid "tripletA" msgstr "trioletA" -#. Documentation/user/tutorial.itely:1552 (variable) +#. Documentation/user/tutorial.itely:1582 (variable) msgid "barA" msgstr "mesureA" # utiliser peut-être le terme anglais, surtout # s'il est massivement utilisé dans les ly #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely msgid "foo" msgstr "toto" @@ -448,6 +491,7 @@ msgid "Windows" msgstr "Windows" #. @subsubheading in Documentation/user/tutorial.itely +#. @subsubheading in Documentation/fr/user/tutorial.itely #. @subsubheading in Documentation/es/user/tutorial.itely msgid "UNIX" msgstr "UNIX" @@ -466,7 +510,6 @@ msgstr "Notation simple" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/pitches.itely #. @section in Documentation/user/pitches.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/pitches.itely #. @section in Documentation/fr/user/pitches.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -479,6 +522,7 @@ msgid "Pitches" msgstr "Hauteurs" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "pitch" @@ -508,19 +552,20 @@ msgid "middle C" msgstr "do central" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "octave" msgstr "octave" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "accidental" msgstr "altération accidentelle" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "Durations (rhythms)" @@ -541,6 +586,7 @@ msgid "duration" msgstr "durée" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "whole note" @@ -570,15 +616,14 @@ msgstr "note pointée" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rests" msgstr "Silences" @@ -591,15 +636,14 @@ msgstr "silence" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time signature" msgstr "Métrique" @@ -634,7 +678,6 @@ msgstr "clef" # bof #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "All together" @@ -721,6 +764,7 @@ msgstr "bémol" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -729,6 +773,7 @@ msgstr "double dièse" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -743,6 +788,7 @@ msgid "Key signatures" msgstr "Armures" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "key signature" @@ -768,12 +814,14 @@ msgid "Warning: key signatures and pitches" msgstr "Attention aux armures et aux hauteurs" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "natural" msgstr "bécarre" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "transposition" @@ -781,6 +829,7 @@ msgstr "transposition" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -802,8 +851,8 @@ msgstr "Liaisons" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely @@ -816,6 +865,7 @@ msgstr "Liaisons de prolongation" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/tutorial.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -824,7 +874,7 @@ msgstr "liaison de prolongation" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -848,7 +898,7 @@ msgstr "liaison d'articulation" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -894,8 +944,6 @@ msgstr "Articulations et nuances" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/expressive.itely @@ -911,6 +959,7 @@ msgid "Fingerings" msgstr "Doigtés" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "fingering" @@ -919,7 +968,7 @@ msgstr "doigté" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/user/tweaks.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -934,6 +983,7 @@ msgid "Dynamics" msgstr "Nuances" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "dynamics" @@ -941,6 +991,7 @@ msgstr "nuances" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -949,6 +1000,7 @@ msgstr "crescendo" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -957,6 +1009,8 @@ msgstr "decrescendo" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1005,18 +1059,19 @@ msgstr "anacrouse" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Tuplets" msgstr "Nolets" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1025,6 +1080,7 @@ msgstr "valeur d'une note" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1036,18 +1092,19 @@ msgstr "triolet" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Grace notes" msgstr "Notes d'ornement" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "grace notes" @@ -1057,6 +1114,7 @@ msgstr "notes d'ornement" # ça vient directement de l'italien comme appogiature #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "acciaccatura" @@ -1064,6 +1122,7 @@ msgstr "acciaccature" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "appoggiatura" @@ -1107,6 +1166,7 @@ msgstr "Expressions musicales simultanées -- plusieurs portées" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1133,6 +1193,8 @@ msgstr "Plusieurs portées" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1142,6 +1204,7 @@ msgstr "Regroupements de portées" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/staff.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "brace" @@ -1161,6 +1224,7 @@ msgstr "Combinaison de notes en accords" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely #. @rglos in Documentation/user/chords.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/es/user/chords.itely @@ -1194,6 +1258,8 @@ msgstr "Chansons" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsubsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1208,6 +1274,7 @@ msgid "Setting simple songs" msgstr "Écriture de chants simples" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "lyrics" @@ -1217,6 +1284,8 @@ msgstr "paroles" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1238,6 +1307,7 @@ msgid "melisma" msgstr "mélisme" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "extender line" @@ -1245,6 +1315,8 @@ msgstr "ligne de prolongation" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1265,6 +1337,8 @@ msgstr "Dernières précisions" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1317,15 +1391,15 @@ msgid "After the tutorial" msgstr "Après le tutoriel" #. Documentation/user/fundamental.itely:352 (variable) -#. Documentation/user/vocal.itely:1054 (variable) -#. Documentation/user/vocal.itely:1096 (variable) +#. Documentation/user/vocal.itely:1165 (variable) +#. Documentation/user/vocal.itely:1207 (variable) msgid "melody" msgstr "melodie" #. Documentation/user/fundamental.itely:353 (variable) -#. Documentation/user/vocal.itely:879 (variable) -#. Documentation/user/vocal.itely:1059 (variable) -#. Documentation/user/vocal.itely:1100 (variable) +#. Documentation/user/vocal.itely:989 (variable) +#. Documentation/user/vocal.itely:1170 (variable) +#. Documentation/user/vocal.itely:1211 (variable) msgid "text" msgstr "texte" @@ -1353,16 +1427,16 @@ msgid "Main voice" msgstr "Voix principale" #. Documentation/user/fundamental.itely:687 (comment) -#. Documentation/user/simultaneous.itely:481 (comment) -#. Documentation/user/simultaneous.itely:503 (comment) -#. Documentation/user/simultaneous.itely:527 (comment) +#. Documentation/user/simultaneous.itely:593 (comment) +#. Documentation/user/simultaneous.itely:618 (comment) +#. Documentation/user/simultaneous.itely:645 (comment) msgid "Bar 1" msgstr "Mesure 1" #. Documentation/user/fundamental.itely:698 (comment) -#. Documentation/user/simultaneous.itely:485 (comment) -#. Documentation/user/simultaneous.itely:507 (comment) -#. Documentation/user/simultaneous.itely:533 (comment) +#. Documentation/user/simultaneous.itely:598 (comment) +#. Documentation/user/simultaneous.itely:623 (comment) +#. Documentation/user/simultaneous.itely:651 (comment) msgid "Bar 2" msgstr "Mesure 2" @@ -1412,6 +1486,7 @@ msgid "Initiate second voice" msgstr "Initialisation de la seconde voix" #. Documentation/user/fundamental.itely:1012 (comment) +#. Documentation/user/fundamental.itely:1074 (comment) msgid "Set stems, etc, down" msgstr "Hampes et autres attributs iront vers le bas" @@ -1421,6 +1496,7 @@ msgid "Initiate third voice" msgstr "Initialisation de la troisième voix" #. Documentation/user/fundamental.itely:1018 (comment) +#. Documentation/user/fundamental.itely:1080 (comment) msgid "Set stems, etc, up" msgstr "Hampes et autres attributs iront vers le haut" @@ -1428,18 +1504,10 @@ msgstr "Hampes et autres attributs iront vers le haut" msgid "Initiate first voice" msgstr "Initialisation de la première voix" -#. Documentation/user/fundamental.itely:1074 (comment) -msgid "set stems, etc down" -msgstr "Hampes et autres attributs iront vers le bas" - -#. Documentation/user/fundamental.itely:1080 (comment) -msgid "set stems, etc up" -msgstr "Hampes et autres attributs iront vers le haut" - #. Documentation/user/fundamental.itely:1187 (variable) #. Documentation/user/fundamental.itely:2497 (variable) -#. Documentation/user/tweaks.itely:3156 (variable) -#. Documentation/user/simultaneous.itely:521 (variable) +#. Documentation/user/tweaks.itely:3168 (variable) +#. Documentation/user/simultaneous.itely:639 (variable) msgid "global" msgstr "glogal" @@ -1465,42 +1533,41 @@ msgid "TimeKey" msgstr "MetriqueArmure" #. Documentation/user/fundamental.itely:1239 (variable) -#. Documentation/user/tweaks.itely:3157 (variable) msgid "SopMusic" msgstr "SopMusique" #. Documentation/user/fundamental.itely:1240 (variable) -#. Documentation/user/tweaks.itely:3158 (variable) +#. Documentation/user/tweaks.itely:3170 (variable) msgid "AltoMusic" msgstr "AltoMusique" #. Documentation/user/fundamental.itely:1241 (variable) -#. Documentation/user/tweaks.itely:3159 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) msgid "TenorMusic" msgstr "TenorMusique" #. Documentation/user/fundamental.itely:1242 (variable) -#. Documentation/user/tweaks.itely:3160 (variable) +#. Documentation/user/tweaks.itely:3172 (variable) msgid "BassMusic" msgstr "BasseMusique" #. Documentation/user/fundamental.itely:1243 (variable) -#. Documentation/user/tweaks.itely:3161 (variable) +#. Documentation/user/tweaks.itely:3173 (variable) msgid "VerseOne" msgstr "CoupletUn" #. Documentation/user/fundamental.itely:1245 (variable) -#. Documentation/user/tweaks.itely:3162 (variable) +#. Documentation/user/tweaks.itely:3174 (variable) msgid "VerseTwo" msgstr "CoupletDeux" #. Documentation/user/fundamental.itely:1247 (variable) -#. Documentation/user/tweaks.itely:3163 (variable) +#. Documentation/user/tweaks.itely:3175 (variable) msgid "VerseThree" msgstr "CoupletTrois" #. Documentation/user/fundamental.itely:1249 (variable) -#. Documentation/user/tweaks.itely:3164 (variable) +#. Documentation/user/tweaks.itely:3176 (variable) msgid "VerseFour" msgstr "CoupletQuatre" @@ -1537,7 +1604,8 @@ msgid "refrainwordsB" msgstr "refrainparolesB" #. Documentation/user/fundamental.itely:1589 (comment) -msgid "start single compound music expression" +#, fuzzy +msgid "start of single compound music expression" msgstr "début de l'unique expression musicale composée" #. Documentation/user/fundamental.itely:1590 (comment) @@ -1585,8 +1653,9 @@ msgid "end of LH voice one notes" msgstr "fin des notes de la voix un de MG" #. Documentation/user/fundamental.itely:1611 (comment) -msgid "end of first LH voice" -msgstr "fin de la voix un de MG" +#, fuzzy +msgid "end of LH voice one" +msgstr "fin de la voix deux de MG" #. Documentation/user/fundamental.itely:1612 (comment) msgid "create LH voice two" @@ -1631,14 +1700,13 @@ msgid "make note heads larger" msgstr "pour obtenir des têtes de note plus grosses" #. Documentation/user/fundamental.itely:1914 (comment) +#. Documentation/user/fundamental.itely:2007 (comment) msgid "return to default size" msgstr "retour à la taille par défaut" -#. Documentation/user/fundamental.itely:2007 (comment) -msgid "return to original size" -msgstr "retour à la taille originelle" - #. Documentation/user/fundamental.itely:2274 (variable) +#. Documentation/user/fundamental.itely:2498 (variable) +#. Documentation/user/input.itely:907 (variable) msgid "sopranoMusic" msgstr "sopranoMusique" @@ -1650,15 +1718,13 @@ msgstr "sopranoParoles" msgid "celloMusic" msgstr "violoncelleMusique" -#. Documentation/user/fundamental.itely:2498 (variable) -msgid "sopMusic" -msgstr "sopMusique" - #. Documentation/user/fundamental.itely:2502 (variable) -msgid "sopWords" +#, fuzzy +msgid "sopranoWords" msgstr "sopParoles" #. Documentation/user/fundamental.itely:2505 (variable) +#. Documentation/user/input.itely:908 (variable) msgid "altoMusic" msgstr "altoMusique" @@ -1667,6 +1733,7 @@ msgid "altoWords" msgstr "altoParoles" #. Documentation/user/fundamental.itely:2510 (variable) +#. Documentation/user/input.itely:909 (variable) msgid "tenorMusic" msgstr "tenorMusique" @@ -1675,6 +1742,7 @@ msgid "tenorWords" msgstr "tenorParoles" #. Documentation/user/fundamental.itely:2515 (variable) +#. Documentation/user/input.itely:910 (variable) msgid "bassMusic" msgstr "bassMusique" @@ -1727,7 +1795,8 @@ msgid "end PianoStaff context" msgstr "fin du contexte PianoStaff" #. Documentation/user/fundamental.itely:2748 (comment) -msgid "end PedalOrgan Staff" +#, fuzzy +msgid "end PedalOrgan Staff context" msgstr "fin du contexte de la portée PedalOrgan" #. Documentation/user/fundamental.itely:2750 (comment) @@ -2006,176 +2075,186 @@ msgstr "Épaississement de la prochaine liaison seulement" msgid "Revert thickness of all following slurs to default of 1.2" msgstr "Retour à l'épaisseur par défaut de 1,2 pour les prochaines liaisons" -#. Documentation/user/tweaks.itely:1257 (comment) +#. Documentation/user/tweaks.itely:1265 (comment) msgid "Don't print clefs in this staff" msgstr "pas de clef pour cette portée" -#. Documentation/user/tweaks.itely:1259 (comment) +#. Documentation/user/tweaks.itely:1267 (comment) msgid "Don't print time signatures in this staff" msgstr "pas de métrique pour cette portée" -#. Documentation/user/tweaks.itely:1320 (comment) +#. Documentation/user/tweaks.itely:1328 (comment) msgid "Reduce all font sizes by ~24%" msgstr "Réduction d'environ 24 % de toutes les tailles de fonte" -#. Documentation/user/tweaks.itely:1376 (comment) +#. Documentation/user/tweaks.itely:1384 (comment) msgid "Reduce stem length and line spacing to match" -msgstr "Réduction de la taille des hampes et de l'interligne pour ne pas déborder" +msgstr "" +"Réduction de la taille des hampes et de l'interligne pour ne pas déborder" -#. Documentation/user/tweaks.itely:1750 (comment) -#. Documentation/user/tweaks.itely:1811 (comment) +#. Documentation/user/tweaks.itely:1758 (comment) +#. Documentation/user/tweaks.itely:1819 (comment) msgid "Set details for later Text Spanner" msgstr "Réglage des détails du texte avec extension" -#. Documentation/user/tweaks.itely:1753 (comment) -#. Documentation/user/tweaks.itely:1814 (comment) +#. Documentation/user/tweaks.itely:1761 (comment) +#. Documentation/user/tweaks.itely:1822 (comment) msgid "Place dynamics above staff" msgstr "Positionnement des nuances au dessus de la portée" -#. Documentation/user/tweaks.itely:1755 (comment) -#. Documentation/user/tweaks.itely:1818 (comment) +#. Documentation/user/tweaks.itely:1763 (comment) +#. Documentation/user/tweaks.itely:1826 (comment) msgid "Start Ottava Bracket" msgstr "Début du crochet d'octavation" -#. Documentation/user/tweaks.itely:1758 (comment) -#. Documentation/user/tweaks.itely:1765 (comment) -#. Documentation/user/tweaks.itely:1821 (comment) -#. Documentation/user/tweaks.itely:1828 (comment) +#. Documentation/user/tweaks.itely:1766 (comment) +#. Documentation/user/tweaks.itely:1773 (comment) +#. Documentation/user/tweaks.itely:1829 (comment) +#. Documentation/user/tweaks.itely:1836 (comment) msgid "Add Dynamic Text" msgstr "Ajout d'une nuance textuelle" -#. Documentation/user/tweaks.itely:1760 (comment) -#. Documentation/user/tweaks.itely:1823 (comment) +#. Documentation/user/tweaks.itely:1768 (comment) +#. Documentation/user/tweaks.itely:1831 (comment) msgid "Add Dynamic Line Spanner" msgstr "Ajout d'une nuance graphique" -#. Documentation/user/tweaks.itely:1762 (comment) -#. Documentation/user/tweaks.itely:1825 (comment) +#. Documentation/user/tweaks.itely:1770 (comment) +#. Documentation/user/tweaks.itely:1833 (comment) msgid "Add Text Script" msgstr "Ajout d'un commentaire textuel" -#. Documentation/user/tweaks.itely:1767 (comment) -#. Documentation/user/tweaks.itely:1830 (comment) +#. Documentation/user/tweaks.itely:1775 (comment) +#. Documentation/user/tweaks.itely:1838 (comment) msgid "Stop Ottava Bracket" msgstr "Fin du crochet d'octavation" -#. Documentation/user/tweaks.itely:1816 (comment) +#. Documentation/user/tweaks.itely:1824 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "Positionnement du crochet d'octavation sous le texte avec extension" -#. Documentation/user/tweaks.itely:1872 (comment) +#. Documentation/user/tweaks.itely:1880 (comment) msgid "Cause notes to space out to accommodate text" msgstr "Force les notes à s'espacer selon le texte" -#. Documentation/user/tweaks.itely:1890 (comment) +#. Documentation/user/tweaks.itely:1898 (comment) msgid "This markup is short enough to fit without collision" msgstr "Cette étiquette est assez courte pour ne pas risquer de chevauchement" -#. Documentation/user/tweaks.itely:1894 (comment) +#. Documentation/user/tweaks.itely:1902 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "Celle-ci est trop longue pour tenir, elle est déplacée plus haut" -#. Documentation/user/tweaks.itely:1898 (comment) -#. Documentation/user/tweaks.itely:1903 (comment) +#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1911 (comment) msgid "Turn off collision avoidance" msgstr "Désactivation du processus d'évitement de collision" -#. Documentation/user/tweaks.itely:1905 (comment) +#. Documentation/user/tweaks.itely:1913 (comment) msgid "and turn on textLengthOn" msgstr "activation de textLengthOn" -#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1914 (comment) msgid "Spaces at end are honored" msgstr "Les espaces de la fin sont pris en compte" -#. Documentation/user/tweaks.itely:2009 (comment) +#. Documentation/user/tweaks.itely:2017 (comment) msgid "Extend width by 1 staff space" msgstr "Élargissement d'un espace" -#. Documentation/user/tweaks.itely:2275 (comment) +#. Documentation/user/tweaks.itely:2283 (comment) msgid "This will not work, see below:" msgstr "La commande suivante est sans résultat ; voir plus loin." -#. Documentation/user/tweaks.itely:2279 (comment) +#. Documentation/user/tweaks.itely:2287 (comment) msgid "This works:" msgstr "Celle-ci donne le résultat escompté" -#. Documentation/user/tweaks.itely:2324 (variable) +#. Documentation/user/tweaks.itely:2332 (variable) msgid "naturalplusflat" msgstr "becarreplusbemol" -#. Documentation/user/tweaks.itely:2359 (comment) +#. Documentation/user/tweaks.itely:2367 (comment) msgid "Extend width by 1 unit" msgstr "Élargissement d'une unité" -#. Documentation/user/tweaks.itely:2361 (comment) +#. Documentation/user/tweaks.itely:2369 (comment) msgid "Align dynamics to a base line 2 units above staff" -msgstr "Alignement des nuances sur une ligne de base à 2 unités au dessus de la portée" - -#. Documentation/user/tweaks.itely:2639 (variable) -#. Documentation/user/tweaks.itely:2690 (variable) -#. Documentation/user/tweaks.itely:2752 (variable) -#. Documentation/user/tweaks.itely:2823 (variable) -#. Documentation/user/tweaks.itely:2885 (variable) -#. Documentation/user/tweaks.itely:2940 (variable) +msgstr "" +"Alignement des nuances sur une ligne de base à 2 unités au dessus de la " +"portée" + +#. Documentation/user/tweaks.itely:2647 (variable) +#. Documentation/user/tweaks.itely:2698 (variable) +#. Documentation/user/tweaks.itely:2760 (variable) +#. Documentation/user/tweaks.itely:2831 (variable) +#. Documentation/user/tweaks.itely:2893 (variable) +#. Documentation/user/tweaks.itely:2948 (variable) msgid "rhMusic" msgstr "mdMusique" -#. Documentation/user/tweaks.itely:2644 (comment) -#. Documentation/user/tweaks.itely:2695 (comment) -#. Documentation/user/tweaks.itely:2759 (comment) -#. Documentation/user/tweaks.itely:2832 (comment) -#. Documentation/user/tweaks.itely:2894 (comment) +#. Documentation/user/tweaks.itely:2652 (comment) +#. Documentation/user/tweaks.itely:2703 (comment) +#. Documentation/user/tweaks.itely:2767 (comment) +#. Documentation/user/tweaks.itely:2840 (comment) +#. Documentation/user/tweaks.itely:2902 (comment) msgid "Start polyphonic section of four voices" msgstr "Début d'un section polyphonique de quatre voix" -#. Documentation/user/tweaks.itely:2657 (variable) -#. Documentation/user/tweaks.itely:2708 (variable) -#. Documentation/user/tweaks.itely:2772 (variable) -#. Documentation/user/tweaks.itely:2847 (variable) -#. Documentation/user/tweaks.itely:2911 (variable) -#. Documentation/user/tweaks.itely:2968 (variable) +#. Documentation/user/tweaks.itely:2665 (variable) +#. Documentation/user/tweaks.itely:2716 (variable) +#. Documentation/user/tweaks.itely:2780 (variable) +#. Documentation/user/tweaks.itely:2855 (variable) +#. Documentation/user/tweaks.itely:2919 (variable) +#. Documentation/user/tweaks.itely:2976 (variable) msgid "lhMusic" msgstr "mgMusique" -#. Documentation/user/tweaks.itely:2898 (comment) -#. Documentation/user/tweaks.itely:2955 (comment) +#. Documentation/user/tweaks.itely:2906 (comment) +#. Documentation/user/tweaks.itely:2963 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "Déplace le do2 pour que la fusion puisse fonctionner" -#. Documentation/user/tweaks.itely:2901 (comment) -#. Documentation/user/tweaks.itely:2958 (comment) +#. Documentation/user/tweaks.itely:2909 (comment) +#. Documentation/user/tweaks.itely:2966 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "la hampe du ré2 ira vers le bas pour permettre la fusion" -#. Documentation/user/tweaks.itely:2953 (comment) +#. Documentation/user/tweaks.itely:2961 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "Repositionnement du do2 à droite de la note fusionnée" -#. Documentation/user/tweaks.itely:3081 (comment) -#. Documentation/user/tweaks.itely:3100 (comment) +#. Documentation/user/tweaks.itely:3089 (comment) +#. Documentation/user/tweaks.itely:3108 (comment) msgid "Visible tempo marking" msgstr "Indication de tempo visible" -#. Documentation/user/tweaks.itely:3085 (comment) -#. Documentation/user/tweaks.itely:3104 (comment) +#. Documentation/user/tweaks.itely:3093 (comment) +#. Documentation/user/tweaks.itely:3112 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "Indication de tempo invisible ; utilisée pour le MIDI" -#. Documentation/user/tweaks.itely:3088 (comment) -#. Documentation/user/tweaks.itely:3107 (comment) +#. Documentation/user/tweaks.itely:3096 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) msgid "New tempo for next section" msgstr "Nouveau tempo pour la section suivante" -#. Documentation/user/tweaks.itely:3147 (variable) -msgid "emph" +#. Documentation/user/tweaks.itely:3159 (variable) +#, fuzzy +msgid "emphasize" msgstr "emphase" -#. Documentation/user/tweaks.itely:3151 (variable) -msgid "norm" +#. Documentation/user/tweaks.itely:3163 (variable) +#, fuzzy +msgid "normal" msgstr "normal" -#. Documentation/user/tweaks.itely:3373 (comment) +#. Documentation/user/tweaks.itely:3169 (variable) +#, fuzzy +msgid "SopranoMusic" +msgstr "sopranoMusique" + +#. Documentation/user/tweaks.itely:3385 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "Arranger pour obtenir une couleur par la procédure color-notehead" @@ -2458,8 +2537,8 @@ msgid "Tying notes across voices" msgstr "Liaison entre plusieurs voix" #. @subheading in Documentation/user/tweaks.itely -#. @subheading in Documentation/es/user/tweaks.itely -msgid "Simulating a fermata" +#, fuzzy +msgid "Simulating a fermata in MIDI" msgstr "Rendu MIDI d'un point d'orgue" #. @node in Documentation/user/tweaks.itely @@ -2503,11 +2582,13 @@ msgid "hornNotes" msgstr "corNotes" #. Documentation/user/working.itely:212 (variable) -msgid "fragA" +#, fuzzy +msgid "fragmentA" msgstr "fragmentA" #. Documentation/user/working.itely:213 (variable) -msgid "fragB" +#, fuzzy +msgid "fragmentB" msgstr "fragmentB" #. Documentation/user/working.itely:226 (variable) @@ -2515,7 +2596,7 @@ msgid "dolce" msgstr "dolce" #. Documentation/user/working.itely:227 (variable) -#. Documentation/user/working.itely:273 (variable) +#. Documentation/user/working.itely:276 (variable) #. Documentation/user/scheme-tutorial.itely:235 (variable) #. Documentation/user/programming-interface.itely:100 (variable) msgid "padText" @@ -2525,11 +2606,11 @@ msgstr "decallageTexte" msgid "fthenp" msgstr "fpuisp" -#. Documentation/user/working.itely:310 (variable) +#. Documentation/user/working.itely:313 (variable) msgid "mpdolce" msgstr "mpdolce" -#. Documentation/user/working.itely:312 (variable) +#. Documentation/user/working.itely:315 (variable) #. Documentation/user/scheme-tutorial.itely:256 (variable) #. Documentation/user/programming-interface.itely:134 (variable) msgid "tempoMark" @@ -2548,6 +2629,8 @@ msgstr "Travail sur des projets LilyPond" #. @node in Documentation/user/working.itely #. @section in Documentation/user/working.itely +#. @node in Documentation/fr/user/working.itely +#. @section in Documentation/fr/user/working.itely msgid "Suggestions for writing LilyPond input files" msgstr "Suggestions de saisie des fichiers LilyPond" @@ -2874,6 +2957,7 @@ msgid "Texinfo" msgstr "Texinfo" #. @appendixsubsec in Documentation/user/templates.itely +#. @appendixsubsec in Documentation/fr/user/templates.itely #. @appendixsubsec in Documentation/es/user/templates.itely msgid "xelatex" msgstr "xelatex" @@ -2895,6 +2979,8 @@ msgstr "Tutoriel Scheme" #. @node in Documentation/user/scheme-tutorial.itely #. @appendixsec in Documentation/user/scheme-tutorial.itely +#. @node in Documentation/fr/user/scheme-tutorial.itely +#. @appendixsec in Documentation/fr/user/scheme-tutorial.itely #. @node in Documentation/es/user/scheme-tutorial.itely #. @appendixsec in Documentation/es/user/scheme-tutorial.itely msgid "Tweaking with Scheme" @@ -2989,6 +3075,7 @@ msgid "Running requirements" msgstr "Logiciels nécessaires à l'exécution" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Requirements for building documentation" msgstr "Prérequis pour générer la documentation" @@ -3014,18 +3101,22 @@ msgid "Compiling for multiple platforms" msgstr "Compilation pour plusieurs plateformes" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Compiling outside the source tree" msgstr "Compilation en dehors de l'arborescence des sources" #. @node in Documentation/user/install.itely #. @subsection in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/es/user/install.itely -#. @unnumberedsubsubsec in Documentation/de/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @subsection in Documentation/de/user/install.itely msgid "Building documentation" msgstr "Compilation de la documentation" #. @node in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Commands for building documentation" msgstr "Commandes pour générer la documentation" @@ -3034,7 +3125,7 @@ msgstr "Commandes pour générer la documentation" #. @node in Documentation/es/user/install.itely #. @subsection in Documentation/es/user/install.itely #. @node in Documentation/de/user/install.itely -#. @subsection in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Building documentation without compiling LilyPond" msgstr "Compilation de la documentation sans compiler LilyPond" @@ -3179,6 +3270,13 @@ msgstr "TexShop" msgid "TextMate" msgstr "TextMate" +#. @node in Documentation/user/setup.itely +#. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely +msgid "LilyKDE" +msgstr "" + #. @node in Documentation/user/setup.itely #. @section in Documentation/user/setup.itely #. @node in Documentation/fr/user/setup.itely @@ -3225,8 +3323,11 @@ msgstr "Utilisation en ligne de commande" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Invoking lilypond" msgstr "Lancement de lilypond" @@ -3234,10 +3335,13 @@ msgstr "Lancement de lilypond" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely #. @subheading in Documentation/user/lilypond-book.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely #. @subheading in Documentation/fr/user/lilypond-book.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely #. @subheading in Documentation/es/user/lilypond-book.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely #. @subheading in Documentation/de/user/lilypond-book.itely msgid "Command line options" @@ -3245,8 +3349,11 @@ msgstr "Options en ligne de commande" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Environment variables" msgstr "Variables d'environnement" @@ -3613,19 +3720,24 @@ msgstr "Index des commandes LilyPond" msgid "Musical notation" msgstr "Notation musicale générale" -#. Documentation/user/pitches.itely:615 (variable) -msgid "mus" -msgstr "musique" +#. Documentation/user/pitches.itely:651 (variable) +#. Documentation/user/input.itely:997 (variable) +#. Documentation/user/input.itely:1016 (variable) +#. Documentation/user/input.itely:1053 (variable) +#. Documentation/user/input.itely:1068 (variable) +#, fuzzy +msgid "music" +msgstr "musiqueA" -#. Documentation/user/pitches.itely:979 (comment) +#. Documentation/user/pitches.itely:1027 (comment) msgid "not strictly necessary, but a good reminder" msgstr "pas strictement nécessaire, mais en pense-bête" -#. Documentation/user/pitches.itely:1068 (variable) +#. Documentation/user/pitches.itely:1119 (variable) msgid "musicA" msgstr "musiqueA" -#. Documentation/user/pitches.itely:1082 (variable) +#. Documentation/user/pitches.itely:1133 (variable) msgid "musicB" msgstr "musiqueB" @@ -3898,122 +4010,135 @@ msgstr "Affiche une longa, équivalant à deux double-pauses" msgid "Print a breve rest" msgstr "Affiche une double-pause" -#. Documentation/user/rhythms.itely:653 (comment) +#. Documentation/user/rhythms.itely:654 (comment) msgid "This is valid input, but does nothing" msgstr "Cette entrée est tout à fait valide, mais ne fait rien" -#. Documentation/user/rhythms.itely:679 (comment) -msgid "Rest bars contracted to single bar" +#. Documentation/user/rhythms.itely:680 (comment) +#. Documentation/user/rhythms.itely:733 (comment) +msgid "Rest measures contracted to single measure" msgstr "Contraction des mesures de silence consécutives en une seule" -#. Documentation/user/rhythms.itely:728 (comment) +#. Documentation/user/rhythms.itely:729 (comment) msgid "Default behavior" msgstr "Comportement par défaut" -#. Documentation/user/rhythms.itely:732 (comment) -msgid "Rest measures contracted to single measure" -msgstr "Contraction des mesures de silence consécutives en une seule" - -#. Documentation/user/rhythms.itely:735 (comment) +#. Documentation/user/rhythms.itely:736 (comment) msgid "Rest measures expanded" msgstr "Expansion des mesures de silence" -#. Documentation/user/rhythms.itely:768 (comment) +#. Documentation/user/rhythms.itely:769 (comment) msgid "This fails, as the wrong object name is specified" msgstr "Ceci échouera, il y a erreur sur l'objet spécifié" -#. Documentation/user/rhythms.itely:771 (comment) +#. Documentation/user/rhythms.itely:772 (comment) msgid "This is correct and works" msgstr "La formulation correcte, qui fonctionnera" -#. Documentation/user/rhythms.itely:917 (comment) +#. Documentation/user/rhythms.itely:919 (comment) msgid "Default style" msgstr "Style par défaut" -#. Documentation/user/rhythms.itely:920 (comment) +#. Documentation/user/rhythms.itely:922 (comment) msgid "Change to numeric style" msgstr "Adoption du style numérique" -#. Documentation/user/rhythms.itely:924 (comment) +#. Documentation/user/rhythms.itely:926 (comment) msgid "Revert to default style" msgstr "Retour au style par défaut" -#. Documentation/user/rhythms.itely:1127 (comment) +#. Documentation/user/rhythms.itely:1129 (comment) msgid "Show all bar numbers" msgstr "Affichage de tous les numéros de mesure" -#. Documentation/user/rhythms.itely:1183 (comment) +#. Documentation/user/rhythms.itely:1193 (comment) msgid "Create 9/8 split into 2/4 + 5/8" msgstr "mise en évidence de la décomposition de 9/8 en 2/4 + 5/8" -#. Documentation/user/rhythms.itely:1184 (variable) +#. Documentation/user/rhythms.itely:1194 (variable) msgid "tsMarkup" msgstr "tsEtiquette" -#. Documentation/user/rhythms.itely:1261 (comment) +#. Documentation/user/rhythms.itely:1274 (comment) msgid "Now each staff has its own time signature." msgstr "Chaque portée dispose désormais de sa propre métrique." -#. Documentation/user/rhythms.itely:1458 (comment) +#. Documentation/user/rhythms.itely:1480 (comment) msgid "Set beam sub-group length to an eighth note" msgstr "Subdivision des ligatures à la croche" -#. Documentation/user/rhythms.itely:1461 (comment) +#. Documentation/user/rhythms.itely:1483 (comment) msgid "Set beam sub-group length to a sixteenth note" msgstr "Subdivision des ligatures à la double-croche" +#. Documentation/user/rhythms.itely:1615 (comment) +msgid "end 1/16 beams for all time signatures at the 1/16 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1619 (comment) +msgid "end 1/32 beams for all time signatures at the 1/16 moment" +msgstr "" + #. Documentation/user/rhythms.itely:1629 (comment) +msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1658 (comment) +msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1671 (comment) msgid "this won't revert it!" msgstr "ceci n'est pas en concordance" -#. Documentation/user/rhythms.itely:1631 (comment) +#. Documentation/user/rhythms.itely:1673 (comment) msgid "this will" msgstr "ceci est conforme" -#. Documentation/user/rhythms.itely:1804 (comment) +#. Documentation/user/rhythms.itely:1852 (comment) msgid "revert to non-feathered beams" msgstr "retour à des liens de croches rectilignes" -#. Documentation/user/rhythms.itely:2025 (comment) -#. Documentation/user/rhythms.itely:2041 (comment) +#. Documentation/user/rhythms.itely:2081 (comment) +#. Documentation/user/rhythms.itely:2097 (comment) msgid "Permit first bar number to be printed" msgstr "Le numéro de la première mesure sera affiché" -#. Documentation/user/rhythms.itely:2042 (comment) -#. Documentation/user/rhythms.itely:2090 (comment) +#. Documentation/user/rhythms.itely:2098 (comment) +#. Documentation/user/rhythms.itely:2146 (comment) msgid "Print a bar number every second measure" msgstr "Affichage du numéro toutes les deux mesures" -#. Documentation/user/rhythms.itely:2058 (comment) +#. Documentation/user/rhythms.itely:2114 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "Affichage du numéro à chaque mesure, hormis en fin de ligne" -#. Documentation/user/rhythms.itely:2062 (comment) -#. Documentation/user/rhythms.itely:2088 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) +#. Documentation/user/rhythms.itely:2144 (comment) msgid "Increase the size of the bar number by 2" msgstr "Augmentation de la taille des numéros de mesure au double" -#. Documentation/user/rhythms.itely:2066 (comment) +#. Documentation/user/rhythms.itely:2122 (comment) msgid "Draw a box round the following bar number(s)" msgstr "Numéros de mesure encadrés dans un rectangle" -#. Documentation/user/rhythms.itely:2071 (comment) +#. Documentation/user/rhythms.itely:2127 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "Numéros de mesure encadrés dans un cercle" -#. Documentation/user/rhythms.itely:2093 (comment) +#. Documentation/user/rhythms.itely:2149 (comment) msgid "Center-align bar numbers" msgstr "Alignement au centre des numéros de mesure" -#. Documentation/user/rhythms.itely:2096 (comment) +#. Documentation/user/rhythms.itely:2152 (comment) msgid "Right-align bar numbers" msgstr "Alignement à droite des numéros de mesure" -#. Documentation/user/rhythms.itely:2194 (variable) +#. Documentation/user/rhythms.itely:2255 (variable) msgid "pipeSymbol" msgstr "pipeSymbole" -#. Documentation/user/rhythms.itely:2565 (variable) +#. Documentation/user/rhythms.itely:2626 (variable) #. @rglos in Documentation/user/rhythms.itely msgid "cadenza" msgstr "cadence" @@ -4043,11 +4168,11 @@ msgstr "Écriture du rythme" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Durations" msgstr "Durées" @@ -4079,15 +4204,16 @@ msgstr "polymétrique" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Scaling durations" msgstr "Changement d'échelle des durées" #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely msgid "laissez vibrer" msgstr "laissez vibrer" @@ -4105,14 +4231,9 @@ msgstr "Écriture des silences" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely -#. @node in Documentation/es/user/rhythms.itely -#. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely -msgid "Skips" -msgstr "Silences invisibles" +#, fuzzy +msgid "Invisible rests" +msgstr "Silences anciens" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely @@ -4139,33 +4260,33 @@ msgstr "Gravure du rythme" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Upbeats" msgstr "Levées" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Unmetered music" msgstr "Musique sans métrique" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Polymetric notation" msgstr "Notation polymétrique" @@ -4180,22 +4301,22 @@ msgstr "métrique" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic note splitting" msgstr "Découpage automatique des notes" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Showing melody rhythms" msgstr "Gravure de lignes rythmiques" @@ -4213,11 +4334,11 @@ msgstr "Barres de ligature" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic beams" msgstr "Barres de ligature automatiques" @@ -4228,29 +4349,29 @@ msgstr "Barres de ligature automatiques" #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Setting automatic beam behavior" msgstr "Définition les règles de ligatures automatiques" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Manual beams" msgstr "Barres de ligature manuelles" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Feathered beams" msgstr "Liens de croches en soufflet" @@ -4268,22 +4389,22 @@ msgstr "Barres de mesure" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar lines" msgstr "Barres de mesure" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar numbers" msgstr "Numéros de mesure" @@ -4297,11 +4418,11 @@ msgstr "Vérification des limites et numéros de mesure" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rehearsal marks" msgstr "Indications de repère" @@ -4319,42 +4440,56 @@ msgstr "Fonctionnalités rythmiques particulières" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Aligning to cadenzas" msgstr "Alignement et cadences" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time administration" msgstr "Gestion du temps" -#. Documentation/user/expressive.itely:332 (variable) -#. Documentation/user/expressive.itely:377 (variable) +#. Documentation/user/expressive.itely:390 (variable) +#. Documentation/user/expressive.itely:458 (variable) msgid "moltoF" msgstr "moltoF" -#. Documentation/user/expressive.itely:348 (variable) -msgid "roundf" +#. Documentation/user/expressive.itely:411 (variable) +#. Documentation/user/expressive.itely:441 (variable) +#, fuzzy +msgid "roundF" msgstr "suggereF" -#. Documentation/user/expressive.itely:350 (variable) -msgid "boxf" +#. Documentation/user/expressive.itely:413 (variable) +#. Documentation/user/expressive.itely:445 (variable) +#, fuzzy +msgid "boxF" msgstr "carreF" -#. Documentation/user/expressive.itely:364 (variable) +#. Documentation/user/expressive.itely:428 (variable) msgid "sfzp" msgstr "sfzp" +#. Documentation/user/expressive.itely:446 (variable) +#, fuzzy +msgid "roundFdynamic" +msgstr "nuances" + +#. Documentation/user/expressive.itely:447 (variable) +#, fuzzy +msgid "boxFdynamic" +msgstr "nuances" + #. @node in Documentation/user/expressive.itely #. @section in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely @@ -4378,7 +4513,9 @@ msgid "Attached to notes" msgstr "Indications attachées à des notes" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely msgid "Articulations and ornamentations" @@ -4405,9 +4542,9 @@ msgid "portato" msgstr "portato" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely -#. @node in Documentation/fr/user/text.itely -#. @unnumberedsubsubsec in Documentation/fr/user/text.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely #. @node in Documentation/de/user/expressive.itely @@ -4427,7 +4564,7 @@ msgid "Curves" msgstr "Courbes" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4438,7 +4575,7 @@ msgid "Breath marks" msgstr "Signes de respiration" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4470,7 +4607,7 @@ msgid "Lines" msgstr "Lignes" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4486,7 +4623,7 @@ msgid "glissando" msgstr "glissando" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4502,7 +4639,7 @@ msgid "arpeggio" msgstr "arpège" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4517,18 +4654,10 @@ msgstr "Trilles" msgid "trill" msgstr "trille" -#. Documentation/user/repeats.itely:237 (comment) -#. Documentation/user/repeats.itely:277 (comment) -msgid "FIXME: I can't believe this is right." -msgstr "" - -#. Documentation/user/repeats.itely:297 (comment) -msgid "FIXME: broken" -msgstr "" - -#. Documentation/user/repeats.itely:298 (comment) -msgid "\\set Score.repeatCommands = #(list (list 'volta voltaChorus ) )" -msgstr "" +#. Documentation/user/repeats.itely:298 (variable) +#, fuzzy +msgid "voltaAdLib" +msgstr "volta" #. @node in Documentation/user/repeats.itely #. @section in Documentation/user/repeats.itely @@ -4547,7 +4676,7 @@ msgid "Long repeats" msgstr "Répétition d'un long passage" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Normal repeats" @@ -4564,14 +4693,14 @@ msgid "volta" msgstr "volta" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Manual repeat marks" msgstr "Indications de reprise manuelles" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Written-out repeats" @@ -4587,7 +4716,7 @@ msgid "Short repeats" msgstr "Répétition d'un fragment court" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely #. @node in Documentation/de/user/repeats.itely @@ -4604,7 +4733,7 @@ msgid "simile" msgstr "simile" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/fr/user/repeats.itely #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely #. @node in Documentation/es/user/repeats.itely @@ -4614,15 +4743,15 @@ msgstr "simile" msgid "Tremolo repeats" msgstr "Répétitions en trémolo" -#. Documentation/user/simultaneous.itely:352 (variable) +#. Documentation/user/simultaneous.itely:482 (variable) msgid "instrumentOne" msgstr "instrumentUn" -#. Documentation/user/simultaneous.itely:360 (variable) +#. Documentation/user/simultaneous.itely:490 (variable) msgid "instrumentTwo" msgstr "instrumentDeux" -#. Documentation/user/simultaneous.itely:539 (comment) +#. Documentation/user/simultaneous.itely:657 (comment) msgid "Bar 3 ..." msgstr "Mesure 3..." @@ -4649,20 +4778,20 @@ msgid "Single voice" msgstr "Monophonie" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Chorded notes" msgstr "Notes en accords" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Clusters" @@ -4685,18 +4814,34 @@ msgid "Multiple voices" msgstr "Plusieurs voix" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +#, fuzzy +msgid "Single-staff polyphony" +msgstr "Polyphonie sur une portée" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +#, fuzzy +msgid "Voice styles" +msgstr "Styles de ligne" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Collision resolution" msgstr "Résolution des collisions" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Automatic part combining" @@ -4713,54 +4858,49 @@ msgid "part" msgstr "partie" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Writing music in parallel" msgstr "Saisie la musique en parallèle" -#. Documentation/user/staff.itely:534 (comment) -msgid "Set here the overrides for the staff " -msgstr "Définition de réglages particuliers pour cette portée" - -#. Documentation/user/staff.itely:538 (comment) -msgid "Revert to the default" -msgstr "Retour aux valeurs par défaut" - -#. Documentation/user/staff.itely:604 (comment) +#. Documentation/user/staff.itely:536 (comment) msgid "No time signature in the ossia staff" msgstr "pas de métrique pour la portée d'ossia" -#. Documentation/user/staff.itely:726 (comment) +#. Documentation/user/staff.itely:678 (comment) msgid "To use the setting globally, uncomment the following line:" -msgstr "Pour une application à toutes les portées, décommenter la ligne suivante" +msgstr "" +"Pour une application à toutes les portées, décommenter la ligne suivante" -#. Documentation/user/staff.itely:727 (comment) +#. Documentation/user/staff.itely:679 (comment) msgid "\\override VerticalAxisGroup #'remove-first = ##t" msgstr "\\override VerticalAxisGroup #'remove-first = ##t" -#. Documentation/user/staff.itely:735 (comment) +#. Documentation/user/staff.itely:687 (comment) msgid "" "To use the setting globally, comment this line, uncomment the line above" -msgstr "Pour une application à toutes les portées, commenter la ligne suivante, et décommenter celle du bloc \\layout" +msgstr "" +"Pour une application à toutes les portées, commenter la ligne suivante, et " +"décommenter celle du bloc \\layout" -#. Documentation/user/staff.itely:1105 (variable) +#. Documentation/user/staff.itely:1079 (variable) msgid "smaller" msgstr "moinsgros" -#. Documentation/user/staff.itely:1119 (comment) +#. Documentation/user/staff.itely:1094 (comment) msgid "setup a context for cue notes." msgstr "définition d'un contexte pour la citation" -#. Documentation/user/staff.itely:1161 (variable) +#. Documentation/user/staff.itely:1135 (variable) msgid "picc" msgstr "picc" -#. Documentation/user/staff.itely:1169 (variable) +#. Documentation/user/staff.itely:1143 (variable) msgid "cbsn" msgstr "cbsn" @@ -4787,7 +4927,7 @@ msgid "Displaying staves" msgstr "Gravure des portées" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Instantiating new staves" msgstr "Initialisation de nouvelles portées" @@ -4800,7 +4940,7 @@ msgid "staves" msgstr "portées" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Grouping staves" msgstr "Regroupement de portées" @@ -4813,7 +4953,7 @@ msgid "grand staff" msgstr "système" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Deeper nested staff groups" msgstr "Regroupements imbriqués de portées" @@ -4823,7 +4963,7 @@ msgid "Modifying single staves" msgstr "Modification de portées individuelles" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4842,7 +4982,7 @@ msgid "ledger line" msgstr "ligne supplémentaire" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Ossia staves" msgstr "Portées d'ossia" @@ -4851,7 +4991,7 @@ msgid "Frenched staff" msgstr "Portée à la française" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4873,7 +5013,7 @@ msgid "Writing parts" msgstr "Écriture de parties séparées" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4900,18 +5040,22 @@ msgid "metronome mark" msgstr "marque métronomique" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely #. @node in Documentation/es/user/staff.itely #. @subsubsection in Documentation/es/user/staff.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely #. @node in Documentation/de/user/staff.itely #. @unnumberedsubsubsec in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Instrument names" msgstr "Noms d'instrument" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4922,7 +5066,7 @@ msgid "Quoting other voices" msgstr "Citation d'autres voix" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4932,7 +5076,7 @@ msgstr "Citation d'autres voix" msgid "Formatting cue notes" msgstr "Mise en forme d'une citation" -#. Documentation/user/editorial.itely:288 (comment) +#. Documentation/user/editorial.itely:323 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "pour cette erreur manifeste, notez que les hampes restent en noir" @@ -5038,7 +5182,7 @@ msgstr "Hors de la portée" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5049,7 +5193,7 @@ msgstr "Info-bulle" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5059,8 +5203,8 @@ msgstr "Quadrillage temporel" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5068,7 +5212,7 @@ msgstr "Quadrillage temporel" msgid "Analysis brackets" msgstr "Crochets d'analyse" -#. Documentation/user/text.itely:403 (variable) +#. Documentation/user/text.itely:410 (variable) msgid "allegro" msgstr "allegro" @@ -5162,13 +5306,17 @@ msgstr "Introduction aux étiquettes de texte" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely -msgid "Common markup commands" +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely +msgid "Selecting font and font size" msgstr "Vue d'ensemble des commandes d'indication textuelle" #. @node in Documentation/user/text.itely #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Text alignment" msgstr "Alignement du texte" @@ -5176,6 +5324,8 @@ msgstr "Alignement du texte" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Graphic notation inside markup" msgstr "Inclusion de graphique dans une étiquette de texte" @@ -5183,6 +5333,8 @@ msgstr "Inclusion de graphique dans une étiquette de texte" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Music notation inside markup" msgstr "Inclusion de musique dans une étiquette de texte" @@ -5190,6 +5342,8 @@ msgstr "Inclusion de musique dans une étiquette de texte" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Multi-page markup" msgstr "Bloc de texte étendu" @@ -5199,6 +5353,8 @@ msgstr "Bloc de texte étendu" #. @subsection in Documentation/fr/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsection in Documentation/de/user/text.itely msgid "Fonts" msgstr "Fontes" @@ -5206,6 +5362,8 @@ msgstr "Fontes" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Entire document fonts" msgstr "Choix des fontes par défaut" @@ -5213,6 +5371,8 @@ msgstr "Choix des fontes par défaut" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Single entry fonts" msgstr "Attribution d'une fonte en particulier" @@ -5227,57 +5387,64 @@ msgstr "Attribution d'une fonte en particulier" msgid "Specialist notation" msgstr "Notation spécialiste" -#. Documentation/user/vocal.itely:720 (variable) +#. Documentation/user/vocal.itely:450 (comment) +msgid "not recommended: left aligns syllables " +msgstr "" + +#. Documentation/user/vocal.itely:453 (comment) +#, fuzzy +msgid "wrong: durations needed" +msgstr "Changement d'échelle des durées" + +#. Documentation/user/vocal.itely:456 (comment) +msgid "correct" +msgstr "" + +#. Documentation/user/vocal.itely:786 (variable) msgid "voice" msgstr "voix" -#. Documentation/user/vocal.itely:727 (variable) +#. Documentation/user/vocal.itely:793 (variable) msgid "lyr" msgstr "paroles" -#. Documentation/user/vocal.itely:933 (comment) -msgid "{" -msgstr "{" - -#. Documentation/user/vocal.itely:946 (comment) +#. Documentation/user/vocal.itely:1056 (comment) msgid "applies to " msgstr "s'applique à" -#. Documentation/user/vocal.itely:952 (comment) -msgid "}" -msgstr "}" - -#. Documentation/user/vocal.itely:1114 (comment) -msgid "moves the column off the left margin; can be removed if" +#. Documentation/user/vocal.itely:1225 (comment) +msgid "moves the column off the left margin; " msgstr "" -#. Documentation/user/vocal.itely:1115 (comment) -msgid "space on the page is tight" +#. Documentation/user/vocal.itely:1226 (comment) +msgid "can be removed if space on the page is tight" msgstr "" -#. Documentation/user/vocal.itely:1123 (comment) -#. Documentation/user/vocal.itely:1141 (comment) +#. Documentation/user/vocal.itely:1234 (comment) +#. Documentation/user/vocal.itely:1252 (comment) msgid "adds vertical spacing between verses" msgstr "ajout d'espace vertical entre les couplets" -#. Documentation/user/vocal.itely:1131 (comment) -msgid "adds horizontal spacing between columns; if they are" +#. Documentation/user/vocal.itely:1242 (comment) +#, fuzzy +msgid "adds horizontal spacing between columns; " msgstr "ajout d'espace horizontal entre les colonnes ; si elles sont" -#. Documentation/user/vocal.itely:1132 (comment) -msgid "still too close, add more pairs until the result " +#. Documentation/user/vocal.itely:1243 (comment) +#, fuzzy +msgid "if they are still too close, add more pairs " msgstr "toujours trop proches, ajouter d'autres paires de jusqu'à" -#. Documentation/user/vocal.itely:1133 (comment) -msgid "looks good" -msgstr "obtenir un résultat satisfaisant" +#. Documentation/user/vocal.itely:1244 (comment) +msgid "until the result looks good" +msgstr "" -#. Documentation/user/vocal.itely:1149 (comment) -msgid "gives some extra space on the right margin; can" +#. Documentation/user/vocal.itely:1260 (comment) +msgid "gives some extra space on the right margin; " msgstr "" -#. Documentation/user/vocal.itely:1150 (comment) -msgid "be removed if page space is tight" +#. Documentation/user/vocal.itely:1261 (comment) +msgid "can be removed if page space is tight" msgstr "" #. @node in Documentation/user/vocal.itely @@ -5297,6 +5464,8 @@ msgstr "Musique vocale" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Common notation for vocals" msgstr "Vue d'ensemble de la musique vocale" @@ -5306,6 +5475,8 @@ msgstr "Vue d'ensemble de la musique vocale" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "References for vocal music" msgstr "Références en matière de musique vocale" @@ -5348,6 +5519,8 @@ msgstr "Durée automatique des syllabes" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Manual syllable durations" msgstr "Durée explicite des syllabes" @@ -5357,6 +5530,8 @@ msgstr "Durée explicite des syllabes" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple syllables to one note" msgstr "Plusieurs syllabes sur une note" @@ -5366,6 +5541,8 @@ msgstr "Plusieurs syllabes sur une note" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple notes to one syllable" msgstr "Plusieurs notes pour une même syllabe" @@ -5375,6 +5552,8 @@ msgstr "Plusieurs notes pour une même syllabe" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Skipping notes" msgstr "Saut de notes" @@ -5395,6 +5574,8 @@ msgstr "Traits d'union et de prolongation" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Lyrics and repeats" msgstr "Paroles et reprises" @@ -5404,6 +5585,8 @@ msgstr "Paroles et reprises" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Placement of lyrics" msgstr "Positionnement des paroles" @@ -5435,6 +5618,8 @@ msgstr "Paroles indépendantes des notes" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Chants" msgstr "Chants" @@ -5444,6 +5629,8 @@ msgstr "Chants" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Spacing out syllables" msgstr "Espacement des syllabes" @@ -5453,6 +5640,8 @@ msgstr "Espacement des syllabes" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Centering lyrics between staves" msgstr "Centrage des paroles entre les portées" @@ -5462,6 +5651,8 @@ msgstr "Centrage des paroles entre les portées" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Stanzas" msgstr "Couplets" @@ -5482,6 +5673,8 @@ msgstr "Numérotation des couplets" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding dynamics marks to stanzas" msgstr "Indication de nuance et couplets" @@ -5491,6 +5684,8 @@ msgstr "Indication de nuance et couplets" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding singers' names to stanzas" msgstr "Indication du personnage et couplets" @@ -5500,16 +5695,20 @@ msgstr "Indication du personnage et couplets" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Stanzas with different rhythms" msgstr "Rythme différent selon le couplet" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Ignoring melismata" msgstr "Désactivation du traitement des mélismes" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Switching to an alternative melody" msgstr "Passage à une mélodie alternative" @@ -5535,10 +5734,23 @@ msgstr "Paroles en fin de partition" msgid "Printing stanzas at the end in multiple columns" msgstr "Paroles sur plusieurs colonnes en fin de partition" -#. Documentation/user/keyboards.itely:162 (comment) +#. Documentation/user/keyboards.itely:175 (comment) msgid "keep staff alive" msgstr "maintien la portée active" +#. Documentation/user/keyboards.itely:373 (comment) +msgid "stems may overlap the other staff" +msgstr "" + +#. Documentation/user/keyboards.itely:375 (comment) +#, fuzzy +msgid "extend the stems to reach other other staff" +msgstr "Définition de réglages particuliers pour cette portée" + +#. Documentation/user/keyboards.itely:377 (comment) +msgid "do not print extra flags" +msgstr "" + #. @node in Documentation/user/keyboards.itely #. @section in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely @@ -5562,7 +5774,7 @@ msgid "Common notation for keyboards" msgstr "Vue d'ensemble des claviers" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5573,7 +5785,7 @@ msgid "References for keyboards" msgstr "Généralités sur les instruments à clavier" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5584,7 +5796,7 @@ msgid "Changing staff manually" msgstr "Changement de portée manuel" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5595,7 +5807,7 @@ msgid "Changing staff automatically" msgstr "Changement de portée automatique" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5606,7 +5818,7 @@ msgid "Staff-change lines" msgstr "Lignes de changement de portée" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5628,7 +5840,7 @@ msgid "Piano" msgstr "Piano" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5650,7 +5862,7 @@ msgid "Accordion" msgstr "Accordéon" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5673,38 +5885,101 @@ msgstr "Cordes frottées" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Common notation for unfretted strings" msgstr "Vue d'ensemble de la notation pour cordes frottées" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "References for unfretted strings" msgstr "Références en matière de cordes frottées" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Bowed instruments" msgstr "Instruments à archet" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "References for bowed strings" msgstr "Références en matière d'instrument à archet" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Plucked instruments" msgstr "Instruments à cordes pincées" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "Harp" msgstr "Harpe" -#. Documentation/user/fretted-strings.itely:159 (variable) +#. Documentation/user/fretted-strings.itely:210 (variable) msgid "melodia" msgstr "melodie" +#. Documentation/user/fretted-strings.itely:376 (comment) +msgid "A chord for ukelele" +msgstr "" + +#. Documentation/user/fretted-strings.itely:665 (variable) +#. Documentation/user/fretted-strings.itely:684 (variable) +#. Documentation/user/fretted-strings.itely:713 (variable) +#. Documentation/user/fretted-strings.itely:738 (variable) +#. Documentation/user/fretted-strings.itely:762 (variable) +#. Documentation/user/fretted-strings.itely:798 (variable) +#, fuzzy +msgid "mychords" +msgstr "mesAccords" + +#. Documentation/user/fretted-strings.itely:688 (variable) +#, fuzzy +msgid "mychordlist" +msgstr "mesAccords" + +#. Documentation/user/fretted-strings.itely:785 (comment) +msgid "add a new chord shape" +msgstr "" + +#. Documentation/user/fretted-strings.itely:789 (comment) +msgid "add some new chords based on the power chord shape" +msgstr "" + #. @node in Documentation/user/fretted-strings.itely #. @section in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely @@ -5718,111 +5993,139 @@ msgstr "Instruments à cordes frettées" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Common notation for fretted strings" msgstr "Vue d'ensemble des cordes frettées" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "References for fretted strings" msgstr "Références en matière de cordes frettées" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "String number indications" msgstr "Indications de numéro de corde" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Default tablatures" msgstr "Tablatures par défaut" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Custom tablatures" msgstr "Tablatures personnalisées" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Fret diagrams" +#, fuzzy +msgid "Fret diagram markups" msgstr "Tablatures" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Right hand fingerings" +#, fuzzy +msgid "Predefined fret diagrams" +msgstr "Tablatures" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +#, fuzzy +msgid "Automatic fret diagrams" +msgstr "Barres de ligature automatiques" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +#, fuzzy +msgid "Right-hand fingerings" msgstr "Doigtés pour la main droite" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Guitar" msgstr "Guitare" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Guitar tablatures" -msgstr "Tablatures pour la guitare" +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Indicating position and barring" +msgstr "Indication de la position et du barré" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Indicating position and barring" -msgstr "Indication de la position et du barré" +msgid "Indicating harmonics and dampened notes" +msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Banjo" msgstr "Banjo" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Banjo tablatures" msgstr "Tablatures pour banjo" -#. Documentation/user/percussion.itely:120 (variable) -#. Documentation/user/percussion.itely:300 (variable) +#. Documentation/user/percussion.itely:214 (variable) +#. Documentation/user/percussion.itely:394 (variable) msgid "up" msgstr "haut" -#. Documentation/user/percussion.itely:121 (variable) -#. Documentation/user/percussion.itely:301 (variable) +#. Documentation/user/percussion.itely:215 (variable) +#. Documentation/user/percussion.itely:395 (variable) msgid "down" msgstr "bas" @@ -5839,44 +6142,56 @@ msgstr "Percussions" #. @node in Documentation/user/percussion.itely #. @subsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsection in Documentation/de/user/percussion.itely msgid "Common notation for percussion" msgstr "Vue d'ensemble des percussions" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "References for percussion" msgstr "Références en matière de notation pour percussions" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Basic percussion notation" msgstr "Notation de base pour percussions" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Percussion staves" msgstr "Portée de percussions" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Ghost notes" msgstr "Notes fantômes" @@ -5893,75 +6208,88 @@ msgstr "Instruments à vent" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely msgid "Common notation for wind instruments" msgstr "Vue d'ensemble des instruments à vent" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "References for wind instruments" msgstr "Références en matière d'instruments à vent" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Half-holes" msgstr "Demi-trous" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely msgid "Bagpipes" msgstr "Cornemuse" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe definitions" msgstr "Définitions pour la cornemuse" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe example" msgstr "Exemple pour la cornemuse" -#. Documentation/user/chords.itely:599 (variable) +#. Documentation/user/chords.itely:651 (variable) msgid "myChords" msgstr "mesAccords" -#. Documentation/user/chords.itely:709 (comment) -msgid "FIXME: broken." -msgstr "" - -#. Documentation/user/chords.itely:710 (comment) -msgid "<6\\\\>" -msgstr "" - -#. Documentation/user/chords.itely:857 (comment) -#. Documentation/user/chords.itely:878 (comment) +#. Documentation/user/chords.itely:974 (comment) +#. Documentation/user/chords.itely:995 (comment) msgid "Put notes on same Staff as figures" msgstr "Assemblage des notes et de la basse chifrée sur une même portée" -#. Documentation/user/chords.itely:955 (comment) +#. Documentation/user/chords.itely:1054 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" -msgstr "Les prolongateurs sont corrects, ils suivent bien le rythme de la basse" +msgstr "" +"Les prolongateurs sont corrects, ils suivent bien le rythme de la basse" -#. Documentation/user/chords.itely:967 (comment) +#. Documentation/user/chords.itely:1066 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "Les prolongateurs sont erronés, bien que le rythme soit le même" -#. Documentation/user/chords.itely:969 (comment) -msgid "\\repeat unfold 4 {<6 4->16. <6 4->32}" -msgstr "" - #. @node in Documentation/user/chords.itely #. @section in Documentation/user/chords.itely #. @node in Documentation/fr/user/chords.itely @@ -5969,41 +6297,62 @@ msgstr "" #. @node in Documentation/es/user/chords.itely #. @section in Documentation/es/user/chords.itely #. @node in Documentation/de/user/chords.itely +#. @section in Documentation/de/user/chords.itely msgid "Chord notation" msgstr "Notation des accords" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Chord mode" msgstr "Mode accords" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Chord mode overview" msgstr "Généralités sur le mode accords" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Common chords" msgstr "Accords courants" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Extended and altered chords" msgstr "Extensions et altération d'accords" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Displaying chords" msgstr "Gravure des accords" @@ -6020,40 +6369,56 @@ msgstr "Impression de noms d'accords" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Customizing chord names" msgstr "Personnalisation des noms d'accords" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Figured bass" msgstr "Basse chiffrée" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Introduction to figured bass" msgstr "Introduction à la basse chiffrée" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Entering figured bass" msgstr "Saisie de la basse chiffrée" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Displaying figured bass" msgstr "Gravure de la basse chiffrée" @@ -6070,239 +6435,408 @@ msgstr "Notations anciennes" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Introduction to ancient notation" msgstr "Introduction aux notations anciennes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient notation supported" msgstr "Formes de notation ancienne prises en charge" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Alternative note signs" msgstr "Signes de note alternatifs" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient note heads" msgstr "Têtes de note anciennes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient accidentals" msgstr "Altérations anciennes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient rests" msgstr "Silences anciens" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient clefs" msgstr "Clefs anciennes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient flags" msgstr "Crochets anciens" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient time signatures" msgstr "Métriques anciennes" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Additional note signs" msgstr "Signes de note supplémentaires" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient articulations" msgstr "Articulations anciennes" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Custodes" msgstr "Guidons" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Divisiones" msgstr "Divisions" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ligatures" msgstr "Ligatures" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "White mensural ligatures" msgstr "Ligatures mensurales" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Gregorian square neumes ligatures" msgstr "Neumes ligaturés grégoriens" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Pre-defined contexts" msgstr "Contextes prédéfinis" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Gregorian chant contexts" msgstr "Contextes du chant grégorien" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensural contexts" msgstr "Le contexte mensural" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Transcribing ancient music" msgstr "Transcription de musique mensurale" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient and modern from one source" msgstr "Différentes éditions à partir d'une même source" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Incipits" msgstr "Des incipits" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensurstriche layout" msgstr "Mise en forme de la musique mensurale" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Transcribing Gregorian chant" msgstr "Transcription de chant grégorien" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Editorial markings" msgstr "Notation éditoriale" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Annotational accidentals" msgstr "Altérations accidentelles" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Baroque rhythmic notation" msgstr "Notation du rythme dans la musique baroque" -#. Documentation/user/input.itely:497 (comment) -msgid "not printed" -msgstr "non imprimé" +#. @node in Documentation/user/world.itely +#. @section in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @section in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @section in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @section in Documentation/de/user/world.itely +#, fuzzy +msgid "World music" +msgstr "Musique vocale" -#. @node in Documentation/user/input.itely -#. @chapter in Documentation/user/input.itely -#. @node in Documentation/fr/user/input.itely -#. @chapter in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @chapter in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @chapter in Documentation/de/user/input.itely -msgid "Input syntax" -msgstr "Syntaxe d'entrée" +#. @node in Documentation/user/world.itely +#. @subsection in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @subsection in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @subsection in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @subsection in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic music" +msgstr "Musique vocale" -#. @node in Documentation/user/input.itely -#. @section in Documentation/user/input.itely +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "References for Arabic music" +msgstr "Références en matière de musique vocale" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic note names" +msgstr "Noms de note absolus" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic key signatures" +msgstr "armure" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic time signatures" +msgstr "Métriques anciennes" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Arabic music example" +msgstr "Exemple concret" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +#, fuzzy +msgid "Further reading" +msgstr "Autres retouches" + +#. Documentation/user/input.itely:494 (comment) +msgid "not printed" +msgstr "non imprimé" + +#. Documentation/user/input.itely:911 (variable) +#, fuzzy +msgid "allLyrics" +msgstr "paroles" + +#. @node in Documentation/user/input.itely +#. @chapter in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @chapter in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @chapter in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @chapter in Documentation/de/user/input.itely +msgid "General input and output" +msgstr "" + +#. @node in Documentation/user/input.itely +#. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Input structure" msgstr "Structure de fichier" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Structure of a score" msgstr "Structure d'une partition" @@ -6330,61 +6864,67 @@ msgstr "Structure de fichier" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Titles and headers" msgstr "Titres et entêtes" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating titles" msgstr "Création de titres" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Custom titles" msgstr "Titres personnalisés" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Reference to page numbers" msgstr "Référence de numéro de page" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Table of contents" msgstr "Table des matières" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Working with input files" msgstr "Travail sur des fichiers texte" @@ -6410,6 +6950,30 @@ msgstr "Insertion de fichiers LilyPond" msgid "Different editions from one source" msgstr "Différentes éditions à partir d'une même source" +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Using variables" +msgstr "Utilisation de variables dans les retouches" + +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Using tags" +msgstr "Masquage de portées" + #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely #. @node in Documentation/fr/user/input.itely @@ -6434,11 +6998,23 @@ msgstr "Affichage de notation au format LilyPond" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Controlling output" msgstr "Contrôle des sorties" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Extracting fragments of music" msgstr "Extraction de fragments musicaux" @@ -6455,118 +7031,155 @@ msgstr "Ignorer des passages de la partition" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "MIDI output" msgstr "Sortie MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating MIDI files" msgstr "Création de fichiers MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "MIDI block" msgstr "Le bloc MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "MIDI instrument names" -msgstr "Noms d'instruments MIDI" - -#. @node in Documentation/user/input.itely -#. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "What goes into the MIDI? FIXME" +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +#, fuzzy +msgid "What goes into the MIDI output?" msgstr "Éléments pris en compte dans le MIDI" +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Supported in MIDI" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Unsupported in MIDI" +msgstr "" + #. @node in Documentation/user/input.itely -#. @subsubsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @unnumberedsubsubsec in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsubsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsubsection in Documentation/de/user/non-music.itely -msgid "Repeats and MIDI" +#. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +#, fuzzy +msgid "Repeats in MIDI" msgstr "Répétitions et MIDI" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely -msgid "other midi" +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +#, fuzzy +msgid "Controlling MIDI dynamics" +msgstr "Contrôle des directions" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +#, fuzzy +msgid "Dynamic marks" +msgstr "Personnalisation des indications de nuance" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Overall MIDI volume" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (i)" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (ii)" msgstr "" -#. Documentation/user/spacing.itely:671 (comment) +#. Documentation/user/spacing.itely:684 (comment) msgid "this does nothing" msgstr "ceci est sans effet" -#. Documentation/user/spacing.itely:672 (comment) +#. Documentation/user/spacing.itely:685 (comment) msgid "a break here would work" msgstr "une rupture serait ici acceptée" -#. Documentation/user/spacing.itely:673 (comment) +#. Documentation/user/spacing.itely:686 (comment) msgid "as does this break" msgstr "tout comme celle-ci" -#. Documentation/user/spacing.itely:685 (comment) +#. Documentation/user/spacing.itely:698 (comment) msgid "now the break is allowed" msgstr "la rupture est maintenant autorisée" -#. Documentation/user/spacing.itely:1438 (comment) +#. Documentation/user/spacing.itely:1460 (comment) msgid "this time the text will be closer to the staff" msgstr "cette fois, le texte est plus proche de la portée" -#. Documentation/user/spacing.itely:1440 (comment) -msgid "by setting outside-staff-priority to a non-number, we" +#. Documentation/user/spacing.itely:1462 (comment) +#, fuzzy +msgid "by setting outside-staff-priority to a non-number, " msgstr "definir outside-staff-priority à autre chose qu'un nombre" -#. Documentation/user/spacing.itely:1441 (comment) -msgid "disable the automatic collision avoidance" +#. Documentation/user/spacing.itely:1463 (comment) +#, fuzzy +msgid "we disable the automatic collision avoidance" msgstr "désactive l'évitement automatique de collision" -#. Documentation/user/spacing.itely:1444 (comment) +#. Documentation/user/spacing.itely:1466 (comment) msgid "now they will collide" msgstr "il y a maintenant chevauchement" -#. Documentation/user/spacing.itely:1469 (comment) +#. Documentation/user/spacing.itely:1491 (comment) msgid "the markup is too close to the following note" msgstr "l'étiquette est trop proche de la note qui suit" -#. Documentation/user/spacing.itely:1472 (comment) +#. Documentation/user/spacing.itely:1494 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "définir outside-staff-horizontal-padding règle le problème" @@ -6647,17 +7260,6 @@ msgstr "Définition de la taille de portée" msgid "Score layout" msgstr "Mise en forme de la partition" -#. @node in Documentation/user/spacing.itely -#. @section in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @section in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @section in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @section in Documentation/de/user/spacing.itely -msgid "Displaying spacing" -msgstr "Mise en évidence de l'espacement" - #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely #. @node in Documentation/fr/user/spacing.itely @@ -6883,25 +7485,18 @@ msgstr "Notation proportionnelle" #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely +#. @node in Documentation/fr/user/tweaks.itely +#. @section in Documentation/fr/user/tweaks.itely #. @node in Documentation/fr/user/spacing.itely #. @section in Documentation/fr/user/spacing.itely #. @node in Documentation/es/user/spacing.itely #. @section in Documentation/es/user/spacing.itely +#. @node in Documentation/de/user/tweaks.itely +#. @section in Documentation/de/user/tweaks.itely #. @node in Documentation/de/user/spacing.itely #. @section in Documentation/de/user/spacing.itely -msgid "Page layout MOVED FROM LM" -msgstr "Mise en page (DÉPLACÉ DU MANUEL D'INITIATION)" - -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Introduction to layout" -msgstr "Introduction à la mise en forme" +msgid "Fitting music onto fewer pages" +msgstr "Réduction du nombre de pages de la partition" #. @node in Documentation/user/spacing.itely #. @subsection in Documentation/user/spacing.itely @@ -6911,8 +7506,8 @@ msgstr "Introduction à la mise en forme" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Global sizes" -msgstr "Tailles par défaut" +msgid "Displaying spacing" +msgstr "Mise en évidence de l'espacement" #. @node in Documentation/user/spacing.itely #. @subsection in Documentation/user/spacing.itely @@ -6922,34 +7517,17 @@ msgstr "Tailles par défaut" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Line breaks" -msgstr "Sauts de ligne" +#, fuzzy +msgid "Changing spacing" +msgstr "Modification de l'espacement horizontal" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Page breaks" -msgstr "Sauts de page" +#. Documentation/user/changing-defaults.itely:1947 (comment) +msgid "Remove bar line at the end of the current line" +msgstr "" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/tweaks.itely -#. @section in Documentation/fr/user/tweaks.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/tweaks.itely -#. @section in Documentation/de/user/tweaks.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Fitting music onto fewer pages" -msgstr "Réduction du nombre de pages de la partition" +#. Documentation/user/changing-defaults.itely:1993 (comment) +msgid "Try to remove all key signatures" +msgstr "" #. @node in Documentation/user/changing-defaults.itely #. @chapter in Documentation/user/changing-defaults.itely @@ -6973,6 +7551,34 @@ msgstr "Modification des réglages prédéfinis" msgid "Interpretation contexts" msgstr "Contextes d'interprétation" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Score - the master of all contexts" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Top-level contexts - staff containers" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Intermediate-level contexts - staves" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Bottom-level contexts - voices" +msgstr "" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -7021,6 +7627,8 @@ msgstr "Alignement des contextes" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Explaining the Internals Reference" msgstr "En quoi consiste la référence du programme" @@ -7061,6 +7669,8 @@ msgstr "Détermination de la propriété de l'objet graphique (grob)" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Naming conventions" msgstr "Conventions d'attribution de nom" @@ -7068,6 +7678,8 @@ msgstr "Conventions d'attribution de nom" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Modifying properties" msgstr "Modification de propriétés" @@ -7075,16 +7687,20 @@ msgstr "Modification de propriétés" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Overview of modifying properties" msgstr "Vue d'ensemble de la modification des propriétés" #. @node in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely msgid "The \\set command" msgstr "La commande \\set" #. @subsection in Documentation/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\set} command" msgstr "La commande @code{\\set}" @@ -7098,7 +7714,7 @@ msgstr "La commande \\override" #. @subsection in Documentation/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\override} command" msgstr "La commande @code{\\override}" @@ -7131,6 +7747,8 @@ msgstr "Objets liés à la source" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Useful concepts and properties" msgstr "Propriétés et contextes utiles" @@ -7138,6 +7756,8 @@ msgstr "Propriétés et contextes utiles" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Input modes" msgstr "Modes de saisie" @@ -7145,6 +7765,8 @@ msgstr "Modes de saisie" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Direction and placement" msgstr "Direction et positionnement" @@ -7152,6 +7774,8 @@ msgstr "Direction et positionnement" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Distances and measurements" msgstr "Distances et unités de mesure" @@ -7159,6 +7783,8 @@ msgstr "Distances et unités de mesure" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Spanners" msgstr "Extenseurs et prolongateurs" @@ -7166,6 +7792,8 @@ msgstr "Extenseurs et prolongateurs" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Common properties" msgstr "Propriétés couramment utilisées" @@ -7179,18 +7807,60 @@ msgid "Controlling visibility of objects" msgstr "Contrôle de la visibilité des objets" #. @node in Documentation/user/changing-defaults.itely -#. @subsection in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @subsection in Documentation/es/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely #. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Line styles" -msgstr "Styles de ligne" +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Removing the stencil" +msgstr "Modification des stencils" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Making objects transparent" +msgstr "Déplacement d'objets" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Painting objects white" +msgstr "Rotation des objets" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Using break-visibility" +msgstr "visibilité des barres (break-visibility)" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Special considerations" +msgstr "Notation spécialiste" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely +msgid "Line styles" +msgstr "Styles de ligne" + +#. @node in Documentation/user/changing-defaults.itely +#. @subsection in Documentation/user/changing-defaults.itely +#. @node in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Rotating objects" msgstr "Rotation des objets" @@ -7198,6 +7868,8 @@ msgstr "Rotation des objets" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Aligning objects" msgstr "Alignement des objets" @@ -7205,6 +7877,8 @@ msgstr "Alignement des objets" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Advanced tweaks" msgstr "Retouches avancées" @@ -7223,6 +7897,8 @@ msgstr "Groupement vertical d'objets graphiques" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying ends of spanners" msgstr "Modification dela terminaison des extenseurs" @@ -7230,23 +7906,21 @@ msgstr "Modification dela terminaison des extenseurs" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying stencils" msgstr "Modification des stencils" #. @node in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -msgid "old The \\override command" -msgstr "ex La commande \\override" - -#. @section in Documentation/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely -msgid "old The @code{\\override} command" -msgstr "ex La commande @code{\\override}" +#. @subsection in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely +#, fuzzy +msgid "Modifying shapes" +msgstr "Modification des stencils" #. @node in Documentation/user/changing-defaults.itely #. @section in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely #. @node in Documentation/de/user/changing-defaults.itely #. @section in Documentation/de/user/changing-defaults.itely msgid "Discussion of specific tweaks" @@ -7254,8 +7928,8 @@ msgstr "Considération de certaines retouches spécifiques" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "old Contexts explained" msgstr "ex Tout savoir sur les contextes" @@ -7575,18 +8249,24 @@ msgstr "Utilisation de procédures Scheme comme propriétés" #. @node in Documentation/user/programming-interface.itely #. @section in Documentation/user/programming-interface.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @section in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "TODO moved into scheme" msgstr "" #. @node in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of \\tweak" msgstr "Utilisation de code Scheme au lieu de \\tweak" #. @subsection in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "Utilisation de code Scheme au lieu de @code{\\tweak}" @@ -7594,8 +8274,10 @@ msgstr "Utilisation de code Scheme au lieu de @code{\\tweak}" #. @subsection in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Difficult tweaks" msgstr "Retouches complexes" @@ -7632,6 +8314,18 @@ msgstr "Tables du manuel de notation" msgid "Chord name chart" msgstr "Table des noms d'accord" +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +#, fuzzy +msgid "Common chord modifiers" +msgstr "Accords courants" + +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +#, fuzzy +msgid "Predefined fretboard diagrams" +msgstr "Commandes prédéfinies" + #. @node in Documentation/user/notation-appendices.itely #. @appendixsec in Documentation/user/notation-appendices.itely #. @node in Documentation/fr/user/notation-appendices.itely @@ -7786,38 +8480,28 @@ msgstr "GNU LilyPond --- manuel d'initiation" msgid "Commonly tweaked properties" msgstr "Propriétés couramment modifiées" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Manuel de l'utilisateur" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel d'apprentissage" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel de référence" -msgstr "" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Hauteurs" +msgstr "Clusters" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Annexes" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Durées et rythme" msgstr "" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Utilisation du programme" -msgstr "" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Silences" +msgstr "Lignes" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Autre documentation" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Métrique" msgstr "" -#. @subsubheading in Documentation/fr/user/tutorial.itely -#. @subsubheading in Documentation/de/user/tutorial.itely -msgid "Unix" -msgstr "Unix" - -#. @rglos in Documentation/fr/user/tutorial.itely -msgid "fourth" -msgstr "quarte" +#. @subheading in Documentation/fr/user/tutorial.itely +#, fuzzy +msgid "Tout ensemble" +msgstr "Ensemble vocal" #. @node in Documentation/fr/user/tutorial.itely #. @subsection in Documentation/fr/user/tutorial.itely @@ -7826,36 +8510,10 @@ msgstr "quarte" msgid "Working on text files" msgstr "Travail sur des fichiers texte" -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "How to read the tutorial" -msgstr "Bien lire le tutoriel" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Relative note names" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Exemples cliquables" msgstr "" -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Piano staves" -msgstr "Double portée" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Printing lyrics" -msgstr "Gravure de paroles" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "A lead sheet" -msgstr "Partition d'une chanson" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Organizing pieces with identifiers" -msgstr "Organisation du code source avec des variables" - #. @node in Documentation/fr/user/fundamental.itely #. @section in Documentation/fr/user/fundamental.itely #. @node in Documentation/es/user/fundamental.itely @@ -7879,15 +8537,6 @@ msgstr "Retouches courantes" msgid "Default files" msgstr "Fichiers fournis avec le logiciel" -#. @node in Documentation/fr/user/working.itely -#. @section in Documentation/fr/user/working.itely -#. @node in Documentation/es/user/working.itely -#. @section in Documentation/es/user/working.itely -#. @node in Documentation/de/user/working.itely -#. @section in Documentation/de/user/working.itely -msgid "Suggestions for writing LilyPond files" -msgstr "Suggestions de saisie des fichiers LilyPond" - #. @node in Documentation/fr/user/working.itely #. @subsection in Documentation/fr/user/working.itely #. @node in Documentation/es/user/working.itely @@ -7902,8 +8551,9 @@ msgid "GNU LilyPond --- utilisation des programmes" msgstr "GNU LilyPond --- utilisation du programme" #. @top in Documentation/fr/user/lilypond.tely -msgid "GNU LilyPond --- le système de gravure musicale" -msgstr "" +#, fuzzy +msgid "GNU LilyPond --- manuel de notation" +msgstr "GNU LilyPond --- manuel d'initiation" #. @node in Documentation/fr/user/pitches.itely #. @unnumberedsubsubsec in Documentation/fr/user/pitches.itely @@ -7941,47 +8591,49 @@ msgid "Octave check" msgstr "Vérification d'octave" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Augmentation dots" msgstr "Points d'augmentation" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely +#. @node in Documentation/es/user/rhythms.itely +#. @subsubsection in Documentation/es/user/rhythms.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely +msgid "Skips" +msgstr "Silences invisibles" + +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Multi measure rests" msgstr "Silences multi-mesures" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar check" msgstr "Vérification des limites de mesure" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Barnumber check" msgstr "Vérification des numéros de mesure" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Proportional notation (introduction)" msgstr "Introduction à la notation proportionnelle" -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely -#. @node in Documentation/de/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely -msgid "Laissez vibrer ties" -msgstr "Liaisons ``laissez vibrer''" - #. @node in Documentation/fr/user/repeats.itely #. @subsection in Documentation/fr/user/repeats.itely msgid "Writing repeats" @@ -8049,7 +8701,7 @@ msgid "System start delimiters" msgstr "Délimitations en début de système" #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely msgid "Blank music sheet" msgstr "Papier à musique" @@ -8060,15 +8712,11 @@ msgstr "Indications textuelles et lignes d'extension" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Nested scores" msgstr "Partitions emboîtées" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Page wrapping text" msgstr "Texte avec sauts de page" @@ -8089,207 +8737,32 @@ msgstr "" msgid "The piano staff" msgstr "La double portée pour piano" -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @subsection in Documentation/fr/user/unfretted-strings.itely -msgid "Orchestral strings sections" -msgstr "Musique orchestrale -- pupitres de cordes" - -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsubsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely -msgid "Artificial harmonics (strings)" -msgstr "Harmoniques artificiels (cordes)" - #. @node in Documentation/fr/user/fretted-strings.itely -#. @subsection in Documentation/fr/user/fretted-strings.itely -msgid "Guitar sections" -msgstr "Sections de guitare" - -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Tablatures basic" -msgstr "Introduction aux tablatures" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Fret diagrams" +msgstr "Tablatures" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Non-guitar tablatures" -msgstr "Tablatures autres que pour la guitare" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Right hand fingerings" +msgstr "Doigtés pour la main droite" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Other guitar issues" -msgstr "Autres éléments relatifs à la guitare" - -#. @node in Documentation/fr/user/percussion.itely -#. @subsection in Documentation/fr/user/percussion.itely -msgid "Percussion sections" -msgstr "Sections de percussions" - -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely -msgid "Entering percussion" -msgstr "Notation des percussions" - -#. @node in Documentation/fr/user/wind.itely -#. @subsection in Documentation/fr/user/wind.itely -#. @node in Documentation/es/user/wind.itely -#. @subsection in Documentation/es/user/wind.itely -#. @node in Documentation/de/user/wind.itely -#. @subsection in Documentation/de/user/wind.itely -msgid "Bagpipe" -msgstr "Cornemuse" - -#. @node in Documentation/fr/user/chords.itely -#. @subsection in Documentation/fr/user/chords.itely -msgid "Chords sections" -msgstr "Sections d'accords" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Entering chord names" -msgstr "Saisie des noms d'accords" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Chords mode" -msgstr "Mode accords" - -#. @node in Documentation/fr/user/ancient.itely -#. @subsection in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @subsection in Documentation/de/user/ancient.itely -msgid "Ancient TODO" -msgstr "Musique ancienne" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Gregorian Chant contexts" -msgstr "Contextes du chant grégorien" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Musica ficta accidentals" -msgstr "Altérations et musica ficta" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Input files" -msgstr "Fichiers d'entrée" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "A single music expression" -msgstr "Une expression musicale unique" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Extracting fragments of notation" -msgstr "Extraction de fragments musicaux" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Common syntax issues TODO name?" -msgstr "Problèmes de syntaxe courants" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -msgid "Controlling direction" -msgstr "Contrôle des directions" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Distances and measurements MAYBE MOVE" -msgstr "Distances et unités de mesure" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Other stuffs TODO move?" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "context list FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "another thing FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Input modes FIXME" -msgstr "" - -#. @node in Documentation/fr/user/non-music.itely -#. @chapter in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @chapter in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @chapter in Documentation/de/user/non-music.itely -msgid "Non-musical notation" -msgstr "Objets non musicaux" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Guitar tablatures" +msgstr "Tablatures pour la guitare" #. @node in Documentation/fr/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely @@ -8298,22 +8771,16 @@ msgstr "Notation automatique" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Changing context properties on the fly" msgstr "Changer à la volée les propriétés de contexte" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Layout tunings within contexts" msgstr "Retouches de mise en forme au sein des contextes" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Constructing a tweak" msgstr "Élaboration d'une retouche" @@ -8337,34 +8804,22 @@ msgstr "" msgid "Advertencias y problemas conocidos" msgstr "" -#. @subheading in Documentation/es/user/introduction.itely -msgid "Learning Manual (LM)" -msgstr "Manuel d'initiation (LM)" - -#. @subheading in Documentation/es/user/introduction.itely -msgid "Notation Reference (NR)" -msgstr "Manuel de notation (NR)" - -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Appendices" -msgstr "Annexes" - -#. @subheading in Documentation/es/user/introduction.itely -#. @subheading in Documentation/de/user/introduction.itely -msgid "Program usage" -msgstr "Utilisation du programme" - -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Other information" -msgstr "Autres sources de documentation" - #. @node in Documentation/es/user/tweaks.itely #. @subsection in Documentation/es/user/tweaks.itely msgid "Automatic behaviour" msgstr "Comportement automatique" +#. @subheading in Documentation/es/user/tweaks.itely +msgid "Simulating a fermata" +msgstr "Rendu MIDI d'un point d'orgue" + +#. @node in Documentation/es/user/working.itely +#. @section in Documentation/es/user/working.itely +#. @node in Documentation/de/user/working.itely +#. @section in Documentation/de/user/working.itely +msgid "Suggestions for writing LilyPond files" +msgstr "Suggestions de saisie des fichiers LilyPond" + #. @rglos in Documentation/es/user/working.itely msgid "baritone" msgstr "baryton" @@ -8384,30 +8839,24 @@ msgstr "" msgid "Writing long repeats" msgstr "Écriture de répétitions longues" -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @subsection in Documentation/de/user/unfretted-strings.itely -msgid "Orchestral strings TODO" -msgstr "Cordes frottées" - #. @rglos in Documentation/es/user/chords.itely msgid " " msgstr "" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Controlling direction and placement" -msgstr "Maîtrise des directions et positionnements" +#. @node in Documentation/es/user/ancient.itely +#. @subsection in Documentation/es/user/ancient.itely +msgid "Ancient TODO" +msgstr "Musique ancienne" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "When to add a -" -msgstr "" +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Gregorian Chant contexts" +msgstr "Contextes du chant grégorien" + +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Musica ficta accidentals" +msgstr "Altérations et musica ficta" #. @top in Documentation/de/user/lilypond-learning.tely msgid "GNU LilyPond -- Handbuch zum Lernen" @@ -8425,6 +8874,22 @@ msgstr "" msgid "Notation reference" msgstr "" +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Appendices" +msgstr "Annexes" + +#. @subheading in Documentation/de/user/introduction.itely +msgid "Program usage" +msgstr "Utilisation du programme" + +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Other information" +msgstr "Autres sources de documentation" + +#. @subsubheading in Documentation/de/user/tutorial.itely +msgid "Unix" +msgstr "Unix" + #. @rglos in Documentation/de/user/tutorial.itely msgid "legato" msgstr "legato" @@ -8442,115 +8907,235 @@ msgstr "GNU LilyPond --- utilisation du programme" msgid "GNU LilyPond -- Das Notationsprogramm" msgstr "" +#. @node in Documentation/de/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely +msgid "Laissez vibrer ties" +msgstr "Liaisons ``laissez vibrer''" + #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Chords" msgstr "Accords" -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely -msgid "Font selection" -msgstr "Sélection de la fonte" +msgid "Up:" +msgstr "Haut :" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Simple lyrics" -msgstr "Paroles simples" +msgid "Next:" +msgstr "Suivant :" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Another way of entering lyrics" -msgstr "Une autre manière de saisir des paroles" +msgid "Previous:" +msgstr "Précédent :" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Assigning more than one syllable to a single note" -msgstr "Plusieurs syllabes sur une même note" +msgid "Appendix " +msgstr "Annexe " -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "More than one note on a single syllable" -msgstr "Plusieurs notes pour une même syllabe" +msgid "Footnotes" +msgstr "Notes de bas de page" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Vocals and variables" -msgstr "Paroles et variables" +msgid "Table of Contents" +msgstr "Table des matières" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Flexibility in placement" -msgstr "Flexibilité dans le placement" +#, fuzzy +#~ msgid "Microtones in MIDI" +#~ msgstr "Altérations microtonales" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Lyrics to multiple notes of a melisma" -msgstr "Paroles sur plusieurs notes d'un mélisme" +#~ msgid "Input files" +#~ msgstr "Fichiers d'entrée" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Switching the melody associated with a lyrics line" -msgstr "Changement de la voix associée à une ligne de paroles" +#~ msgid "A single music expression" +#~ msgstr "Une expression musicale unique" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Spacing vocals" -msgstr "Espacement des paroles" +#~ msgid "Extracting fragments of notation" +#~ msgstr "Extraction de fragments musicaux" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Spacing lyrics" -msgstr "Espacement des paroles" +#~ msgid "Common syntax issues TODO name?" +#~ msgstr "Problèmes de syntaxe courants" -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "More about stanzas" -msgstr "Traitement avancé des couplets" +#~ msgid "Controlling direction" +#~ msgstr "Contrôle des directions" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding dynamics marks" -msgstr "Ajout de nuances" +#~ msgid "Distances and measurements MAYBE MOVE" +#~ msgstr "Distances et unités de mesure" -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding singer names" -msgstr "Nom des chanteurs" +#~ msgid "Non-musical notation" +#~ msgstr "Objets non musicaux" -#. @node in Documentation/de/user/fretted-strings.itely -#. @subsection in Documentation/de/user/fretted-strings.itely -msgid "Guitar TODO" -msgstr "Guitare" +#~ msgid "MIDI instrument names" +#~ msgstr "Noms d'instruments MIDI" -#. @node in Documentation/de/user/percussion.itely -#. @subsection in Documentation/de/user/percussion.itely -msgid "TODO percussion node fix" -msgstr "" +#~ msgid "What goes into the MIDI? FIXME" +#~ msgstr "Éléments pris en compte dans le MIDI" -#. @section in Documentation/de/user/chords.itely -msgid "Chords notation" -msgstr "Notation des accords" +#~ msgid "Repeats and MIDI" +#~ msgstr "Répétitions et MIDI" -#. @node in Documentation/de/user/chords.itely -#. @subsection in Documentation/de/user/chords.itely -msgid "TODO chords fix" -msgstr "" +#~ msgid "Page layout MOVED FROM LM" +#~ msgstr "Mise en page (DÉPLACÉ DU MANUEL D'INITIATION)" -msgid "Up:" -msgstr "Haut :" +#~ msgid "Introduction to layout" +#~ msgstr "Introduction à la mise en forme" -msgid "Next:" -msgstr "Suivant :" +#~ msgid "Global sizes" +#~ msgstr "Tailles par défaut" -msgid "Previous:" -msgstr "Précédent :" +#~ msgid "Line breaks" +#~ msgstr "Sauts de ligne" -msgid "Appendix " -msgstr "Annexe " +#~ msgid "Page breaks" +#~ msgstr "Sauts de page" -msgid "Footnotes" -msgstr "Notes de bas de page" +#~ msgid "Input syntax" +#~ msgstr "Syntaxe d'entrée" -msgid "Table of Contents" -msgstr "Table des matières" +#~ msgid "Controlling direction and placement" +#~ msgstr "Maîtrise des directions et positionnements" + +#~ msgid "old The \\override command" +#~ msgstr "ex La commande \\override" + +#~ msgid "old The @code{\\override} command" +#~ msgstr "ex La commande @code{\\override}" + +#~ msgid "Font selection" +#~ msgstr "Sélection de la fonte" + +#~ msgid "Simple lyrics" +#~ msgstr "Paroles simples" + +#~ msgid "Another way of entering lyrics" +#~ msgstr "Une autre manière de saisir des paroles" + +#~ msgid "Assigning more than one syllable to a single note" +#~ msgstr "Plusieurs syllabes sur une même note" + +#~ msgid "More than one note on a single syllable" +#~ msgstr "Plusieurs notes pour une même syllabe" + +#~ msgid "Vocals and variables" +#~ msgstr "Paroles et variables" + +#~ msgid "Flexibility in placement" +#~ msgstr "Flexibilité dans le placement" + +#~ msgid "Lyrics to multiple notes of a melisma" +#~ msgstr "Paroles sur plusieurs notes d'un mélisme" + +#~ msgid "Switching the melody associated with a lyrics line" +#~ msgstr "Changement de la voix associée à une ligne de paroles" + +#~ msgid "Spacing vocals" +#~ msgstr "Espacement des paroles" + +#~ msgid "Spacing lyrics" +#~ msgstr "Espacement des paroles" + +#~ msgid "More about stanzas" +#~ msgstr "Traitement avancé des couplets" + +#~ msgid "Adding dynamics marks" +#~ msgstr "Ajout de nuances" + +#~ msgid "Adding singer names" +#~ msgstr "Nom des chanteurs" + +#~ msgid "set stems, etc down" +#~ msgstr "Hampes et autres attributs iront vers le bas" + +#~ msgid "set stems, etc up" +#~ msgstr "Hampes et autres attributs iront vers le haut" + +#~ msgid "end of first LH voice" +#~ msgstr "fin de la voix un de MG" + +#~ msgid "return to original size" +#~ msgstr "retour à la taille originelle" + +#~ msgid "sopMusic" +#~ msgstr "sopMusique" + +#~ msgid "mus" +#~ msgstr "musique" + +#~ msgid "Rest bars contracted to single bar" +#~ msgstr "Contraction des mesures de silence consécutives en une seule" + +#~ msgid "Revert to the default" +#~ msgstr "Retour aux valeurs par défaut" + +#~ msgid "{" +#~ msgstr "{" + +#~ msgid "}" +#~ msgstr "}" + +#~ msgid "looks good" +#~ msgstr "obtenir un résultat satisfaisant" + +#~ msgid "fourth" +#~ msgstr "quarte" + +#~ msgid "How to read the tutorial" +#~ msgstr "Bien lire le tutoriel" + +#~ msgid "Piano staves" +#~ msgstr "Double portée" + +#~ msgid "Printing lyrics" +#~ msgstr "Gravure de paroles" + +#~ msgid "A lead sheet" +#~ msgstr "Partition d'une chanson" + +#~ msgid "Organizing pieces with identifiers" +#~ msgstr "Organisation du code source avec des variables" + +#~ msgid "Orchestral strings sections" +#~ msgstr "Musique orchestrale -- pupitres de cordes" + +#~ msgid "Artificial harmonics (strings)" +#~ msgstr "Harmoniques artificiels (cordes)" + +#~ msgid "Guitar sections" +#~ msgstr "Sections de guitare" + +#~ msgid "Tablatures basic" +#~ msgstr "Introduction aux tablatures" + +#~ msgid "Non-guitar tablatures" +#~ msgstr "Tablatures autres que pour la guitare" + +#~ msgid "Other guitar issues" +#~ msgstr "Autres éléments relatifs à la guitare" + +#~ msgid "Percussion sections" +#~ msgstr "Sections de percussions" + +#~ msgid "Entering percussion" +#~ msgstr "Notation des percussions" + +#~ msgid "Bagpipe" +#~ msgstr "Cornemuse" + +#~ msgid "Chords sections" +#~ msgstr "Sections d'accords" + +#~ msgid "Entering chord names" +#~ msgstr "Saisie des noms d'accords" + +#~ msgid "Chords mode" +#~ msgstr "Mode accords" + +#~ msgid "Learning Manual (LM)" +#~ msgstr "Manuel d'initiation (LM)" + +#~ msgid "Notation Reference (NR)" +#~ msgstr "Manuel de notation (NR)" + +#~ msgid "Orchestral strings TODO" +#~ msgstr "Cordes frottées" + +#~ msgid "Guitar TODO" +#~ msgstr "Guitare" +#~ msgid "Chords notation" +#~ msgstr "Notation des accords" diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot index fc6030d94e..ef6ce1d04a 100644 --- a/Documentation/po/lilypond-doc.pot +++ b/Documentation/po/lilypond-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-20 09:14+0200\n" +"POT-Creation-Date: 2008-08-11 18:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,72 +58,81 @@ msgid "" msgstr "" #: translations-status.py:56 +msgid "Section titles" +msgstr "" + +#: translations-status.py:57 +#, python-format +msgid "

    Last updated %s

    \n" +msgstr "" + +#: translations-status.py:58 msgid "Translators" msgstr "" -#: translations-status.py:56 +#: translations-status.py:58 msgid "Translation checkers" msgstr "" -#: translations-status.py:57 +#: translations-status.py:59 msgid "Translated" msgstr "" -#: translations-status.py:57 +#: translations-status.py:59 msgid "Up to date" msgstr "" -#: translations-status.py:58 +#: translations-status.py:60 msgid "Other info" msgstr "" -#: translations-status.py:60 +#: translations-status.py:62 msgid "no" msgstr "" -#: translations-status.py:61 +#: translations-status.py:63 msgid "not translated" msgstr "" -#: translations-status.py:63 +#: translations-status.py:65 #, python-format msgid "partially (%(p)d %%)" msgstr "" -#: translations-status.py:65 +#: translations-status.py:67 #, python-format msgid "partially translated (%(p)d %%)" msgstr "" -#: translations-status.py:66 translations-status.py:68 +#: translations-status.py:68 translations-status.py:70 msgid "yes" msgstr "" -#: translations-status.py:67 +#: translations-status.py:69 msgid "translated" msgstr "" -#: translations-status.py:68 translations-status.py:69 +#: translations-status.py:70 translations-status.py:71 msgid "up to date" msgstr "" -#: translations-status.py:70 +#: translations-status.py:72 msgid "partially" msgstr "" -#: translations-status.py:71 +#: translations-status.py:73 msgid "partially up to date" msgstr "" -#: translations-status.py:72 +#: translations-status.py:74 msgid "N/A" msgstr "" -#: translations-status.py:73 +#: translations-status.py:75 msgid "pre-GDP" msgstr "" -#: translations-status.py:74 +#: translations-status.py:76 msgid "post-GDP" msgstr "" @@ -223,15 +232,19 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @section in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @section in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @section in Documentation/es/user/introduction.itely msgid "Background" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Engraving" @@ -240,9 +253,9 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Automated engraving" @@ -251,9 +264,9 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "What symbols to engrave?" @@ -262,9 +275,9 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Music representation" @@ -273,9 +286,9 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely #. @node in Documentation/fr/user/introduction.itely -#. @section in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely #. @node in Documentation/es/user/introduction.itely -#. @section in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely #. @node in Documentation/de/user/introduction.itely #. @section in Documentation/de/user/introduction.itely msgid "Example applications" @@ -294,40 +307,68 @@ msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Learning Manual (LM)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Music Glossary (MG)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Notation Reference (NR)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Application Usage (AU)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Snippet List (SL)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "About the Internals Reference (IR)" msgstr "" #. @node in Documentation/user/introduction.itely #. @unnumberedsubsec in Documentation/user/introduction.itely +#. @node in Documentation/fr/user/introduction.itely +#. @unnumberedsubsec in Documentation/fr/user/introduction.itely +#. @node in Documentation/es/user/introduction.itely +#. @unnumberedsubsec in Documentation/es/user/introduction.itely msgid "Other documentation" msgstr "" -#. Documentation/user/tutorial.itely:226 (comment) +#. Documentation/user/tutorial.itely:225 (comment) msgid "set the starting point to middle C" msgstr "" @@ -335,49 +376,50 @@ msgstr "" msgid "one octave above middle C" msgstr "" -#. Documentation/user/tutorial.itely:271 (comment) +#. Documentation/user/tutorial.itely:272 (comment) msgid "c is 1 staff space up, so is the c above" msgstr "" -#. Documentation/user/tutorial.itely:272 (comment) +#. Documentation/user/tutorial.itely:273 (comment) msgid "d is 2 up or 5 down, so is the d above" msgstr "" -#. Documentation/user/tutorial.itely:273 (comment) +#. Documentation/user/tutorial.itely:274 (comment) msgid "e is 3 up or 4 down, so is the e above" msgstr "" -#. Documentation/user/tutorial.itely:274 (comment) +#. Documentation/user/tutorial.itely:275 (comment) msgid "a is 6 up or 1 down, so is the a below" msgstr "" -#. Documentation/user/tutorial.itely:275 (comment) +#. Documentation/user/tutorial.itely:276 (comment) msgid "g is 5 up or 2 down, so is the g below" msgstr "" -#. Documentation/user/tutorial.itely:276 (comment) +#. Documentation/user/tutorial.itely:277 (comment) msgid "f is 4 up or 3 down, so is the f below" msgstr "" -#. Documentation/user/tutorial.itely:1525 (variable) +#. Documentation/user/tutorial.itely:1551 (variable) #. Documentation/user/working.itely:214 (variable) #. Documentation/user/working.itely:229 (variable) msgid "violin" msgstr "" -#. Documentation/user/tutorial.itely:1528 (variable) +#. Documentation/user/tutorial.itely:1556 (variable) msgid "cello" msgstr "" -#. Documentation/user/tutorial.itely:1551 (variable) +#. Documentation/user/tutorial.itely:1581 (variable) msgid "tripletA" msgstr "" -#. Documentation/user/tutorial.itely:1552 (variable) +#. Documentation/user/tutorial.itely:1582 (variable) msgid "barA" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely msgid "foo" msgstr "" @@ -437,6 +479,7 @@ msgid "Windows" msgstr "" #. @subsubheading in Documentation/user/tutorial.itely +#. @subsubheading in Documentation/fr/user/tutorial.itely #. @subsubheading in Documentation/es/user/tutorial.itely msgid "UNIX" msgstr "" @@ -455,7 +498,6 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/pitches.itely #. @section in Documentation/user/pitches.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/pitches.itely #. @section in Documentation/fr/user/pitches.itely #. @subheading in Documentation/es/user/tutorial.itely @@ -468,6 +510,7 @@ msgid "Pitches" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "pitch" @@ -497,19 +540,20 @@ msgid "middle C" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "octave" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "accidental" msgstr "" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "Durations (rhythms)" @@ -530,6 +574,7 @@ msgid "duration" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "whole note" @@ -559,15 +604,14 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rests" msgstr "" @@ -580,15 +624,14 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time signature" msgstr "" @@ -622,7 +665,6 @@ msgid "clef" msgstr "" #. @subheading in Documentation/user/tutorial.itely -#. @subheading in Documentation/fr/user/tutorial.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely msgid "All together" @@ -709,6 +751,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -717,6 +760,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -731,6 +775,7 @@ msgid "Key signatures" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "key signature" @@ -756,12 +801,14 @@ msgid "Warning: key signatures and pitches" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "natural" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "transposition" @@ -769,6 +816,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/pitches.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/pitches.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -790,8 +838,8 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely @@ -804,6 +852,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely #. @rglos in Documentation/fr/user/tutorial.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -812,7 +861,7 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -836,7 +885,7 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -882,8 +931,6 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/fr/user/tutorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @subheading in Documentation/es/user/tutorial.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/expressive.itely @@ -899,6 +946,7 @@ msgid "Fingerings" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "fingering" @@ -907,7 +955,7 @@ msgstr "" #. @subheading in Documentation/user/tutorial.itely #. @subheading in Documentation/user/tweaks.itely #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely @@ -922,6 +970,7 @@ msgid "Dynamics" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "dynamics" @@ -929,6 +978,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -937,6 +987,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/expressive.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/expressive.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -945,6 +996,8 @@ msgstr "" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -993,18 +1046,19 @@ msgstr "" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Tuplets" msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1013,6 +1067,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/rhythms.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1024,18 +1079,19 @@ msgstr "" #. @subsubsection in Documentation/user/rhythms.itely #. @subheading in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @subheading in Documentation/es/user/tutorial.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @subheading in Documentation/de/user/tutorial.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Grace notes" msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "grace notes" @@ -1043,6 +1099,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "acciaccatura" @@ -1050,6 +1107,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "appoggiatura" @@ -1093,6 +1151,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/de/user/tutorial.itely @@ -1119,6 +1178,8 @@ msgstr "" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1128,6 +1189,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/staff.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "brace" @@ -1147,6 +1209,7 @@ msgstr "" #. @rglos in Documentation/user/tutorial.itely #. @rglos in Documentation/user/simultaneous.itely #. @rglos in Documentation/user/chords.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/es/user/simultaneous.itely #. @rglos in Documentation/es/user/chords.itely @@ -1180,6 +1243,8 @@ msgstr "" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsubsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1194,6 +1259,7 @@ msgid "Setting simple songs" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "lyrics" @@ -1203,6 +1269,8 @@ msgstr "" #. @subsection in Documentation/user/tutorial.itely #. @node in Documentation/user/vocal.itely #. @subsection in Documentation/user/vocal.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/fr/user/vocal.itely #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/tutorial.itely @@ -1224,6 +1292,7 @@ msgid "melisma" msgstr "" #. @rglos in Documentation/user/tutorial.itely +#. @rglos in Documentation/fr/user/tutorial.itely #. @rglos in Documentation/es/user/tutorial.itely #. @rglos in Documentation/de/user/tutorial.itely msgid "extender line" @@ -1231,6 +1300,8 @@ msgstr "" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1251,6 +1322,8 @@ msgstr "" #. @node in Documentation/user/tutorial.itely #. @subsection in Documentation/user/tutorial.itely +#. @node in Documentation/fr/user/tutorial.itely +#. @subsection in Documentation/fr/user/tutorial.itely #. @node in Documentation/es/user/tutorial.itely #. @subsection in Documentation/es/user/tutorial.itely #. @node in Documentation/de/user/tutorial.itely @@ -1303,15 +1376,15 @@ msgid "After the tutorial" msgstr "" #. Documentation/user/fundamental.itely:352 (variable) -#. Documentation/user/vocal.itely:1054 (variable) -#. Documentation/user/vocal.itely:1096 (variable) +#. Documentation/user/vocal.itely:1165 (variable) +#. Documentation/user/vocal.itely:1207 (variable) msgid "melody" msgstr "" #. Documentation/user/fundamental.itely:353 (variable) -#. Documentation/user/vocal.itely:879 (variable) -#. Documentation/user/vocal.itely:1059 (variable) -#. Documentation/user/vocal.itely:1100 (variable) +#. Documentation/user/vocal.itely:989 (variable) +#. Documentation/user/vocal.itely:1170 (variable) +#. Documentation/user/vocal.itely:1211 (variable) msgid "text" msgstr "" @@ -1339,16 +1412,16 @@ msgid "Main voice" msgstr "" #. Documentation/user/fundamental.itely:687 (comment) -#. Documentation/user/simultaneous.itely:481 (comment) -#. Documentation/user/simultaneous.itely:503 (comment) -#. Documentation/user/simultaneous.itely:527 (comment) +#. Documentation/user/simultaneous.itely:593 (comment) +#. Documentation/user/simultaneous.itely:618 (comment) +#. Documentation/user/simultaneous.itely:645 (comment) msgid "Bar 1" msgstr "" #. Documentation/user/fundamental.itely:698 (comment) -#. Documentation/user/simultaneous.itely:485 (comment) -#. Documentation/user/simultaneous.itely:507 (comment) -#. Documentation/user/simultaneous.itely:533 (comment) +#. Documentation/user/simultaneous.itely:598 (comment) +#. Documentation/user/simultaneous.itely:623 (comment) +#. Documentation/user/simultaneous.itely:651 (comment) msgid "Bar 2" msgstr "" @@ -1398,6 +1471,7 @@ msgid "Initiate second voice" msgstr "" #. Documentation/user/fundamental.itely:1012 (comment) +#. Documentation/user/fundamental.itely:1074 (comment) msgid "Set stems, etc, down" msgstr "" @@ -1407,6 +1481,7 @@ msgid "Initiate third voice" msgstr "" #. Documentation/user/fundamental.itely:1018 (comment) +#. Documentation/user/fundamental.itely:1080 (comment) msgid "Set stems, etc, up" msgstr "" @@ -1414,18 +1489,10 @@ msgstr "" msgid "Initiate first voice" msgstr "" -#. Documentation/user/fundamental.itely:1074 (comment) -msgid "set stems, etc down" -msgstr "" - -#. Documentation/user/fundamental.itely:1080 (comment) -msgid "set stems, etc up" -msgstr "" - #. Documentation/user/fundamental.itely:1187 (variable) #. Documentation/user/fundamental.itely:2497 (variable) -#. Documentation/user/tweaks.itely:3156 (variable) -#. Documentation/user/simultaneous.itely:521 (variable) +#. Documentation/user/tweaks.itely:3168 (variable) +#. Documentation/user/simultaneous.itely:639 (variable) msgid "global" msgstr "" @@ -1451,42 +1518,41 @@ msgid "TimeKey" msgstr "" #. Documentation/user/fundamental.itely:1239 (variable) -#. Documentation/user/tweaks.itely:3157 (variable) msgid "SopMusic" msgstr "" #. Documentation/user/fundamental.itely:1240 (variable) -#. Documentation/user/tweaks.itely:3158 (variable) +#. Documentation/user/tweaks.itely:3170 (variable) msgid "AltoMusic" msgstr "" #. Documentation/user/fundamental.itely:1241 (variable) -#. Documentation/user/tweaks.itely:3159 (variable) +#. Documentation/user/tweaks.itely:3171 (variable) msgid "TenorMusic" msgstr "" #. Documentation/user/fundamental.itely:1242 (variable) -#. Documentation/user/tweaks.itely:3160 (variable) +#. Documentation/user/tweaks.itely:3172 (variable) msgid "BassMusic" msgstr "" #. Documentation/user/fundamental.itely:1243 (variable) -#. Documentation/user/tweaks.itely:3161 (variable) +#. Documentation/user/tweaks.itely:3173 (variable) msgid "VerseOne" msgstr "" #. Documentation/user/fundamental.itely:1245 (variable) -#. Documentation/user/tweaks.itely:3162 (variable) +#. Documentation/user/tweaks.itely:3174 (variable) msgid "VerseTwo" msgstr "" #. Documentation/user/fundamental.itely:1247 (variable) -#. Documentation/user/tweaks.itely:3163 (variable) +#. Documentation/user/tweaks.itely:3175 (variable) msgid "VerseThree" msgstr "" #. Documentation/user/fundamental.itely:1249 (variable) -#. Documentation/user/tweaks.itely:3164 (variable) +#. Documentation/user/tweaks.itely:3176 (variable) msgid "VerseFour" msgstr "" @@ -1523,7 +1589,7 @@ msgid "refrainwordsB" msgstr "" #. Documentation/user/fundamental.itely:1589 (comment) -msgid "start single compound music expression" +msgid "start of single compound music expression" msgstr "" #. Documentation/user/fundamental.itely:1590 (comment) @@ -1571,7 +1637,7 @@ msgid "end of LH voice one notes" msgstr "" #. Documentation/user/fundamental.itely:1611 (comment) -msgid "end of first LH voice" +msgid "end of LH voice one" msgstr "" #. Documentation/user/fundamental.itely:1612 (comment) @@ -1617,14 +1683,13 @@ msgid "make note heads larger" msgstr "" #. Documentation/user/fundamental.itely:1914 (comment) -msgid "return to default size" -msgstr "" - #. Documentation/user/fundamental.itely:2007 (comment) -msgid "return to original size" +msgid "return to default size" msgstr "" #. Documentation/user/fundamental.itely:2274 (variable) +#. Documentation/user/fundamental.itely:2498 (variable) +#. Documentation/user/input.itely:907 (variable) msgid "sopranoMusic" msgstr "" @@ -1636,15 +1701,12 @@ msgstr "" msgid "celloMusic" msgstr "" -#. Documentation/user/fundamental.itely:2498 (variable) -msgid "sopMusic" -msgstr "" - #. Documentation/user/fundamental.itely:2502 (variable) -msgid "sopWords" +msgid "sopranoWords" msgstr "" #. Documentation/user/fundamental.itely:2505 (variable) +#. Documentation/user/input.itely:908 (variable) msgid "altoMusic" msgstr "" @@ -1653,6 +1715,7 @@ msgid "altoWords" msgstr "" #. Documentation/user/fundamental.itely:2510 (variable) +#. Documentation/user/input.itely:909 (variable) msgid "tenorMusic" msgstr "" @@ -1661,6 +1724,7 @@ msgid "tenorWords" msgstr "" #. Documentation/user/fundamental.itely:2515 (variable) +#. Documentation/user/input.itely:910 (variable) msgid "bassMusic" msgstr "" @@ -1713,7 +1777,7 @@ msgid "end PianoStaff context" msgstr "" #. Documentation/user/fundamental.itely:2748 (comment) -msgid "end PedalOrgan Staff" +msgid "end PedalOrgan Staff context" msgstr "" #. Documentation/user/fundamental.itely:2750 (comment) @@ -1992,176 +2056,180 @@ msgstr "" msgid "Revert thickness of all following slurs to default of 1.2" msgstr "" -#. Documentation/user/tweaks.itely:1257 (comment) +#. Documentation/user/tweaks.itely:1265 (comment) msgid "Don't print clefs in this staff" msgstr "" -#. Documentation/user/tweaks.itely:1259 (comment) +#. Documentation/user/tweaks.itely:1267 (comment) msgid "Don't print time signatures in this staff" msgstr "" -#. Documentation/user/tweaks.itely:1320 (comment) +#. Documentation/user/tweaks.itely:1328 (comment) msgid "Reduce all font sizes by ~24%" msgstr "" -#. Documentation/user/tweaks.itely:1376 (comment) +#. Documentation/user/tweaks.itely:1384 (comment) msgid "Reduce stem length and line spacing to match" msgstr "" -#. Documentation/user/tweaks.itely:1750 (comment) -#. Documentation/user/tweaks.itely:1811 (comment) +#. Documentation/user/tweaks.itely:1758 (comment) +#. Documentation/user/tweaks.itely:1819 (comment) msgid "Set details for later Text Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1753 (comment) -#. Documentation/user/tweaks.itely:1814 (comment) +#. Documentation/user/tweaks.itely:1761 (comment) +#. Documentation/user/tweaks.itely:1822 (comment) msgid "Place dynamics above staff" msgstr "" -#. Documentation/user/tweaks.itely:1755 (comment) -#. Documentation/user/tweaks.itely:1818 (comment) +#. Documentation/user/tweaks.itely:1763 (comment) +#. Documentation/user/tweaks.itely:1826 (comment) msgid "Start Ottava Bracket" msgstr "" -#. Documentation/user/tweaks.itely:1758 (comment) -#. Documentation/user/tweaks.itely:1765 (comment) -#. Documentation/user/tweaks.itely:1821 (comment) -#. Documentation/user/tweaks.itely:1828 (comment) +#. Documentation/user/tweaks.itely:1766 (comment) +#. Documentation/user/tweaks.itely:1773 (comment) +#. Documentation/user/tweaks.itely:1829 (comment) +#. Documentation/user/tweaks.itely:1836 (comment) msgid "Add Dynamic Text" msgstr "" -#. Documentation/user/tweaks.itely:1760 (comment) -#. Documentation/user/tweaks.itely:1823 (comment) +#. Documentation/user/tweaks.itely:1768 (comment) +#. Documentation/user/tweaks.itely:1831 (comment) msgid "Add Dynamic Line Spanner" msgstr "" -#. Documentation/user/tweaks.itely:1762 (comment) -#. Documentation/user/tweaks.itely:1825 (comment) +#. Documentation/user/tweaks.itely:1770 (comment) +#. Documentation/user/tweaks.itely:1833 (comment) msgid "Add Text Script" msgstr "" -#. Documentation/user/tweaks.itely:1767 (comment) -#. Documentation/user/tweaks.itely:1830 (comment) +#. Documentation/user/tweaks.itely:1775 (comment) +#. Documentation/user/tweaks.itely:1838 (comment) msgid "Stop Ottava Bracket" msgstr "" -#. Documentation/user/tweaks.itely:1816 (comment) +#. Documentation/user/tweaks.itely:1824 (comment) msgid "Place following Ottava Bracket below Text Spanners" msgstr "" -#. Documentation/user/tweaks.itely:1872 (comment) +#. Documentation/user/tweaks.itely:1880 (comment) msgid "Cause notes to space out to accommodate text" msgstr "" -#. Documentation/user/tweaks.itely:1890 (comment) +#. Documentation/user/tweaks.itely:1898 (comment) msgid "This markup is short enough to fit without collision" msgstr "" -#. Documentation/user/tweaks.itely:1894 (comment) +#. Documentation/user/tweaks.itely:1902 (comment) msgid "This is too long to fit, so it is displaced upwards" msgstr "" -#. Documentation/user/tweaks.itely:1898 (comment) -#. Documentation/user/tweaks.itely:1903 (comment) +#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1911 (comment) msgid "Turn off collision avoidance" msgstr "" -#. Documentation/user/tweaks.itely:1905 (comment) +#. Documentation/user/tweaks.itely:1913 (comment) msgid "and turn on textLengthOn" msgstr "" -#. Documentation/user/tweaks.itely:1906 (comment) +#. Documentation/user/tweaks.itely:1914 (comment) msgid "Spaces at end are honored" msgstr "" -#. Documentation/user/tweaks.itely:2009 (comment) +#. Documentation/user/tweaks.itely:2017 (comment) msgid "Extend width by 1 staff space" msgstr "" -#. Documentation/user/tweaks.itely:2275 (comment) +#. Documentation/user/tweaks.itely:2283 (comment) msgid "This will not work, see below:" msgstr "" -#. Documentation/user/tweaks.itely:2279 (comment) +#. Documentation/user/tweaks.itely:2287 (comment) msgid "This works:" msgstr "" -#. Documentation/user/tweaks.itely:2324 (variable) +#. Documentation/user/tweaks.itely:2332 (variable) msgid "naturalplusflat" msgstr "" -#. Documentation/user/tweaks.itely:2359 (comment) +#. Documentation/user/tweaks.itely:2367 (comment) msgid "Extend width by 1 unit" msgstr "" -#. Documentation/user/tweaks.itely:2361 (comment) +#. Documentation/user/tweaks.itely:2369 (comment) msgid "Align dynamics to a base line 2 units above staff" msgstr "" -#. Documentation/user/tweaks.itely:2639 (variable) -#. Documentation/user/tweaks.itely:2690 (variable) -#. Documentation/user/tweaks.itely:2752 (variable) -#. Documentation/user/tweaks.itely:2823 (variable) -#. Documentation/user/tweaks.itely:2885 (variable) -#. Documentation/user/tweaks.itely:2940 (variable) +#. Documentation/user/tweaks.itely:2647 (variable) +#. Documentation/user/tweaks.itely:2698 (variable) +#. Documentation/user/tweaks.itely:2760 (variable) +#. Documentation/user/tweaks.itely:2831 (variable) +#. Documentation/user/tweaks.itely:2893 (variable) +#. Documentation/user/tweaks.itely:2948 (variable) msgid "rhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2644 (comment) -#. Documentation/user/tweaks.itely:2695 (comment) -#. Documentation/user/tweaks.itely:2759 (comment) -#. Documentation/user/tweaks.itely:2832 (comment) -#. Documentation/user/tweaks.itely:2894 (comment) +#. Documentation/user/tweaks.itely:2652 (comment) +#. Documentation/user/tweaks.itely:2703 (comment) +#. Documentation/user/tweaks.itely:2767 (comment) +#. Documentation/user/tweaks.itely:2840 (comment) +#. Documentation/user/tweaks.itely:2902 (comment) msgid "Start polyphonic section of four voices" msgstr "" -#. Documentation/user/tweaks.itely:2657 (variable) -#. Documentation/user/tweaks.itely:2708 (variable) -#. Documentation/user/tweaks.itely:2772 (variable) -#. Documentation/user/tweaks.itely:2847 (variable) -#. Documentation/user/tweaks.itely:2911 (variable) -#. Documentation/user/tweaks.itely:2968 (variable) +#. Documentation/user/tweaks.itely:2665 (variable) +#. Documentation/user/tweaks.itely:2716 (variable) +#. Documentation/user/tweaks.itely:2780 (variable) +#. Documentation/user/tweaks.itely:2855 (variable) +#. Documentation/user/tweaks.itely:2919 (variable) +#. Documentation/user/tweaks.itely:2976 (variable) msgid "lhMusic" msgstr "" -#. Documentation/user/tweaks.itely:2898 (comment) -#. Documentation/user/tweaks.itely:2955 (comment) +#. Documentation/user/tweaks.itely:2906 (comment) +#. Documentation/user/tweaks.itely:2963 (comment) msgid "Move the c2 out of the main note column so the merge will work" msgstr "" -#. Documentation/user/tweaks.itely:2901 (comment) -#. Documentation/user/tweaks.itely:2958 (comment) +#. Documentation/user/tweaks.itely:2909 (comment) +#. Documentation/user/tweaks.itely:2966 (comment) msgid "Stem on the d2 must be down to permit merging" msgstr "" -#. Documentation/user/tweaks.itely:2953 (comment) +#. Documentation/user/tweaks.itely:2961 (comment) msgid "Reposition the c2 to the right of the merged note" msgstr "" -#. Documentation/user/tweaks.itely:3081 (comment) -#. Documentation/user/tweaks.itely:3100 (comment) +#. Documentation/user/tweaks.itely:3089 (comment) +#. Documentation/user/tweaks.itely:3108 (comment) msgid "Visible tempo marking" msgstr "" -#. Documentation/user/tweaks.itely:3085 (comment) -#. Documentation/user/tweaks.itely:3104 (comment) +#. Documentation/user/tweaks.itely:3093 (comment) +#. Documentation/user/tweaks.itely:3112 (comment) msgid "Invisible tempo marking to lengthen fermata in MIDI" msgstr "" -#. Documentation/user/tweaks.itely:3088 (comment) -#. Documentation/user/tweaks.itely:3107 (comment) +#. Documentation/user/tweaks.itely:3096 (comment) +#. Documentation/user/tweaks.itely:3115 (comment) msgid "New tempo for next section" msgstr "" -#. Documentation/user/tweaks.itely:3147 (variable) -msgid "emph" +#. Documentation/user/tweaks.itely:3159 (variable) +msgid "emphasize" +msgstr "" + +#. Documentation/user/tweaks.itely:3163 (variable) +msgid "normal" msgstr "" -#. Documentation/user/tweaks.itely:3151 (variable) -msgid "norm" +#. Documentation/user/tweaks.itely:3169 (variable) +msgid "SopranoMusic" msgstr "" -#. Documentation/user/tweaks.itely:3373 (comment) +#. Documentation/user/tweaks.itely:3385 (comment) msgid "Arrange to obtain color from color-notehead procedure" msgstr "" @@ -2444,8 +2512,7 @@ msgid "Tying notes across voices" msgstr "" #. @subheading in Documentation/user/tweaks.itely -#. @subheading in Documentation/es/user/tweaks.itely -msgid "Simulating a fermata" +msgid "Simulating a fermata in MIDI" msgstr "" #. @node in Documentation/user/tweaks.itely @@ -2489,11 +2556,11 @@ msgid "hornNotes" msgstr "" #. Documentation/user/working.itely:212 (variable) -msgid "fragA" +msgid "fragmentA" msgstr "" #. Documentation/user/working.itely:213 (variable) -msgid "fragB" +msgid "fragmentB" msgstr "" #. Documentation/user/working.itely:226 (variable) @@ -2501,7 +2568,7 @@ msgid "dolce" msgstr "" #. Documentation/user/working.itely:227 (variable) -#. Documentation/user/working.itely:273 (variable) +#. Documentation/user/working.itely:276 (variable) #. Documentation/user/scheme-tutorial.itely:235 (variable) #. Documentation/user/programming-interface.itely:100 (variable) msgid "padText" @@ -2511,11 +2578,11 @@ msgstr "" msgid "fthenp" msgstr "" -#. Documentation/user/working.itely:310 (variable) +#. Documentation/user/working.itely:313 (variable) msgid "mpdolce" msgstr "" -#. Documentation/user/working.itely:312 (variable) +#. Documentation/user/working.itely:315 (variable) #. Documentation/user/scheme-tutorial.itely:256 (variable) #. Documentation/user/programming-interface.itely:134 (variable) msgid "tempoMark" @@ -2534,6 +2601,8 @@ msgstr "" #. @node in Documentation/user/working.itely #. @section in Documentation/user/working.itely +#. @node in Documentation/fr/user/working.itely +#. @section in Documentation/fr/user/working.itely msgid "Suggestions for writing LilyPond input files" msgstr "" @@ -2860,6 +2929,7 @@ msgid "Texinfo" msgstr "" #. @appendixsubsec in Documentation/user/templates.itely +#. @appendixsubsec in Documentation/fr/user/templates.itely #. @appendixsubsec in Documentation/es/user/templates.itely msgid "xelatex" msgstr "" @@ -2881,6 +2951,8 @@ msgstr "" #. @node in Documentation/user/scheme-tutorial.itely #. @appendixsec in Documentation/user/scheme-tutorial.itely +#. @node in Documentation/fr/user/scheme-tutorial.itely +#. @appendixsec in Documentation/fr/user/scheme-tutorial.itely #. @node in Documentation/es/user/scheme-tutorial.itely #. @appendixsec in Documentation/es/user/scheme-tutorial.itely msgid "Tweaking with Scheme" @@ -2975,6 +3047,7 @@ msgid "Running requirements" msgstr "" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Requirements for building documentation" msgstr "" @@ -3000,18 +3073,22 @@ msgid "Compiling for multiple platforms" msgstr "" #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Compiling outside the source tree" msgstr "" #. @node in Documentation/user/install.itely #. @subsection in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/es/user/install.itely -#. @unnumberedsubsubsec in Documentation/de/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @subsection in Documentation/de/user/install.itely msgid "Building documentation" msgstr "" #. @node in Documentation/user/install.itely #. @unnumberedsubsubsec in Documentation/user/install.itely +#. @node in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Commands for building documentation" msgstr "" @@ -3020,7 +3097,7 @@ msgstr "" #. @node in Documentation/es/user/install.itely #. @subsection in Documentation/es/user/install.itely #. @node in Documentation/de/user/install.itely -#. @subsection in Documentation/de/user/install.itely +#. @unnumberedsubsubsec in Documentation/de/user/install.itely msgid "Building documentation without compiling LilyPond" msgstr "" @@ -3165,6 +3242,13 @@ msgstr "" msgid "TextMate" msgstr "" +#. @node in Documentation/user/setup.itely +#. @subsection in Documentation/user/setup.itely +#. @node in Documentation/fr/user/setup.itely +#. @subsection in Documentation/fr/user/setup.itely +msgid "LilyKDE" +msgstr "" + #. @node in Documentation/user/setup.itely #. @section in Documentation/user/setup.itely #. @node in Documentation/fr/user/setup.itely @@ -3211,8 +3295,11 @@ msgstr "" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Invoking lilypond" msgstr "" @@ -3220,10 +3307,13 @@ msgstr "" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely #. @subheading in Documentation/user/lilypond-book.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely #. @subheading in Documentation/fr/user/lilypond-book.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely #. @subheading in Documentation/es/user/lilypond-book.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely #. @subheading in Documentation/de/user/lilypond-book.itely msgid "Command line options" @@ -3231,8 +3321,11 @@ msgstr "" #. @node in Documentation/user/running.itely #. @subsection in Documentation/user/running.itely +#. @node in Documentation/fr/user/running.itely #. @subsection in Documentation/fr/user/running.itely +#. @node in Documentation/es/user/running.itely #. @subsection in Documentation/es/user/running.itely +#. @node in Documentation/de/user/running.itely #. @subsection in Documentation/de/user/running.itely msgid "Environment variables" msgstr "" @@ -3599,19 +3692,23 @@ msgstr "" msgid "Musical notation" msgstr "" -#. Documentation/user/pitches.itely:615 (variable) -msgid "mus" +#. Documentation/user/pitches.itely:651 (variable) +#. Documentation/user/input.itely:997 (variable) +#. Documentation/user/input.itely:1016 (variable) +#. Documentation/user/input.itely:1053 (variable) +#. Documentation/user/input.itely:1068 (variable) +msgid "music" msgstr "" -#. Documentation/user/pitches.itely:979 (comment) +#. Documentation/user/pitches.itely:1027 (comment) msgid "not strictly necessary, but a good reminder" msgstr "" -#. Documentation/user/pitches.itely:1068 (variable) +#. Documentation/user/pitches.itely:1119 (variable) msgid "musicA" msgstr "" -#. Documentation/user/pitches.itely:1082 (variable) +#. Documentation/user/pitches.itely:1133 (variable) msgid "musicB" msgstr "" @@ -3884,122 +3981,135 @@ msgstr "" msgid "Print a breve rest" msgstr "" -#. Documentation/user/rhythms.itely:653 (comment) +#. Documentation/user/rhythms.itely:654 (comment) msgid "This is valid input, but does nothing" msgstr "" -#. Documentation/user/rhythms.itely:679 (comment) -msgid "Rest bars contracted to single bar" +#. Documentation/user/rhythms.itely:680 (comment) +#. Documentation/user/rhythms.itely:733 (comment) +msgid "Rest measures contracted to single measure" msgstr "" -#. Documentation/user/rhythms.itely:728 (comment) +#. Documentation/user/rhythms.itely:729 (comment) msgid "Default behavior" msgstr "" -#. Documentation/user/rhythms.itely:732 (comment) -msgid "Rest measures contracted to single measure" -msgstr "" - -#. Documentation/user/rhythms.itely:735 (comment) +#. Documentation/user/rhythms.itely:736 (comment) msgid "Rest measures expanded" msgstr "" -#. Documentation/user/rhythms.itely:768 (comment) +#. Documentation/user/rhythms.itely:769 (comment) msgid "This fails, as the wrong object name is specified" msgstr "" -#. Documentation/user/rhythms.itely:771 (comment) +#. Documentation/user/rhythms.itely:772 (comment) msgid "This is correct and works" msgstr "" -#. Documentation/user/rhythms.itely:917 (comment) +#. Documentation/user/rhythms.itely:919 (comment) msgid "Default style" msgstr "" -#. Documentation/user/rhythms.itely:920 (comment) +#. Documentation/user/rhythms.itely:922 (comment) msgid "Change to numeric style" msgstr "" -#. Documentation/user/rhythms.itely:924 (comment) +#. Documentation/user/rhythms.itely:926 (comment) msgid "Revert to default style" msgstr "" -#. Documentation/user/rhythms.itely:1127 (comment) +#. Documentation/user/rhythms.itely:1129 (comment) msgid "Show all bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:1183 (comment) +#. Documentation/user/rhythms.itely:1193 (comment) msgid "Create 9/8 split into 2/4 + 5/8" msgstr "" -#. Documentation/user/rhythms.itely:1184 (variable) +#. Documentation/user/rhythms.itely:1194 (variable) msgid "tsMarkup" msgstr "" -#. Documentation/user/rhythms.itely:1261 (comment) +#. Documentation/user/rhythms.itely:1274 (comment) msgid "Now each staff has its own time signature." msgstr "" -#. Documentation/user/rhythms.itely:1458 (comment) +#. Documentation/user/rhythms.itely:1480 (comment) msgid "Set beam sub-group length to an eighth note" msgstr "" -#. Documentation/user/rhythms.itely:1461 (comment) +#. Documentation/user/rhythms.itely:1483 (comment) msgid "Set beam sub-group length to a sixteenth note" msgstr "" +#. Documentation/user/rhythms.itely:1615 (comment) +msgid "end 1/16 beams for all time signatures at the 1/16 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1619 (comment) +msgid "end 1/32 beams for all time signatures at the 1/16 moment" +msgstr "" + #. Documentation/user/rhythms.itely:1629 (comment) +msgid "end beams of all durations in 5/8 time signature at the 2/8 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1658 (comment) +msgid "undo a rule ending 1/16 beams in 4/4 time at 1/4 moment" +msgstr "" + +#. Documentation/user/rhythms.itely:1671 (comment) msgid "this won't revert it!" msgstr "" -#. Documentation/user/rhythms.itely:1631 (comment) +#. Documentation/user/rhythms.itely:1673 (comment) msgid "this will" msgstr "" -#. Documentation/user/rhythms.itely:1804 (comment) +#. Documentation/user/rhythms.itely:1852 (comment) msgid "revert to non-feathered beams" msgstr "" -#. Documentation/user/rhythms.itely:2025 (comment) -#. Documentation/user/rhythms.itely:2041 (comment) +#. Documentation/user/rhythms.itely:2081 (comment) +#. Documentation/user/rhythms.itely:2097 (comment) msgid "Permit first bar number to be printed" msgstr "" -#. Documentation/user/rhythms.itely:2042 (comment) -#. Documentation/user/rhythms.itely:2090 (comment) +#. Documentation/user/rhythms.itely:2098 (comment) +#. Documentation/user/rhythms.itely:2146 (comment) msgid "Print a bar number every second measure" msgstr "" -#. Documentation/user/rhythms.itely:2058 (comment) +#. Documentation/user/rhythms.itely:2114 (comment) msgid "Prevent bar numbers at the end of a line and permit them elsewhere" msgstr "" -#. Documentation/user/rhythms.itely:2062 (comment) -#. Documentation/user/rhythms.itely:2088 (comment) +#. Documentation/user/rhythms.itely:2118 (comment) +#. Documentation/user/rhythms.itely:2144 (comment) msgid "Increase the size of the bar number by 2" msgstr "" -#. Documentation/user/rhythms.itely:2066 (comment) +#. Documentation/user/rhythms.itely:2122 (comment) msgid "Draw a box round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2071 (comment) +#. Documentation/user/rhythms.itely:2127 (comment) msgid "Draw a circle round the following bar number(s)" msgstr "" -#. Documentation/user/rhythms.itely:2093 (comment) +#. Documentation/user/rhythms.itely:2149 (comment) msgid "Center-align bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:2096 (comment) +#. Documentation/user/rhythms.itely:2152 (comment) msgid "Right-align bar numbers" msgstr "" -#. Documentation/user/rhythms.itely:2194 (variable) +#. Documentation/user/rhythms.itely:2255 (variable) msgid "pipeSymbol" msgstr "" -#. Documentation/user/rhythms.itely:2565 (variable) +#. Documentation/user/rhythms.itely:2626 (variable) #. @rglos in Documentation/user/rhythms.itely msgid "cadenza" msgstr "" @@ -4029,11 +4139,11 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Durations" msgstr "" @@ -4065,15 +4175,16 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Scaling durations" msgstr "" #. @rglos in Documentation/user/rhythms.itely +#. @rglos in Documentation/fr/user/rhythms.itely #. @rglos in Documentation/es/user/rhythms.itely msgid "laissez vibrer" msgstr "" @@ -4091,13 +4202,7 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely -#. @node in Documentation/es/user/rhythms.itely -#. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely -msgid "Skips" +msgid "Invisible rests" msgstr "" #. @node in Documentation/user/rhythms.itely @@ -4125,33 +4230,33 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Upbeats" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Unmetered music" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Polymetric notation" msgstr "" @@ -4166,22 +4271,22 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic note splitting" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Showing melody rhythms" msgstr "" @@ -4199,11 +4304,11 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Automatic beams" msgstr "" @@ -4214,29 +4319,29 @@ msgstr "" #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Setting automatic beam behavior" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Manual beams" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Feathered beams" msgstr "" @@ -4254,22 +4359,22 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar lines" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar numbers" msgstr "" @@ -4283,11 +4388,11 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Rehearsal marks" msgstr "" @@ -4305,42 +4410,52 @@ msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Aligning to cadenzas" msgstr "" #. @node in Documentation/user/rhythms.itely #. @subsubsection in Documentation/user/rhythms.itely #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/es/user/rhythms.itely #. @subsubsection in Documentation/es/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Time administration" msgstr "" -#. Documentation/user/expressive.itely:332 (variable) -#. Documentation/user/expressive.itely:377 (variable) +#. Documentation/user/expressive.itely:390 (variable) +#. Documentation/user/expressive.itely:458 (variable) msgid "moltoF" msgstr "" -#. Documentation/user/expressive.itely:348 (variable) -msgid "roundf" +#. Documentation/user/expressive.itely:411 (variable) +#. Documentation/user/expressive.itely:441 (variable) +msgid "roundF" msgstr "" -#. Documentation/user/expressive.itely:350 (variable) -msgid "boxf" +#. Documentation/user/expressive.itely:413 (variable) +#. Documentation/user/expressive.itely:445 (variable) +msgid "boxF" msgstr "" -#. Documentation/user/expressive.itely:364 (variable) +#. Documentation/user/expressive.itely:428 (variable) msgid "sfzp" msgstr "" +#. Documentation/user/expressive.itely:446 (variable) +msgid "roundFdynamic" +msgstr "" + +#. Documentation/user/expressive.itely:447 (variable) +msgid "boxFdynamic" +msgstr "" + #. @node in Documentation/user/expressive.itely #. @section in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely @@ -4364,7 +4479,9 @@ msgid "Attached to notes" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely msgid "Articulations and ornamentations" @@ -4391,9 +4508,9 @@ msgid "portato" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely -#. @node in Documentation/fr/user/text.itely -#. @unnumberedsubsubsec in Documentation/fr/user/text.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely +#. @node in Documentation/fr/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely #. @subsubsection in Documentation/es/user/expressive.itely #. @node in Documentation/de/user/expressive.itely @@ -4413,7 +4530,7 @@ msgid "Curves" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4424,7 +4541,7 @@ msgid "Breath marks" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4456,7 +4573,7 @@ msgid "Lines" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4472,7 +4589,7 @@ msgid "glissando" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4488,7 +4605,7 @@ msgid "arpeggio" msgstr "" #. @node in Documentation/user/expressive.itely -#. @subsubsection in Documentation/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/user/expressive.itely #. @node in Documentation/fr/user/expressive.itely #. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely #. @node in Documentation/es/user/expressive.itely @@ -4503,17 +4620,8 @@ msgstr "" msgid "trill" msgstr "" -#. Documentation/user/repeats.itely:237 (comment) -#. Documentation/user/repeats.itely:277 (comment) -msgid "FIXME: I can't believe this is right." -msgstr "" - -#. Documentation/user/repeats.itely:297 (comment) -msgid "FIXME: broken" -msgstr "" - -#. Documentation/user/repeats.itely:298 (comment) -msgid "\\set Score.repeatCommands = #(list (list 'volta voltaChorus ) )" +#. Documentation/user/repeats.itely:298 (variable) +msgid "voltaAdLib" msgstr "" #. @node in Documentation/user/repeats.itely @@ -4533,7 +4641,7 @@ msgid "Long repeats" msgstr "" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Normal repeats" @@ -4550,14 +4658,14 @@ msgid "volta" msgstr "" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Manual repeat marks" msgstr "" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely msgid "Written-out repeats" @@ -4573,7 +4681,7 @@ msgid "Short repeats" msgstr "" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/es/user/repeats.itely #. @subsubsection in Documentation/es/user/repeats.itely #. @node in Documentation/de/user/repeats.itely @@ -4590,7 +4698,7 @@ msgid "simile" msgstr "" #. @node in Documentation/user/repeats.itely -#. @subsubsection in Documentation/user/repeats.itely +#. @unnumberedsubsubsec in Documentation/user/repeats.itely #. @node in Documentation/fr/user/repeats.itely #. @unnumberedsubsubsec in Documentation/fr/user/repeats.itely #. @node in Documentation/es/user/repeats.itely @@ -4600,15 +4708,15 @@ msgstr "" msgid "Tremolo repeats" msgstr "" -#. Documentation/user/simultaneous.itely:352 (variable) +#. Documentation/user/simultaneous.itely:482 (variable) msgid "instrumentOne" msgstr "" -#. Documentation/user/simultaneous.itely:360 (variable) +#. Documentation/user/simultaneous.itely:490 (variable) msgid "instrumentTwo" msgstr "" -#. Documentation/user/simultaneous.itely:539 (comment) +#. Documentation/user/simultaneous.itely:657 (comment) msgid "Bar 3 ..." msgstr "" @@ -4635,20 +4743,20 @@ msgid "Single voice" msgstr "" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Chorded notes" msgstr "" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Clusters" @@ -4671,18 +4779,32 @@ msgid "Multiple voices" msgstr "" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +msgid "Single-staff polyphony" +msgstr "" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely +#. @node in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely +msgid "Voice styles" +msgstr "" + +#. @node in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely msgid "Collision resolution" msgstr "" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Automatic part combining" @@ -4699,54 +4821,46 @@ msgid "part" msgstr "" #. @node in Documentation/user/simultaneous.itely -#. @subsubsection in Documentation/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/user/simultaneous.itely #. @node in Documentation/fr/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/fr/user/simultaneous.itely #. @node in Documentation/es/user/simultaneous.itely -#. @subsubsection in Documentation/es/user/simultaneous.itely +#. @unnumberedsubsubsec in Documentation/es/user/simultaneous.itely #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Writing music in parallel" msgstr "" -#. Documentation/user/staff.itely:534 (comment) -msgid "Set here the overrides for the staff " -msgstr "" - -#. Documentation/user/staff.itely:538 (comment) -msgid "Revert to the default" -msgstr "" - -#. Documentation/user/staff.itely:604 (comment) +#. Documentation/user/staff.itely:536 (comment) msgid "No time signature in the ossia staff" msgstr "" -#. Documentation/user/staff.itely:726 (comment) +#. Documentation/user/staff.itely:678 (comment) msgid "To use the setting globally, uncomment the following line:" msgstr "" -#. Documentation/user/staff.itely:727 (comment) +#. Documentation/user/staff.itely:679 (comment) msgid "\\override VerticalAxisGroup #'remove-first = ##t" msgstr "" -#. Documentation/user/staff.itely:735 (comment) +#. Documentation/user/staff.itely:687 (comment) msgid "" "To use the setting globally, comment this line, uncomment the line above" msgstr "" -#. Documentation/user/staff.itely:1105 (variable) +#. Documentation/user/staff.itely:1079 (variable) msgid "smaller" msgstr "" -#. Documentation/user/staff.itely:1119 (comment) +#. Documentation/user/staff.itely:1094 (comment) msgid "setup a context for cue notes." msgstr "" -#. Documentation/user/staff.itely:1161 (variable) +#. Documentation/user/staff.itely:1135 (variable) msgid "picc" msgstr "" -#. Documentation/user/staff.itely:1169 (variable) +#. Documentation/user/staff.itely:1143 (variable) msgid "cbsn" msgstr "" @@ -4773,7 +4887,7 @@ msgid "Displaying staves" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Instantiating new staves" msgstr "" @@ -4786,7 +4900,7 @@ msgid "staves" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Grouping staves" msgstr "" @@ -4799,7 +4913,7 @@ msgid "grand staff" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Deeper nested staff groups" msgstr "" @@ -4809,7 +4923,7 @@ msgid "Modifying single staves" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4828,7 +4942,7 @@ msgid "ledger line" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely msgid "Ossia staves" msgstr "" @@ -4837,7 +4951,7 @@ msgid "Frenched staff" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4859,7 +4973,7 @@ msgid "Writing parts" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4886,18 +5000,22 @@ msgid "metronome mark" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely #. @node in Documentation/es/user/staff.itely #. @subsubsection in Documentation/es/user/staff.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely #. @node in Documentation/de/user/staff.itely #. @unnumberedsubsubsec in Documentation/de/user/staff.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely msgid "Instrument names" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4908,7 +5026,7 @@ msgid "Quoting other voices" msgstr "" #. @node in Documentation/user/staff.itely -#. @subsubsection in Documentation/user/staff.itely +#. @unnumberedsubsubsec in Documentation/user/staff.itely #. @node in Documentation/fr/user/staff.itely #. @unnumberedsubsubsec in Documentation/fr/user/staff.itely #. @node in Documentation/es/user/staff.itely @@ -4918,7 +5036,7 @@ msgstr "" msgid "Formatting cue notes" msgstr "" -#. Documentation/user/editorial.itely:288 (comment) +#. Documentation/user/editorial.itely:323 (comment) msgid "this is deliberate nonsense; note that the stems remain black" msgstr "" @@ -5024,7 +5142,7 @@ msgstr "" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5035,7 +5153,7 @@ msgstr "" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5045,8 +5163,8 @@ msgstr "" #. @node in Documentation/user/editorial.itely #. @unnumberedsubsubsec in Documentation/user/editorial.itely -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely +#. @node in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely #. @node in Documentation/es/user/editorial.itely #. @unnumberedsubsubsec in Documentation/es/user/editorial.itely #. @node in Documentation/de/user/editorial.itely @@ -5054,7 +5172,7 @@ msgstr "" msgid "Analysis brackets" msgstr "" -#. Documentation/user/text.itely:403 (variable) +#. Documentation/user/text.itely:410 (variable) msgid "allegro" msgstr "" @@ -5148,13 +5266,17 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely -msgid "Common markup commands" +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely +msgid "Selecting font and font size" msgstr "" #. @node in Documentation/user/text.itely #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Text alignment" msgstr "" @@ -5162,6 +5284,8 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Graphic notation inside markup" msgstr "" @@ -5169,6 +5293,8 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Music notation inside markup" msgstr "" @@ -5176,6 +5302,8 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Multi-page markup" msgstr "" @@ -5185,6 +5313,8 @@ msgstr "" #. @subsection in Documentation/fr/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsection in Documentation/de/user/text.itely msgid "Fonts" msgstr "" @@ -5192,6 +5322,8 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Entire document fonts" msgstr "" @@ -5199,6 +5331,8 @@ msgstr "" #. @subsubsection in Documentation/user/text.itely #. @node in Documentation/es/user/text.itely #. @subsubsection in Documentation/es/user/text.itely +#. @node in Documentation/de/user/text.itely +#. @subsubsection in Documentation/de/user/text.itely msgid "Single entry fonts" msgstr "" @@ -5213,57 +5347,61 @@ msgstr "" msgid "Specialist notation" msgstr "" -#. Documentation/user/vocal.itely:720 (variable) -msgid "voice" +#. Documentation/user/vocal.itely:450 (comment) +msgid "not recommended: left aligns syllables " msgstr "" -#. Documentation/user/vocal.itely:727 (variable) -msgid "lyr" +#. Documentation/user/vocal.itely:453 (comment) +msgid "wrong: durations needed" msgstr "" -#. Documentation/user/vocal.itely:933 (comment) -msgid "{" +#. Documentation/user/vocal.itely:456 (comment) +msgid "correct" msgstr "" -#. Documentation/user/vocal.itely:946 (comment) -msgid "applies to " +#. Documentation/user/vocal.itely:786 (variable) +msgid "voice" +msgstr "" + +#. Documentation/user/vocal.itely:793 (variable) +msgid "lyr" msgstr "" -#. Documentation/user/vocal.itely:952 (comment) -msgid "}" +#. Documentation/user/vocal.itely:1056 (comment) +msgid "applies to " msgstr "" -#. Documentation/user/vocal.itely:1114 (comment) -msgid "moves the column off the left margin; can be removed if" +#. Documentation/user/vocal.itely:1225 (comment) +msgid "moves the column off the left margin; " msgstr "" -#. Documentation/user/vocal.itely:1115 (comment) -msgid "space on the page is tight" +#. Documentation/user/vocal.itely:1226 (comment) +msgid "can be removed if space on the page is tight" msgstr "" -#. Documentation/user/vocal.itely:1123 (comment) -#. Documentation/user/vocal.itely:1141 (comment) +#. Documentation/user/vocal.itely:1234 (comment) +#. Documentation/user/vocal.itely:1252 (comment) msgid "adds vertical spacing between verses" msgstr "" -#. Documentation/user/vocal.itely:1131 (comment) -msgid "adds horizontal spacing between columns; if they are" +#. Documentation/user/vocal.itely:1242 (comment) +msgid "adds horizontal spacing between columns; " msgstr "" -#. Documentation/user/vocal.itely:1132 (comment) -msgid "still too close, add more pairs until the result " +#. Documentation/user/vocal.itely:1243 (comment) +msgid "if they are still too close, add more pairs " msgstr "" -#. Documentation/user/vocal.itely:1133 (comment) -msgid "looks good" +#. Documentation/user/vocal.itely:1244 (comment) +msgid "until the result looks good" msgstr "" -#. Documentation/user/vocal.itely:1149 (comment) -msgid "gives some extra space on the right margin; can" +#. Documentation/user/vocal.itely:1260 (comment) +msgid "gives some extra space on the right margin; " msgstr "" -#. Documentation/user/vocal.itely:1150 (comment) -msgid "be removed if page space is tight" +#. Documentation/user/vocal.itely:1261 (comment) +msgid "can be removed if page space is tight" msgstr "" #. @node in Documentation/user/vocal.itely @@ -5283,6 +5421,8 @@ msgstr "" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Common notation for vocals" msgstr "" @@ -5292,6 +5432,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "References for vocal music" msgstr "" @@ -5334,6 +5476,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Manual syllable durations" msgstr "" @@ -5343,7 +5487,9 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely -msgid "Multiple syllables to one note" +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely +msgid "Multiple syllables to one note" msgstr "" #. @node in Documentation/user/vocal.itely @@ -5352,6 +5498,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Multiple notes to one syllable" msgstr "" @@ -5361,6 +5509,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Skipping notes" msgstr "" @@ -5381,6 +5531,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Lyrics and repeats" msgstr "" @@ -5390,6 +5542,8 @@ msgstr "" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Placement of lyrics" msgstr "" @@ -5421,6 +5575,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Chants" msgstr "" @@ -5430,6 +5586,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Spacing out syllables" msgstr "" @@ -5439,6 +5597,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Centering lyrics between staves" msgstr "" @@ -5448,6 +5608,8 @@ msgstr "" #. @subsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsection in Documentation/de/user/vocal.itely msgid "Stanzas" msgstr "" @@ -5468,6 +5630,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding dynamics marks to stanzas" msgstr "" @@ -5477,6 +5641,8 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Adding singers' names to stanzas" msgstr "" @@ -5486,16 +5652,20 @@ msgstr "" #. @subsubsection in Documentation/fr/user/vocal.itely #. @node in Documentation/es/user/vocal.itely #. @subsubsection in Documentation/es/user/vocal.itely +#. @node in Documentation/de/user/vocal.itely +#. @subsubsection in Documentation/de/user/vocal.itely msgid "Stanzas with different rhythms" msgstr "" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Ignoring melismata" msgstr "" #. @subsubheading in Documentation/user/vocal.itely #. @subsubheading in Documentation/es/user/vocal.itely +#. @subsubheading in Documentation/de/user/vocal.itely msgid "Switching to an alternative melody" msgstr "" @@ -5521,10 +5691,22 @@ msgstr "" msgid "Printing stanzas at the end in multiple columns" msgstr "" -#. Documentation/user/keyboards.itely:162 (comment) +#. Documentation/user/keyboards.itely:175 (comment) msgid "keep staff alive" msgstr "" +#. Documentation/user/keyboards.itely:373 (comment) +msgid "stems may overlap the other staff" +msgstr "" + +#. Documentation/user/keyboards.itely:375 (comment) +msgid "extend the stems to reach other other staff" +msgstr "" + +#. Documentation/user/keyboards.itely:377 (comment) +msgid "do not print extra flags" +msgstr "" + #. @node in Documentation/user/keyboards.itely #. @section in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely @@ -5548,7 +5730,7 @@ msgid "Common notation for keyboards" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5559,7 +5741,7 @@ msgid "References for keyboards" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5570,7 +5752,7 @@ msgid "Changing staff manually" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5581,7 +5763,7 @@ msgid "Changing staff automatically" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5592,7 +5774,7 @@ msgid "Staff-change lines" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5614,7 +5796,7 @@ msgid "Piano" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5636,7 +5818,7 @@ msgid "Accordion" msgstr "" #. @node in Documentation/user/keyboards.itely -#. @subsubsection in Documentation/user/keyboards.itely +#. @unnumberedsubsubsec in Documentation/user/keyboards.itely #. @node in Documentation/fr/user/keyboards.itely #. @subsubsection in Documentation/fr/user/keyboards.itely #. @node in Documentation/es/user/keyboards.itely @@ -5659,38 +5841,99 @@ msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Common notation for unfretted strings" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "References for unfretted strings" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Bowed instruments" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "References for bowed strings" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsection in Documentation/de/user/unfretted-strings.itely msgid "Plucked instruments" msgstr "" #. @node in Documentation/user/unfretted-strings.itely #. @subsubsection in Documentation/user/unfretted-strings.itely +#. @node in Documentation/fr/user/unfretted-strings.itely +#. @subsubsection in Documentation/fr/user/unfretted-strings.itely +#. @node in Documentation/es/user/unfretted-strings.itely +#. @subsubsection in Documentation/es/user/unfretted-strings.itely +#. @node in Documentation/de/user/unfretted-strings.itely +#. @subsubsection in Documentation/de/user/unfretted-strings.itely msgid "Harp" msgstr "" -#. Documentation/user/fretted-strings.itely:159 (variable) +#. Documentation/user/fretted-strings.itely:210 (variable) msgid "melodia" msgstr "" +#. Documentation/user/fretted-strings.itely:376 (comment) +msgid "A chord for ukelele" +msgstr "" + +#. Documentation/user/fretted-strings.itely:665 (variable) +#. Documentation/user/fretted-strings.itely:684 (variable) +#. Documentation/user/fretted-strings.itely:713 (variable) +#. Documentation/user/fretted-strings.itely:738 (variable) +#. Documentation/user/fretted-strings.itely:762 (variable) +#. Documentation/user/fretted-strings.itely:798 (variable) +msgid "mychords" +msgstr "" + +#. Documentation/user/fretted-strings.itely:688 (variable) +msgid "mychordlist" +msgstr "" + +#. Documentation/user/fretted-strings.itely:785 (comment) +msgid "add a new chord shape" +msgstr "" + +#. Documentation/user/fretted-strings.itely:789 (comment) +msgid "add some new chords based on the power chord shape" +msgstr "" + #. @node in Documentation/user/fretted-strings.itely #. @section in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely @@ -5704,111 +5947,135 @@ msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Common notation for fretted strings" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "References for fretted strings" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "String number indications" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Default tablatures" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Custom tablatures" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Fret diagrams" +msgid "Fret diagram markups" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -#. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Right hand fingerings" +msgid "Predefined fret diagrams" +msgstr "" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +msgid "Automatic fret diagrams" +msgstr "" + +#. @node in Documentation/user/fretted-strings.itely +#. @subsubsection in Documentation/user/fretted-strings.itely +msgid "Right-hand fingerings" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Guitar" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Guitar tablatures" +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Indicating position and barring" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely -#. @node in Documentation/es/user/fretted-strings.itely -#. @subsubsection in Documentation/es/user/fretted-strings.itely -msgid "Indicating position and barring" +msgid "Indicating harmonics and dampened notes" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsection in Documentation/user/fretted-strings.itely +#. @node in Documentation/fr/user/fretted-strings.itely +#. @subsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsection in Documentation/es/user/fretted-strings.itely +#. @node in Documentation/de/user/fretted-strings.itely +#. @subsection in Documentation/de/user/fretted-strings.itely msgid "Banjo" msgstr "" #. @node in Documentation/user/fretted-strings.itely #. @subsubsection in Documentation/user/fretted-strings.itely #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely #. @node in Documentation/es/user/fretted-strings.itely #. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely +#. @subsubsection in Documentation/de/user/fretted-strings.itely msgid "Banjo tablatures" msgstr "" -#. Documentation/user/percussion.itely:120 (variable) -#. Documentation/user/percussion.itely:300 (variable) +#. Documentation/user/percussion.itely:214 (variable) +#. Documentation/user/percussion.itely:394 (variable) msgid "up" msgstr "" -#. Documentation/user/percussion.itely:121 (variable) -#. Documentation/user/percussion.itely:301 (variable) +#. Documentation/user/percussion.itely:215 (variable) +#. Documentation/user/percussion.itely:395 (variable) msgid "down" msgstr "" @@ -5825,44 +6092,56 @@ msgstr "" #. @node in Documentation/user/percussion.itely #. @subsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsection in Documentation/de/user/percussion.itely msgid "Common notation for percussion" msgstr "" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "References for percussion" msgstr "" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely +#. @node in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely +#. @node in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Basic percussion notation" msgstr "" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Percussion staves" msgstr "" #. @node in Documentation/user/percussion.itely #. @subsubsection in Documentation/user/percussion.itely #. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely +#. @subsubsection in Documentation/fr/user/percussion.itely #. @node in Documentation/es/user/percussion.itely #. @subsubsection in Documentation/es/user/percussion.itely #. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely +#. @subsubsection in Documentation/de/user/percussion.itely msgid "Ghost notes" msgstr "" @@ -5879,75 +6158,87 @@ msgstr "" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely msgid "Common notation for wind instruments" msgstr "" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "References for wind instruments" msgstr "" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsubsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Half-holes" msgstr "" #. @node in Documentation/user/wind.itely #. @subsection in Documentation/user/wind.itely +#. @node in Documentation/fr/user/wind.itely +#. @subsection in Documentation/fr/user/wind.itely +#. @node in Documentation/es/user/wind.itely +#. @subsection in Documentation/es/user/wind.itely +#. @node in Documentation/de/user/wind.itely +#. @subsection in Documentation/de/user/wind.itely msgid "Bagpipes" msgstr "" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe definitions" msgstr "" #. @node in Documentation/user/wind.itely #. @subsubsection in Documentation/user/wind.itely #. @node in Documentation/fr/user/wind.itely -#. @unnumberedsubsubsec in Documentation/fr/user/wind.itely +#. @subsubsection in Documentation/fr/user/wind.itely #. @node in Documentation/es/user/wind.itely #. @subsubsection in Documentation/es/user/wind.itely #. @node in Documentation/de/user/wind.itely -#. @unnumberedsubsubsec in Documentation/de/user/wind.itely +#. @subsubsection in Documentation/de/user/wind.itely msgid "Bagpipe example" msgstr "" -#. Documentation/user/chords.itely:599 (variable) +#. Documentation/user/chords.itely:651 (variable) msgid "myChords" msgstr "" -#. Documentation/user/chords.itely:709 (comment) -msgid "FIXME: broken." -msgstr "" - -#. Documentation/user/chords.itely:710 (comment) -msgid "<6\\\\>" -msgstr "" - -#. Documentation/user/chords.itely:857 (comment) -#. Documentation/user/chords.itely:878 (comment) +#. Documentation/user/chords.itely:974 (comment) +#. Documentation/user/chords.itely:995 (comment) msgid "Put notes on same Staff as figures" msgstr "" -#. Documentation/user/chords.itely:955 (comment) +#. Documentation/user/chords.itely:1054 (comment) msgid "The extenders are correct here, with the same rhythm as the bass" msgstr "" -#. Documentation/user/chords.itely:967 (comment) +#. Documentation/user/chords.itely:1066 (comment) msgid "The extenders are incorrect here, even though the timing is the same" msgstr "" -#. Documentation/user/chords.itely:969 (comment) -msgid "\\repeat unfold 4 {<6 4->16. <6 4->32}" -msgstr "" - #. @node in Documentation/user/chords.itely #. @section in Documentation/user/chords.itely #. @node in Documentation/fr/user/chords.itely @@ -5955,41 +6246,62 @@ msgstr "" #. @node in Documentation/es/user/chords.itely #. @section in Documentation/es/user/chords.itely #. @node in Documentation/de/user/chords.itely +#. @section in Documentation/de/user/chords.itely msgid "Chord notation" msgstr "" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Chord mode" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Chord mode overview" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Common chords" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Extended and altered chords" msgstr "" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Displaying chords" msgstr "" @@ -6006,40 +6318,56 @@ msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Customizing chord names" msgstr "" #. @node in Documentation/user/chords.itely #. @subsection in Documentation/user/chords.itely -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @node in Documentation/fr/user/chords.itely +#. @subsection in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @subsection in Documentation/es/user/chords.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @node in Documentation/de/user/chords.itely +#. @subsection in Documentation/de/user/chords.itely msgid "Figured bass" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Introduction to figured bass" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Entering figured bass" msgstr "" #. @node in Documentation/user/chords.itely #. @unnumberedsubsubsec in Documentation/user/chords.itely +#. @node in Documentation/fr/user/chords.itely +#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely #. @node in Documentation/es/user/chords.itely #. @unnumberedsubsubsec in Documentation/es/user/chords.itely +#. @node in Documentation/de/user/chords.itely +#. @unnumberedsubsubsec in Documentation/de/user/chords.itely msgid "Displaying figured bass" msgstr "" @@ -6056,221 +6384,369 @@ msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Introduction to ancient notation" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient notation supported" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Alternative note signs" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient note heads" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient accidentals" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient rests" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient clefs" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient flags" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient time signatures" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Additional note signs" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient articulations" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Custodes" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Divisiones" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ligatures" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "White mensural ligatures" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Gregorian square neumes ligatures" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Pre-defined contexts" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Gregorian chant contexts" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely #. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely #. @node in Documentation/es/user/ancient.itely #. @subsubsection in Documentation/es/user/ancient.itely #. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensural contexts" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Transcribing ancient music" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Ancient and modern from one source" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Incipits" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Mensurstriche layout" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Transcribing Gregorian chant" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsection in Documentation/de/user/ancient.itely msgid "Editorial markings" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Annotational accidentals" msgstr "" #. @node in Documentation/user/ancient.itely #. @subsubsection in Documentation/user/ancient.itely +#. @node in Documentation/fr/user/ancient.itely +#. @subsubsection in Documentation/fr/user/ancient.itely +#. @node in Documentation/de/user/ancient.itely +#. @subsubsection in Documentation/de/user/ancient.itely msgid "Baroque rhythmic notation" msgstr "" -#. Documentation/user/input.itely:497 (comment) +#. @node in Documentation/user/world.itely +#. @section in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @section in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @section in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @section in Documentation/de/user/world.itely +msgid "World music" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @subsection in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @subsection in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @subsection in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @subsection in Documentation/de/user/world.itely +msgid "Arabic music" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "References for Arabic music" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "Arabic note names" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "Arabic key signatures" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "Arabic time signatures" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "Arabic music example" +msgstr "" + +#. @node in Documentation/user/world.itely +#. @unnumberedsubsubsec in Documentation/user/world.itely +#. @node in Documentation/fr/user/world.itely +#. @unnumberedsubsubsec in Documentation/fr/user/world.itely +#. @node in Documentation/es/user/world.itely +#. @unnumberedsubsubsec in Documentation/es/user/world.itely +#. @node in Documentation/de/user/world.itely +#. @unnumberedsubsubsec in Documentation/de/user/world.itely +msgid "Further reading" +msgstr "" + +#. Documentation/user/input.itely:494 (comment) msgid "not printed" msgstr "" +#. Documentation/user/input.itely:911 (variable) +msgid "allLyrics" +msgstr "" + #. @node in Documentation/user/input.itely #. @chapter in Documentation/user/input.itely #. @node in Documentation/fr/user/input.itely @@ -6279,16 +6755,28 @@ msgstr "" #. @chapter in Documentation/es/user/input.itely #. @node in Documentation/de/user/input.itely #. @chapter in Documentation/de/user/input.itely -msgid "Input syntax" +msgid "General input and output" msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Input structure" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Structure of a score" msgstr "" @@ -6316,61 +6804,67 @@ msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Titles and headers" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "Creating titles" -msgstr "" - -#. @node in Documentation/user/input.itely -#. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +msgid "Creating titles" +msgstr "" + +#. @node in Documentation/user/input.itely +#. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Custom titles" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Reference to page numbers" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Table of contents" msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Working with input files" msgstr "" @@ -6396,6 +6890,28 @@ msgstr "" msgid "Different editions from one source" msgstr "" +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Using variables" +msgstr "" + +#. @node in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Using tags" +msgstr "" + #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely #. @node in Documentation/fr/user/input.itely @@ -6420,11 +6936,23 @@ msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "Controlling output" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Extracting fragments of music" msgstr "" @@ -6441,118 +6969,149 @@ msgstr "" #. @node in Documentation/user/input.itely #. @section in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @section in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @section in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @section in Documentation/de/user/input.itely msgid "MIDI output" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "Creating MIDI files" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely msgid "MIDI block" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "MIDI instrument names" +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +msgid "What goes into the MIDI output?" msgstr "" -#. @node in Documentation/user/input.itely -#. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @subsection in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsection in Documentation/de/user/non-music.itely -msgid "What goes into the MIDI? FIXME" +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Supported in MIDI" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Unsupported in MIDI" msgstr "" #. @node in Documentation/user/input.itely -#. @subsubsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @unnumberedsubsubsec in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @subsubsection in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @subsubsection in Documentation/de/user/non-music.itely -msgid "Repeats and MIDI" +#. @subsection in Documentation/user/input.itely +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +msgid "Repeats in MIDI" msgstr "" #. @node in Documentation/user/input.itely #. @subsection in Documentation/user/input.itely -#. @node in Documentation/fr/user/non-music.itely -#. @section in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @section in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @section in Documentation/de/user/non-music.itely -msgid "other midi" +#. @node in Documentation/fr/user/input.itely +#. @subsection in Documentation/fr/user/input.itely +#. @node in Documentation/es/user/input.itely +#. @subsection in Documentation/es/user/input.itely +#. @node in Documentation/de/user/input.itely +#. @subsection in Documentation/de/user/input.itely +msgid "Controlling MIDI dynamics" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Dynamic marks" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Overall MIDI volume" msgstr "" -#. Documentation/user/spacing.itely:671 (comment) +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (i)" +msgstr "" + +#. @unnumberedsubsubsec in Documentation/user/input.itely +#. @unnumberedsubsubsec in Documentation/fr/user/input.itely +#. @unnumberedsubsubsec in Documentation/es/user/input.itely +#. @unnumberedsubsubsec in Documentation/de/user/input.itely +msgid "Equalizing different instruments (ii)" +msgstr "" + +#. Documentation/user/spacing.itely:684 (comment) msgid "this does nothing" msgstr "" -#. Documentation/user/spacing.itely:672 (comment) +#. Documentation/user/spacing.itely:685 (comment) msgid "a break here would work" msgstr "" -#. Documentation/user/spacing.itely:673 (comment) +#. Documentation/user/spacing.itely:686 (comment) msgid "as does this break" msgstr "" -#. Documentation/user/spacing.itely:685 (comment) +#. Documentation/user/spacing.itely:698 (comment) msgid "now the break is allowed" msgstr "" -#. Documentation/user/spacing.itely:1438 (comment) +#. Documentation/user/spacing.itely:1460 (comment) msgid "this time the text will be closer to the staff" msgstr "" -#. Documentation/user/spacing.itely:1440 (comment) -msgid "by setting outside-staff-priority to a non-number, we" +#. Documentation/user/spacing.itely:1462 (comment) +msgid "by setting outside-staff-priority to a non-number, " msgstr "" -#. Documentation/user/spacing.itely:1441 (comment) -msgid "disable the automatic collision avoidance" +#. Documentation/user/spacing.itely:1463 (comment) +msgid "we disable the automatic collision avoidance" msgstr "" -#. Documentation/user/spacing.itely:1444 (comment) +#. Documentation/user/spacing.itely:1466 (comment) msgid "now they will collide" msgstr "" -#. Documentation/user/spacing.itely:1469 (comment) +#. Documentation/user/spacing.itely:1491 (comment) msgid "the markup is too close to the following note" msgstr "" -#. Documentation/user/spacing.itely:1472 (comment) +#. Documentation/user/spacing.itely:1494 (comment) msgid "setting outside-staff-horizontal-padding fixes this" msgstr "" @@ -6633,17 +7192,6 @@ msgstr "" msgid "Score layout" msgstr "" -#. @node in Documentation/user/spacing.itely -#. @section in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @section in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @section in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @section in Documentation/de/user/spacing.itely -msgid "Displaying spacing" -msgstr "" - #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely #. @node in Documentation/fr/user/spacing.itely @@ -6869,24 +7417,17 @@ msgstr "" #. @node in Documentation/user/spacing.itely #. @section in Documentation/user/spacing.itely +#. @node in Documentation/fr/user/tweaks.itely +#. @section in Documentation/fr/user/tweaks.itely #. @node in Documentation/fr/user/spacing.itely #. @section in Documentation/fr/user/spacing.itely #. @node in Documentation/es/user/spacing.itely #. @section in Documentation/es/user/spacing.itely +#. @node in Documentation/de/user/tweaks.itely +#. @section in Documentation/de/user/tweaks.itely #. @node in Documentation/de/user/spacing.itely #. @section in Documentation/de/user/spacing.itely -msgid "Page layout MOVED FROM LM" -msgstr "" - -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Introduction to layout" +msgid "Fitting music onto fewer pages" msgstr "" #. @node in Documentation/user/spacing.itely @@ -6897,7 +7438,7 @@ msgstr "" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Global sizes" +msgid "Displaying spacing" msgstr "" #. @node in Documentation/user/spacing.itely @@ -6908,33 +7449,15 @@ msgstr "" #. @subsection in Documentation/es/user/spacing.itely #. @node in Documentation/de/user/spacing.itely #. @subsection in Documentation/de/user/spacing.itely -msgid "Line breaks" +msgid "Changing spacing" msgstr "" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Page breaks" +#. Documentation/user/changing-defaults.itely:1947 (comment) +msgid "Remove bar line at the end of the current line" msgstr "" -#. @node in Documentation/user/spacing.itely -#. @subsection in Documentation/user/spacing.itely -#. @node in Documentation/fr/user/tweaks.itely -#. @section in Documentation/fr/user/tweaks.itely -#. @node in Documentation/fr/user/spacing.itely -#. @subsection in Documentation/fr/user/spacing.itely -#. @node in Documentation/es/user/spacing.itely -#. @subsection in Documentation/es/user/spacing.itely -#. @node in Documentation/de/user/tweaks.itely -#. @section in Documentation/de/user/tweaks.itely -#. @node in Documentation/de/user/spacing.itely -#. @subsection in Documentation/de/user/spacing.itely -msgid "Fitting music onto fewer pages" +#. Documentation/user/changing-defaults.itely:1993 (comment) +msgid "Try to remove all key signatures" msgstr "" #. @node in Documentation/user/changing-defaults.itely @@ -6959,6 +7482,34 @@ msgstr "" msgid "Interpretation contexts" msgstr "" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Score - the master of all contexts" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Top-level contexts - staff containers" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Intermediate-level contexts - staves" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Bottom-level contexts - voices" +msgstr "" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/fr/user/changing-defaults.itely @@ -7007,6 +7558,8 @@ msgstr "" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Explaining the Internals Reference" msgstr "" @@ -7047,6 +7600,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Naming conventions" msgstr "" @@ -7054,6 +7609,8 @@ msgstr "" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Modifying properties" msgstr "" @@ -7061,16 +7618,20 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Overview of modifying properties" msgstr "" #. @node in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely msgid "The \\set command" msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\set} command" msgstr "" @@ -7084,7 +7645,7 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @section in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "The @code{\\override} command" msgstr "" @@ -7117,6 +7678,8 @@ msgstr "" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Useful concepts and properties" msgstr "" @@ -7124,6 +7687,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Input modes" msgstr "" @@ -7131,6 +7696,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Direction and placement" msgstr "" @@ -7138,6 +7705,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Distances and measurements" msgstr "" @@ -7145,6 +7714,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Spanners" msgstr "" @@ -7152,6 +7723,8 @@ msgstr "" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Common properties" msgstr "" @@ -7164,6 +7737,41 @@ msgstr "" msgid "Controlling visibility of objects" msgstr "" +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Removing the stencil" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Making objects transparent" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Painting objects white" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Using break-visibility" +msgstr "" + +#. @node in Documentation/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @unnumberedsubsubsec in Documentation/de/user/changing-defaults.itely +msgid "Special considerations" +msgstr "" + #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely @@ -7177,6 +7785,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Rotating objects" msgstr "" @@ -7184,6 +7794,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Aligning objects" msgstr "" @@ -7191,6 +7803,8 @@ msgstr "" #. @section in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @section in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @section in Documentation/de/user/changing-defaults.itely msgid "Advanced tweaks" msgstr "" @@ -7209,6 +7823,8 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying ends of spanners" msgstr "" @@ -7216,23 +7832,20 @@ msgstr "" #. @subsection in Documentation/user/changing-defaults.itely #. @node in Documentation/es/user/changing-defaults.itely #. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Modifying stencils" msgstr "" #. @node in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -msgid "old The \\override command" -msgstr "" - -#. @section in Documentation/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely -msgid "old The @code{\\override} command" +#. @subsection in Documentation/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely +msgid "Modifying shapes" msgstr "" #. @node in Documentation/user/changing-defaults.itely #. @section in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @section in Documentation/es/user/changing-defaults.itely #. @node in Documentation/de/user/changing-defaults.itely #. @section in Documentation/de/user/changing-defaults.itely msgid "Discussion of specific tweaks" @@ -7240,8 +7853,8 @@ msgstr "" #. @node in Documentation/user/changing-defaults.itely #. @subsection in Documentation/user/changing-defaults.itely -#. @node in Documentation/es/user/changing-defaults.itely -#. @subsection in Documentation/es/user/changing-defaults.itely +#. @node in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/de/user/changing-defaults.itely msgid "old Contexts explained" msgstr "" @@ -7561,18 +8174,24 @@ msgstr "" #. @node in Documentation/user/programming-interface.itely #. @section in Documentation/user/programming-interface.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @section in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @section in Documentation/de/user/programming-interface.itely msgid "TODO moved into scheme" msgstr "" #. @node in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely +#. @node in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of \\tweak" msgstr "" #. @subsection in Documentation/user/programming-interface.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely msgid "Using Scheme code instead of @code{\\tweak}" msgstr "" @@ -7580,10 +8199,12 @@ msgstr "" #. @subsection in Documentation/user/programming-interface.itely #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely -msgid "Difficult tweaks" -msgstr "" +#. @node in Documentation/es/user/programming-interface.itely +#. @subsection in Documentation/es/user/programming-interface.itely +#. @node in Documentation/de/user/programming-interface.itely +#. @subsection in Documentation/de/user/programming-interface.itely +msgid "Difficult tweaks" +msgstr "" #. @node in Documentation/user/literature.itely #. @appendix in Documentation/user/literature.itely @@ -7618,6 +8239,16 @@ msgstr "" msgid "Chord name chart" msgstr "" +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +msgid "Common chord modifiers" +msgstr "" + +#. @node in Documentation/user/notation-appendices.itely +#. @appendixsec in Documentation/user/notation-appendices.itely +msgid "Predefined fretboard diagrams" +msgstr "" + #. @node in Documentation/user/notation-appendices.itely #. @appendixsec in Documentation/user/notation-appendices.itely #. @node in Documentation/fr/user/notation-appendices.itely @@ -7772,37 +8403,24 @@ msgstr "" msgid "Commonly tweaked properties" msgstr "" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Manuel de l'utilisateur" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel d'apprentissage" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Manuel de référence" -msgstr "" - -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Annexes" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Hauteurs" msgstr "" -#. @subheading in Documentation/fr/user/introduction.itely -msgid "Utilisation du programme" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Durées et rythme" msgstr "" -#. @subsubheading in Documentation/fr/user/introduction.itely -msgid "Autre documentation" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Silences" msgstr "" -#. @subsubheading in Documentation/fr/user/tutorial.itely -#. @subsubheading in Documentation/de/user/tutorial.itely -msgid "Unix" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Métrique" msgstr "" -#. @rglos in Documentation/fr/user/tutorial.itely -msgid "fourth" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Tout ensemble" msgstr "" #. @node in Documentation/fr/user/tutorial.itely @@ -7812,34 +8430,8 @@ msgstr "" msgid "Working on text files" msgstr "" -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "How to read the tutorial" -msgstr "" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Relative note names" -msgstr "" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Piano staves" -msgstr "" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Printing lyrics" -msgstr "" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "A lead sheet" -msgstr "" - -#. @node in Documentation/fr/user/tutorial.itely -#. @subsection in Documentation/fr/user/tutorial.itely -msgid "Organizing pieces with identifiers" +#. @subheading in Documentation/fr/user/tutorial.itely +msgid "Exemples cliquables" msgstr "" #. @node in Documentation/fr/user/fundamental.itely @@ -7865,15 +8457,6 @@ msgstr "" msgid "Default files" msgstr "" -#. @node in Documentation/fr/user/working.itely -#. @section in Documentation/fr/user/working.itely -#. @node in Documentation/es/user/working.itely -#. @section in Documentation/es/user/working.itely -#. @node in Documentation/de/user/working.itely -#. @section in Documentation/de/user/working.itely -msgid "Suggestions for writing LilyPond files" -msgstr "" - #. @node in Documentation/fr/user/working.itely #. @subsection in Documentation/fr/user/working.itely #. @node in Documentation/es/user/working.itely @@ -7888,7 +8471,7 @@ msgid "GNU LilyPond --- utilisation des programmes" msgstr "" #. @top in Documentation/fr/user/lilypond.tely -msgid "GNU LilyPond --- le système de gravure musicale" +msgid "GNU LilyPond --- manuel de notation" msgstr "" #. @node in Documentation/fr/user/pitches.itely @@ -7927,47 +8510,49 @@ msgid "Octave check" msgstr "" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Augmentation dots" msgstr "" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely +#. @node in Documentation/es/user/rhythms.itely +#. @subsubsection in Documentation/es/user/rhythms.itely +#. @node in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely +msgid "Skips" +msgstr "" + +#. @node in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Multi measure rests" msgstr "" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Bar check" msgstr "" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Barnumber check" msgstr "" #. @node in Documentation/fr/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/fr/user/rhythms.itely +#. @subsubsection in Documentation/fr/user/rhythms.itely #. @node in Documentation/de/user/rhythms.itely -#. @unnumberedsubsubsec in Documentation/de/user/rhythms.itely +#. @subsubsection in Documentation/de/user/rhythms.itely msgid "Proportional notation (introduction)" msgstr "" -#. @node in Documentation/fr/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/fr/user/expressive.itely -#. @node in Documentation/de/user/expressive.itely -#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely -msgid "Laissez vibrer ties" -msgstr "" - #. @node in Documentation/fr/user/repeats.itely #. @subsection in Documentation/fr/user/repeats.itely msgid "Writing repeats" @@ -8035,7 +8620,7 @@ msgid "System start delimiters" msgstr "" #. @node in Documentation/fr/user/editorial.itely -#. @subsubsection in Documentation/fr/user/editorial.itely +#. @unnumberedsubsubsec in Documentation/fr/user/editorial.itely msgid "Blank music sheet" msgstr "" @@ -8046,15 +8631,11 @@ msgstr "" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Nested scores" msgstr "" #. @node in Documentation/fr/user/text.itely #. @unnumberedsubsubsec in Documentation/fr/user/text.itely -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely msgid "Page wrapping text" msgstr "" @@ -8075,206 +8656,31 @@ msgstr "" msgid "The piano staff" msgstr "" -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @subsection in Documentation/fr/user/unfretted-strings.itely -msgid "Orchestral strings sections" -msgstr "" - -#. @node in Documentation/fr/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/unfretted-strings.itely -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsubsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/unfretted-strings.itely -msgid "Artificial harmonics (strings)" -msgstr "" - #. @node in Documentation/fr/user/fretted-strings.itely -#. @subsection in Documentation/fr/user/fretted-strings.itely -msgid "Guitar sections" -msgstr "" - -#. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Tablatures basic" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Fret diagrams" msgstr "" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Non-guitar tablatures" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Right hand fingerings" msgstr "" #. @node in Documentation/fr/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/fr/user/fretted-strings.itely +#. @subsubsection in Documentation/fr/user/fretted-strings.itely +#. @node in Documentation/es/user/fretted-strings.itely +#. @subsubsection in Documentation/es/user/fretted-strings.itely #. @node in Documentation/de/user/fretted-strings.itely -#. @unnumberedsubsubsec in Documentation/de/user/fretted-strings.itely -msgid "Other guitar issues" -msgstr "" - -#. @node in Documentation/fr/user/percussion.itely -#. @subsection in Documentation/fr/user/percussion.itely -msgid "Percussion sections" -msgstr "" - -#. @node in Documentation/fr/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/fr/user/percussion.itely -#. @node in Documentation/de/user/percussion.itely -#. @unnumberedsubsubsec in Documentation/de/user/percussion.itely -msgid "Entering percussion" -msgstr "" - -#. @node in Documentation/fr/user/wind.itely -#. @subsection in Documentation/fr/user/wind.itely -#. @node in Documentation/es/user/wind.itely -#. @subsection in Documentation/es/user/wind.itely -#. @node in Documentation/de/user/wind.itely -#. @subsection in Documentation/de/user/wind.itely -msgid "Bagpipe" -msgstr "" - -#. @node in Documentation/fr/user/chords.itely -#. @subsection in Documentation/fr/user/chords.itely -msgid "Chords sections" -msgstr "" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Entering chord names" -msgstr "" - -#. @node in Documentation/fr/user/chords.itely -#. @unnumberedsubsubsec in Documentation/fr/user/chords.itely -#. @node in Documentation/de/user/chords.itely -#. @unnumberedsubsubsec in Documentation/de/user/chords.itely -msgid "Chords mode" -msgstr "" - -#. @node in Documentation/fr/user/ancient.itely -#. @subsection in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @subsection in Documentation/de/user/ancient.itely -msgid "Ancient TODO" -msgstr "" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Gregorian Chant contexts" -msgstr "" - -#. @node in Documentation/fr/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/fr/user/ancient.itely -#. @node in Documentation/es/user/ancient.itely -#. @subsubsection in Documentation/es/user/ancient.itely -#. @node in Documentation/de/user/ancient.itely -#. @unnumberedsubsubsec in Documentation/de/user/ancient.itely -msgid "Musica ficta accidentals" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Input files" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "A single music expression" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Extracting fragments of notation" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Common syntax issues TODO name?" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -msgid "Controlling direction" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Distances and measurements MAYBE MOVE" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @section in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @section in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @section in Documentation/de/user/input.itely -msgid "Other stuffs TODO move?" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "context list FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "another thing FIXME" -msgstr "" - -#. @node in Documentation/fr/user/input.itely -#. @subsection in Documentation/fr/user/input.itely -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Input modes FIXME" -msgstr "" - -#. @node in Documentation/fr/user/non-music.itely -#. @chapter in Documentation/fr/user/non-music.itely -#. @node in Documentation/es/user/non-music.itely -#. @chapter in Documentation/es/user/non-music.itely -#. @node in Documentation/de/user/non-music.itely -#. @chapter in Documentation/de/user/non-music.itely -msgid "Non-musical notation" +#. @subsubsection in Documentation/de/user/fretted-strings.itely +msgid "Guitar tablatures" msgstr "" #. @node in Documentation/fr/user/changing-defaults.itely @@ -8284,22 +8690,16 @@ msgstr "" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Changing context properties on the fly" msgstr "" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Layout tunings within contexts" msgstr "" #. @node in Documentation/fr/user/changing-defaults.itely #. @subsection in Documentation/fr/user/changing-defaults.itely -#. @node in Documentation/de/user/changing-defaults.itely -#. @subsection in Documentation/de/user/changing-defaults.itely msgid "Constructing a tweak" msgstr "" @@ -8323,32 +8723,20 @@ msgstr "" msgid "Advertencias y problemas conocidos" msgstr "" -#. @subheading in Documentation/es/user/introduction.itely -msgid "Learning Manual (LM)" -msgstr "" - -#. @subheading in Documentation/es/user/introduction.itely -msgid "Notation Reference (NR)" -msgstr "" - -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Appendices" -msgstr "" - -#. @subheading in Documentation/es/user/introduction.itely -#. @subheading in Documentation/de/user/introduction.itely -msgid "Program usage" +#. @node in Documentation/es/user/tweaks.itely +#. @subsection in Documentation/es/user/tweaks.itely +msgid "Automatic behaviour" msgstr "" -#. @subsubheading in Documentation/es/user/introduction.itely -#. @subsubheading in Documentation/de/user/introduction.itely -msgid "Other information" +#. @subheading in Documentation/es/user/tweaks.itely +msgid "Simulating a fermata" msgstr "" -#. @node in Documentation/es/user/tweaks.itely -#. @subsection in Documentation/es/user/tweaks.itely -msgid "Automatic behaviour" +#. @node in Documentation/es/user/working.itely +#. @section in Documentation/es/user/working.itely +#. @node in Documentation/de/user/working.itely +#. @section in Documentation/de/user/working.itely +msgid "Suggestions for writing LilyPond files" msgstr "" #. @rglos in Documentation/es/user/working.itely @@ -8370,29 +8758,23 @@ msgstr "" msgid "Writing long repeats" msgstr "" -#. @node in Documentation/es/user/unfretted-strings.itely -#. @subsection in Documentation/es/user/unfretted-strings.itely -#. @node in Documentation/de/user/unfretted-strings.itely -#. @subsection in Documentation/de/user/unfretted-strings.itely -msgid "Orchestral strings TODO" -msgstr "" - #. @rglos in Documentation/es/user/chords.itely msgid " " msgstr "" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "Controlling direction and placement" +#. @node in Documentation/es/user/ancient.itely +#. @subsection in Documentation/es/user/ancient.itely +msgid "Ancient TODO" msgstr "" -#. @node in Documentation/es/user/input.itely -#. @subsection in Documentation/es/user/input.itely -#. @node in Documentation/de/user/input.itely -#. @subsection in Documentation/de/user/input.itely -msgid "When to add a -" +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Gregorian Chant contexts" +msgstr "" + +#. @node in Documentation/es/user/ancient.itely +#. @subsubsection in Documentation/es/user/ancient.itely +msgid "Musica ficta accidentals" msgstr "" #. @top in Documentation/de/user/lilypond-learning.tely @@ -8411,6 +8793,22 @@ msgstr "" msgid "Notation reference" msgstr "" +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Appendices" +msgstr "" + +#. @subheading in Documentation/de/user/introduction.itely +msgid "Program usage" +msgstr "" + +#. @subsubheading in Documentation/de/user/introduction.itely +msgid "Other information" +msgstr "" + +#. @subsubheading in Documentation/de/user/tutorial.itely +msgid "Unix" +msgstr "" + #. @rglos in Documentation/de/user/tutorial.itely msgid "legato" msgstr "" @@ -8428,100 +8826,16 @@ msgstr "" msgid "GNU LilyPond -- Das Notationsprogramm" msgstr "" +#. @node in Documentation/de/user/expressive.itely +#. @unnumberedsubsubsec in Documentation/de/user/expressive.itely +msgid "Laissez vibrer ties" +msgstr "" + #. @node in Documentation/de/user/simultaneous.itely #. @unnumberedsubsubsec in Documentation/de/user/simultaneous.itely msgid "Chords" msgstr "" -#. @node in Documentation/de/user/text.itely -#. @subsubsection in Documentation/de/user/text.itely -msgid "Font selection" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Simple lyrics" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Another way of entering lyrics" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Assigning more than one syllable to a single note" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "More than one note on a single syllable" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Vocals and variables" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Flexibility in placement" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Lyrics to multiple notes of a melisma" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Switching the melody associated with a lyrics line" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "Spacing vocals" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Spacing lyrics" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsection in Documentation/de/user/vocal.itely -msgid "More about stanzas" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding dynamics marks" -msgstr "" - -#. @node in Documentation/de/user/vocal.itely -#. @subsubsection in Documentation/de/user/vocal.itely -msgid "Adding singer names" -msgstr "" - -#. @node in Documentation/de/user/fretted-strings.itely -#. @subsection in Documentation/de/user/fretted-strings.itely -msgid "Guitar TODO" -msgstr "" - -#. @node in Documentation/de/user/percussion.itely -#. @subsection in Documentation/de/user/percussion.itely -msgid "TODO percussion node fix" -msgstr "" - -#. @section in Documentation/de/user/chords.itely -msgid "Chords notation" -msgstr "" - -#. @node in Documentation/de/user/chords.itely -#. @subsection in Documentation/de/user/chords.itely -msgid "TODO chords fix" -msgstr "" - msgid "Up:" msgstr "" diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 5e6ff487e2..cafa877cf1 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -66,29 +66,56 @@ which scares away people. @end ignore @item -A few syntax changes were made: +Predefined, user-configurable, transposable fret diagrams +are now available in the FretBoards context: +@lilypond[] +\include "predefined-guitar-fretboards.ly" +<< + \new ChordNames { + \chordmode { + c1 \transpose c e { c } + } + } + \new FretBoards { + \chordmode { + c1 \transpose c e { c } + } + } +>> +@end lilypond + +@item +The following syntax changes were made, in chronological order. In +addition, fret diagram properties have been moved to +@code{fret-diagram-details}, and @code{#'style} property is used to +select solid/dashed lines instead of @code{#'dash-fraction}. + @example -2.11.23: #'break-align-symbol -> #'break-align-symbols -2.11.35: scripts.caesura -> scripts.caesura.curved. -Use #'style not #'dash-fraction to select solid/dashed lines. -2.11.38: \setEasyHeads -> \easyHeadsOn, \fatText -> \textLengthOn, +#'break-align-symbol -> #'break-align-symbols +scripts.caesura -> scripts.caesura.curved +\setEasyHeads -> \easyHeadsOn +\easyHeadsOff (new command) +\fatText -> \textLengthOn \emptyText -> \textLengthOff -2.11.46: \set hairpinToBarline -> \override Hairpin #'to-barline -2.11.48: \compressMusic -> \scaleDurations -2.11.50: metronomeMarkFormatter uses text markup as second -argument, -fret diagram properties moved to fret-diagram-details. -2.11.51: \octave -> \octaveCheck, \arpeggioUp -> \arpeggioArrowUp, -\arpeggioDown -> \arpeggioArrowDown, \arpeggioNeutral -> -\arpeggioNormal, -\setTextCresc -> \crescTextCresc, \setTextDecresc -> -\dimTextDecresc, -\setTextDecr -> \dimTextDecr, \setTextDim -> \dimTextDim, -\setHairpinCresc -> \crescHairpin, \setHairpinDecresc -> -\dimHairpin, -\sustainUp -> \sustainOff, \sustainDown -> \sustainOn -\sostenutoDown -> \sostenutoOn, \sostenutoUp -> \sostenutoOff -2.11.53: infinite-spacing-height -> extra-spacing-height +\set hairpinToBarline -> \override Hairpin #'to-barline +\compressMusic -> \scaleDurations +\octave -> \octaveCheck +\arpeggioUp -> \arpeggioArrowUp +\arpeggioDown -> \arpeggioArrowDown +\arpeggioNeutral -> \arpeggioNormal +\setTextCresc -> \crescTextCresc +\setTextDecresc -> \dimTextDecresc +\setTextDecr -> \dimTextDecr +\setTextDim -> \dimTextDim +\setHairpinCresc -> \crescHairpin +\setHairpinDecresc -> \dimHairpin +\sustainUp -> \sustainOff +\sustainDown -> \sustainOn +\sostenutoDown -> \sostenutoOn +\sostenutoUp -> \sostenutoOff +infinite-spacing-height -> extra-spacing-height +#(set-octavation oct) -> \ottava #oct +\put-adjacent markup axis dir markup -> \put-adjacent axis dir markup markup @end example @item @@ -111,15 +138,6 @@ using the @code{rounded-box} command. to guess the line width, thanks to @code{--latex-program} command line option. -@item -@code{\setEasyHeads} has been renamed to @code{\easyHeadsOn}, and a new -command @code{\easyHeadsOff} reverts note heads to normal heads. - -@item -@code{\fatText}, @code{\emptyText} and @code{\compressMusic} have been -renamed to @code{\textLengthOn}, @code{\textLengthOff} and -@code{\scaleDurations}, respectively. - @item Underlining is now possible with the @code{\underline} markup command. @@ -178,7 +196,6 @@ their end points. This includes glissando, voice followers, text crescendos and other text spanners. The old syntax for setting text on line spanners is no longer valid. -@c with ragged-right we can't see the gliss. @lilypond[] \relative c'' { \override Glissando #'bound-details #'right #'text = \markup { \hcenter \bold down } @@ -187,6 +204,8 @@ text on line spanners is no longer valid. \override Glissando #'bound-details #'left #'arrow = ##t \override Glissando #'bound-details #'left #'padding = #3.0 \override Glissando #'style = #'trill + \override Glissando #'springs-and-rods = #ly:spanner::set-spacing-rods + \override Glissando #'minimum-length = #12 c1 \glissando c' } @@ -290,13 +309,13 @@ duration and count (if given) are shown in parentheses after the text. \tempo "Fast" c'4 c' c' c' c'4 c' c' c' - \tempo "Andante" 4=120 + \tempo "Andante" 4 = 120 c'4 c' c' c' c'4 c' c' c' - \tempo 4=100 + \tempo 4 = 100 c'4 c' c' c' c'4 c' c' c' - \tempo "" 4=30 + \tempo "" 4 = 30 c'4 c' c' c' c'4 c' c' c' } diff --git a/Documentation/translations.html.in b/Documentation/translations.html.in index 19c9bbbc1a..432a74c3c1 100644 --- a/Documentation/translations.html.in +++ b/Documentation/translations.html.in @@ -38,7 +38,7 @@ translations.template.html.in; DO NOT EDIT !--> is finished.

    -

    Last updated Sat Jul 19 15:59:20 UTC 2008 +

    Last updated Mon Aug 11 16:16:20 UTC 2008

    pré-GDP
    1 Introduction
    (3699)    		1 Introduction
    (3678)    		 Ludovic Sardain
    John Mandereau    		 Jean-Charles Malahieude
    Jean-Yves Baudais    		 ouipartiellementpré-GDPouipost-GDP
    2 Tutoriel
    (5652)    		2 Tutoriel
    (5685)    		 Nicolas Grandclaude
    Ludovic Sardain
    Gauvain Pocentek    		 ouipartiellementpré-GDPouipost-GDP
    3 Concepts fondamentaux
    (9800)    		pré-GDP
    4 Retouche des partitions
    (12262)    		4 Retouche des partitions
    (12334)    		 Valentin Villenave
    Nicolas Klutchnikoff    		 Jean-Charles Malahieude
    @@ -178,7 +210,7 @@ translations.template.html.in; DO NOT EDIT !-->     		Autres informations
    Section titles
    (544)    		Section titles
    (547)    		 John Mandereau
    Jean-Charles Malahieude    		 ouipartiellementoui pré-GDP
    1.1 Hauteurs
    (2822)    		1.1 Hauteurs
    (2948)    		 Frédéric Chiasson Valentin Villenave
    Jean-Charles Malahieude    		pré-GDP
    1.2 Rythme
    (6657)    		1.2 Rythme
    (6785)    		 Frédéric Chiasson Valentin Villenave
    Jean-Charles Malahieude    		pré-GDP
    1.3 Signes d'interprétation
    (843)    		1.3 Signes d'interprétation
    (1119)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		pré-GDP
    1.4 Répétitions et reprises
    (940)    		1.4 Répétitions et reprises
    (556)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		pré-GDP
    1.5 Notes simultanées
    (883)    		1.5 Notes simultanées
    (1000)    		 Frédéric Chiasson
    Valentin Villenave    		 Jean-Charles Malahieude
    @@ -242,16 +274,16 @@ translations.template.html.in; DO NOT EDIT !-->     		pré-GDP
    1.6 Notation sur la portée
    (2310)    		1.6 Notation sur la portée
    (1800)    		 Valentin Villenave
    Jean-Charles Malahieude    		 John Mandereau ouipartiellementpartiellement pré-GDP
    1.7 Notation éditoriale
    (827)    		1.7 Notation éditoriale
    (908)    		 Jean-Charles Malahieude ouipré-GDP
    1.8 Texte
    (1851)    		1.8 Texte
    (2082)    		 Jean-Charles Malahieude Valentin Villenave
    John Mandereau    		partiellement (83 %)partiellement (82 %) partiellement pré-GDP
    ouipartiellementoui pré-GDP
    2.1 Musique vocale
    (2745)    		2.1 Musique vocale
    (2799)    		 Valentin Villenave Jean-Charles Malahieude partiellement (96 %)pré-GDP
    2.2 Instruments à clavier
    (561)    		2.2 Instruments à clavier
    (668)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		partiellement (90 %)partiellementpartiellement (89 %)partiellement pré-GDP
    pré-GDP
    2.4 Instruments à cordes frettées
    (857)    		2.4 Instruments à cordes frettées
    (1369)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		partiellement (32 %)partiellement (16 %) partiellement pré-GDP
    2.5 Percussions
    (546)    		2.5 Percussions
    (747)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		partiellement (97 %)partiellement (98 %) partiellement pré-GDP
    pré-GDP
    2.7 Notation des accords
    (1303)    		2.7 Notation des accords
    (1352)    		 Valentin Villenave Jean-Charles Malahieude
    John Mandereau    		partiellement (65 %)partiellement (62 %) partiellement pré-GDP
    pré-GDP
    3 Syntaxe d'entrée
    (5399)    		Jean-Charles Malahieude2.9 World music
    (1115)    		nonpré-GDP
    3 General input and output
    (5431)    		Jean-Charles Malahieude
    + Valentin Villenave    		 partiellement (3 %)partiellement (6 %) partiellement pré-GDP
    4 Gestion de l'espace
    (8400)    		4 Gestion de l'espace
    (7896)    		 nonpré-GDP
    5 Modification des réglages prédéfinis
    (6855)    		5 Modification des réglages prédéfinis
    (8377)    		 Valentin Villenave Gilles Thibaultpartiellement (77 %)partiellementpartiellement (51 %)partiellement pré-GDP
    6 Interfaces pour les programmeurs
    (5213)    		6 Interfaces pour les programmeurs
    (5218)    		 nonpré-GDP
    B Tables du manuel de notation
    (1127)    		B Tables du manuel de notation
    (1146)    		 Frédéric Chiasson
    Jean-Charles Malahieude    		 partiellement (12 %)partiellementpartiellement (7 %)partiellement pré-GDP
      - +
    @@ -79,25 +79,25 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -134,7 +134,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -291,7 +291,7 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -311,7 +311,7 @@ translations.template.html.in; DO NOT EDIT !--> - + - + - + - + - + - + - + - + @@ -460,7 +460,7 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -520,37 +520,37 @@ translations.template.html.in; DO NOT EDIT !--> - + - + @@ -571,20 +571,20 @@ translations.template.html.in; DO NOT EDIT !--> - + @@ -604,10 +604,8 @@ translations.template.html.in; DO NOT EDIT !--> - - + @@ -615,7 +613,23 @@ translations.template.html.in; DO NOT EDIT !--> - + + + + + + + - + - + - + diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely index c6b489a827..f641269f2b 100644 --- a/Documentation/user/ancient.itely +++ b/Documentation/user/ancient.itely @@ -150,7 +150,7 @@ a'\maxima a'\longa a'\breve a'1 a'2 a'4 a'8 a'16 a' @end lilypond When typesetting a piece in Gregorian chant notation, the -@rinternals{Gregorian_ligature_engraver} automatically selects the proper +@rinternals{Vaticana_ligature_engraver} automatically selects the proper note heads, so there is no need to explicitly set the note head style. Still, the note head style can be set, e.g., to @code{vaticana_punctum} to produce punctum neumes. Similarly, the diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index b7a905254e..0ba8be5d83 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -40,6 +40,8 @@ LilyPond. It is written as a HTML document, which is available @uref{http://@/lilypond@/.org/@/doc/@/stable/@/Documentation/@/user/@/lilypond@/-internals/,on@/-line}, but is also included with the LilyPond documentation package. +@c TODO The following is at variance to what actually follows. Fix -td + There are four areas where the default settings may be changed: @itemize @@ -71,13 +73,13 @@ on entering numbers, lists, strings, and symbols in Scheme.} @menu -* Interpretation contexts:: -* Explaining the Internals Reference:: -* Modifying properties:: -* Useful concepts and properties:: -* Common properties:: -* Advanced tweaks:: -* Discussion of specific tweaks:: +* Interpretation contexts:: +* Explaining the Internals Reference:: +* Modifying properties:: +* Useful concepts and properties:: +* Common properties:: +* Advanced tweaks:: +* Discussion of specific tweaks:: @end menu @@ -87,12 +89,12 @@ on entering numbers, lists, strings, and symbols in Scheme.} This section describes what contexts are, and how to modify them. @menu -* Contexts explained:: -* Creating contexts:: -* Modifying context plug-ins:: -* Changing context default settings:: -* Defining new contexts:: -* Aligning contexts:: +* Contexts explained:: +* Creating contexts:: +* Modifying context plug-ins:: +* Changing context default settings:: +* Defining new contexts:: +* Aligning contexts:: @end menu @@ -125,10 +127,10 @@ further explanation and with links to the IR. Contexts are arranged heirarchically: @menu -* Score - the master of all contexts:: -* Top-level contexts - staff containers:: -* Intermediate-level contexts - staves:: -* Bottom-level contexts - voices:: +* Score - the master of all contexts:: +* Top-level contexts - staff containers:: +* Intermediate-level contexts - staves:: +* Bottom-level contexts - voices:: @end menu @node Score - the master of all contexts @@ -538,7 +540,7 @@ time signature. @subsection Changing context default settings The adjustments of the previous subsections ( -@ref{The \set command}, @ref{Modifying context plug-ins}, and +@ref{The set command}, @ref{Modifying context plug-ins}, and @ref{Overview of modifying properties}) can also be entered separately from the music in the @code{\layout} block, @@ -700,7 +702,7 @@ The notes look like a slash, and have no stem, All these plug-ins have to cooperate, and this is achieved with a special plug-in, which must be marked with the keyword @code{\type}. -This should always be @rinternals{Engraver_group}, +This should always be @code{Engraver_group}. @example \type "Engraver_group" @@ -801,10 +803,10 @@ ossia = { f4 f f f } @menu -* Navigating the program reference:: -* Layout interfaces:: -* Determining the grob property:: -* Naming conventions:: +* Navigating the program reference:: +* Layout interfaces:: +* Determining the grob property:: +* Naming conventions:: @end menu @node Navigating the program reference @@ -836,9 +838,9 @@ Internals Reference: @rinternals{Fingering}. @c outdated info; probably will delete. @ignore This fragment points to two parts of the program reference: a page -on @code{FingerEvent} and one on @code{Fingering}. +on @code{FingeringEvent} and one on @code{Fingering}. -The page on @code{FingerEvent} describes the properties of the music +The page on @code{FingeringEvent} describes the properties of the music expression for the input @code{-2}. The page contains many links forward. For example, it says @@ -854,7 +856,7 @@ plug-in, which says This engraver creates the following layout objects: @rinternals{Fingering}. @end quotation -In other words, once the @code{FingerEvent}s are interpreted, the +In other words, once the @code{FingeringEvent}s are interpreted, the @code{Fingering_engraver} plug-in will process them. @end ignore @@ -900,7 +902,7 @@ Music types accepted: @rinternals{fingering-event} @item @rinternals{fingering-event}: Music event type @code{fingering-event} is in Music expressions named -@rinternals{FingerEvent} +@rinternals{FingeringEvent} @end itemize This path goes against the flow of information in the program: it @@ -1122,11 +1124,11 @@ LP-specific? @section Modifying properties @menu -* Overview of modifying properties:: -* The \set command:: -* The \override command:: -* \set versus \override:: -* Objects connected to the input:: +* Overview of modifying properties:: +* The set command:: +* The override command:: +* set versus override:: +* The tweak command:: @end menu @@ -1244,7 +1246,7 @@ or crashes, or both. -@node The \set command +@node The set command @subsection The @code{\set} command @cindex properties @@ -1369,7 +1371,7 @@ Translation @expansion{} Tunable context properties. -@node The \override command +@node The override command @subsection The @code{\override} command Commands which change output generally look like @@ -1411,7 +1413,7 @@ We demonstrate how to glean this information from the notation manual and the program reference. -@node \set versus \override +@node set versus override @subsection @code{\set} vs. @code{\override} We have seen two methods of changing properties: @code{\set} and @@ -1462,8 +1464,8 @@ objects. Since this is a common change, the special property (modified with @code{\set}) was created. -@node Objects connected to the input -@subsection Objects connected to the input +@node The tweak command +@subsection The @code{\tweak} command TODO: can't use \tweak in a variable @@ -1516,10 +1518,10 @@ details. @menu -* Input modes:: -* Direction and placement:: -* Distances and measurements:: -* Spanners:: +* Input modes:: +* Direction and placement:: +* Distances and measurements:: +* Spanners:: @end menu @node Input modes @@ -1735,17 +1737,12 @@ restricted to a sub-set of the spanners. @section Common properties @menu -* Controlling visibility of objects:: -* Line styles:: -* Rotating objects:: -* Aligning objects:: +* Controlling visibility of objects:: +* Line styles:: +* Rotating objects:: +* Aligning objects:: @end menu -@c TODO Add new subsection Shapes of objects -@c which would include Slur shapes -@c with a Known issue: can't modify shapes with 'control-points if there are -@c more than one at the same musical moment - @node Controlling visibility of objects @subsection Controlling visibility of objects @@ -1766,11 +1763,11 @@ certain layout objects. These are covered under Special considerations. @menu -* Removing the stencil:: -* Making objects transparent:: -* Painting objects white:: -* Using break-visibility:: -* Special considerations:: +* Removing the stencil:: +* Making objects transparent:: +* Painting objects white:: +* Using break-visibility:: +* Special considerations:: @end menu @@ -1833,15 +1830,14 @@ a1 @end lilypond This may be avoided by changing the order of printing the objects. -All layout objects have a @code{layer} property which takes a real -number. Objects with the lowest value of @code{layer} are drawn -first, then objects with progressively higher values are drawn, so -objects with higher values overwrite objects with lower values. +All layout objects have a @code{layer} property which should be set +to an integer. Objects with the lowest value of @code{layer} are +drawn first, then objects with progressively higher values are drawn, +so objects with higher values overwrite objects with lower values. By default most objects are assigned a @code{layer} value of @code{1}, although a few objects, including @code{StaffSymbol} and @code{BarLine}, are assigned a value of @code{0}. The order of -printing objects with the same nominal value of @code{layer} is -indeterminate. +printing objects with the same value of @code{layer} is indeterminate. In the example above the white clef, with a default @code{layer} value of @code{1}, is drawn after the staff lines (default @@ -1858,6 +1854,8 @@ a1 @node Using break-visibility @unnumberedsubsubsec Using break-visibility +@c TODO Add making other objects breakable + @cindex break-visibility Most layout objects are printed only once, but some like @@ -1879,19 +1877,20 @@ of the next line and a cautionary time signature will be printed at the end of the previous line as well. This behaviour is controlled by the @code{break-visibility} -property, which is explained in @rlearning{Visibility and color of -objects}. This property takes a vector of three booleans which, -in order, determine whether the object is printed at the end of, -within the body of, or at the beginning of a line. Or to be more -precise, before a line break, where there is no line break, or -after a line break. +property, which is explained in +@c Leave this ref on a newline - formats incorrectly otherwise -td +@rlearning{Visibility and color of objects}. This property takes +a vector of three booleans which, in order, determine whether the +object is printed at the end of, within the body of, or at the +beginning of a line. Or to be more precise, before a line break, +where there is no line break, or after a line break. Alternatively, seven of the eight combinations may be specified by pre-defined functions, defined in @file{scm/output-lib.scm}, where the last three columns indicate whether the layout objects will be visible in the positions shown at the head of the columns: -@multitable @columnfractions .40 .15 .15 .15 .15 +@multitable @columnfractions .40 .15 .1 .1 .1 @c TODO check these more carefully @headitem Function @tab Vector @tab Before @tab At no @tab After @headitem form @tab form @tab break @tab break @tab break @@ -2248,7 +2247,65 @@ Internals Reference: @rinternals{TextSpanner}, @node Rotating objects @subsection Rotating objects -@c FIXME Write this section +Both layout objects and elements of markup text can be rotated by +any angle about any point, but the method of doing so differs. + +@menu +* Rotating layout objects:: +* Rotating markup:: +@end menu + +@node Rotating layout objects +@unnumberedsubsubsec Rotating layout objects + +@cindex rotating objects +@cindex objects, rotating + +All layout objects which support the @code{grob-interface} can be +rotated by setting their @code{rotation} property. This takes a +list of three items: the angle of rotation counter-clockwise, +and the x and y coordinates of the point relative to the object's +reference point about which the rotation is to be performed. The +angle of rotation is specified in degrees and the coordinates in +staff-spaces. + +The angle of rotation and the coordinates of the rotation point must +be determined by trial and error. + +@cindex hairpins, angled +@cindex angled hairpins + +There are only a few situations where the rotation of layout +objects is useful; the following example shows one situation where +they may be: + +@lilypond[quote,verbatim,relative=1] +g4\< e' d' f\! +\override Hairpin #'rotation = #'(20 -1 0) +g,,4\< e' d' f\! +@end lilypond + +@node Rotating markup +@unnumberedsubsubsec Rotating markup + +All markup text can be rotated to lie at any angle by prefixing it +with the @code{\rotate} command. The command takes two arguments: +the angle of rotation in degrees counter-clockwise and the text to +be rotated. The extents of the text are not rotated: they take +their values from the extremes of the x and y coordinates of the +rotated text. In the following example the +@code{outside-staff-priority} property for text is set to @code{#f} +to disable the automatic collision avoidance, which would push some +of the text too high. + +@lilypond[quote,verbatim,relative=1] +\override TextScript #'outside-staff-priority = ##f +g4^\markup { \rotate #30 "a G" } +b^\markup { \rotate #30 "a B" } +des^\markup { \rotate #30 "a D-Flat" } +fis^\markup { \rotate #30 "an F-Sharp" } +@end lilypond + @node Aligning objects @subsection Aligning objects @@ -2260,10 +2317,10 @@ Internals Reference: @rinternals{TextSpanner}, @section Advanced tweaks @menu -* Vertical grouping of grobs:: -* Modifying ends of spanners:: -* Modifying stencils:: -* Modifying shapes:: +* Vertical grouping of grobs:: +* Modifying ends of spanners:: +* Modifying stencils:: +* Modifying shapes:: @end menu @@ -2286,23 +2343,148 @@ VerticalAxisGroup. @subsection Modifying ends of spanners @c FIXME Write this section +@c See earlier material in Line styles @node Modifying stencils @subsection Modifying stencils -@c FIXME Write this section +All layout objects have a @code{stencil} property which is part of +the @code{grob-interface}. By default, this property is usually +set to a function specific to the object that is tailor-made to +render the symbol which represents it in the output. For example, +the standard setting for the @code{stencil} property of the +@code{MultiMeasureRest} object is @code{ly:multi-measure-rest::print}. + +The standard symbol for any object can be replaced by modifying the +@code{stencil} property to reference a different, specially-written, +procedure. This requires a high level of knowledge of the internal +workings of LilyPond, but there is an easier way which can often +produce adequate results. + +This is to set the @code{stencil} property to the procedure which +prints text -- @code{ly:text-interface::print} -- and to add a +@code{text} property to the object which is set to contain the +markup text which produces the required symbol. Due to the +flexibility of markup, much can be achieved -- see in particular +@ref{Graphic notation inside markup}. + +The following example demonstrates this by changing the note head +symbol to a cross within a circle. + +@lilypond[verbatim,quote] +XinO = { + \once \override NoteHead #'stencil = #ly:text-interface::print + \once \override NoteHead #'text = \markup { + \combine + \halign #-0.7 \draw-circle #0.85 #0.2 ##f + \musicglyph #"noteheads.s2cross" + } +} +\relative c'' { + a a \XinO a a +} +@end lilypond + +Any of the glyphs in the feta Font can be supplied to the +@code{\musicglyph} markup command -- see @ref{The Feta font}. + +@c TODO Add inserting eps files or ref to later + +@c TODO Add inserting Postscript or ref to later + +@seealso + +Notation Reference: +@ref{Graphic notation inside markup}, +@ref{Formatting text}, +@ref{Text markup commands}, +@ref{The Feta font}. + @node Modifying shapes @subsection Modifying shapes -@c FIXME Write this section -@c Discussion of Bezier curves and the control-points property +@menu +* Modifying ties and slurs:: +@end menu + +@node Modifying ties and slurs +@unnumberedsubsubsec Modifying ties and slurs + +Ties, slurs and phrasing slurs are drawn as third-order Bézier +curves. If the shape of the tie or slur which is calculated +automatically is not optimum, the shape may be modified manually by +explicitly specifying the four control points required to define +a third-order Bézier curve. + +Third-order or cubic Bézier curves are defined by four control +points. The first and fourth control points are precisely the +starting and ending points of the curve. The intermediate two +control points define the shape. Animations showing how the curve +is drawn can be found on the web, but the following description +may be helpful. The curve starts from the first control point +heading directly towards the second, gradually bending over to +head towards the third and continuing to bend over to head towards +the fourth, arriving there travelling directly from the third +control point. The curve is entirely contained in the +quadrilateral defined by the four control points. + +Here is an example of a case where the tie is not optimum, and +where @code{\tieDown} would not help. + +@lilypond[verbatim,quote,relative=1] +<< + { e1 ~ e } +\\ + { r4 } +>> +@end lilypond + +One way of improving this tie is to manually modify its control +points, as follows. + +The coordinates of the Bézier control points are specified in units +of staff-spaces. The X@tie{}coordinate is relative to the reference +point of the note to which the tie or slur is attached, and the +Y@tie{}coordinate is relative to the staff center line. The +coordinates are entered as a list of four pairs of decimal numbers +(reals). One approach is to estimate the coordinates of the two +end points, and then guess the two intermediate points. The optimum +values are then found by trial and error. + +It is useful to remember that a symmetric curve requires symmetric +control points, and that Bézier curves have the useful property that +transformations of the curve such as translation, rotation and +scaling can be achieved by applying the same transformation to the +curve's control points. + +For the example above the following override gives a satisfactory +tie: + +@lilypond[verbatim,quote,relative=1] +<< + \once \override Tie + #'control-points = #'((1 . -1) (3 . 0.6) (12.5 . 0.6) (14.5 . -1)) + { e1 ~ e1 } +\\ + { r4 4 } +>> +@end lilypond + +@knownissues + +It is not possible to modify shapes of ties or slurs by changing +the @code{control-points} property if there are more than one at +the same musical moment, not even by using the @code{\tweak} +command. + + @node Discussion of specific tweaks @section Discussion of specific tweaks @menu -* old Contexts explained:: +* old Contexts explained:: @end menu diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely index e6c2ab5291..2b1d12c029 100644 --- a/Documentation/user/chords.itely +++ b/Documentation/user/chords.itely @@ -14,8 +14,9 @@ @lilypondfile[quote]{chords-headword.ly} -Chords can be entered in chord mode, which recognizes some traditional European chord naming conventions. Chord names can also -be displayed. In addition, figured bass notation can be displayed. +Chords can be entered either as normal notes or in chord mode and displayed +using a variety of traditional European chord naming conventions. Chord +names and figured bass notation can also be displayed. @menu * Chord mode:: @@ -502,15 +503,15 @@ traditions use different names for the same set of chords. There are also different symbols displayed for a given chord name. The names and symbols displayed for chord names are customizable. -@cindex Banter @cindex jazz chords @cindex chords, jazz -The default chord name layout is a system for Jazz music, proposed -by Klaus Ignatzek (see @ref{Literature list}). There are also two -other chord name schemes implemented: an alternate Jazz chord -notation, and a systematic scheme called Banter chords. The -alternate Jazz notation is also shown on the chart in @ref{Chord +The basic chord name layout is a system for Jazz music, proposed +by Klaus Ignatzek (see @ref{Literature list}). The chord naming +system can be modified as described below. An alternate jazz +chord system has been developed using these modifications. +The Ignatzek and alternate +Jazz notation are shown on the chart in @ref{Chord name chart}. @c TODO -- Change this so we don't have a non-verbatim example. @@ -525,7 +526,7 @@ The effect is demonstrated here: @lilypondfile[ragged-right]{chord-names-languages.ly} -If none of the default settings give the desired output, the chord +If none of the existing settings give the desired output, the chord name display can be tuned through the following properties. @table @code @@ -723,6 +724,9 @@ example, the vertical spacing of the figures may be set with @seealso +Music Glossary: +@rglos{figured bass}. + Snippets: @rlsr{Chords} @@ -911,7 +915,7 @@ End of continuation line @c @rlearning{}. @c Notation Reference: -@c @ruser{}. +@c @ref{}. @c Application Usage: @c @rprogram{}. @@ -923,7 +927,7 @@ Snippets: @rlsr{Chords}. Internals Reference: -@rinternals{NewBassFigure}, +@rinternals{BassFigure}, @rinternals{BassFigureAlignment}, @rinternals{BassFigureLine}, @rinternals{BassFigureBracket}, @@ -1018,7 +1022,7 @@ or below the staff. @c @rlearning{}. @c Notation Reference: -@c @ruser{}. +@c @ref{}. @c Application Usage: @c @rprogram{}. @@ -1030,7 +1034,7 @@ Snippets: @rlsr{Chords}. Internals Reference: -@rinternals{NewBassFigure}, +@rinternals{BassFigure}, @rinternals{BassFigureAlignment}, @rinternals{BassFigureLine}, @rinternals{BassFigureBracket}, diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely index 65adae6d60..c93a2c4045 100644 --- a/Documentation/user/editorial.itely +++ b/Documentation/user/editorial.itely @@ -65,7 +65,7 @@ The font size of notation elements may be altered. It does not change the size of variable symbols, such as beams or slurs. @warning{For font sizes of text, see -@ref{Common markup commands}.} +@ref{Selecting font and font size}.} @lilypond[verbatim,quote,relative=2] \huge @@ -138,8 +138,6 @@ Snippets: @rlsr{Editorial annotations}. Internals Reference: -@rinternals{fontSize}, -@rinternals{font-size}, @rinternals{font-interface}. @@ -350,8 +348,8 @@ gis4 a @seealso Notation Reference: -@ref{List of colors}, @ref{Objects connected to -the input}. +@ref{List of colors}, @ref{The +tweak command}. Snippets: @rlsr{Editorial annotations}. @@ -373,7 +371,7 @@ and @code{'ForestGreen}. For web use normal colors are recommended Notes in a chord cannot be colored with @code{\override}; use -@code{\tweak} instead, see @ref{Objects connected to the input}. +@code{\tweak} instead, see @ref{The tweak command}. @node Parentheses diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely index 9bb34c806c..e292e5c683 100644 --- a/Documentation/user/expressive.itely +++ b/Documentation/user/expressive.itely @@ -147,23 +147,41 @@ Internals Reference: @cindex dynamics @cindex dynamics, absolute @funindex \ppppp +@funindex ppppp @funindex \pppp +@funindex pppp @funindex \ppp +@funindex ppp @funindex \pp +@funindex pp @funindex \p +@funindex p @funindex \mp +@funindex mp @funindex \mf +@funindex mf @funindex \f +@funindex f @funindex \ff +@funindex ff @funindex \fff +@funindex fff @funindex \ffff +@funindex ffff @funindex \fp +@funindex fp @funindex \sf +@funindex sf @funindex \sff +@funindex sff @funindex \sp +@funindex sp @funindex \spp +@funindex spp @funindex \sfz +@funindex sfz @funindex \rfz +@funindex rfz Absolute dynamic marks are specified using a command after a note, such as @code{c4\ff}. The available dynamic marks are @@ -171,7 +189,7 @@ such as @code{c4\ff}. The available dynamic marks are @code{\mp}, @code{\mf}, @code{\f}, @code{\ff}, @code{\fff}, @code{\ffff}, @code{\fp}, @code{\sf}, @code{\sff}, @code{\sp}, @code{\spp}, @code{\sfz}, and @code{\rfz}. The dynamic marks may -be manually placed above or below the staff, see +be manually placed above or below the staff, see @ref{Direction and placement}. @lilypond[verbatim,quote,relative=2] @@ -181,6 +199,8 @@ c2_\spp c^\ff @end lilypond @cindex hairpin +@cindex crescendo +@cindex decrescendo @funindex \< @funindex \> @funindex \! @@ -208,12 +228,17 @@ c1\! Spacer rests are needed to engrave multiple marks on one note. +@cindex multiple dynamic marks on one note +@cindex dynamic marks, multiple on one note + @lilypond[verbatim,quote,relative=2] c4\< c\! d\> e\! << f1 { s4 s4\< s4\> s4\! } >> @end lilypond @cindex espressivo articulation +@funindex \espressivo +@funindex espressivo In some situations the @code{\espressivo} articulation mark may be the appropriate choice to indicate a crescendo and decrescendo on @@ -227,6 +252,18 @@ g1\espressivo @cindex crescendo @cindex decrescendo @cindex diminuendo +@funindex \crescTextCresc +@funindex crescTextCresc +@funindex \dimTextDecresc +@funindex dimTextDecresc +@funindex \dimTextDecr +@funindex dimTextDecr +@funindex \dimTextDim +@funindex dimTextDim +@funindex \crescHairpin +@funindex crescHairpin +@funindex \dimHairpin +@funindex dimHairpin Crescendos and decrescendos can be engraved as textual markings instead of hairpins. Dashed lines are printed to indicate their @@ -247,9 +284,14 @@ c2\< d | e f\! e2\> d\! @end lilypond + To create new absolute dynamic marks or text that should be aligned with dynamics, see @ref{New dynamic marks}. +@cindex dynamics, vertical positioning +@cindex vertical positioning of dynamics +@funindex DynamicLineSpanner + Vertical positioning of dynamics is handled by @rinternals{DynamicLineSpanner}. @@ -257,22 +299,31 @@ Vertical positioning of dynamics is handled by @predefined @funindex \dynamicUp +@funindex dynamicUp @code{\dynamicUp}, @funindex \dynamicDown +@funindex dynamicDown @code{\dynamicDown}, @funindex \dynamicNeutral +@funindex dynamicNeutral @code{\dynamicNeutral}, @funindex \crescTextCresc +@funindex crescTextCresc @code{\crescTextCresc}, @funindex \dimTextDim +@funindex dimTextDim @code{\dimTextDim}, @funindex \dimTextDecr +@funindex dimTextDecr @code{\dimTextDecr}, @funindex \dimTextDecresc +@funindex dimTextDecresc @code{\dimTextDecresc}, @funindex \crescHairpin +@funindex crescHairpin @code{\crescHairpin}, @funindex \dimHairpin +@funindex dimHairpin @code{\dimHairpin}. @@ -313,7 +364,9 @@ Learning Manual: Notation Reference: @ref{Direction and placement}, -@ref{New dynamic marks}. +@ref{New dynamic marks}, +@ref{What goes into the MIDI output?}, +@ref{Controlling MIDI dynamics}. Snippets: @rlsr{Expressive marks}. @@ -344,27 +397,32 @@ moltoF = \markup { molto \dynamic f } @cindex dynamics, editorial @cindex dynamics, parenthesis +@cindex editorial dynamics +@funindex \bracket +@funindex bracket +@funindex \dynamic +@funindex dynamic In markup mode, editorial dynamics (within parentheses or square brackets) can be created. The syntax for markup mode is described in @ref{Formatting text}. @lilypond[verbatim,quote] -roundf = \markup { \center-align { \line { \bold { \italic ( } - \dynamic f \bold { \italic ) } } } } -boxf = \markup { \bracket { \dynamic f } } +roundF = \markup { \hcenter \concat { \bold { \italic ( } + \dynamic f \bold { \italic ) } } } +boxF = \markup { \bracket { \dynamic f } } \relative c' { - c1_\roundf - c1_\boxf + c1_\roundF + c1_\boxF } @end lilypond -By default, markup objects are aligned to the left side of a note -head, but authentic dynamic marks are always centered on the note -head. New, centered dynamic marks can be created using the -following function: - @cindex make-dynamic-script +@funindex make-dynamic-script + +Simple, centered dynamic marks are easily created with the +@code{make-dynamic-script} function. The dynamic font only +contains the characters @code{f,m,p,r,s} and @code{z}. @lilypond[verbatim,quote] sfzp = #(make-dynamic-script "sfzp") @@ -373,33 +431,51 @@ sfzp = #(make-dynamic-script "sfzp") } @end lilypond -@noindent -The dynamic font only contains the characters @code{f,m,p,r,s} and -@code{z}. In order to use other font families, it is necessary to -use markup mode in its Scheme form, as explained in -@ref{Markup construction in Scheme}. +In general, @code{make-dynamic-script} takes any markup object as +its argument. In the following example, using +@code{make-dynamic-script} ensures the vertical alignment of +markup objects and hairpins that are attached to the same note +head. @lilypond[verbatim,quote] -moltoF = #(make-dynamic-script (markup - #:normal-text "molto" - #:dynamic "f")) +roundF = \markup { \hcenter \concat { + \normal-text { \bold { \italic ( } } + \dynamic f + \normal-text { \bold { \italic ) } } } } +boxF = \markup { \bracket { \dynamic f } } +roundFdynamic = #(make-dynamic-script roundF) +boxFdynamic = #(make-dynamic-script boxF) +\relative c' { + c4_\roundFdynamic\< d e f + g,1_\boxFdynamic +} +@end lilypond + +The Scheme form of markup mode may be used instead. Its syntax is +explained in @ref{Markup construction in Scheme}. + +@lilypond[verbatim,quote] +moltoF = #(make-dynamic-script + (markup #:normal-text "molto" + #:dynamic "f")) \relative c' { 16 2..\moltoF } @end lilypond -@noindent Font settings in markup mode are described in -@ref{Common markup commands}. +@ref{Selecting font and font size}. @seealso Notation Reference: @ref{Formatting text}, -@ref{Common markup commands}, -@ref{Markup construction in Scheme}. +@ref{Selecting font and font size}, +@ref{Markup construction in Scheme}, +@ref{What goes into the MIDI output?}, +@ref{Controlling MIDI dynamics}. Snippets: @rlsr{Expressive marks}. @@ -432,6 +508,14 @@ a4 g2 f4) 2( 2) @end lilypond +@cindex slurs, manual placement +@cindex slurs, below notes +@cindex slurs, above notes +@funindex \slurDown +@funindex slurDown +@funindex \slurNeutral +@funindex slurNeutral + Slurs may be manually placed above or below the notes, see @ref{Direction and placement}. @@ -443,9 +527,31 @@ c2( d) c2( d) @end lilypond +@cindex phrasing slur +@cindex multiple slurs +@cindex simultaneous slurs +@cindex slur, phrasing +@cindex slurs, multiple +@cindex slurs, simultaneous + Phrasing slurs must be used to print more than one slur at once. For details, see @ref{Phrasing slurs}. +@cindex slur style +@cindex slur, solid +@cindex slur, dotted +@cindex slur, dashed +@cindex solid slur +@cindex dotted slur +@cindex dashed slur +@cindex sytle, slur +@funindex \slurDashed +@funindex slurDashed +@funindex \slurDotted +@funindex slurDotted +@funindex \slurSolid +@funindex slurSolid + Slurs can be solid, dotted, or dashed. Solid is the default slur style: @@ -487,6 +593,9 @@ g4( e c2) Music Glossary: @rglos{slur}. +Learning Manual: +@rlearning{On the un-nestedness of brackets and ties}. + Notation Reference: @ref{Direction and placement}, @ref{Phrasing slurs}. @@ -503,6 +612,8 @@ Internals Reference: @cindex phrasing slurs @cindex phrasing marks +@cindex slur, phrasing +@cindex mark, phrasing @funindex \( @funindex \) @@ -515,6 +626,13 @@ c4\( d( e) f( e2) d\) @end lilypond +@funindex \phrasingSlurUp +@funindex phrasingSlurUp +@funindex \phrasingSlurDown +@funindex phrasingSlurDown +@funindex \phrasingSlurNeutral +@funindex phrasingSlurNeutral + Typographically, a phrasing slur behaves almost exactly like a normal slur. However, they are treated as different objects; a @code{\slurUp} will have no effect on a phrasing slur. Phrasing @@ -527,21 +645,28 @@ c4\( g' c,( b) | c1\) c4\( g' c,( b) | c1\) @end lilypond +@cindex simultaneous phrasing slurs +@cindex multiple phrasing slurs +@cindex slurs, simultaneous phrasing +@cindex slurs, multiple phrasing +@cindex phrasing slurs, simultaneous +@cindex phrasing slurs, multiple + Simultaneous phrasing slurs are not permitted. @predefined -@funindex \phrasingSlurUp @code{\phrasingSlurUp}, -@funindex \phrasingSlurDown @code{\phrasingSlurDown}, -@funindex \phrasingSlurNeutral @code{\phrasingSlurNeutral}. @seealso +Learning Manual: +@rlearning{On the un-nestedness of brackets and ties}. + Notation Reference: @ref{Direction and placement}. @@ -557,6 +682,7 @@ Internals Reference: @cindex breath marks @funindex \breathe +@funindex breathe Breath marks are entered using @code{\breathe}: @@ -599,6 +725,7 @@ Internals Reference: @cindex falls @cindex doits @funindex \bendAfter +@funindex bendAfter @notation{Falls} and @notation{doits} can be added to notes using the @code{\bendAfter} command. The direction of the fall or doit @@ -651,6 +778,7 @@ follow a linear path: glissandos, arpeggios, and trills. @cindex glissando @funindex \glissando +@funindex glissando A @notation{glissando} is created by attaching @code{\glissando} to a note: @@ -700,6 +828,14 @@ supported. @cindex arpeggio @cindex broken chord @cindex chord, broken +@funindex \arpeggio +@funindex arpeggio +@funindex \arpeggioArrowUp +@funindex arpeggioArrowUp +@funindex \arpeggioArrowDown +@funindex arpeggioArrowDown +@funindex \arpeggioNormal +@funindex arpeggioNormal An @notation{arpeggio} on a chord (also known as a broken chord) is denoted by appending @code{\arpeggio} to the chord construct: @@ -721,6 +857,13 @@ Different types of arpeggios may be written. 2\arpeggio @end lilypond +@cindex arpeggio symbols, special +@cindex special arpeggio symbols +@funindex \arpeggioBracket +@funindex arpeggioBracket +@funindex \arpeggioParenthesis +@funindex arpeggioParenthesis + Special @emph{bracketed} arpeggio symbols can be created: @lilypond[verbatim,quote,relative=1] @@ -738,17 +881,11 @@ information, see @ref{Ties}. @predefined -@funindex \arpeggio @code{\arpeggio}, -@funindex \arpeggioArrowUp @code{\arpeggioArrowUp}, -@funindex \arpeggioArrowDown @code{\arpeggioArrowDown}, -@funindex \arpeggioNormal @code{\arpeggioNormal}, -@funindex \arpeggioBracket @code{\arpeggioBracket}, -@funindex \arpeggioParenthesis @code{\arpeggioParenthesis}. @@ -782,6 +919,10 @@ Internals Reference: @knownissues +@cindex cross-staff parenthesis-style arpeggio +@cindex arpeggio, parenthesis-style, cross-staff +@cindex arpeggio, cross-staff parenthesis-style + It is not possible to mix connected arpeggios and unconnected arpeggios in one @code{PianoStaff} at the same point in time. @@ -795,15 +936,27 @@ cross-staff arpeggios. @cindex trills @funindex \trill +@funindex trill +@funindex \startTrillSpan +@funindex startTrillSpan +@funindex \stopTrillSpan +@funindex stopTrillSpan Short @notation{trills} without an extender line are printed with @code{\trill}; see @ref{Articulations and ornamentations}. Longer trills with an extender line are made with -@code{\startTrillSpan} and @code{\stopTrillSpan}. In the -following example, the trill is combined with grace notes. To -achieve precise control over the placement of the grace notes, see -@ref{Grace notes}. +@code{\startTrillSpan} and @code{\stopTrillSpan}: + +@lilypond[verbatim,quote,relative=2] +d1~\startTrillSpan +d1 +c2\stopTrillSpan r2 +@end lilypond + +In the following example, a trill is combined with grace notes. +The syntax of this construct and the method to precisely position +the grace notes are described in @ref{Grace notes}. @lilypond[verbatim,quote,relative=2] c1 \afterGrace @@ -813,24 +966,23 @@ e2 r2 @cindex pitched trills @cindex trills, pitched +@funindex \pitchedTrill +@funindex pitchedTrill Trills that require an auxiliary note with an explicit pitch can be typeset with the @code{\pitchedTrill} command. The first argument is the main note, and the second is the @emph{trilled} note, printed as a stemless note head in parentheses. -@c This syntax example doesn't look nice. -pm - -@c @example -@c @code{\pitchedTrill} @var{mainnote} @code{\startTrillSpan} -@c @var{trillnote} @var{endnote} @code{\stopTrillSpan} -@c @end example - @lilypond[verbatim,quote,relative=1] \pitchedTrill e2\startTrillSpan fis d\stopTrillSpan @end lilypond +@cindex pitched trill with forced accidental +@cindex trill, pitched with forced accidental +@cindex accidental, forced for pitched trill + In the following example, the second pitched trill is ambiguous; the accidental of the trilled note is not printed. As a workaround, the accidentals of the trilled notes can be forced. @@ -850,9 +1002,7 @@ g\stopTrillSpan @predefined -@funindex \startTrillSpan @code{\startTrillSpan}, -@funindex \stopTrillSpan @code{\stopTrillSpan}. @@ -870,3 +1020,4 @@ Snippets: Internals Reference: @rinternals{TrillSpanner}. + diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely index e49b1bc739..a13e61a53f 100644 --- a/Documentation/user/fretted-strings.itely +++ b/Documentation/user/fretted-strings.itely @@ -36,13 +36,14 @@ to fretted string instruments. * String number indications:: * Default tablatures:: * Custom tablatures:: -* Automatic fret diagrams:: * Fret diagram markups:: +* Predefined fret diagrams:: +* Automatic fret diagrams:: * Right-hand fingerings:: @end menu @node References for fretted strings -@subsubsection References for fretted strings +@unnumberedsubsubsec References for fretted strings Music for fretted string instruments is normally notated on a single staff, either in traditional music notation or in @@ -69,16 +70,17 @@ in @ref{Collision resolution}. @seealso Notation Reference: -@ref{Instrument names}, -@ref{Writing music in parallel}, @ref{Fingering instructions}, @ref{Ties}, +@ref{Collision resolution}, +@ref{Instrument names}, +@ref{Writing music in parallel}, @ref{Arpeggio}, @ref{List of articulations}, @ref{Clef}. @node String number indications -@subsubsection String number indications +@unnumberedsubsubsec String number indications @cindex String numbers @@ -127,7 +129,7 @@ Internals Reference: @node Default tablatures -@subsubsection Default tablatures +@unnumberedsubsubsec Default tablatures @cindex Tablatures, basic @cindex Tablatures, default @@ -155,8 +157,8 @@ The notes are printed as tablature, by using @code{TabStaff} and When no string is specified for a note, the note is assigned to the lowest string that can generate the note with a fret number -greater than or equal to @code{minimumFret} is selected. The -default value for @code{minimumFret} is 0. +greater than or equal to the value of @code{minimumFret}. +The default value for @code{minimumFret} is 0. @lilypond[quote,ragged-right,verbatim] @@ -174,6 +176,18 @@ default value for @code{minimumFret} is 0. >> @end lilypond +Harmonic indications and slides can be added to tablature +notation. + +@lilypond[fragment, verbatim, quote, relative=1] +\new TabStaff { + \new TabVoice { + d\2\glissando e\2 + } +} +@end lilypond + + @snippets @lilypondfile[verbatim,lilyquote,texidoc,doctitle] @@ -218,31 +232,17 @@ melodia = \partcombine { e4 g g g }{ e4 e e e } >> @end lilypond +Guitar special effects are limited to harmonics and slides. @node Custom tablatures -@subsubsection Custom tablatures +@unnumberedsubsubsec Custom tablatures @cindex Tablatures, custom -You can change the tuning of the strings. A string tuning is -given as a Scheme list with one integer number for each string, -the number being the pitch (measured in semitones relative to -middle C) of an open string. The numbers specified for -@code{stringTunings} are the numbers of semitones to subtract or -add, starting the specified pitch by default middle C, in string -order. LilyPond automatically calculates the number of strings by -looking at @code{stringTunings}. - -In the next example, @code{stringTunings} is set for the pitches -e, a, d, and g. - -@lilypond[quote,ragged-right,fragment,verbatim] -\new TabStaff << - \set TabStaff.stringTunings = #'(-5 -10 -15 -20) - { - a,4 c' a e' e c' a e' - } ->> -@end lilypond +LilyPond tabulature automatically calculates the fret for +a note based on the string to which the note is assigned. +In order to do this, the tuning of the strings must be +specified. The tuning of the strings is given in the +@code{StringTunings} property. LilyPond comes with predefined string tunings for banjo, mandolin, guitar and bass guitar. Lilypond automatically sets the correct @@ -251,152 +251,80 @@ for bass guitar, which sounds an octave lower than written. @lilypond[quote,ragged-right,verbatim] << - \new Staff << + \new Staff { \clef "bass_8" \relative c, { - c4 d e f + c4 d e f } - >> - \new TabStaff << + } + \new TabStaff { \set TabStaff.stringTunings = #bass-tuning \relative c, { - c4 d e f + c4 d e f } - >> ->> -@end lilypond - -The default string tuning is @code{guitar-tuning} (the standard -EADGBE tuning). Some other predefined tunings are -@code{guitar-open-g-tuning}, @code{mandolin-tuning} and -@code{banjo-open-g-tuning}. - -@seealso - -Snippets: -@rlsr{Fretted strings}. - -The file @file{scm/@/output@/-lib@/.scm} contains the predefined string -tunings. - -Internals Reference: -@rinternals{Tab_note_heads_engraver}. - -@knownissues - -No guitar special effects have been implemented. - -@node Automatic fret diagrams -@subsubsection Automatic fret diagrams -@cindex fret diagrams -@cindex chord diagrams - -Fret diagrams can be automatically created from entered notes using the -@code{FretBoards} context. This context calculates strings and frets -which can be used to play the notes. - -@lilypond[quote,ragged-right,verbatim] -<< - \context ChordNames { - \chordmode { - f1 g - } - } - \context FretBoards { - < f, c f a c' f'>1 - < g,\6 b, d g b g'> - } - \context Staff { - \clef "treble_8" - < f, c f a c' f'>1 - < g, b, d g b' g'> - } ->> -@end lilypond - -Notes can be explicitly placed on a string. It is often enough -to place only the lowest note on an explicit string; the rest of -the notes will then be placed appropriately by the @code{FretBoards} -context. - -@lilypond[quote,ragged-right,verbatim] -<< - \context ChordNames { - \chordmode { - c1 c d:m d:m - } - } - \context FretBoards { - < c e g c' e' > 1 - < c\5 e g c' e' > 1 - < d a d' f'> - < d\4 a d' f'> } - \context Staff { - \clef "treble_8" - < c e g c' e' > 1 - < c e g c' e' > 1 - < d a d' f'> - < d a d' f'> - } >> @end lilypond -Fingerings can be added to FretBoard fret diagrams. +The default string tuning is @code{guitar-tuning}, which +is the standard EADGBE tuning. Some other predefined tunings are +@code{guitar-open-g-tuning}, @code{mandolin-tuning} and +@code{banjo-open-g-tuning}. The predefined string tunings +are found in @code{scm/output-lib.scm}. + +A string tuning is a Scheme list of string pitches, +one for each string, ordered by string number from 1 to N, +where string 1 is at the top of the tablature staff and +string N is at the bottom. This ordinarily results in ordering +from highest pitch to lowest pitch, but some instruments +(e.g. ukulele) do not have strings ordered by pitch. + +A string pitch in a string tuning list is the pitch difference +of the open string from middle C measured in semitones. The +string pitch must be an integer. Lilypond calculates the actual +pitch of the string by adding the string tuning pitch to the +actual pitch for middle C. + +LilyPond automatically calculates the number of strings in the +@code{TabStaff} as the number of elements in @code{stringTunings}. + +Any desired string tuning can be created. For example, we can +define a string tuning for a four-string instrument with pitches +of @code{a''}, @code{d''}, @code{g'}, and @code{c'}: + + +@lilypond[quote,verbatim] +mynotes = { + c'4 e' g' c'' | + e'' g'' b'' c''' +} -@lilypond[quote, verbatim] << - \context ChordNames { - \chordmode { - c1 d:m - } + \new Staff { + \clef treble + \mynotes } - \context FretBoards { - < c\5-3 e-2 g c'-1 e' > 1 - < d\4 a-2 d'-3 f'-1> + \new TabStaff { + \set TabStaff.stringTunings = #'(21 14 7 0) + \mynotes } - \context Staff { - \clef "treble_8" - < c e g c' e' > 1 - < d a d' f'> - } >> @end lilypond -The strings and frets for the @code{FretBoards} context depend -on the @code{stringTunings} property, which has the same meaning -as in the TabStaff context. See @ref{Custom tablatures} for -information on the @code{stringTunings} property. - -The graphical layout of a fret diagram can be customized according to -user preference through the properties of the @code{fret-diagram-interface}. -Details are found at @rinternals{fret-diagram-interface}. For a -@code{FretBoards} fret diagram, the interface properties belong to -@code{FretBoards}. - -@snippets -The minimum fret to be used in calculating strings and frets for -the FretBoard context can be set with the @code{minimumFret} -property. - -@c TODO -- snippet showing minimum fret. - -@c TODO -- snippet for using StringTunings - @seealso -Notation Reference: -@ref{Custom tablatures} +Installed Files: +@file{scm/output-lib.scm}. Snippets: @rlsr{Fretted strings}. -Internals Reference: -@rinternals {fret-diagram-interface}. +Internals Reference: +@rinternals{Tab_note_heads_engraver}. @node Fret diagram markups -@subsubsection Fret diagram markups +@unnumberedsubsubsec Fret diagram markups @cindex fret diagrams @cindex chord diagrams @@ -711,7 +639,10 @@ Details are found at @rinternals{fret-diagram-interface}. For a fret diagram markup , the interface properties belong to @code{Voice.TextScript}. @snippets -TODO create snippets for changing properties. Use regression test? + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{customizing-markup-fret-diagrams.ly} + @seealso @@ -724,8 +655,392 @@ Snippets: Internals Reference: @rinternals{fret-diagram-interface}. +@node Predefined fret diagrams +@unnumberedsubsubsec Predefined fret diagrams +@cindex fret diagrams +@cindex chord diagrams + +Fret diagrams can be displayed using the @code{FretBoards} context. By +default, the @code{FretBoards} context will display fret diagrams that +are stored in a lookup table: + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" +\context FretBoards { + \chordmode { + c1 d + } +} +@end lilypond + +The default predefined fret diagrams are contained in the file +@code{predefined-guitar-fretboards.ly}. Fret diagrams are +stored based on the pitches of a chord and the value of +@code{stringTunings} that is currently in use. +@code{predefined-guitar-fretboards.ly} contains predefined +fret diagrams only for @code{guitar-tuning}. Predefined fret +diagrams can be added for other instruments or other tunings +by following the examples found in +@code{predefined-guitar-fretboards.ly}. + +Chord pitches can be entered +either as simultaneous music or using chord mode (see +@ref{Chord mode overview}). + +@lilypond[verbatim, ragged-right,quote] +\include "predefined-guitar-fretboards.ly" +\context FretBoards { + \chordmode {c1} + 1 +} +@end lilypond + +It is common that both chord names and fret diagrams are displayed together. +This is achieved by putting a @code{ChordNames} context in parallel with +a @code{FretBoards} context and giving both contexts the same music. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" +mychords = \chordmode{ + c1 f g +} + +<< + \context ChordNames { + \mychords + } + \context FretBoards { + \mychords + } +>> +@end lilypond + +Predefined fret diagrams are transposable, as long as a diagram for the +transposed chord is stored in the fret diagram table. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" +mychords = \chordmode{ + c1 f g +} + +mychordlist = { + \mychords + \transpose c e { \mychords} +} +<< + \context ChordNames { + \mychordlist + } + \context FretBoards { + \mychordlist + } +>> +@end lilypond + + +The predefined fret diagram table contains seven chords (major, minor, +augmented, diminished, dominant seventh, major seventh, minor seventh) +for each of 17 keys. A complete list of the predefined fret diagrams is +shown in @ref{Predefined fretboard diagrams}. If there is no entry in +the table for a chord, the FretBoards engraver will calculate a +fret-diagram using the automatic fret diagram functionality described in +@ref{Automatic fret diagrams}. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" +mychords = \chordmode{ + c1 c:9 +} + +<< + \context ChordNames { + \mychords + } + \context FretBoards { + \mychords + } +>> +@end lilypond + +Fret diagrams can be added to the fret diagram table. To add a diagram, +you must specify the chord for the diagram, the tuning to be used, and the +fret-diagram-terse definition string for the diagram. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" + +\storePredefinedDiagram \chordmode {c:9} + #guitar-tuning + #"x;3-2;2-1;3-3;3-4;x;" + +mychords = \chordmode{ + c1 c:9 +} + +<< + \context ChordNames { + \mychords + } + \context FretBoards { + \mychords + } +>> +@end lilypond + +Different fret diagrams for the same chord name can be stored using different +octaves of pitches. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" + +\storePredefinedDiagram \chordmode {c'} + #guitar-tuning + #(offset-fret 2 (chord-shape 'bes)) + +mychords = \chordmode{ + c1 c' +} + +<< + \context ChordNames { + \mychords + } + \context FretBoards { + \mychords + } +>> +@end lilypond + +In addition to fret diagrams, LilyPond stores an internal list of chord +shapes. The chord shapes are fret diagrams that can be shifted along +the neck to different posistions to provide different chords. Chord +shapes can be added to the internal list and then used to define +predefined fret diagrams. + +@lilypond[verbatim, ragged-right, quote] +\include "predefined-guitar-fretboards.ly" + +% add a new chord shape + +\addChordShape #'powerf #"1-1;3-3;3-4;x;x;x;" + +% add some new chords based on the power chord shape + +\storePredefinedDiagram \chordmode {f'} + #guitar-tuning + #(chord-shape 'powerf) +\storePredefinedDiagram \chordmode {g'} + #guitar-tuning + #(offset-fret 2 (chord-shape 'powerf)) + +mychords = \chordmode{ + f1 f' g g' +} + +<< + \context ChordNames { + \mychords + } + \context FretBoards { + \mychords + } +>> +@end lilypond + +The graphical layout of a fret diagram can be customized according to +user preference through the properties of the @code{fret-diagram-interface}. +Details are found at @rinternals{fret-diagram-interface}. For a +predefined fret diagram, the interface properties belong to +@code{FretBoards.FretBoard}. + +@snippets + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{customizing-fretboard-fret-diagrams.ly} + + +@seealso + +Notation Reference: +@ref{Custom tablatures}, +@ref{Automatic fret diagrams}, +@ref{Chord mode overview}, +@ref{Predefined fretboard diagrams}. + +Installed Files: +@file{ly/predefined-guitar-fretboards.ly}. + +Snippets: +@rlsr{Fretted strings}. + +Internals Reference: +@rinternals {fret-diagram-interface}. + + +@node Automatic fret diagrams +@unnumberedsubsubsec Automatic fret diagrams +@cindex fret diagrams +@cindex chord diagrams + +Fret diagrams can be automatically created from entered notes using the +@code{FretBoards} context. If no predefined diagram is available for +the entered notes in the active @code{stringTunings}, this context +calculates strings and frets that can be used to play the notes. + +@lilypond[quote,ragged-right,verbatim] +<< + \context ChordNames { + \chordmode { + f1 g + } + } + \context FretBoards { + < f, c f a c' f'>1 + < g,\6 b, d g b g'> + } + \context Staff { + \clef "treble_8" + < f, c f a c' f'>1 + < g, b, d g b' g'> + } +>> +@end lilypond + +As no predefined diagrams are loaded by default, automatic calculation +of fret diagrams is the default behavior. Once default diagrams are +loaded, automatic calculation can be enabled and disabled with predefined +commands: + +@lilypond[quote,ragged-right,verbatim] + +\storePredefinedDiagram + #guitar-tuning + #"x;3-1-(;5-2;5-3;5-4;3-1-1);" +<< + \context ChordNames { + \chordmode { + c1 c c + } + } + \context FretBoards { + 1 + \predefinedFretboardsOff + + \predefinedFretboardsOn + + } + \context Staff { + \clef "treble_8" + 1 + + + } +>> +@end lilypond + + + +Sometimes the fretboard calculator will be unable to find +an accceptable diagram. This can often be remedied by +manually assigning a note to a string. In many cases, only one +note need be manually placed on a string; the rest of +the notes will then be placed appropriately by the @code{FretBoards} +context. + +@lilypond[quote,ragged-right,verbatim] +<< + \context ChordNames { + \chordmode { + c1 c + } + } + \context FretBoards { + < c g c' e' g'> 1 + < c g\4 c' e' g'> 1 + } + \context Staff { + \clef "treble_8" + < c g c' e' g'> 1 + < c g c' e' g'> 1 + } +>> +@end lilypond + +Fingerings can be added to FretBoard fret diagrams. + +@lilypond[quote, verbatim] +<< + \context ChordNames { + \chordmode { + c1 d:m + } + } + \context FretBoards { + < c-3 e-2 g c'-1 e' > 1 + < d a-2 d'-3 f'-1> + } + \context Staff { + \clef "treble_8" + < c e g c' e' > 1 + < d a d' f'> + } +>> +@end lilypond + +The minimum fret to be used in calculating strings and frets for +the FretBoard context can be set with the @code{minimumFret} +property. + +@lilypond[quote, verbatim] +<< + \context ChordNames { + \chordmode { + d1:m d:m + } + } + \context FretBoards { + < d a d' f'> + \set FretBoards.minimumFret = #5 + < d a d' f'> + } + \context Staff { + \clef "treble_8" + < d a d' f'> + < d a d' f'> + } +>> +@end lilypond + +The strings and frets for the @code{FretBoards} context depend +on the @code{stringTunings} property, which has the same meaning +as in the TabStaff context. See @ref{Custom tablatures} for +information on the @code{stringTunings} property. + +The graphical layout of a fret diagram can be customized according to +user preference through the properties of the @code{fret-diagram-interface}. +Details are found at @rinternals{fret-diagram-interface}. For a +@code{FretBoards} fret diagram, the interface properties belong to +@code{FretBoards.FretBoard}. + +@predefined +@code{\predefinedFretboardsOff}, +@code{\predefinedFretboardsOn}. + +@seealso + +Notation Reference: +@ref{Custom tablatures}. + +Snippets: +@rlsr{Fretted strings}. + +Internals Reference: +@rinternals {fret-diagram-interface}. + + @node Right-hand fingerings -@subsubsection Right-hand fingerings +@unnumberedsubsubsec Right-hand fingerings Right-hand fingerings @var{p-i-m-a} must be entered within a chord construct @code{<>} for them to be printed in the score, @@ -788,7 +1103,7 @@ or, for experienced users, a typesetter like GuitarTeX. @end menu @node Indicating position and barring -@subsubsection Indicating position and barring +@unnumberedsubsubsec Indicating position and barring This example demonstrates how to include guitar position and barring indications. @@ -813,7 +1128,7 @@ Snippets: @rlsr{Expressive marks}. @node Indicating harmonics and dampened notes -@subsubsection Indicating harmonics and dampened notes +@unnumberedsubsubsec Indicating harmonics and dampened notes Special note heads can be used to indicate dampened notes or harmonics. Harmonics are normally further explained with a @@ -846,7 +1161,7 @@ Notation Reference: @end menu @node Banjo tablatures -@subsubsection Banjo tablatures +@unnumberedsubsubsec Banjo tablatures @cindex Banjo tablatures LilyPond has basic support for the five-string banjo. When making tablatures diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely index b4cb7d9ba0..543f6f95b6 100644 --- a/Documentation/user/fundamental.itely +++ b/Documentation/user/fundamental.itely @@ -52,9 +52,9 @@ A basic example of a LilyPond input file is @example \version @w{"@version{}"} +\header @{ @} \score @{ @var{...compound music expression...} % all the music goes here! - \header @{ @} \layout @{ @} \midi @{ @} @} @@ -156,22 +156,20 @@ things, such as @cindex midi @noindent -Note that these three commands -- @code{\header}, @code{\layout} -and @code{\midi} -- are special: unlike all other commands which -begin with a backward slash (@code{\}) they are @emph{not} music -expressions and are not part of any music expression. -So they may be placed inside a @code{\score} block -or outside it. In fact, these commands are commonly placed -outside the @code{\score} block -- for example, @code{\header} -is often placed above the @code{\score} command because headers -naturally appear at the top of a score. That's just another -shorthand that LilyPond accepts. +Note that these three commands -- @code{\header}, @code{\layout} and +@code{\midi} -- are special: unlike many other commands which begin +with a backward slash (@code{\}) they are @emph{not} music expressions +and are not part of any music expression. So they may be placed +inside a @code{\score} block or outside it. In fact, these commands +are commonly placed outside the @code{\score} block -- for example, +@code{\header} is often placed above the @code{\score} command, as the +example at the beginning of this section shows. Two more commands you have not previously seen are @code{\layout @{ @}} and @code{\midi @{@}}. If these appear as shown they will cause LilyPond to produce a printed output and a MIDI output respectively. They are described fully in the -Notation Reference -- @ruser{Score layout} and +Notation Reference -- @ruser{Score layout}, and @ruser{Creating MIDI files}. @cindex scores, multiple @@ -188,7 +186,7 @@ separate output file. In summary: Every @code{\book} block creates a separate output file (e.g., a -pdf file). If you haven't explicitly added one, LilyPond wraps +PDF file). If you haven't explicitly added one, LilyPond wraps your entire input code in a @code{\book} block implicitly. Every @code{\score} block is a separate chunk of music within a @@ -201,10 +199,6 @@ block, but a @code{\layout} block outside of a @code{\score} block (and thus in a @code{\book} block, either explicitly or implicitly) will affect every @code{\score} in that @code{\book}. -Every @code{\context} block will affect the named context (e.g., -@code{\StaffGroup}) throughout the block (@code{\score} or -@code{\book}) in which it appears. - For details see @ruser{Multiple scores in a book}. @cindex variables @@ -251,9 +245,9 @@ For a complete definition of the input format, see @cindex Music expression, compound We saw the general organization of LilyPond input files in the -previous section, @ref{How LilyPond input files work}. But we seemed to -skip over the most important part: how do we figure out what to -write after @code{\score}? +previous section, @ref{Introduction to the LilyPond file structure}. +But we seemed to skip over the most important part: how do we figure +out what to write after @code{\score}? We didn't skip over it at all. The big mystery is simply that there @emph{is} no mystery. This line explains it all: @@ -264,7 +258,7 @@ there @emph{is} no mystery. This line explains it all: @noindent To understand what is meant by a music expression and a compound -music expression you may find it useful to review +music expression, you may find it useful to review the tutorial, @ref{Music expressions explained}. In that section, we saw how to build big music expressions from small pieces -- we started from notes, then chords, etc. Now we're going to start from a big @@ -299,16 +293,16 @@ it. We @emph{do} need a singer and a piano, though. @} @end example -Remember that we use @code{<< ... >>} instead of -@code{@{ ... @}} to show simultaneous -music. And we definitely want to show the vocal part and piano -part at the same time, not one after the other! However, the -@code{<< ... >>} construct is not really necessary for the Singer -staff, as it contains only one music expression, but Staves often -do require simultaneous Voices within them, so using -@code{<< ... >>} -rather than braces is a good habit to adopt. We'll add some real -music later; for now let's just put in some dummy notes and lyrics. +Remember that we use @code{<< ... >>} instead of @code{@{ ... @}} to +show simultaneous music. And we definitely want to show the vocal +part and piano part at the same time, not one after the other! Note +that the @code{<< ... >>} construct is not really necessary for the +Singer staff, as it contains only one sequential music expression; +however, using @code{<< ... >>} instead of braces is still necessary +if the music in the Staff is made of two simultaneous expressions, +e.g. two simultaneous Voices, or a Voice with lyrics. We'll add some +real music later; for now let's just put in some dummy notes and +lyrics. @lilypond[verbatim,quote,ragged-right] \score { @@ -374,17 +368,21 @@ lower = \relative c { b2 e2 } Be careful about the difference between notes, which are introduced -with @code{\relative}, and lyrics, which are introduced with +with @code{\relative} or which are directly included in a music +expression, and lyrics, which are introduced with @code{\lyricmode}. These are essential to tell LilyPond to interpret the following content as music and text respectively. When writing (or reading) a @code{\score} section, just take it -slowly and carefully. Start with the outer layer, then work on -each smaller layer. It also really helps to be strict with -indentation -- make sure that each item on the same layer starts +slowly and carefully. Start with the outer level, then work on +each smaller level. It also really helps to be strict with +indentation -- make sure that each item on the same level starts on the same horizontal position in your text editor. +@seealso + +Notation Reference: @ruser{Structure of a score}. @node Nesting music expressions @subsection Nesting music expressions @@ -392,12 +390,11 @@ on the same horizontal position in your text editor. @cindex staves, temporary @cindex ossias -It is not essential to declare all staves at the beginning; -they may be introduced temporarily at any point. This is -particularly useful for creating ossia sections -(see @rglos{ossia}). Here is a simple example showing how -to introduce a new staff temporarily for the duration of -three notes: +It is not essential to declare all staves at the beginning; they may +be introduced temporarily at any point. This is particularly useful +for creating ossia sections -- see @rglos{ossia}. Here is a simple +example showing how to introduce a new staff temporarily for the +duration of three notes: @lilypond[verbatim,quote,ragged-right] \new Staff { @@ -448,10 +445,14 @@ of a single Staff. Here it says that the new staff should be placed above the staff called @qq{main} instead of the default position which is below. +@seealso + Ossia are often written without clef and without time signature and are usually in a smaller font. These require further commands which -have not yet been introduced. See @ref{Size of objects} +have not yet been introduced. See @ref{Size of objects}, +and @ruser{Ossia staves}. + @node On the un-nestedness of brackets and ties @subsection On the un-nestedness of brackets and ties @@ -473,11 +474,11 @@ let's first review the different types of bracket. @item @code{< .. >} @tab Encloses the notes of a chord @item @code{<< .. >>} - @tab Encloses concurrent or simultaneous sections + @tab Encloses simultaneous music expressions @item @code{( .. )} @tab Marks the start and end of a slur @item @code{\( .. \)} - @tab Marks the start and end of a phrase mark + @tab Marks the start and end of a phrasing slur @item @code{[ .. ]} @tab Marks the start and end of a manual beam @end multitable @@ -586,7 +587,7 @@ Now we have two notes which start at the same time but have different durations: the quarter-note D and the eighth-note F-sharp. How are these to be coded? They cannot be written as a chord because all the notes in a chord must have the same -duration. And they cannot be written as two separate notes +duration. And they cannot be written as two sequential notes as they need to start at the same time. This is when two voices are required. @@ -742,8 +743,8 @@ note of the preceding chord. So in @code{noteB} is relative to @code{noteA} @* @code{noteC} is relative to @code{noteB}, not @code{noteA}; @* @code{noteD} is relative to @code{noteB}, not @code{noteA} or -@code{noteC}. @* -@code{noteE} is relative to @code{noteD}, not @code{noteA} +@code{noteC}; @* +@code{noteE} is relative to @code{noteD}, not @code{noteA}. An alternative way, which may be clearer if the notes in the voices are widely separated, is to place a @code{\relative} @@ -883,21 +884,24 @@ and placing the music in voice four: @end lilypond @noindent -We see that this fixes the stem direction, but exposes a -problem sometimes encountered with multiple voices -- the -stems of the notes in one voice can collide with the note heads -in other voices. In laying out the notes, LilyPond allows the -notes or chords from two voices to occupy the same vertical -note column provided the stems are in opposite directions, but -the notes from the third and fourth voices are displaced to if -necessary to avoid the note heads -colliding. This usually works well, but in this example the -notes of the lowest voice are clearly not well placed by default. -LilyPond provides several ways to adjust the horizontal placing -of notes. We are not quite ready yet to see how to correct this, -so we shall leave this problem until a later section -(see the force-hshift property in @ref{Fixing overlapping -notation} ) +We see that this fixes the stem direction, but exposes a problem +sometimes encountered with multiple voices -- the stems of the notes +in one voice can collide with the note heads in other voices. In +laying out the notes, LilyPond allows the notes or chords from two +voices to occupy the same vertical note column provided the stems are +in opposite directions, but the notes from the third and fourth voices +are displaced, if necessary, to avoid the note heads colliding. This +usually works well, but in this example the notes of the lowest voice +are clearly not well placed by default. LilyPond provides several ways +to adjust the horizontal placing of notes. We are not quite ready yet +to see how to correct this, so we shall leave this problem until a +later section --- see the @code{force-hshift} property in @ref{Fixing +overlapping notation}. + +@seealso + +Notation Reference: @ruser{Multiple voices}. + @node Explicitly instantiating voices @subsection Explicitly instantiating voices @@ -1124,6 +1128,11 @@ same direction are placed at the same position and both voices have no shift or the same shift specified, the error message @qq{Too many clashing note columns} will be produced. +@seealso + +Notation Reference: @ruser{Multiple voices}. + + @node Voices and vocals @subsection Voices and vocals @@ -1226,7 +1235,7 @@ in separate files should they become too long. @cindex hymn structure -Here is a example of the first line of a hymn with four +Here is an example of the first line of a hymn with four verses, set for SATB. In this case the words for all four parts are the same. Note how we use variables to separate the music notation and words from the staff structure. See too @@ -1458,6 +1467,11 @@ refrainwordsB = \lyricmode { } @end lilypond +@seealso + +Notation Reference: @ruser{Vocal music}. + + @node Contexts and engravers @section Contexts and engravers @@ -1547,6 +1561,11 @@ words, each word being capitalized and joined immediately to the preceding word with no hyphen or underscore, e.g., @code{GregorianTranscriptionStaff}. +@seealso + +Notation Reference: @ruser{Contexts explained}. + + @node Creating contexts @subsection Creating contexts @@ -1645,12 +1664,15 @@ context to distinguish it from other contexts of the same type, @end example Note the distinction between the name of the context type, -@code{Staff}, @code{Voice}, etc, and -the identifying name of a particular instance of that type, -which can be any sequence of letters invented by the user. -The identifying name is used to refer back to that particular -instance of a context. We saw this in use in the section on -lyrics in @ref{Voices and vocals}. +@code{Staff}, @code{Voice}, etc, and the identifying name of a +particular instance of that type, which can be any sequence of letters +and digits invented by the user. The identifying name is used to +refer back to that particular instance of a context. We saw this in +use in the section on lyrics, see @ref{Voices and vocals}. + +@seealso + +Notation Reference: @ruser{Creating contexts}. @node Engravers explained @@ -1668,11 +1690,11 @@ about any. Engravers live and operate in Contexts. Engravers such as the @code{Metronome_mark_engraver}, whose -action and output applies to the score as a whole, operate in +action and output apply to the score as a whole, operate in the highest level context -- the @code{Score} context. The @code{Clef_engraver} and @code{Key_engraver} are to be -found in every Staff Context, as different staves may require +found in every @code{Staff} Context, as different staves may require different clefs and keys. The @code{Note_heads_engraver} and @code{Stem_engraver} live @@ -1707,7 +1729,8 @@ from the name, or vice versa. @tab Engraves clefs @item Completion_heads_engraver @tab Splits notes which cross bar lines -@item Dynamic_engraver +@c The old Dynamic_engraver is deprecated. -jm +@item New_dynamic_engraver @tab Creates hairpins and dynamic texts @item Forbid_line_break_engraver @tab Prevents line breaks if a musical element is still active @@ -1732,6 +1755,10 @@ from the name, or vice versa. We shall see later how the output of LilyPond can be changed by modifying the action of Engravers. +@seealso + +Internals reference: @rinternals{Engravers and performers}. + @node Modifying context properties @subsection Modifying context properties @@ -1809,7 +1836,7 @@ in which context they operate. Sometimes this is obvious, but occasionally it can be tricky. If the wrong context is specified, no error message is produced, but the expected action will not take place. For example, the -@code{instrumentName} clearly lives in the Staff context, since +@code{instrumentName} clearly lives in the @code{Staff} context, since it is the staff that is to be named. In this example the first staff is labelled, but not the second, because we omitted the context name. @@ -1827,23 +1854,25 @@ because we omitted the context name. >> @end lilypond -Remember the default context name is Voice, so the second +Remember the default context name is @code{Voice}, so the second @code{\set} command set the property @code{instrumentName} in the -Voice context to @qq{Alto}, but as LilyPond does not look +@code{Voice} context to @qq{Alto}, but as LilyPond does not look for any such property in the @code{Voice} context, no further action took place. This is not an error, and no error message is logged in the log file. -Similarly, if the property name is mis-spelt no error message -is produced, and clearly the expected action cannot be performed. -If fact, you can set any (fictitious) @q{property} using any -name you like in any context that exists by using the -@code{\set} command. But if the name is not -known to LilyPond it will not cause any action to be taken. -This is one of the reasons why it is highly recommended to -use a context-sensitive editor with syntax highlighting for -editing LilyPond input files, such as Vim, Jedit, ConTEXT or Emacs, -since unknown property names will be highlighted differently. +Similarly, if the property name is mis-spelt no error message is +produced, and clearly the expected action cannot be performed. If +fact, you can set any (fictitious) @q{property} using any name you +like in any context that exists by using the @code{\set} command. But +if the name is not known to LilyPond it will not cause any action to +be taken. Some text editors with special support for LilyPond input +files document property names with bullets when you hover them with +the mouse, like JEdit with LilyPondTool, or highlight unknown property +names differently, like ConTEXT. If you do not use an editor with +such features, it is recommended to check the property name in the +Internals Reference: see @rinternals{Tunable context properties}, or +@rinternals{Contexts}. The @code{instrumentName} property will take effect only if it is set in the @code{Staff} context, but @@ -1916,15 +1945,15 @@ f g a b @end lilypond -We have now seen how to set the values of several different -types of property. Note that integers and numbers are always -preceded by a hash sign, @code{#}, while a true or false value -is specified by ##t and ##f, with two hash signs. A text -property should be enclosed in double quotation signs, as above, -although we shall see later that text can actually be specified -in a much more general way by using the very powerful -@code{markup} command. +We have now seen how to set the values of several different types of +property. Note that integers and numbers are always preceded by a +hash sign, @code{#}, while a true or false value is specified by +@code{##t} and @code{##f}, with two hash signs. A text property +should be enclosed in double quotation signs, as above, although we +shall see later that text can actually be specified in a much more +general way by using the very powerful @code{markup} command. +@unnumberedsubsubsec Setting context properties with @code{\with} @funindex \with @cindex context properties, setting with \with @@ -1963,10 +1992,57 @@ Properties set in this way may still be changed dynamically using The @code{fontSize} property is treated differently. If this is set in a @code{\with} clause it effectively resets the default -value of the font size. If it is later changed with @code{\set} +value of the font size. If it is later changed with @code{\set}, this new default value may be restored with the @code{\unset fontSize} command. +@unnumberedsubsubsec Setting context properties with @code{\context} + +The values of context properties may be set in @emph{all} contexts +of a particular type, such as all @code{Staff} contexts, with a single +command. The context type is identified by using its +type name, like @code{Staff}, prefixed by a back-slash: @code{\Staff}. +The statement which sets the property value is the same as that in a +@code{\with} block, introduced above. It is placed in a +@code{\context} block within a @code{\layout} block. Each +@code{\context} block will affect all contexts of the type specified +throughout the @code{\score} or @code{\book} block in which the +@code{\layout} block appears. Here is a example to show the format: + +@lilypond[verbatim,quote] +\score { + \new Staff { + \relative c'' { + cis4 e d ces + } + } + \layout { + \context { + \Staff + extraNatural = ##t + } + } +} +@end lilypond + +@noindent +Context properties set in this way may be overridden for particular +instances of contexts by statements in a @code{\with} block, and by +@code{\set} commands embedded in music statements. + +@seealso + +Notation Reference: +@ruser{Changing context default settings}. +@c FIXME +@c uncomment when backslash-node-name issue is resolved -pm +@c @ruser{The set command}. + +Internals Reference: +@rinternals{Contexts}, +@rinternals{Tunable context properties}. + + @node Adding and removing engravers @subsection Adding and removing engravers @@ -1979,7 +2055,7 @@ this new default value may be restored with the We have seen that contexts each contain several engravers, each of which is responsible for producing a particular part of the output, like bar lines, staves, note heads, stems, etc. If an -engraver is removed from a context it can no longer produce its +engraver is removed from a context, it can no longer produce its output. This is a crude way of modifying the output, but it can sometimes be useful. @@ -1989,10 +2065,9 @@ To remove an engraver from a single context we use the @code{\with} command placed immediately after the context creation command, as in the previous section. -As an -illustration let's repeat an example from the previous -section with the staff lines removed. Remember that the -staff lines are produced by the Staff_symbol_engraver. +As an illustration, let's repeat an example from the previous section +with the staff lines removed. Remember that the staff lines are +produced by the @code{Staff_symbol_engraver}. @lilypond[quote,verbatim,ragged-right] \new Staff \with { @@ -2014,15 +2089,15 @@ staff lines are produced by the Staff_symbol_engraver. Engravers can also be added to individual contexts. The command to do this is -@code{\consists @emph{Engraver_name}}, +@code{\consists @var{Engraver_name}}, -placed inside a @code{\with} block. Some vocal scores -have an @rglos{ambitus} placed at the beginning of a -staff to indicate the range of notes in that staff. -The ambitus is produced by the @code{Ambitus_engraver}, -which is not normally included in any context. If -we add it to the @code{Voice} context it calculates -the range from that voice only: +@noindent +placed inside a @code{\with} block. Some vocal scores have an ambitus +placed at the beginning of a staff to indicate the range of notes in +that staff -- see @rglos{ambitus}. The ambitus is produced by the +@code{Ambitus_engraver}, which is not normally included in any +context. If we add it to the @code{Voice} context, it calculates the +range from that voice only: @lilypond[quote,verbatim,ragged-right] \new Staff << @@ -2042,8 +2117,8 @@ the range from that voice only: @end lilypond @noindent -but if we add the Ambitus engraver to the -@code{Staff} context it calculates the range from all +but if we add the ambitus engraver to the +@code{Staff} context, it calculates the range from all the notes in all the voices on that staff: @lilypond[quote,verbatim,ragged-right] @@ -2073,7 +2148,7 @@ individual contexts. It is also possible to remove or add engravers to every context of a specific type by placing the commands in the appropriate context in a @code{\layout} block. For example, if we wanted to show an ambitus for every -staff in a four-staff score we could write +staff in a four-staff score, we could write @lilypond[quote,verbatim,ragged-right] \score { @@ -2108,6 +2183,12 @@ for all contexts of a particular type by including the @code{\set} command in a @code{\context} block in the same way. +@seealso + +Notation Reference: @ruser{Modifying context plug-ins}, +@ruser{Changing context default settings}. + + @node Extending the templates @section Extending the templates @@ -2115,10 +2196,7 @@ You've read the tutorial, you know how to write music, you understand the fundamental concepts. But how can you get the staves that you want? Well, you can find lots of templates (see @ref{Templates}) which may give you a start. -But what -if you want something that isn't covered there? Read on. - -TODO Add links to templates after they have been moved to LSR +But what if you want something that isn't covered there? Read on. @menu * Soprano and cello:: @@ -2246,7 +2324,7 @@ want the cello part to appear under the soprano part, we need to add underneath the soprano stuff. We also need to add @code{<<} and @code{>>} around the music -- that tells LilyPond that there's more than one thing (in this case, two @code{Staves}) happening -at once. The @code{\score} looks like this now +at once. The @code{\score} looks like this now: @c Indentation in this example is deliberately poor @example @@ -2305,6 +2383,11 @@ celloMusic = \relative c { } @end lilypond +@seealso + +The starting templates can be found in the @q{Templates} appendix, +see @ref{Single staff}. + @node Four-part SATB vocal score @subsection Four-part SATB vocal score @@ -2393,13 +2476,12 @@ lower = \relative c, { } @end lilypond -None of the templates provides this layout exactly. The -nearest is @q{SATB vocal score and automatic piano reduction}, -but we need to change the layout and add a piano -accompaniment which is not derived automatically from the -vocal parts. The variables holding the music and words for -the vocal parts are fine, but we shall need to add variables for -the piano reduction. +None of the templates provides this layout exactly. The nearest is +@q{SATB vocal score and automatic piano reduction} -- see @ref{Vocal +ensembles} -- but we need to change the layout and add a piano +accompaniment which is not derived automatically from the vocal parts. +The variables holding the music and words for the vocal parts are +fine, but we shall need to add variables for the piano reduction. The order in which the contexts appear in the ChoirStaff of the template do not correspond with the order in the vocal @@ -2572,7 +2654,7 @@ lower = \relative c, { @cindex template, writing your own -After gaining some facility with writing LilyPond code you +After gaining some facility with writing LilyPond code, you may find that it is easier to build a score from scratch rather than modifying one of the templates. You can also develop your own style this way to suit the sort of music you @@ -2615,7 +2697,7 @@ Next let's see what should go in the score block. We simply mirror the staff structure we want. Organ music is usually written on three staves, one for each manual and one for the pedals. The -manual staves should be bracketed together so we +manual staves should be bracketed together, so we need to use a PianoStaff for them. The first manual part needs two voices and the second manual part just one. @@ -2659,20 +2741,20 @@ see what errors it generates. >> @end example -It is not strictly necessary to use the simultaneous construct +It is not necessary to use the simultaneous construct @code{<< .. >>} for the manual two staff and the pedal organ staff, -since they contain only one music expression, but it does no harm +since they contain only one music expression, but it does no harm, and always using angle brackets after @code{\new Staff} is a good habit to cultivate in case there are multiple voices. The opposite is true for Voices: these should habitually be followed by braces @code{@{ .. @}} in case your music is coded in several variables which need to run consecutively. -Let's add this structure to the score block, and adjust the -indenting. We also add the appropriate clefs, ensure the -second voice stems point down with @code{\voiceTwo} and -enter the time signature and key to each staff using our -predefined variable, @code{\TimeKey}. +Let's add this structure to the score block, and adjust the indenting. +We also add the appropriate clefs, ensure stems, ties and slurs in +each voice on the upper staff point to the right direction with +@code{\voiceOne} and @code{\voiceTwo}, and enter the time signature +and key to each staff using our predefined variable, @code{\TimeKey}. @example \score @{ @@ -2681,7 +2763,7 @@ predefined variable, @code{\TimeKey}. \new Staff = "ManualOne" << \TimeKey % set time signature and key \clef "treble" - \new Voice @{ \ManualOneVoiceOneMusic @} + \new Voice @{ \voiceOne \ManualOneVoiceOneMusic @} \new Voice @{ \voiceTwo \ManualOneVoiceTwoMusic @} >> % end ManualOne Staff context \new Staff = "ManualTwo" << @@ -2732,7 +2814,7 @@ PedalOrganMusic = \relative c { \new Staff = "ManualOne" << \TimeKey % set time signature and key \clef "treble" - \new Voice { \ManualOneVoiceOneMusic } + \new Voice { \voiceOne \ManualOneVoiceOneMusic } \new Voice { \voiceTwo \ManualOneVoiceTwoMusic } >> % end ManualOne Staff context \new Staff = "ManualTwo" << @@ -2751,8 +2833,3 @@ PedalOrganMusic = \relative c { @end lilypond - - - - - diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely index fde1bd564f..8be7691a17 100644 --- a/Documentation/user/input.itely +++ b/Documentation/user/input.itely @@ -1838,8 +1838,8 @@ to the same values as the previous example. @ignore @c Delete when satisfied this is adequately covered elsewhere -td -@node Microtones in MIDI -@subsection Microtones in MIDI +@n ode Microtones in MIDI +@s ubsection Microtones in MIDI @cindex microtones in MIDI diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely index a88a14212b..e63cd63c22 100644 --- a/Documentation/user/install.itely +++ b/Documentation/user/install.itely @@ -325,6 +325,17 @@ for more information, see @file{Documentation/user/README.txt} and @knownissues +@code{-j} command-line option of @command{make} is unsupported for +building the documentation. As the most time consuming task is +running LilyPond to build images of music, the makefile variable +@code{CPU_COUNT} may be set in @file{local.make} or on the command line +to the number of @code{.ly} files that LilyPond should process +simultaneously, e.g. on a bi-processor or Dual core machine + +@example +make CPU_COUNT=2 web +@end example + If source files have changed since last documentation build, output files that need to be rebuilt are normally rebuilt, even if you do not run @code{make web-clean} first. However, building dependencies in the diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 5875d37673..1dbd05b929 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -789,6 +789,7 @@ makes it easy to mix music and text in documents. This section explains the different portions of the documentation. @c leave these lines wrapping around. It's some texinfo 4.12 thing. -gp +@c This is actually a limitation of texi2html. -jm @menu * About the Learning Manual (LM):: this manual introduces LilyPond, giving in-depth explanations of how to create notation. @@ -814,6 +815,12 @@ This book explains how to begin learning LilyPond, as well as explaining some key concepts in easy terms. You should read these chapters in a linear fashion. +There is a paragraph @strong{See also} at the end of each section, +which contains cross-references to other sections: you should not +follow these cross-references at first reading; when you have read all +of the Learning Manual, you may want to read some sections again and +follow cross-references for further reading. + @itemize @item @@ -869,7 +876,7 @@ all. @cindex foreign languages @cindex language -@ref{Top,Music glossary,,music-glossary}: +@rglosnamed{Top,Music glossary} this explains musical terms, and includes translations to various languages. If you are not familiar with music notation or music terminology (especially if you are a non-native English speaker), @@ -950,7 +957,7 @@ a complete index. @node About the Application Usage (AU) @unnumberedsubsec About the Application Usage (AU) -This book explains how to execute the program and how to integrate +This book explains how to execute the programs and how to integrate LilyPond notation with other programs. @itemize @@ -992,7 +999,7 @@ formats to the @code{.ly} format. @cindex snippets @cindex LSR -@ref{Top,LilyPond Snippet List,,lilypond-snippets}: this shows a +@rlsrnamed{Top,LilyPond Snippet List}: this shows a selected set of LilyPond snippets from the @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository} (LSR). All the snippets are in the public domain. @@ -1010,7 +1017,7 @@ The list of snippets for each subsection of the Notation Reference @node About the Internals Reference (IR) @unnumberedsubsec About the Internals Reference (IR) -@ref{Top,Internals Reference,,lilypond-internals}: this is a set +@rinternalsnamed{Top,Internals Reference}: this is a set of heavily cross linked HTML pages which document the nitty-gritty details of each and every LilyPond class, object, and function. It is produced directly from the formatting definitions in the diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely index 6064369ad9..3aa0986a90 100644 --- a/Documentation/user/keyboards.itely +++ b/Documentation/user/keyboards.itely @@ -39,6 +39,14 @@ instruments. @node References for keyboards @unnumberedsubsubsec References for keyboards +@cindex piano staves +@cindex staves, piano +@cindex staves, keyboard instruments +@cindex staves, keyed instruments +@cindex keyboard instrument staves +@cindex keyed instrument staves +@funindex PianoStaff + Keyboard instruments are usually notated with Piano staves. These are two or more normal staves coupled with a brace. The same notation is also used for other keyed instruments. @@ -53,6 +61,7 @@ music. Several common issues in keyboard music are covered elsewhere: @itemize + @item Keyboard music usually contains multiple voices and the number of voices may change regularly; this is described in @ref{Collision resolution}. @@ -110,6 +119,12 @@ Snippets: @knownissues +@cindex keyboard music, centering dynamics +@cindex dynamics, centered in keyboard music +@cindex piano music, centering dynamics +@cindex centered dynamics in piano music +@funindex staff-padding + Dynamics are not automatically centered, but workarounds do exist. One option is the @q{piano centered dynamics} template under @rlearning{Piano templates}; another option is to increase the @@ -127,6 +142,7 @@ objects}. @cindex cross-staff beams @cindex beams, cross-staff @funindex \change +@funindex change Voices can be switched between staves manually, using the command @@ -174,8 +190,8 @@ Learning Manual: @rlearning{Fixing overlapping notation}. Notation Reference: -@ruser{Stems}, -@ruser{Automatic beams}. +@ref{Stems}, +@ref{Automatic beams}. Snippets: @rlsr{Keyboards}. @@ -192,6 +208,8 @@ Internals Reference: @cindex automatic staff changes @cindex staff changes, automatic @funindex \autochange +@funindex autochange +@funindex PianoStaff Voices can be made to switch automatically between the top and the bottom staff. The syntax for this is @@ -217,6 +235,11 @@ in advance. } @end lilypond +@cindex relative music and autochange +@cindex autochange and relative music +@funindex \relative +@funindex relative + A @code{\relative} section that is outside of @code{\autochange} has no effect on the pitches of the music, so if necessary, put @code{\relative} inside @code{\autochange}. @@ -258,6 +281,8 @@ Internals Reference: @knownissues +@cindex chords, splitting across staves with \autochange + The staff switches may not end up in optimal places. For high quality output, staff switches should be specified manually. @@ -267,13 +292,21 @@ staff based on the first note named in the chord construct. @node Staff-change lines @unnumberedsubsubsec Staff-change lines -@cindex staff-change lines -@cindex cross-staff lines -@cindex lines, staff-change follower +@cindex staff-change line +@cindex staff change line +@cindex cross-staff line +@cindex cross staff line +@cindex line, staff-change follower +@cindex line, cross-staff +@cindex line, staff-change @cindex follow voice @cindex staff switching @cindex cross-staff @funindex followVoice +@funindex \showStaffSwitch +@funindex showStaffSwitch +@funindex \hideStaffSwitch +@funindex hideStaffSwitch Whenever a voice switches to another staff, a line connecting the notes can be printed automatically: @@ -295,8 +328,6 @@ notes can be printed automatically: @predefined -@funindex \showStaffSwitch -@funindex \hideStaffSwitch @code{\showStaffSwitch}, @code{\hideStaffSwitch}. @seealso @@ -313,9 +344,18 @@ Internals Reference: @unnumberedsubsubsec Cross-staff stems @cindex cross-staff notes +@cindex cross staff notes @cindex notes, cross-staff @cindex cross-staff stems +@cindex cross staff stems @cindex stems, cross-staff +@cindex chords, cross-staff +@cindex cross-staff chords +@cindex cross staff chords +@funindex Stem +@funindex cross-staff +@funindex length +@funindex flag-style Chords that cross staves may be produced: @@ -371,18 +411,27 @@ piano. @node Piano pedals @unnumberedsubsubsec Piano pedals + @cindex piano pedals @cindex pedals, piano @cindex sustain pedal @cindex sostenuto pedal @cindex una corda @cindex tre corde +@cindex sos. +@cindex U.C. @funindex \sustainOn +@funindex sustainOn @funindex \sustainOff +@funindex sustainOff @funindex \sostenutoOn +@funindex sostenutoOn @funindex \sostenutoOff +@funindex sostenutoOff @funindex \unaCorda +@funindex unaCorda @funindex \treCorde +@funindex treCorde Pianos generally have three pedals that alter the way sound is produced: @notation{sustain}, @notation{sostenuto} @@ -398,6 +447,17 @@ c4\unaCorda d e g 1\treCorde @end lilypond +@cindex pedal indication styles +@cindex pedal indication, text +@cindex pedal indication, bracket +@cindex pedal indication, mixed +@cindex pedal sustain style +@cindex sustain pedal style +@funindex pedalSustainStyle +@funindex mixed +@funindex bracket +@funindex text + There are three styles of pedal indications: text, bracket, and mixed. The sustain pedal and the una corda pedal use the text style by default while the sostenuto pedal uses mixed by default. @@ -441,6 +501,8 @@ Internals Reference: @node Accordion @subsection Accordion +@cindex accordion + This section discusses notation that is unique to the accordion. @menu @@ -452,6 +514,7 @@ This section discusses notation that is unique to the accordion. @cindex accordion discant symbols @cindex discant symbols, accordion @cindex accordion shifts +@cindex accordion shift symbols Accordions are often built with more than one set of reeds that may be in unison with, an octave above, or an octave below the written pitch. diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index fb4e0e779a..07cf74a547 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -25,13 +25,16 @@ @quotedblleft{}\TEXT\@quotedblright{} @end macro -@macro warning{TEXT} @ifhtml +@macro warning{TEXT} @cartouche @b{Note:} \TEXT\ @end cartouche +@end macro @end ifhtml + @ifnothtml +@macro warning{TEXT} @quotation @quotation @cartouche @@ -39,8 +42,8 @@ @end cartouche @end quotation @end quotation -@end ifnothtml @end macro +@end ifnothtml @ifnotinfo @macro notation{TEXT} @@ -125,11 +128,15 @@ @c @rlearning @c @ruser @c @rprogram -@c @rsnippets +@c @rlsr @c @rinternals +@c all these also have a @...named version, which allows to specify the +@c displayed text for the reference as second argument -@ifhtml -@c ***** HTML ***** +@c ***** HTML + bigpage is a special case (other manual names), all other +@c formats are treated similarly + +@ifnottex @ifset bigpage @@ -138,30 +145,59 @@ @ref{\TEXT\,,,music-glossary-big-page,Music Glossary} @end macro +@macro rglosnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Music Glossary} +@end macro + @macro rlearning{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual} @end macro +@macro rlearningnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual} +@end macro + @macro ruser{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-big-page,Notation Reference} @end macro +@macro rusernamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference} +@end macro + @macro rprogram{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-program-big-page,Application Usage} @end macro +@macro rprogramnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage} +@end macro + @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets-big-page,Snippets} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets} +@end macro + @macro rinternals{TEXT} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference} @end macro +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference} +@end macro + @end ifset @@ -172,44 +208,17 @@ @ref{\TEXT\,,,music-glossary,Music Glossary} @end macro -@macro rlearning{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Learning Manual} -@end macro - -@macro ruser{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Notation Reference} -@end macro - -@macro rprogram{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Application Usage} -@end macro - -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Snippets} -@end macro - -@macro rinternals{TEXT} +@macro rglosnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Internals Reference} +@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary} @end macro -@end ifclear - -@end ifhtml - - -@ifdocbook -@c ***** DOCBOOK-XML ***** - -@macro rglos{TEXT} +@macro rlearning{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Music Glossary} +@ref{\TEXT\,,,lilypond-learning,Learning Manual} @end macro -@macro rlearning{TEXT} +@macro rlearningnamed{TEXT,DISPLAY} @vindex \TEXT\ @ref{\TEXT\,,,lilypond-learning,Learning Manual} @end macro @@ -219,56 +228,43 @@ @ref{\TEXT\,,,lilypond,Notation Reference} @end macro -@macro rprogram{TEXT} +@macro rusernamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Application Usage} +@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Snippets} +@macro rprogram{TEXT} +@vindex \TEXT\ +@ref{\TEXT\,,,lilypond-program,Application Usage} @end macro -@macro rinternals{TEXT} +@macro rprogramnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Internals Reference} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage} @end macro -@end ifdocbook - - -@ifinfo -@c **** INFO **** - -@macro rglos{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,music-glossary,Music Glossary} +@macro rlsr{TEXT} +@ref{\TEXT\,,,lilypond-snippets,Snippets} @end macro -@macro rlearning{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond-learning,Learning Manual} +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets} @end macro -@macro ruser{TEXT} +@macro rinternals{TEXT} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond,Notation Reference} +@ref{\TEXT\,,,lilypond-internals,Internals Reference} @end macro -@macro rprogram{TEXT} +@macro rinternalsnamed{TEXT,DISPLAY} @vindex \TEXT\ -@ref{\TEXT\,,,lilypond-program,Application Usage} +@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference} @end macro -@macro rlsr{TEXT} -@ref{\TEXT\,,,lilypond-snippets,Snippets} -@end macro +@end ifclear -@macro rinternals{TEXT} -@vindex \TEXT\ -@ref{\TEXT\,,,lilypond-internals,Internals Reference} -@end macro +@end ifnottex -@end ifinfo @c **** TEX **** @@ -279,26 +275,51 @@ @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} -learning manual, @ref{\TEXT\,,,lilypond-learning,Learning Manual} +@ref{\TEXT\,,,lilypond-learning,Learning Manual} +@end macro + +@macro rlearningnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual} @end macro @macro ruser{TEXT} -notation reference, @ref{\TEXT\,,,lilypond,Notation Reference} +@ref{\TEXT\,,,lilypond,Notation Reference} +@end macro + +@macro rusernamed{TEXT,DISPLAY,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference} @end macro @macro rprogram{TEXT} -program usage manual, @ref{\TEXT\,,,lilypond-program,Application Usage} +@ref{\TEXT\,,,lilypond-program,Application Usage} +@end macro + +@macro rprogramnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage} @end macro @macro rlsr{TEXT} @ref{\TEXT\,,,lilypond-snippets,Snippets} @end macro +@macro rlsrnamed{TEXT,DISPLAY} +@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets} +@end macro + @macro rinternals{TEXT} @vindex \TEXT\ @code{\TEXT\} @end macro -@end iftex +@macro rinternalsnamed{TEXT,DISPLAY} +@vindex \TEXT\ +@code{\DISPLAY\} +@end macro +@end iftex diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index ff12ff62be..cdcb02e370 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -166,8 +166,8 @@ Languages in this order. * arpeggio:: * articulation:: * ascending interval:: -* augmentation:: * augmented interval:: +* augmentation:: * autograph:: * B:: * backfall:: @@ -179,7 +179,7 @@ Languages in this order. * bass clef:: * beam:: * beat:: -* beat repeat:: +* beat repeat:: * bind:: * brace:: * bracket:: @@ -212,7 +212,7 @@ Languages in this order. * contralto:: * copying music:: * counterpoint:: -* countertenor:: +* countertenor:: * crescendo:: * cue-notes:: * custos:: @@ -225,11 +225,13 @@ Languages in this order. * didymic comma:: * diminished interval:: * diminuendo:: -* diminution:: +* diminution:: * direct:: * disjunct movement:: * dissonance:: * dissonant interval:: +* divisio:: +* doit:: * dominant:: * dominant ninth chord:: * dominant seventh chord:: @@ -260,12 +262,14 @@ Languages in this order. * extender line:: * F:: * F clef:: +* fall:: * feathered beam:: * fermata:: * fifth:: * figured bass:: * fingering:: * flag:: +* flageolet:: * flat:: * forefall:: * forte:: @@ -283,14 +287,17 @@ Languages in this order. * grave:: * gruppetto:: * H:: +* hairpin:: * half note:: * half rest:: * harmonic cadence:: +* harmonics:: * harmony:: * hemiola:: * homophony:: +* hymn meter:: * interval:: -* inversion:: +* inversion:: * inverted interval:: * just intonation:: * key:: @@ -314,7 +321,7 @@ Languages in this order. * major interval:: * meantone temperament:: * measure:: -* measure repeat:: +* measure repeat:: * mediant:: * melisma:: * melisma line:: @@ -344,17 +351,17 @@ Languages in this order. * note head:: * note names:: * note value:: -* octavation:: +* octavation:: * octave:: -* octave mark:: -* octave marking:: +* octave mark:: +* octave marking:: * octave sign:: * ornament:: * ossia:: * part:: * pause:: * pennant:: -* percent repeat:: +* percent repeat:: * percussion:: * perfect interval:: * phrase:: @@ -370,9 +377,9 @@ Languages in this order. * portato:: * presto:: * proportion:: -* Pythagorean comma:: +* Pythagorean comma:: * quadruplet:: -* quality:: +* quality:: * quarter note:: * quarter rest:: * quarter tone:: @@ -395,14 +402,14 @@ Languages in this order. * sextuplet:: * shake:: * sharp:: -* simile:: +* simile:: * simple meter:: * sixteenth note:: * sixteenth rest:: * sixth:: * sixty-fourth note:: * sixty-fourth rest:: -* slash repeat:: +* slash repeat:: * slur:: * solmization:: * sonata:: @@ -413,6 +420,7 @@ Languages in this order. * staff:: * staves:: * stem:: +* stringendo:: * strings:: * strong beat:: * subdominant:: @@ -423,7 +431,7 @@ Languages in this order. * supertonic:: * symphony:: * syncopation:: -* syntonic comma:: +* syntonic comma:: * system:: * temperament:: * tempo indication:: @@ -2201,7 +2209,7 @@ S: crescendo, FI: cresendo, voimistuen. Increasing volume. Indicated by a rightwards opening horizontal wedge -or the abbreviation @samp{cresc.}. +(hairpin) or the abbreviation @samp{cresc.}. @lilypond[fragment,ragged-right] \key g \major \time 4/4 @@ -2345,8 +2353,8 @@ DK: decrescendo, S: decrescendo, FI: decresendo, hiljentyen. -Decreasing tone volume. Indicated by a leftwards opening horizontal wedge -or the abbreviation @samp{decresc.}. +Decreasing tone volume. Indicated by a leftwards opening horizontal +wedge (hairpin) or the abbreviation @samp{decresc.}. @lilypond[fragment,ragged-right] \relative c'' { @@ -2387,7 +2395,7 @@ A scale consisting of 5@w{ }@ref{whole tone}s and 2@w{ }@ref{semitone}s (S). Scales played on the white keys of a piano keybord are diatonic; and these scales are sometimes called, somewhat inaccurately, @q{church modes}). -These @q{modes} are used in gregorian chant and in pre-baroque early music +These @q{modes} are used in Gregorian chant and in pre-baroque early music but also to some extent in newer jazz music. @lilypond[fragment,notime,ragged-right] @@ -2699,6 +2707,62 @@ FI: dissonanssi, dissonoiva intervalli, riitasointi. @ref{harmony}. +@node divisio +@section divisio + +ES: ?, +I: ?, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +[Latin: @q{division}: pl. @emph{divisiones}] In Gregorian chant, a +vertical stroke through part or all of the staff that serves to +structure a chant into phrases and sections. There are four types: + +@itemize + +@item @emph{divisio minima}, a short pause + +@item @emph{divisio maior}, a medium pause + +@item @emph{divisio maxima}, a long pause + +@item @emph{finalis}, to indicate the end of a chant, or the end of a +section in a long antiphonal or responsorial chant. + +@end itemize + +TODO: musical example here? + +@seealso + +None yet. + + +@node doit +@section doit + +ES: ?, +I: ?, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +Indicator for a indeterminately rising pitch bend. Compare with +@emph{glissando}, which has determinate starting and ending pitches. + +@seealso + +@ref{fall}, @ref{glissando}. + + @node dominant @section dominant @@ -3307,6 +3371,26 @@ double bass @ref{strings}). @c F: 'point d'orgue' on a note, 'point d'arret' on a rest. +@node fall +@section fall + +ES: ?, +I: ?, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +Indicator for a indeterminately falling pitch bend. Compare with +@emph{glissando}, which has determinate starting and ending pitches. + +@seealso + +@ref{doit}, @ref{glissando}. + + @node feathered beam @section feathered beam @@ -3412,8 +3496,6 @@ above the bass notes. @end lilypond - - @node fingering @section fingering @@ -3457,6 +3539,36 @@ less than a quarter note. The number of flags determines the @end lilypond +@node flageolet +@section flageolet + +ES: ?, +I: ?, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +An articulation for string players that means the note or passage is to +be played in harmonics. + +Also: + +@itemize + +@item A duct flute similar to the recorder. + +@item An organ stop of flute scale at 1' or 2' pitch. + +@end itemize + +@seealso + +@ref{articulation}, @ref{harmonics}. + + @node flat @section flat @@ -3786,7 +3898,18 @@ usage. In the standard usage of these countries, @samp{B} means @seealso -@ref{Pitch names}, @ref{B} +@ref{Pitch names}, @ref{B}. + + +@node hairpin +@section hairpin + +Graphical version of the @notation{crescendo} and @notation{decrescendo} +dynamic marks. + +@seealso + +@ref{crescendo}, @ref{decrescendo}. @node half note @@ -3865,6 +3988,31 @@ A sequence of chords that terminates a musical phrase or section. @end lilypond +@node harmonics +@section harmonics + +ES: sonidos del flautín, +I: suoni flautati, +F: flageolet, sons harmoniques, +D: Flageolett-Töne, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +The general class of pitches produced by sounding the second or higher +harmonic of a tone producer: string, column of air, and so on. + +On stringed instruments, these pitches sound rather flute-like; hence, +their name in languages other than English. They are produced by +lightly touching the string at a node for the desired mode of vibration +while it is being bowed or plucked. + +For instruments of the violin family, there are two types of harmonics: +natural harmonics, which are those played on the open string; and +artificial harmonics, which are produced on stopped strings. + + @node harmony @section harmony @@ -3973,6 +4121,53 @@ voices more or less in the same rhythm. In contrast to @ref{polyphony}. +@node hymn meter +@section hymn meter + +ES: ?, +I: ?, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +A group or list of numbers that indicate the number of syllables in a +line of a hymn's verse. Different hymnals have different ways of noting +the hymn meter -- consider a hymn having four lines in two couplets that +alternate between eight and seven syllables. The @emph{English Hymnal} +notes this as 87.@w{ }87. Other hymnals may note it as 8787, 87.87, or +8@w{ }7@w{ }8@w{ }7. + +Some frequently-used hymn meters have traditional names: + +@itemize + +@item 66.86 is called Short Meter (abbreviated SM or S.M.) + +@item 86.86 is called Common Meter (CM or C.M.) + +@item 88.88 is called Long Meter (LM or L.M.) + +@end itemize + +Some hymns and their tunes are doubled versions of a simpler meter: for +easier reading, a hymn with a meter of 87.87.87.87 is usually written +87.87D. The traditional names above also have doubled versions: + +@itemize + +@item 66.86.66.86 is Double Short Meter (DSM or D.S.M.) + +@item 86.86.86.86 is Double Common Meter (DCM or D.C.M.) + +@item 88.88.88.88 is Double Long Meter (DLM or D.L.M.) + +@end itemize + + + @node interval @section interval @@ -5882,7 +6077,7 @@ original chord and the quality of the seventh added. Five common types of seventh chords have standard symbols. The chord quality indications are sometimes superscripted and sometimes not (e.g. Dm7, Dm^7, -and D^m7 are all identical). The last three chords are not used commonly +and D^m7 are all identical). The last three chords are not commonly used except in jazz. @seealso @@ -6667,6 +6862,26 @@ whole note. @end lilypond +@node stringendo +@section stringendo + +ES: ?, +I: stringendo, +F: ?, +D: ?, +NL: ?, +DK: ?, +S: ?, +FI: ?. + +[It, @q{pressing}]. Pressing, urging, or hastening the time, as to a +climax. + +@seealso + +@ref{accelerando}. + + @node strings @section strings diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely index b47dd2ece6..3996570429 100644 --- a/Documentation/user/notation-appendices.itely +++ b/Documentation/user/notation-appendices.itely @@ -15,6 +15,7 @@ @menu * Chord name chart:: * Common chord modifiers:: +* Predefined fretboard diagrams:: * MIDI instruments:: * List of colors:: * The Feta font:: @@ -371,6 +372,13 @@ TODO @end multitable +@node Predefined fretboard diagrams +@appendixsec Predefined fretboard diagrams + +The chart below shows the predefined fretboard diagrams. + +@lilypondfile{display-predefined-fretboards.ly} + @node MIDI instruments @appendixsec MIDI instruments diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index 9263b951dc..1ed786a61f 100644 --- a/Documentation/user/programming-interface.itely +++ b/Documentation/user/programming-interface.itely @@ -453,10 +453,10 @@ This section explains how to gather the information necessary to create complicated music functions. @menu -* Displaying music expressions:: -* Music properties:: -* Doubling a note with slurs (example):: -* Adding articulation to notes (example):: +* Displaying music expressions:: +* Music properties:: +* Doubling a note with slurs (example):: +* Adding articulation to notes (example):: @end menu @@ -465,7 +465,6 @@ to create complicated music functions. @cindex internal storage @funindex \displayMusic -@funindex \displayLilyMusic When writing a music function it is often instructive to inspect how a music expression is stored internally. This can be done with the @@ -578,6 +577,8 @@ of the @code{NoteEvent} object, The note pitch can be changed by setting this 'pitch property, +@funindex \displayLilyMusic + @example #(set! (ly:music-property (first (ly:music-property someNote 'elements)) 'pitch) diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely index e251cb98f4..c92b4d54a0 100644 --- a/Documentation/user/rhythms.itely +++ b/Documentation/user/rhythms.itely @@ -267,7 +267,7 @@ Learning Manual: @rlearning{Tweaking methods}. Notation Reference: @ref{Time administration}, @ref{Scaling durations}, -@ref{Objects connected to the input}, +@ref{The tweak command}, @ref{Polymetric notation}. Snippets: @@ -1312,7 +1312,7 @@ Snippets: Internals Reference: @rinternals{TimeSignature}, -@rinternals{Timing-translator}, +@rinternals{Timing_translator}, @rinternals{Staff}. @knownissues @@ -2397,7 +2397,6 @@ other formatting functions. Examples: @c @lsr{parts,rehearsal-mark-numbers.ly} - @node Special rhythmic concerns @subsection Special rhythmic concerns @@ -2469,34 +2468,33 @@ c1 \afterGrace d1 { c16[ d] } c4 This will put the grace notes after a @q{space} lasting 3/4 of the length of the main note. The fraction 3/4 can be changed by -setting @code{afterGraceFraction}, i.e., - -@example -#(define afterGraceFraction (cons 7 8)) -@end example +setting @code{afterGraceFraction}. The following example will put +the grace note at 7/8 of the main note. -@noindent -will put the grace note at 7/8 of the main note. +@lilypond[quote,ragged-right,verbatim,relative=2,fragment] +#(define afterGraceFraction (cons 15 16)) +c1 \afterGrace d1 { c16[ d] } c4 +@end lilypond -The same effect can be achieved manually by doing +The space between the main note and the grace note may also be +specified using spacers. The following example places the grace +note at 7/8 of the main note. @lilypond[quote,ragged-right,fragment,verbatim,relative=2] \new Voice { << { d1^\trill_( } - { s2 \grace { c16[ d] } } >> + { s2 s4. \grace { c16[ d] } } >> c4) } @end lilypond -@noindent -By adjusting the duration of the skip note (here it is a -half-note), the space between the main note and the grace -may be adjusted. - A @code{\grace} music expression will introduce special typesetting settings, for example, to produce smaller type, and -set directions. Hence, when introducing layout tweaks, they -should be inside the grace expression, for example, +set directions. Hence, when introducing layout tweaks to +override the special settings, they should be placed inside +the grace expression. The overrides should also be reverted +inside the grace expression. Here, the grace note's default stem +direction is overriden and then reverted. @lilypond[quote,ragged-right,fragment,verbatim,relative=2] \new Voice { @@ -2509,22 +2507,42 @@ should be inside the grace expression, for example, } @end lilypond -@noindent -The overrides should also be reverted inside the grace expression. + +@cindex stem, with slash + + +@snippets + +The slash through the stem in @emph{acciaccatura}s can be obtained in +other situations: + +@lilypond[quote,ragged-right,fragment,verbatim,relative=2] +\relative c'' { + \override Stem #'stroke-style = #"grace" + c8( d2) e8( f4) +} +@end lilypond The layout of grace expressions can be changed throughout the music using the function @code{add-grace-property}. The following example undefines the @code{Stem} direction for this grace, so that stems do not always point up. -@example -\new Staff @{ - #(add-grace-property 'Voice 'Stem 'direction '()) - @dots{} -@} -@end example +@lilypond[quote,ragged-right,fragment,verbatim,relative=2] +\relative c'' { + \new Staff { + #(add-grace-property 'Voice 'Stem 'direction ly:stem::calc-direction) + #(remove-grace-property 'Voice 'Stem 'direction) + \new Voice { + \acciaccatura { + f16 + } + g4 + } + } +} +@end lilypond -@noindent Another option is to change the variables @code{startGraceMusic}, @code{stopGraceMusic}, @code{startAcciaccaturaMusic}, @code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic}, @@ -2532,32 +2550,23 @@ Another option is to change the variables @code{startGraceMusic}, seen in the file @file{ly/@/grace@/-init@/.ly}. By redefining them other effects may be obtained. -@cindex stem, with slash - -@noindent -The slash through the stem in @emph{acciaccatura}s can be obtained in -other situations by @code{\override Stem #'stroke-style = -#"grace"}. +Grace notes may be forced to align with regular notes +in other staves: - -@snippets - -Grace notes may be forced to use align with regular notes -in other staves by setting @code{strict-grace-spacing} to -##t: - -@lilypond[verbatim,quote,relative=2] -<< - \override Score.SpacingSpanner #'strict-grace-spacing = ##t - \new Staff { - c4 - \afterGrace c4 { c16[ c8 c16] } - c4 r - } - \new Staff { - c16 c c c c c c c c4 r - } ->> +@lilypond[verbatim,quote,ragged-right] +\relative c'' { + << + \override Score.SpacingSpanner #'strict-grace-spacing = ##t + \new Staff { + c4 + \afterGrace c4 { c16[ c8 c16] } + c4 r + } + \new Staff { + c16 c c c c c c c c4 r + } + >> +} @end lilypond @@ -2724,3 +2733,4 @@ Snippets: Internals Reference: @rinternals{Timing_translator}, @rinternals{Score} + diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely index 1daccd6b6d..daf89d72c6 100644 --- a/Documentation/user/setup.itely +++ b/Documentation/user/setup.itely @@ -282,14 +282,23 @@ reducing the size of PDF and PS files, point and click may be switched off by issuing @example -#(ly:set-option 'point-and-click #f) +\pointAndClickOff @end example @noindent -in a @file{.ly} file. Alternately, you may pass this as an command-line -option +in a @file{.ly} file. Point and click may be explicitly enabled with + +@example +\pointAndClickOn +@end example + +Alternately, you may disable point and click with a command-line +option: @example lilypond -dno-point-and-click file.ly @end example +@warning{You should always turn off point and click in any LilyPond +files to be distributed to avoid including path information about +your computer in the .pdf file, which can pose a security risk.} diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely index 39e7cd0897..3a6c66fefc 100644 --- a/Documentation/user/simultaneous.itely +++ b/Documentation/user/simultaneous.itely @@ -165,7 +165,7 @@ separated by double backslashes. @end lilypond First and third voices get stems up, second and fourth voices get -stems down, third and fourth voice noteheads are horizontally shifted, +stems down, third and fourth voice note heads are horizontally shifted, and rests move to avoid collisions. In the following example, the intermediate voice has stems up, therefore we enter it in the third place, so it becomes voice three which has the stems up as desired. @@ -183,18 +183,18 @@ place, so it becomes voice three which has the stems up as desired. Spacing rests are often used to avoid too many rests, as seen in the example above. -The method exposed creates two new voices when the @code{<<@{...@} \\ -@{...@}>>} construction is found in the code; to temporally add only -one additional voice to an existing one, it is necessary to -instantiate that voice explicitly. For these purposes, the -@code{\voiceOne} ... @code{\voiceFour}, and @code{\oneVoice} commands -can be used: +Each music expression in the @code{<<@{...@} \\ @{...@}>>} construct +is placed in a new voice, distinct from the voice for single-voice +music; to temporarily add only one additional voice to an existing +one, it is necessary to instantiate that voice explicitly. For +these purposes, the @code{\voiceOne} ... @code{\voiceFour}, and +@code{\oneVoice} commands can be used: @example << @{ \voiceOne ... @} \new Voice @{ \voiceTwo ... @} >> \oneVoice @end example -This is a better construction to keep the control of the voices, for +This is a better construct to keep the control of the voices, for example, to ease a consistent assign of lyrics to the proper voice context. diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely index d025bda0d8..3c4be6a41d 100644 --- a/Documentation/user/staff.itely +++ b/Documentation/user/staff.itely @@ -18,23 +18,23 @@ scores with more than one staff, and how to apply specific performance marks to single staves. @menu -* Displaying staves:: -* Modifying single staves:: -* Writing parts:: +* Displaying staves:: +* Modifying single staves:: +* Writing parts:: @end menu @node Displaying staves @subsection Displaying staves -This section shows the different possibilities to create and group -staves into groups, which can be marked in the beginning of each -line with either a bracket or a brace. +This section shows the different possibilities of creating and +grouping staves, which are marked at the beginning of each line +with either a bracket or a brace. @menu * Instantiating new staves:: -* Grouping staves:: -* Deeper nested staff groups:: +* Grouping staves:: +* Deeper nested staff groups:: @end menu @node Instantiating new staves @@ -52,71 +52,57 @@ line with either a bracket or a brace. @cindex tabstaff @cindex tablature -Staves (sg. staff) are created with the @code{\new} or -@code{\context} commands. For an explanation on these commands, -see @ref{Creating contexts}. +@notation{Staves} (singular: @notation{staff}) are created with +the @code{\new} or @code{\context} commands. For details, see +@ref{Creating contexts}. -There are different predefined staff contexts available in -LilyPond: - -@itemize -@item -The default is @code{Staff}: +The basic staff context is @code{Staff}: @lilypond[verbatim,quote,relative=2] \new Staff { c4 d e f } @end lilypond -@item -@code{DrumStaff} creates a five line staff set up for a typical -drum set. It uses different names for each instrument. The -instrument names have to be set using the @code{drummode}. See -@ref{Percussion staves}. +@code{DrumStaff} creates a five-line staff set up for a +typical drum set. It uses different names for each instrument. +The instrument names are set using the @code{\drummode} command. +For details, see @ref{Percussion staves}. @lilypond[verbatim,quote] -\new DrumStaff { +\new DrumStaff { \drummode { cymc hh ss tomh } } @end lilypond @c FIXME: remove when mentioned in NR 2.8 -@item -@code{GregorianTranscriptionStaff} sets up a staff to notate +@code{GregorianTranscriptionStaff} creates a staff to notate modern Gregorian chant. It does not show bar lines. @lilypond[verbatim,quote,relative=2] \new GregorianTranscriptionStaff { c4 d e f } @end lilypond -@item -@code{RhythmicStaff} can be used to show the rhythm of some music. -The notes are printed on one line regardless of their pitch, but -the duration is preserved. See @ref{Showing melody rhythms}. +@code{RhythmicStaff} creates a single-line staff that only +displays the rhythmic values of the input. Real durations are +preserved. For details, see @ref{Showing melody rhythms}. @lilypond[verbatim,quote,relative=2] \new RhythmicStaff { c4 d e f } @end lilypond -@item -@code{TabStaff} creates by default a tablature with six strings in -standard guitar tuning. See @ref{Default tablatures}. +@code{TabStaff} creates a tablature with six strings in standard +guitar tuning. For details, see @ref{Default tablatures}. @lilypond[verbatim,quote,relative=2] \new TabStaff { c4 d e f } @end lilypond -@end itemize +There are two staff contexts specific for the notation of ancient +music: @code{MensuralStaff} and @code{VaticanaStaff}. They are +described in @ref{Pre-defined contexts}. -@noindent -Besides these staves there are two staff contexts specific for the -notation of ancient music: @code{MensuralStaff} and -@code{VaticanaStaff}. They are described in @ref{Pre-defined -contexts}. - -Once a staff is instantiated it can be started or stopped at every -point in the score. This is done with the commands -@code{\startStaff} and @code{\stopStaff}. How to use it is -explained in @ref{Staff symbol}. +Staves can be started or stopped at any point in the score. The +commands @code{\startStaff} and @code{\stopStaff} are used for +this purpose. For details, see @ref{Staff symbol}. @seealso @@ -127,7 +113,7 @@ Music Glossary: Notation Reference: @ref{Creating contexts}, -@ref{Percussion staves}, +@ref{Percussion staves}, @ref{Default tablatures}, @ref{Gregorian chant contexts}, @ref{Mensural contexts}, @@ -158,24 +144,21 @@ Internals Reference: @cindex system start delimiters @cindex bracket, vertical @cindex brace, vertical +@cindex choir staff @cindex grand staff @cindex piano staff @cindex staff group @cindex staff, choir -@cindex choir staff +@cindex staff, piano @cindex system -LilyPond provides different types of contexts to group single -staves together. These contexts influence in the first place the -appearance of the system start delimiter, but they have also -influence on the behavior of the bar lines. +Various contexts exist to group single staves together in order to +form multi-stave systems. Each grouping context sets the style of +the system start delimiter and the behavior of bar lines. -@itemize -@item -If no context is specified, the default properties for the score -will be used: the group is started with a vertical line, and the -bar lines are not connected. The name of the beginning bar line -grob is @code{SystemStartBar}. +If no context is specified, the default properties will be used: +the group is started with a vertical line, and the bar lines are +not connected. @lilypond[verbatim,quote,relative=2] << @@ -184,9 +167,8 @@ grob is @code{SystemStartBar}. >> @end lilypond -@item -In a @code{StaffGroup}, the bar lines will be drawn through all -the staves, and the group is started with a bracket. +In the @code{StaffGroup} context, the group is started with a +bracket and bar lines are drawn through all the staves. @lilypond[verbatim,quote,relative=2] \new StaffGroup << @@ -195,9 +177,8 @@ the staves, and the group is started with a bracket. >> @end lilypond -@item -In a @code{ChoirStaff}, the group is started with a bracket, but -bar lines are not connected. +In a @code{ChoirStaff}, the group starts with a bracket, but bar +lines are not connected. @lilypond[verbatim,quote,relative=2] \new ChoirStaff << @@ -206,9 +187,8 @@ bar lines are not connected. >> @end lilypond -@item -In a @code{GrandStaff}, the group is started with a brace at the -left, and bar lines are connected between the staves. +In a @code{GrandStaff}, the group begins with a brace, and bar +lines are connected between the staves. @lilypond[verbatim,quote,relative=2] \new GrandStaff << @@ -217,42 +197,24 @@ left, and bar lines are connected between the staves. >> @end lilypond -@item -The @code{PianoStaff} behaves almost as the @code{GrandStaff} but -is optimized for setting piano music. In particular it supports -the printing of an instrument name directly, see @ref{Instrument -names}. +The @code{PianoStaff} is almost identical to a @code{GrandStaff}, +except that it supports printing the instrument name directly. +For details, see @ref{Instrument names}. @lilypond[verbatim,quote,relative=2] \new PianoStaff << + \set PianoStaff.instrumentName = "Piano" \new Staff { c1 c } \new Staff { c1 c } >> @end lilypond -@end itemize - Each staff group context sets the property -@code{systemStartDelimiter} to one of the values -@code{SystemStartBar}, @code{SystemStartBrace}, and +@code{systemStartDelimiter} to one of the following values: +@code{SystemStartBar}, @code{SystemStartBrace}, or @code{SystemStartBracket}. A fourth delimiter, -@code{systemStartSquare}, is also available, but must be -instantiated manually. The usage of this last delimiter is shown -further down in the snippet section. - -According to classic engraver rules an orchestral score consists -of staves connected only with a single line at the beginning of -the system. In LilyPond this is produced grouping the -@code{Staff} contexts with @code{<< ... >>}. - -Each instrument family is grouped inside of a @code{StaffGroup} -with a starting bracket. A group of same instruments or an -instrument using more than one staff is grouped with braces in a -@code{GrandStaff}. - -As the context names tell, @code{PianoStaff} is used for notating -piano music and @code{ChoirStaff} for all kind of vocal ensemble -music. +@code{SystemStartSquare}, is also available, but it must be +explicitly specified. @snippets @@ -276,7 +238,7 @@ music. @seealso Music Glossary: -@rglos{brace}, +@rglos{brace}, @rglos{bracket}, @rglos{grand staff}. @@ -290,33 +252,17 @@ Internals Reference: @rinternals{Staff}, @rinternals{ChoirStaff}, @rinternals{GrandStaff}, -@rinternals{PianoStaff}, +@rinternals{PianoStaff}, @rinternals{StaffGroup}, -@rinternals{systemStartDelimiter}, @rinternals{SystemStartBar}, @rinternals{SystemStartBrace}, @rinternals{SystemStartBracket}, -@rinternals{systemStartSquare}. +@rinternals{SystemStartSquare}. @node Deeper nested staff groups @unnumberedsubsubsec Deeper nested staff groups -There are also two inner staff contexts named -@code{InnerStaffGroup} and @code{InnerChoirStaffGroup} besides the -grouping contexts mentioned in @ref{Grouping staves}. They behave -in the same way as their simple counterparts, except that they are -contained in another staff grouping context, thus producing one -more bracket on top of the existing one. Note that -@code{GrandStaff} and @code{PianoStaff} do not have any inner -grouping contexts. They can both be inside any other staff -context, including inner staff groups, though. - -Here is an example of an orchestral score using groupings and -nesting of these groupings. Note that the instrument names are -omitted from the source code, for instructions how to set them see -@ref{Instrument names}. - @cindex staff, nested @cindex staves, nested @cindex nesting of staves @@ -327,85 +273,38 @@ omitted from the source code, for instructions how to set them see @cindex inner staff group @cindex inner choir staff group -@example -\score @{ -\relative c' << - \new StaffGroup %woodwinds - << - \new Staff @{ c1 d @} %flute - \new InnerStaffGroup << - \new Staff @{ c1 d @} %sax - \new Staff @{ c1 d @} %oboe - \new Staff @{ c1 d @} %English horn - >> - \new Staff @{ \clef bass c,1 d @} %bassoon - >> - \new StaffGroup %the brass group - << - \new Staff @{ c'1 d @} %trumpet - \new Staff @{ \clef bass c,1 d @} %trombone - \new GrandStaff %the horns need a GrandStaff (same instrument) - << - \new Staff @{ c'1 d @} - \new Staff @{ \clef bass c,1 d @} - >> - >> - \new ChoirStaff %for setting vocal music - << - \new Staff @{ c'1 d @} - \new InnerChoirStaff << - \new Staff @{ c1 d @} - \new Staff @{ c1 d @} - >> - \new Staff @{ c1 d @} - >> - \new PianoStaff %for the piano - << - \new Staff @{ c1 d @} - \new Staff @{ \clef bass c,1 d @} - >> ->> @} -@end example +Two additional staff-group contexts are available that can be +nested within a @code{StaffGroup} or @code{ChoirStaff} context: +@code{InnerStaffGroup} and @code{InnerChoirStaff}. These contexts +create an additional bracket next to the original bracket of their +parent staff group. -@c no verbatim so instrument names are only in the music -@lilypond[quote] -\score { -\relative c' << - \new StaffGroup %woodwinds - << - \new Staff { \set Staff.instrumentName = "fl" c1 d } %flute +An @code{InnerStaffGroup} is treated similarly to a +@code{StaffGroup}; bar lines are connected between each stave +within the context: + +@lilypond[verbatim,quote,relative=2] +\new StaffGroup << + \new Staff { c2 c } \new InnerStaffGroup << - \new Staff { \set Staff.instrumentName = "sax" c1 d } %sax 1 - \new Staff { \set Staff.instrumentName = "ob" c1 d } %sax 2 - \new Staff { \set Staff.instrumentName = "ca" c1 d } - >> - \new Staff { \set Staff.instrumentName = "bs" \clef bass c,1 d } %bassoon - >> - \new StaffGroup %the brass group - << - \new Staff { \set Staff.instrumentName = "tr" c'1 d } %trumpet - \new Staff { \set Staff.instrumentName = "tb" \clef bass c,1 d } %trombone - \new GrandStaff %the horns need a GrandStaff (same instrument) - << - \new Staff { \set Staff.instrumentName = "cor1" c'1 d } - \new Staff { \set Staff.instrumentName = "cor2" \clef bass c,1 d } - >> + \new Staff { g2 g } + \new Staff { e2 e } >> - \new ChoirStaff %for setting vocal music - << - \new Staff { \set Staff.instrumentName = "S" c'1 d } - \new InnerChoirStaff << - \new Staff { \set Staff.instrumentName = "A1" c1 d } - \new Staff { \set Staff.instrumentName = "A2" c1 d } - >> - \new Staff { \set Staff.instrumentName = "T" c1 d } - >> - \new PianoStaff %for the piano - << - \new Staff { c1 d } - \new Staff { \clef bass c,1 d } +>> +@end lilypond + +Bar lines are @emph{not} connected between staves of an +@code{InnerChoirStaff}, just like a @code{ChoirStaff}: + +@lilypond[verbatim,quote,relative=2] +\new ChoirStaff << + \new Staff { c2 c } + \new InnerChoirStaff << + \new Staff { g2 g } + \new Staff { e2 e } >> ->> } + \new Staff { c1 } +>> @end lilypond @@ -425,27 +324,30 @@ Notation Reference: @ref{Instrument names}. Internals Reference: -@rinternals{InnerChoirStaffGroup}, @rinternals{InnerStaffGroup}, -@rinternals{SystemStartBar}, +@rinternals{StaffGroup}, +@rinternals{InnerChoirStaff}, +@rinternals{ChoirStaff}, +@rinternals{SystemStartBar}, @rinternals{SystemStartBrace}, -@rinternals{SystemStartBracket}, -@rinternals{systemStartDelimiterHierarchy}. +@rinternals{SystemStartBracket}. @node Modifying single staves @subsection Modifying single staves This section explains how to change specific attributes of one -staff like the staff lines, starting and stopping of staves, -sizing of staves, and setting ossia sections. +staff: for example, modifying the number of staff lines or the +staff size. Methods to start and stop staves and set ossia +sections are also described. @menu -* Staff symbol:: -* Ossia staves:: -* Hiding staves:: +* Staff symbol:: +* Ossia staves:: +* Hiding staves:: @end menu + @node Staff symbol @unnumberedsubsubsec Staff symbol @@ -464,17 +366,16 @@ sizing of staves, and setting ossia sections. @cindex spacing of ledger lines @cindex number of staff lines -The layout object which draws the lines of a staff is called -@code{staff symbol}. The staff symbol may be tuned in number, -thickness and distance of lines, using properties. It may also be -started and stopped at every point in the score. +The grob @code{StaffSymbol} is responsible for drawing the lines +of a staff. Its properties can be altered in order to change the +appearance of a staff, but they must be changed before the staff +is created. A staff may be started or stopped at any point in the +score. -@itemize -@item -Changing the number of staff lines is done by overriding -@code{line-count}. You may need to adjust the clef position and -the position of the middle C to fit to the new staff. For an -explanation, see the snippet section in @ref{Displaying pitches}. +The number of staff lines may be changed. The clef position and +the position of middle C may need to be modified to fit the new +staff. For an explanation, refer to the snippet section in +@ref{Clef}. @lilypond[verbatim,quote,relative=2] \new Staff { @@ -483,14 +384,16 @@ explanation, see the snippet section in @ref{Displaying pitches}. } @end lilypond -@item -The placement and amount of the staff lines can also set totally -manually by defining their positions explicitly. The middle of -the staff has the value of 0, each half staff space up and down -adds an integer. The default values are 4 2 0 -2 -4. Bar lines -are drawn according to the calculated width of the system, but -they are always centered. As the example shows, the positions of -the notes are not influenced by the position of the staff lines. +The vertical position of staff lines and the number of staff lines +can be defined at the same time. As the example shows, the +positions of the notes are not influenced by the position of the +staff lines. Details for modifying this property are found in +@rinternals{staff-symbol-interface}. + +@warning{The @code{'line-positions} property overrides the +@code{'line-count} property. The number of staff lines is +implicitly defined by the number of elements in the list of values +for @code{'line-positions}} @lilypond[verbatim,quote,relative=1] \new Staff \with { @@ -499,44 +402,30 @@ the notes are not influenced by the position of the staff lines. { a4 e' f b | d1 } @end lilypond -@item -The staff line thickness can be set by overriding the -@code{thickness} property. Note that it gets applied also to -ledger lines and stems, since they depend on the staff line -thickness. The argument of @code{thickness} is a factor of -@code{line-thickness} which defaults to the normal staff line +The staff line thickness can be modified. The thickness of ledger +lines and stems are also affected, since they depend on staff line thickness. @lilypond[verbatim,quote,relative=1] \new Staff \with { \override StaffSymbol #'thickness = #3 } -{ d4 d d d } +{ e4 d c b } @end lilypond -@item -The thickness of the ledger lines can also be set independent of -the settings for staff lines. The setting is calculated from a -pair of values which will be added for the final thickness. The -first value is the staff line thickness multiplied by a factor, -the second is the staff space multiplied by a factor. In the -example the ledger lines get their thickness from one staff line -thickness plus 1/5 staff space, so they are heavier than a normal -staff line. +The thickness of ledger lines can be set independently of staff +line thickness. A description of this property is also found in +@rinternals{staff-symbol-interface}. @lilypond[verbatim,quote,relative=1] \new Staff \with { \override StaffSymbol #'ledger-line-thickness = #'(1 . 0.2) } -{ d4 d d d } +{ e4 d c b } @end lilypond -@item -The distance of the stafflines can be changed with the -@code{staff-space} property. Its argument is the amount of staff -spaces that should be inserted between the lines. The default -value is 1. Setting the distance has influence on the staff lines -as well as on ledger lines. +The distance between staff lines can be changed. The setting has +influence on ledger lines as well. @lilypond[verbatim,quote,relative=1] \new Staff \with { @@ -545,10 +434,9 @@ as well as on ledger lines. { a4 b c d } @end lilypond -@item -The length of the staff line can also be adjusted manually. The -unit is one staff space. Spacing of the objects inside the staff -does not get influenced by this setting. +The width of a staff can be adjusted. The unit is one staff +space. The spacing of objects inside the staff is not influenced +by this setting. @lilypond[verbatim,quote,relative=1] \new Staff \with { @@ -557,25 +445,21 @@ does not get influenced by this setting. { a4 e' f b | d1 } @end lilypond -@end itemize - -These properties can only be set before instantiating the staff -symbol. But it is possible to start and stop staves in the middle -of a score, so each new setting will be applied to the newly -instantiated staff. +Modifications to staff properties in the middle of a score can be +placed between @code{\stopStaff} and @code{\startStaff}: @lilypond[verbatim,quote,relative=2] -b4 b -%Set here the overrides for the staff -\override Staff.StaffSymbol #'line-count = 2 -\stopStaff \startStaff -b b -%Revert to the default +c2 c +\stopStaff +\override Staff.StaffSymbol #'line-count = #2 +\startStaff +b2 b +\stopStaff \revert Staff.StaffSymbol #'line-count -\stopStaff \startStaff -b b +\startStaff +a2 a @end lilypond - + @predefined @@ -590,6 +474,7 @@ b b @lilypondfile[verbatim,lilyquote,texidoc,doctitle] {making-some-staff-lines-thicker-than-the-others.ly} + @seealso Music Glossary: @@ -601,7 +486,9 @@ Notation Reference: @ref{Displaying pitches}. Internals Reference: -@rinternals{StaffSymbol}. +@rinternals{StaffSymbol}, +@rinternals{staff-symbol-interface}. + @knownissues @@ -633,7 +520,6 @@ Tweaking the staff object allows to resize the staff: } @end lilypond -@noindent This involves shrinking the staff spaces, the staff lines and the font size by the factor 3. You find a more precise explanation in @ref{Setting the staff size}. @@ -666,7 +552,7 @@ space is inserted with the @code{\skip} command. s2 \startStaff - f8 d g4 + f8 d g4 } \new Staff \relative c'' { \time 2/4 @@ -678,9 +564,8 @@ space is inserted with the @code{\skip} command. @snippets -@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle] -@c {making-some-staff-lines-thicker-than-the-others.ly} -@c snippet 277 +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{vertically-aligning-ossias-and-lyrics.ly} @seealso @@ -690,6 +575,11 @@ Music Glossary: @rglos{staff}, @rglos{Frenched staff}. +Learning Manual: +@rlearning{Nesting music expressions}, +@rlearning{Size of objects}, +@rlearning{Length and thickness of objects}. + Notation Reference: @ref{Setting the staff size}. @@ -705,7 +595,7 @@ Internals Reference: @cindex Frenched scores @cindex staff, hiding -@cindex staff, empty +@cindex staff, empty @cindex hiding of staves @cindex empty staves @cindex Frenched staves @@ -732,7 +622,7 @@ whole mesure rests are removed after a line break. << \new Staff { e4 f g a \break c1 } \new Staff { c4 d e f \break R1 } - >> + >> } @end lilypond @@ -742,10 +632,15 @@ To remove other types of contexts, use @cindex ossia +@c FIXME Really? I need to see about this. -pm + Another application of the @code{\RemoveEmptyStaffContext} is to make ossia sections, i.e., alternative melodies on a separate piece of staff, with help of a Frenched staff. See -@ref{Ossia staves}. +@ref{Ossia staves}. + +@c FIXME Is this in the right section? +@c maybe move to Staff symbol -pm You can make the staff lines invisible by removing the @code{Staff_symbol_engraver} from the @code{Staff} context. @@ -778,15 +673,15 @@ is written. @lilypond[verbatim,quote] \layout { - \context { - \RemoveEmptyStaffContext + \context { + \RemoveEmptyStaffContext %To use the setting globally, uncomment the following line: %\override VerticalAxisGroup #'remove-first = ##t } } \new StaffGroup \relative c'' << - \new Staff { + \new Staff { e4 f g a \break c1 } \new Staff { %To use the setting globally, comment this line, uncomment the line above @@ -835,17 +730,17 @@ Internals Reference: @subsection Writing parts @menu -* Metronome marks:: -* Instrument names:: -* Quoting other voices:: -* Formatting cue notes:: +* Metronome marks:: +* Instrument names:: +* Quoting other voices:: +* Formatting cue notes:: @end menu @node Metronome marks @unnumberedsubsubsec Metronome marks -@cindex Tempo +@cindex tempo @cindex beats per minute @cindex metronome marking @@ -882,7 +777,6 @@ c4^\markup { ) } @end lilypond -@noindent For more details, see @ref{Formatting text}. @@ -895,14 +789,14 @@ Music Glossary: @rglos{metronome mark}. Notation Reference: -@ref{Formatting text}. +@ref{Formatting text}, +@ref{MIDI output}. Snippets: @rlsr{Staff notation}. Internals Reference: -@rinternals{MetronomeMark}, -@ref{MIDI output}. +@rinternals{MetronomeMark}. @knownissues @@ -945,8 +839,8 @@ c1 c''1 @end lilypond -You can also use markup texts to construct more complicated -instrument names, for example +Markup mode can be used to create more complicated instrument +names: @lilypond[verbatim,quote,relative=2] \set Staff.instrumentName = \markup { @@ -1000,7 +894,7 @@ in @ref{Modifying context plug-ins}. @cindex instrument names, changing -Instrument names may be changed in the middle of a piece, +Instrument names may be changed in the middle of a piece: @lilypond[verbatim,quote,relative=1] \set Staff.instrumentName = "First" @@ -1161,7 +1055,7 @@ written entirely in lower-case letters: @code{\addquote}. @cindex cue notes @cindex cue notes, formatting @cindex fragments -@cindex quoting other voices +@cindex quoting other voices @cindex cues, formatting The previous section deals with inserting notes from another diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index 45b7f6468d..702ca59a16 100644 --- a/Documentation/user/templates.itely +++ b/Documentation/user/templates.itely @@ -1,5 +1,5 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c This file is part of lilypond.tely +@c This file is part of lilypond-learning.tely @ignore Translation of GIT committish: FILL-IN-HEAD-COMMITTISH diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index b1b4a12f03..43f4e94227 100644 --- a/Documentation/user/text.itely +++ b/Documentation/user/text.itely @@ -180,8 +180,13 @@ Internals Reference: @rinternals{TextSpanner}. Various text elements can be added to a score using the syntax described in @ref{Rehearsal marks}: +@c \mark needs to be placed on a separate line (it's not +@c attached to an object like \markup is). -vv + @lilypond[verbatim,quote,ragged-right,fragment,relative=2] -c4\mark "Allegro" c c c +c4 +\mark "Allegro" +c c c @end lilypond This syntax makes it possible to put any text on a bar line; @@ -191,7 +196,8 @@ signs like coda, segno or fermata, by specifying the appropriate symbol name: @lilypond[fragment,quote,ragged-right,verbatim,relative=2] -c1 \mark \markup { \musicglyph #"scripts.ufermata" } +c1 +\mark \markup { \musicglyph #"scripts.ufermata" } c1 @end lilypond @@ -203,9 +209,10 @@ beginning of a score or at a line break, marks will be printed at the beginning of the line (the next line, in case of a line break). @lilypond[fragment,quote,ragged-right,verbatim,relative=2] -\mark "Allegro" c1 -c\mark "assai" \break -c c +\mark "Allegro" +c1 c +\mark "assai" \break +c c @end lilypond @@ -314,7 +321,7 @@ using the @code{\markup} mode specific syntax. @menu * Text markup introduction:: -* Common markup commands:: +* Selecting font and font size:: * Text alignment:: * Graphic notation inside markup:: * Music notation inside markup:: @@ -362,9 +369,9 @@ c @cindex quoted text in markup mode A @code{\markup} block may also contain quoted text, which -can be useful to print special characters (such as @code{\} and @code{#}). -Quoted text even allows to print double quotation marks, by preceding -them with backslashes: +can be useful to print special characters such as @code{\} and @code{#}, +or even double quotation marks -- these have to be preceded +with backslashes: @lilypond[quote,verbatim,fragment,relative=1] \clef bass @@ -385,9 +392,9 @@ c1^\markup { \line { a b c } } @end lilypond Lists of words that are not enclosed with double quotes -or preceded by a command are not kept distinct. In -the following example, the first two @code{\markup} expressions -are equivalent: +or preceded by a command are not treated as a distinct +expression. In the following example, the first two +@code{\markup} expressions are equivalent: @lilypond[quote,verbatim,fragment,relative=1] c1^\markup { \center-align { a bbb c } } @@ -428,20 +435,18 @@ Init files: @file{scm/@/new@/-markup@/.scm}. @knownissues -Syntax errors for markup mode are confusing. - +Syntax errors for markup mode can be confusing. -@node Common markup commands -@subsubsection Common markup commands -Markup text may be formatted in different ways. +@node Selecting font and font size +@subsubsection Selecting font and font size @cindex font switching @funindex \italic @funindex \bold @funindex \underline -Basic font switching is supported: +Basic font switching is supported in markup mode: @lilypond[quote,verbatim,relative=2] { @@ -472,7 +477,7 @@ the font size can be defined to an absolute value, predefined commands allow to easily select standard sizes, @item -other commands allow to change the size relatively to its previous value. +the font size can also be changed relatively to its previous value. @end itemize @noindent @@ -513,10 +518,13 @@ these are printed in a smaller size, but a normal size can be used as well: } @end lilypond +@cindex font families + The markup mode provides an easy way to select alternate -font families. The default serif font, of roman type, is automatically -selected unless specified otherwise: on the last line of the following example, -there is no difference between the first word and the following words. +font families. The default serif font, of roman type, is +automatically selected unless specified otherwise: on the +last line of the following example, there is no difference +between the first and the second word. @lilypond[quote,verbatim] \markup { @@ -524,7 +532,7 @@ there is no difference between the first word and the following words. \line { Act \number 1 } \line { \sans { Scene I. } } \line { \typewriter { Verona. An open place. } } - \line { \roman Enter Valentine and Proteus. } + \line { Enter \roman Valentine and Proteus. } } } @end lilypond @@ -535,11 +543,34 @@ such as numbers or dynamics, do not provide all characters, as mentioned in @ref{New dynamic marks} and @ref{Manual repeat marks}. +@c \concat is actually documented in Align (it is not +@c a font-switching command). But we need it here. -vv -Defining custom font sets is also possible, as explained in -@ref{Fonts}. An exhaustive list of font-switching, font-size +When used inside a word, some font-switching or formatting +commands may produce an unwanted blank space. This can +easily be solved by concatenating the text elements together: + +@lilypond[quote,verbatim] +\markup { + \column { + \line { + \concat { 1 \super st } + movement + } + \line { + \concat { \dynamic p , } + \italic { con dolce espressione } + } + } +} +@end lilypond + +An exhaustive list of font-switching, font-size and font-families related commands can be found in @ref{Font}. +Defining custom font sets is also possible, as explained in +@ref{Fonts}. + @predefined @funindex \teeny @@ -555,131 +586,209 @@ and font-families related commands can be found in @ref{Font}. @code{\large}, @code{\huge}. - @c TODO: add @seealso -@knownissues -When used inside a word, some of these commands may produce an unwanted -blank space. This can easily be solved by concatenating the text -elements together, using a specific command -described in @ref{Text alignment}. - - @node Text alignment @subsubsection Text alignment -@warning{This subsection discusses how to place text in markup mode, -inside a @code{\markup} block. However, markup objects can also -be moved as a whole using the syntax described in -@rlearning{Moving objects}.} +@cindex text, aligning +@cindex aligning text + +This subsection discusses how to place text in markup mode, +inside a @code{\markup} block. Markup objects can also +be moved as a whole, using the syntax described in +@rlearning{Moving objects}. + +@c The padding commands should be mentioned on this page, but +@c most of these require \box to be more clearly illustrated. -vv -Markup objects can be aligned in different ways. By default, +@cindex text, horizontal alignment +@cindex horizontal text alignment +@funindex \left-align +@funindex \hcenter +@funindex \right-align + +Markup objects may be aligned in different ways. By default, a text indication is aligned on its left edge: in the following -example, there's no difference between the first and the second -markup. +example, there's no difference +between the first and the second markup. @lilypond[quote,verbatim,fragment,relative=1] a1-\markup { poco } e' a,-\markup { \left-align poco } e' -a,-\markup { \center-align { poco } } +a,-\markup { \hcenter { poco } } e' a,-\markup { \right-align poco } @end lilypond -@c FIXME: \center-align actually doesn't belong here -@c \center-align vs \column -@c \center-align vs \hcenter - -Horizontal alignment: -\hcenter -\general-align -\halign - - -\null -\hspace +@funindex \halign -\lower -\raise -\translate -\translate-scaled -\rotate -\transparent -\whiteout - -Vertical alignment: -\vcenter -\column -\dir-column - -Building a "large" markup: - -\line - -\fill-line - -\hcenter-in - -\pad-around -\pad-markup -\pad-to-box -\pad-x - -Alignment inside a "large" markup: - -\justify-field -\justify -\justify-string - -\wordwrap-field -\wordwrap -\wordwrap-string +The horizontal alignment may be fine-tuned +using a numeric value: +@lilypond[quote,verbatim,fragment,relative=1] +a1-\markup { \halign #-1 poco } +e' +a,-\markup { \halign #0 poco } +e' +a,-\markup { \halign #0.5 poco } +e' +a,-\markup { \halign #2 poco } +@end lilypond -@ignore -TODO: here are some commands that could be described here. -I'm putting them in bulk, prior to working on this section. -vv +@noindent +Some objects may have alignment procedures of their own, +and therefore are not affected by these commands. It is +possible to move such markup objects as a whole, as shown +for instance in @ref{Text marks}, + +@cindex text, vertical alignment +@cindex vertical text alignment +@funindex \raise +@funindex \lower + +Vertical alignment is a bit more complex. As stated above, +markup objects can be moved as a whole; however, it is also +possible to move specific elements inside a markup block. +In this case, the element to be moved needs to be preceded +with an @emph{anchor point}, that can be another markup element +or an invisible object. The following example demonstrates these +two possibilities; the last markup in this example has no anchor +point, and therefore is not moved. -\simple +@lilypond[quote,verbatim,fragment,relative=1] +d2^\markup { + Acte I + \raise #2 { Scène 1 } } +a' +g_\markup { + \null + \lower #4 \bold { Très modéré } } +a +d,^\markup { + \raise #4 \italic { Une forêt. } } +a'4 a g2 a +@end lilypond -\char -\fraction +@funindex \general-align +@funindex \translate +@funindex \translate-scaled -\combine -\concat -\put-adjacent +Some commands can affect both the horizontal and vertical +alignment of text objects in markup mode. Any object +affected by these commands must be preceded with an +anchor point: +@lilypond[quote,verbatim,fragment,relative=1] +d2^\markup { + Acte I + \translate #'(-1 . 2) "Scène 1" } +a' +g_\markup { + \null + \general-align #Y #3.2 \bold "Très modéré" } +a +d,^\markup { + \null + \translate-scaled #'(-1 . 2) \teeny "Une forêt." } +a'4 a g2 a +@end lilypond -\page-ref (see also "Table of contents") -\fromproperty -\verbatim-file -\with-url +@cindex multi-line markup +@cindex multi-line text +@cindex columns, text -\on-the-fly -\override +A markup object may include several lines of text. +In the following example, each element or expression +is placed on its own line, either left-aligned or centered: +@lilypond[quote,verbatim] +\markup { + \column { + a + "b c" + \line { d e f } + } + \hspace #10 + \center-align { + a + "b c" + \line { d e f } + } +} +@end lilypond +Similarly, a list of elements or expressions may be +spread to fill the entire horizontal line width -- if there +is only one element, it will be centered on the page. +These expressions can, in turn, include multi-line text +or any other markup expression: -@end ignore +@lilypond[quote,verbatim] +\markup { + \fill-line { + \line { William S. Gilbert } + \center-align { + \huge \smallCaps "The Mikado" + or + \smallCaps "The Town of Titipu" + } + \line { Sir Arthur Sullivan } + } +} +\markup { + \fill-line { 1885 } +} +@end lilypond +Long text indications can also be automatically wrapped +accordingly to the given line width. These will be +either left-aligned or justified, as shown in +the following example. -Some objects have alignment procedures of their own, which cancel -out any effects of alignments applied to their markup arguments as -a whole. For example, the @rinternals{RehearsalMark} is -horizontally centered, so using @code{\mark \markup @{ \left-align -.. @}} has no effect. +@lilypond[quote,verbatim] +\markup { + \column { + \line \smallCaps { La vida breve } + \line \bold { Acto I } + \wordwrap \italic { + (La escena representa el corral de una casa de + gitanos en el Albaicín de Granada. Al fondo una + puerta por la que se vé el negro interior de + una Fragua, iluminado por los rojos resplandores + del fuego.) + } + \hspace #0 + + \line \bold { Acto II } + \override #'(line-width . 50) + \justify \italic { + (Calle de Granada. Fachada de la casa de Carmela + y su hermano Manuel con grandes ventanas abiertas + a través de las que se ve el patio + donde se celebra una alegre fiesta) + } + } +} +@end lilypond +An exhaustive list of text alignment commands +can be found in @ref{Align}. +@c TODO: add @seealso @node Graphic notation inside markup @subsubsection Graphic notation inside markup + Graphics around text: \box \circle +(TODO: document padding commands here) + \bracket \hbracket diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 4e1d289d40..0ad6e8f903 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1500,7 +1500,7 @@ example from Handel's @notation{Judas Maccabæus}: @end lilypond Scores any more complex than this simple example are better -produced by separating out the staff structure from the notes and +produced by separating out the score structure from the notes and lyrics with variables. These are discussed in @ref{Organizing pieces with variables}. @@ -1625,7 +1625,7 @@ By convention, this is placed at the top of your LilyPond file. These annotations make future upgrades of LilyPond go more smoothly. Changes in the syntax are handled with a special -program, @file{convert-ly}, and it uses @code{\version} to +program, @command{convert-ly}, and it uses @code{\version} to determine what rules to apply. For details, see @rprogram{Updating files with convert-ly}. @@ -1636,7 +1636,7 @@ determine what rules to apply. For details, see The title, composer, opus number, and similar information are entered in the @code{\header} block. This exists outside of the main music expression; the @code{\header} block is usually placed -underneath the @ref{Version number}. +underneath the version number. @example \version @w{"@version{}"} @@ -1749,6 +1749,13 @@ Manual assumes that you are familiar with LilyPond input. You may wish to skim these chapters right now, and come back to them after you have more experience. +In this tutorial and in the rest of the Learning Manual, there is a +paragraph @strong{See also} at the end of each section, which contains +cross-references to other sections: you should not follow these +cross-references at first reading; when you have read all of the +Learning Manual, you may want to read some sections again and follow +cross-references for further reading. + If you have not done so already, @emph{please} read @ref{About the documentation}. There is a lot of information about LilyPond, so newcomers often do not know where they should look for help. If diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely index 8d8925bd89..8094700d47 100644 --- a/Documentation/user/tweaks.itely +++ b/Documentation/user/tweaks.itely @@ -124,15 +124,15 @@ We met some object naming conventions previously, in @ref{Contexts and engravers}. Here for reference is a list of the most common object and property types together with the conventions for naming them and a couple of examples of -some real names. We have used A to stand for any capitalized -alphabetic character and aaa to stand for any number of +some real names. We have used @q{A} to stand for any capitalized +alphabetic character and @q{aaa} to stand for any number of lower-case alphabetic characters. Other characters are used verbatim. @multitable @columnfractions .33 .33 .33 @headitem Object/property type @tab Naming convention - @tab Example + @tab Examples @item Contexts @tab Aaaa or AaaaAaaaAaaa @tab Staff, GrandStaff @@ -170,7 +170,7 @@ properties. We have already met the commands @code{\set} and @code{\with}, used to change the properties of @strong{contexts} and to remove and add @strong{engravers}, in -@ref{Modifying context properties} and @ref{Adding +@ref{Modifying context properties}, and @ref{Adding and removing engravers}. We now must meet some more important commands. @@ -185,17 +185,16 @@ how this is done. The general syntax of this command is: @example -\override @emph{context}.@emph{layout_object} - #'@emph{layout_property} = #@emph{value} +\override @var{Context}.@var{LayoutObject} #'@var{layout-property} = #@var{value} @end example @noindent -This will set the property with the name @emph{layout_property} +This will set the property with the name @var{layout-property} of the layout object with the name -@emph{layout_object}, which is a member of the @emph{context} -context, to the value @emph{value}. +@var{LayoutObject}, which is a member of the @var{Context} +context, to the value @var{value}. -The @emph{context} can be omitted (and usually is) when the +The @var{Context} can be omitted (and usually is) when the required context is unambiguously implied and is one of lowest level contexts, i.e., @code{Voice}, @code{ChordNames} or @code{Lyrics}, and we shall omit it in many of the following @@ -235,11 +234,11 @@ value; note, not its previous value if several @code{\override} commands have been issued. @example -\revert @emph{context}.@emph{layout_object} #'@emph{layout_property} +\revert @var{Context}.@var{LayoutObject} #'@var{layout-property} @end example -Again, just like @emph{context} in the @code{\override} command, -@emph{context} is often not needed. It will be omitted +Again, just like @var{Context} in the @code{\override} command, +@var{Context} is often not needed. It will be omitted in many of the following examples. Here we revert the color of the note head to the default value for the final two notes: @@ -294,7 +293,7 @@ within a chord, whereas @code{\tweak} affects just the following item in the input stream. Here's an example. Suppose we wish to change the size of the -middle note (the E) in a C major chord. Let's first see what +middle note head (the E) in a C major chord. Let's first see what @code{\once \override} would do: @lilypond[quote,fragment,ragged-right,verbatim,relative=1] @@ -304,7 +303,7 @@ middle note (the E) in a C major chord. Let's first see what @end lilypond -We see the override affects @emph{all} the notes in the chord. +We see the override affects @emph{all} the note heads in the chord. This is because all the notes of a chord occur at the same @emph{musical moment}, and the action of @code{\once} is to apply the override to all layout objects of the type specified @@ -314,9 +313,9 @@ command itself. The @code{\tweak} command operates in a different way. It acts on the immediately following item in the input stream. However, it is effective only on objects which are created directly from -the input stream, essentially note heads and articulations. -(Objects such as stems and accidentals are created later and -cannot be tweaked in this way). Furthermore, when it is applied +the input stream, essentially note heads and articulations; +objects such as stems and accidentals are created later and +cannot be tweaked in this way. Furthermore, when it is applied to note heads these @emph{must} be within a chord, i.e., within single angle brackets, so to tweak a single note the @code{\tweak} command must be placed inside single angle brackets with the @@ -335,10 +334,10 @@ of the @code{\override} command. Neither the context nor the layout object should be specified; in fact, it would generate an error to do so. These are both implied by the following item in the input stream. So the general syntax of the -@code{\tweak} command is simply: +@code{\tweak} command is simply @example -\tweak #'@emph{layout_property} = #@emph{value} +\tweak #'@var{layout-property} = #@var{value} @end example A @code{\tweak} command can also be used to modify just one in @@ -350,6 +349,7 @@ a ^Black -\tweak #'color #green _Green @end lilypond +@noindent Note that the @code{\tweak} command must be preceded by an articulation mark as if it were an articulation itself. @@ -381,10 +381,7 @@ printed in red on the first short tuplet bracket. } @end lilypond -You can find more details of the @code{\tweak} command in -@ruser{Objects connected to the input}. - -If nested tuplets do not begin at the same moment their +If nested tuplets do not begin at the same moment, their appearance may be modified in the usual way with @code{\override} commands: @@ -403,6 +400,11 @@ appearance may be modified in the usual way with } @end lilypond +@seealso + +Notation Reference: +@ruser{The tweak command}. + @node The Internals Reference manual @section The Internals Reference manual @@ -449,7 +451,7 @@ yourself with just a little practice. Let's use a concrete example with a simple fragment of real music: -@lilypond[quote,fragment,ragged-right,verbatim,relative=2] +@lilypond[quote,verbatim,relative=2] { \time 6/8 { @@ -472,7 +474,7 @@ this we must look in the Internals Reference, or IR for short. The IR for the version of LilyPond you are using may be found on the LilyPond website at @uref{http://lilypond.org}. Go to the documentation page and click on the Internals Reference link. -For learning purposes you should use the standard html version, +For learning purposes you should use the standard HTML version, not the @q{one big page} or the PDF. For the next few paragraphs to make sense you will need to actually do this as you read. @@ -485,18 +487,17 @@ The page that appears lists all the layout objects used in your version of LilyPond, in alphabetic order. Select the link to Slur, and the properties of Slurs are listed. -(An alternative way of finding this page is from the Notation -Reference. On one of the pages that deals with slurs you may -find a link to the Internals Reference. This link will -take you directly to this page, but often it is easier to go -straight to the IR and search there.) +An alternative way of finding this page is from the Notation +Reference. On one of the pages that deals with slurs you may find a +link to the Internals Reference. This link will take you directly to +this page, but if you have an idea about the name of the layout object +to be tweaked, it is easier to go straight to the IR and search there. -This Slur page in the IR tells us first that Slur objects are -created by the -Slur_engraver. Then it lists the standard settings. Note -these are @strong{not} in alphabetic order. Browse down -them looking for a property that might control the heaviness -of slurs, and you should find +This Slur page in the IR tells us first that Slur objects are created +by the Slur_engraver. Then it lists the standard settings. Note +these are @strong{not} in alphabetic order. Browse down them looking +for a property that might control the heaviness of slurs, and you +should find @example @code{thickness} (number) @@ -533,7 +534,7 @@ placed?} While you are unsure and learning, the best answer is, @q{Within the music, before the first slur and close to it.} Let's do that: -@lilypond[quote,fragment,ragged-right,verbatim,relative=2] +@lilypond[quote,verbatim,relative=2] { \time 6/8 { @@ -597,7 +598,7 @@ is encountered, it is simply discarded. So the command with @code{\once} must be repositioned as follows: -@lilypond[quote,fragment,ragged-right,verbatim,relative=2] +@lilypond[quote,verbatim,relative=2] { \time 6/8 { @@ -631,7 +632,7 @@ heavier? Well, we could use two commands, each preceded by @code{\once} placed immediately before each of the notes where the slurs begin: -@lilypond[quote,fragment,ragged-right,verbatim,relative=2] +@lilypond[quote,verbatim,relative=2] { \time 6/8 { @@ -656,7 +657,7 @@ or we could omit the @code{\once} command and use the to return the @code{thickness} property to its default value after the second slur: -@lilypond[quote,fragment,ragged-right,verbatim,relative=2] +@lilypond[quote,verbatim,relative=2] { \time 6/8 { @@ -688,6 +689,7 @@ additional features of the IR, and partly to give you more practice in extracting information from it. These examples will contain progressively fewer words of guidance and explanation. + @node Properties found in interfaces @subsection Properties found in interfaces @@ -1006,8 +1008,8 @@ We see from the properties specified in the @code{grob-interface} page in the IR that the @code{transparent} property is a boolean. This should be set to @code{#t} to make the grob transparent. -In this next example let us make the time signature invisible -rather than the bar lines. +In this next example let us make the time signature invisible +rather than the bar lines. To do this we need to find the grob name for the time signature. Back to the @q{All layout objects} page in the IR to find the properties @@ -1028,10 +1030,10 @@ transparent is: @end lilypond @noindent -The time signature is gone, but this command leaves a gap where +The time signature is gone, but this command leaves a gap where the time signature should be. Maybe this is what is wanted for -an exercise for the student to fill it in, but in other -circumstances a gap might be undesirable. To remove it, the +an exercise for the student to fill it in, but in other +circumstances a gap might be undesirable. To remove it, the stencil for the time signature should be set to @code{#f} instead: @@ -1053,8 +1055,16 @@ leaves it where it is, but makes it invisible. @subheading color @cindex color property -Finally we could make the bar lines invisible by coloring -them white. The @code{grob-interface} specifies that the +Finally let us try making the bar lines invisible by coloring +them white. (There is a difficulty with this in that the +white bar line may or may not blank out the staff lines where +they cross. You may see in some of the examples below that this +happens unpredictably. The details of why this is so and how to +control it are covered in @ruser{Painting objects white}. But at +the moment we are learning about color, so please just accept this +limitation for now.) + +The @code{grob-interface} specifies that the color property value is a list, but there is no explanation of what that list should be. The list it requires is actually a list of values in internal units, @@ -1080,7 +1090,7 @@ and again, we see the bar lines are not visible. Note that a symbol, but a @emph{function}. When called, it provides the list of internal values required to set the color to white. The other colors in the normal list are functions -too. To convince yourself this is working you might like +too. To convince yourself this is working you might like to change the color to one of the other functions in the list. @@ -1113,7 +1123,7 @@ an apostrophe and the two enclosed in brackets. There is yet a third function, one which converts RGB values into internal colors -- the @code{rgb-color} function. This takes -three arguments giving the intensities of the red, green and +three arguments giving the intensities of the red, green and blue colors. These take values in the range 0 to 1. So to set the color to red the value should be @code{(rgb-color 1 0 0)} and to white it should be @code{(rgb-color 1 1 1)}: diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely index deb747afc0..dfc2352241 100644 --- a/Documentation/user/vocal.itely +++ b/Documentation/user/vocal.itely @@ -51,21 +51,31 @@ lyrics extender in this section. @end ignore -Since LilyPond input files are text, there are two issues to -consider when working with vocal music: +Since LilyPond input files are text, there are two issues to consider +when working with vocal music: @itemize @item -Song texts must be entered as text, not notes. For example, the -input@tie{}@code{d} should be interpreted as a one letter syllable, not the -note@tie{}D. +Song texts must be interpreted as text, not notes. For example, the +input@tie{}@code{d} should be interpreted as a one letter syllable, +not the note@tie{}D. @item Song texts must be aligned with the notes of their melody. @end itemize -There are a few different ways to define lyrics; we shall begin -by examining the simplest method, and gradually increase complexity. +To address the first issue, the fundamental method is the special mode +opened by @code{\lyricmode} that interprets its contents as text. +This mode is implicit by some abbreviated methods, as we will see. + +Aligning of text with melodies can be made automatically, but if you +specify the durations of the syllables it can also be made manually. +Lyrics aligning and typesetting are prepared with the help of skips, +hyphens and extender lines. + +All these methods and their combinations lead to a few different ways +to define lyrics; we shall begin by examining the simplest method, and +gradually increase complexity. @menu * Common notation for vocals:: @@ -74,28 +84,6 @@ by examining the simplest method, and gradually increase complexity. * Stanzas:: @end menu -@snippets - -Checking to make sure that text scripts and lyrics are within the margins is -a relatively large computational task. To speed up processing, LilyPond does -not perform such calculations by default; to enable it, use - -@example -\override Score.PaperColumn #'keep-inside-line = ##t -@end example - -To make lyrics avoid bar lines as well, use - -@example -\layout @{ - \context @{ - \Lyrics - \consists "Bar_engraver" - \consists "Separating_line_group_engraver" - \override BarLine #'transparent = ##t - @} -@} -@end example @node Common notation for vocals @subsection Common notation for vocals @@ -458,8 +446,14 @@ The following example uses different commands for entering lyrics. \time 2/4 c4 b8. a16 g4. f8 e4 d c2 } + +% not recommended: left aligns syllables \new Lyrics \lyricmode { Joy4 to8. the16 world!4. the8 Lord4 is come.2 } + +% wrong: durations needed \new Lyrics \lyricmode { Joy to the earth! the Sa -- viour reigns. } + +%correct \new Lyrics \lyricsto "one" { No more let sins and sor -- rows grow. } >> @end lilypond @@ -574,7 +568,7 @@ single syllable; such vocalises are called melismas, or melismata. @c it might be better to present it first - vv You can define melismata entirely in the lyrics, by entering @code{_} -for every note that is part of the melisma. +for every extra note that has to be added to the the melisma. @c verbose! --FV @c duplicated: TODO fix @@ -585,6 +579,7 @@ that are used for this purpose (all of them surrounded by spaces): double hyphens to separate syllables in a word, underscores to add notes to a melisma, and a double underscore to put an extender line. +@c wrong: extender line only on last syllable of a word. Change example @lilypond[relative=1,verbatim,fragment,quote] { \set melismaBusyProperties = #'() c d( e) f f( e) e e } @@ -640,9 +635,6 @@ A complete example of a SATB score setup is in section @seealso -Internals Reference: -@rinternals{Melisma_translator}. - @c @lsr{vocal,lyric@/-combine.ly}. @knownissues @@ -675,10 +667,11 @@ For example, @cindex extender @c leave this as samp. -gp -Melismata are sometimes indicated with a long horizontal line starting -in the melisma syllable, and ending in the next one. Such a line is -called an extender line, and it is entered as @samp{ __ } (note the -spaces before and after the two underscore characters). +In the last syllable of a word, melismata are sometimes indicated with +a long horizontal line starting in the melisma syllable, and ending in +the next one. Such a line is called an extender line, and it is +entered as @samp{ __ } (note the spaces before and after the two +underscore characters). @warning{Melismata are indicated in the score with extender lines, which are entered as one double underscore; but short melismata can @@ -870,6 +863,30 @@ layout. @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] {aligning-lyrics.ly} + +@snippets + +Checking to make sure that text scripts and lyrics are within the margins is +a relatively large computational task. To speed up processing, LilyPond does +not perform such calculations by default; to enable it, use + +@example +\override Score.PaperColumn #'keep-inside-line = ##t +@end example + +To make lyrics avoid bar lines as well, use + +@example +\layout @{ + \context @{ + \Lyrics + \consists "Bar_engraver" + \consists "Separating_line_group_engraver" + \override BarLine #'transparent = ##t + @} +@} +@end example + @c TODO Create and add lsr example of lyricMelismaAlignment @c It's used like this to center-align all lyric syllables, @c even when notes are tied. -td @@ -881,6 +898,7 @@ layout. } @end ignore + @node Centering lyrics between staves @subsubsection Centering lyrics between staves @@ -1108,10 +1126,10 @@ This is achieved with Here, @code{alternative} is the name of the @code{Voice} context containing the triplet. -This command command must be one syllable too early, before @q{Ty} in -this case. In other words, changing the associatedVoice happens one -step later than expected. This is for technical reasons, and it is -not a bug. +This command must be one syllable too early, before @q{Ty} in this +case. In other words, changing the associatedVoice happens one step +later than expected. This is for technical reasons, and it is not a +bug. @example \new Lyrics \lyricsto "lahlah" @{ @@ -1247,8 +1265,7 @@ text = \lyricmode { Internals Reference: @rinternals{LyricText}, -@rinternals{StanzaNumber}, -@rinternals{VocalName}. +@rinternals{StanzaNumber}. diff --git a/Documentation/user/wind.itely b/Documentation/user/wind.itely index a754aaca31..9c9e483d0b 100644 --- a/Documentation/user/wind.itely +++ b/Documentation/user/wind.itely @@ -11,7 +11,10 @@ @node Wind instruments @section Wind instruments -This section includes extra information for writing for bagpipes. +@lilypondfile[quote]{wind-headword.ly} + +This section includes some elements of music notation that arise when +writing for winds. @menu * Common notation for wind instruments:: @@ -21,32 +24,111 @@ This section includes extra information for writing for bagpipes. @node Common notation for wind instruments @subsection Common notation for wind instruments +This section discusses some issues common to most wind instruments. + @menu * References for wind instruments:: -* Half-holes:: +* Fingerings:: @end menu @node References for wind instruments -@subsubsection References for wind instruments +@unnumberedsubsubsec References for wind instruments + +@cindex wind instruments + +Many notation issues for wind instruments pertain to breathing and +tonguing: + +@itemize +@item Breathing can be specified by rests or @ref{Breath marks}. +@item Legato playing is indicated by @ref{Slurs}. +@item Different types of tonguings, ranging from legato to non-legato to +stacatto are usually shown by articulation marks, sometimes combined +with slurs, see @ref{Articulations and ornamentations} and @ref{List of +articulations}. +@item Flutter tonguing is usually indicated by placing a tremolo mark +and a text markup on the note. See @ref{Tremolo repeats}. +@end itemize + +There are also other aspects of musical notation that can apply to wind +instruments: + +@itemize +@item Many wind instruments are transposing intruments, see +@ref{Instrument transpositions}. +@item The slide glissando are characteristic of the trombone, but other +winds may perform keyed or valved glissandi. See @ref{Glissando}. +@item Harmonic series glissandi, which are possible on all brass +instruments but common for French Horns, are usually written out as +@ref{Grace notes}. +@item Pitch inflections at the end of a note are discussed in @ref{Falls +and doits}. +@item Key slaps or valve slaps are often shown by the @code{cross} style +of @ref{Special note heads}. +@item Woodwinds can overblow low notes to sound harmonics. These are +shown by the @code{flageolet} articulation. See @ref{List of articulations}. +@item The use of brass mutes is usually indicated by a text markup, but +where there are many rapid changes it is better to use the +@code{stopped} and @code{open} articulations. See @ref{Articulations and +ornamentations} and @ref{List of articulations}. +@item Stopped horns are indicated by the @code{stopped} articulation. +See @ref{Articulations and ornamentations}. +@end itemize + +@snippets + +@lilypondfile[verbatim,lilyquote,texidoc,doctitle] +{changing--flageolet-mark-size.ly} + +@seealso + +Notation Reference: +@ref{Breath marks}, +@ref{Slurs}, +@ref{Articulations and ornamentations}, +@ref{List of articulations}, +@ref{Tremolo repeats}, +@ref{Instrument transpositions}, +@ref{Glissando}, +@ref{Grace notes}, +@ref{Falls and doits}, +@ref{Special note heads}, + +Snippets: +@rlsr{Winds} + + +@node Fingerings +@unnumberedsubsubsec Fingerings +@c TODO add link to LSR snippet by Libero Mureddo once he has added +@c it (after August 15th). +All wind instruments other than the trombone require the use of several +fingers to produce each pitch. -@c TODO Add refs -TBC - -@node Half-holes -@subsubsection Half-holes -@c TODO Add text; search -user TBC @node Bagpipes @subsection Bagpipes +This section includes extra information for writing for bagpipes. + @menu * Bagpipe definitions:: * Bagpipe example:: @end menu @node Bagpipe definitions -@subsubsection Bagpipe definitions +@unnumberedsubsubsec Bagpipe definitions + +@cindex bagpipe +@cindex Scottish highland bagpipe +@cindex grace notes +@funindex \taor +@funindex taor +@funindex \hideKeySignature +@funindex hideKeySignature +@funindex \showKeySignature +@funindex showKeySignature LilyPond contains special definitions for music for the Scottish highland bagpipe; to use them, add @@ -85,9 +167,14 @@ This can be indicated by @code{cflat} or @code{fflat}. Similarly, the piobaireachd high g can be written @code{gflat} when it occurs in light music. +@seealso +@rlsr{Winds} @node Bagpipe example -@subsubsection Bagpipe example +@unnumberedsubsubsec Bagpipe example + +@cindex bagpipe example +@cindex Amazing Grace bagpipe example This is what the well known tune Amazing Grace looks like in bagpipe notation. @@ -129,7 +216,5 @@ notation. } @end lilypond - - - - +@seealso +@rlsr{Winds} diff --git a/Documentation/user/world.itely b/Documentation/user/world.itely index 9490c227bf..6538ad949c 100644 --- a/Documentation/user/world.itely +++ b/Documentation/user/world.itely @@ -276,8 +276,7 @@ beat, but in a manner that is difficult to match by adjusting automatic beaming. You can override this by switching off automatic beaming and beaming the notes manually. Where matching existing typeset music is not an issue, you may still want to -adjust the beaming behaviour and/or using compound time -signatures. +adjust the beaming behaviour and/or use compound time signatures. @snippets diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index 34ada97aac..f063132132 100644 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@ -13,12 +13,15 @@ import langdefs # 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', 'out-www/examples', 'Documentation/topdocs', 'Documentation/bibliography', 'Documentation/out-www/THANKS', 'Documentation/out-www/DEDICATION', + 'Documentation/out-www/devel', 'input/'] def _doc (s): @@ -253,7 +256,7 @@ def add_html_footer (package_name = '', translation = langdefs.translation localtime = time.strftime ('%c %Z', time.localtime (time.time ())) - if re.search ("http://", mail_address): + if "http://" in mail_address: mail_address_url = mail_address else: mail_address_url= 'mailto:' + mail_address @@ -263,6 +266,23 @@ def add_html_footer (package_name = '', if int (versiontup[1]) % 2: branch_str = _doc ('development-branch') + # Initialize dictionaries for string formatting + subst = {} + subst[''] = dict ([i for i in globals ().items() if type (i[1]) is str]) + subst[''].update (dict ([i for i in locals ().items() if type (i[1]) is str])) + for l in translation: + e = langdefs.LANGDICT[l].webext + if e: + subst[e] = {} + for name in subst['']: + subst[e][name] = translation[l] (subst[''][name]) + # Do deeper string formatting as early as possible, + # so only one '%' formatting pass is needed later + for e in subst: + subst[e]['footer_name_version'] = subst[e]['footer_name_version'] % subst[e] + subst[e]['footer_report_errors'] = subst[e]['footer_report_errors'] % subst[e] + subst[e]['footer_suggest_docs'] = subst[e]['footer_suggest_docs'] % subst[e] + for prefix, ext_list in pages_dict.items (): for lang_ext in ext_list: file_name = langdefs.lang_file_name (prefix, lang_ext, '.html') @@ -282,16 +302,8 @@ def add_html_footer (package_name = '', page_flavors = process_links (s, prefix, lang_ext, file_name, missing, target) # Add menu after stripping: must not have autoselection for language menu. page_flavors = add_menu (page_flavors, prefix, available, target, translation) - subst = dict ([i for i in globals().items() if type (i[1]) is str]) - subst.update (dict ([i for i in locals().items() if type (i[1]) is str])) for k in page_flavors: - if page_flavors[k][0] in translation: - for name in subst: - subst[name] = translation[page_flavors[k][0]] (subst[name]) - subst['footer_name_version'] = subst['footer_name_version'] % subst - subst['footer_report_errors'] = subst['footer_report_errors'] % subst - subst['footer_suggest_docs'] = subst['footer_suggest_docs'] % subst - page_flavors[k][1] = page_flavors[k][1] % subst + page_flavors[k][1] = page_flavors[k][1] % subst[page_flavors[k][0]] out_f = open (name_filter (k), 'w') out_f.write (page_flavors[k][1]) out_f.close() diff --git a/buildscripts/check_texi_refs.py b/buildscripts/check_texi_refs.py index 94bd6ecb64..4df33e68e7 100755 --- a/buildscripts/check_texi_refs.py +++ b/buildscripts/check_texi_refs.py @@ -143,8 +143,10 @@ else: return None -ref_re = re.compile (r'@(ref|ruser|rlearning|rprogram|rglos)\{([^,\\]*?)\}(.)', - re.DOTALL) +ref_re = re.compile \ + ('@(ref|ruser|rlearning|rprogram|rglos)(?:\\{(?P[^,\\\\\\}]+?)|\ +named\\{(?P[^,\\\\]+?),(?P[^,\\\\\\}]+?))\\}(?P.)', + re.DOTALL) node_include_re = re.compile (r'(?m)^@(node|include)\s+(.+?)$') whitespace_re = re.compile (r'\s+') @@ -327,18 +329,24 @@ in the list)\n") t -= 1 raise InteractionError ("%d retries limit exceeded" % retries) +refs_count = 0 def check_ref (manual, file, m): - global fixes_count, bad_refs_count + global fixes_count, bad_refs_count, refs_count + refs_count += 1 bad_ref = False fixed = True type = m.group (1) - original_name = m.group (2) + original_name = m.group ('ref') or m.group ('refname') name = whitespace_re.sub (' ', original_name). strip () newline_indices = manuals[manual]['newline_indices'][file] line = which_line (m.start (), newline_indices) - linebroken = '\n' in m.group (2) - next_char = m.group (3) + linebroken = '\n' in original_name + original_display_name = m.group ('display') + next_char = m.group ('last') + if original_display_name: # the xref has an explicit display name + display_linebroken = '\n' in original_display_name + display_name = whitespace_re.sub (' ', original_display_name). strip () commented_out = is_commented_out \ (m.start (), m.end (), manuals[manual]['comments_boundaries'][file]) useful_fix = not outdir in file @@ -433,7 +441,7 @@ and x-ref by index number or beginning of name:\n", [''.join ([i[0], ' ', i[1]]) fixed = True if not fixed: - # all previous automatic fixes attempts failed, + # all previous automatic fixing attempts failed, # ask user for substring to look in node names while True: node_list = search_prompt () @@ -466,11 +474,29 @@ please fix the code source instead of generated documentation.\n") # compute returned string if new_name == name: - return ('@%s{%s}' % (type, original_name)) + next_char + if bad_ref and (options.interactive or options.auto_fix): + # only the type of the ref was fixed + fixes_count += 1 + if original_display_name: + return ('@%snamed{%s,%s}' % (type, original_name, original_display_name)) + next_char + else: + return ('@%s{%s}' % (type, original_name)) + next_char else: fixes_count += 1 (ref, n) = preserve_linebreak (new_name, linebroken) - return ('@%s{%s}' % (type, ref)) + next_char + n + if original_display_name: + if bad_ref: + stdout.write ("Current display name is `%s'\n") + display_name = raw_input \ + ("Enter a new display name or press enter to keep the existing name:\n") \ + or display_name + (display_name, n) = preserve_linebreak (display_name, display_linebroken) + else: + display_name = original_display_name + return ('@%snamed{%s,%s}' % (type, ref, display_name)) + \ + next_char + n + else: + return ('@%s{%s}' % (type, ref)) + next_char + n log.write ("Checking cross-references...\n") @@ -489,5 +515,5 @@ except InteractionError, instance: log.write ("Operation refused by user: %s\nExiting.\n" % instance) sys.exit (3) -log.write ("Done: %d bad x-refs found, fixed %d.\n" % - (bad_refs_count, fixes_count)) +log.write ("Done: %d x-refs found, %d bad x-refs found, fixed %d.\n" % + (refs_count, bad_refs_count, fixes_count)) diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py index cece2be39b..844e2ef868 100644 --- a/buildscripts/texi-langutils.py +++ b/buildscripts/texi-langutils.py @@ -26,9 +26,9 @@ make_gettext = ('--gettext', '') in optlist # --gettext generate a node lis make_skeleton = ('--skeleton', '') in optlist # --skeleton extract the node tree from a Texinfo source output_file = 'doc.pot' -node_blurb = '''@ifhtml -UNTRANSLATED NODE: IGNORE ME -@end ifhtml + +# @untranslated should be defined as a macro in Texinfo source +node_blurb = '''@untranslated ''' doclang = '' head_committish = read_pipe ('git-rev-parse HEAD') @@ -57,7 +57,7 @@ for x in optlist: elif x[0] == '-l': # -l ISOLANG set documentlanguage to ISOLANG doclang = '; documentlanguage: ' + x[1] -texinfo_with_menus_re = re.compile (r"^(\*) +([^:\n]+)::.*?$|^@(include|menu|end menu|node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) *(.+?)$|@(rglos){(.+?)}", re.M) +texinfo_with_menus_re = re.compile (r"^(\*) +([^:\n]+)::.*?$|^@(include|menu|end menu|node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) *(.*?)$|@(rglos){(.+?)}", re.M) texinfo_re = re.compile (r"^@(include|node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) *(.+?)$|@(rglos){(.+?)}", re.M) @@ -104,19 +104,23 @@ def process_texi (texifilename, i_blurb, n_blurb, write_skeleton, topfile, outpu g.write ('* ' + item[1] + '::\n') elif output_file and item[4] == 'rglos': output_file.write ('_(r"' + item[5] + '") # @rglos in ' + printedfilename + '\n') + elif item[2] == 'menu': + g.write ('@menu\n') + elif item[2] == 'end menu': + g.write ('@end menu\n\n') else: g.write ('@' + item[2] + ' ' + item[3] + '\n') if node_trigger: g.write (n_blurb) node_trigger = False - if not item[2] in ('include', 'menu', 'end menu'): + elif item[2] == 'include': + includes.append (item[3]) + else: if output_file: output_file.write ('# @' + item[2] + ' in ' + \ printedfilename + '\n_(r"' + item[3].strip () + '")\n') if item[2] == 'node': node_trigger = True - elif item[2] == 'include': - includes.append (item[3]) g.write (end_blurb) g.close () diff --git a/buildscripts/translations-status.py b/buildscripts/translations-status.py index a3b6799f21..1c62ee56d2 100755 --- a/buildscripts/translations-status.py +++ b/buildscripts/translations-status.py @@ -50,7 +50,7 @@ checkers_re = re.compile (r'^@c\s+Translation\s*checkers\s*:\s*(.*?)$', re.M | re.I) status_re = re.compile (r'^@c\s+Translation\s*status\s*:\s*(.*?)$', re.M | re.I) post_gdp_re = re.compile ('post.GDP', re.I) -untranslated_node_str = 'UNTRANSLATED NODE: IGNORE ME' +untranslated_node_str = '@untranslated' skeleton_str = '-- SKELETON FILE --' section_titles_string = _doc ('Section titles') diff --git a/input/lsr/broken-crescendo-hairpin.ly b/input/lsr/broken-crescendo-hairpin.ly index 9e8edf5ccd..4f6180c112 100644 --- a/input/lsr/broken-crescendo-hairpin.ly +++ b/input/lsr/broken-crescendo-hairpin.ly @@ -50,7 +50,9 @@ draw the rectangle over the hairpin. \dynamicUp \override DynamicLineSpanner #'staff-padding = #4 r2 r16 c'8.\pp r4 - } \\ { + } + \\ + { \override DynamicLineSpanner #'layer = #0 des,2\mf\< ~ \override TextScript #'layer = #2 diff --git a/input/lsr/changing-partcombine-texts.ly b/input/lsr/changing-partcombine-texts.ly index f8c645982c..0b5af64503 100644 --- a/input/lsr/changing-partcombine-texts.ly +++ b/input/lsr/changing-partcombine-texts.ly @@ -5,6 +5,14 @@ \header { lsrtags = "simultaneous-notes" + texidoces = " +Al utilizar la posibilidad de combinación automática de partes, se +puede modificar el texto que se imprime para las secciones de solo +y de unísono: + +" + doctitlees = "Cambiar los textos de partcombine" + texidoc = " When using the automatic part combining feature, the printed text for the solo and unison sections may be changed: diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly index e9be018cfd..1ed784efce 100644 --- a/input/lsr/changing-the-breath-mark-symbol.ly +++ b/input/lsr/changing-the-breath-mark-symbol.ly @@ -23,7 +23,7 @@ text. } % begin verbatim \relative c'' { c2 - \override BreathingSign #'text = #(make-musicglyph-markup "scripts.rvarcomma") + \override BreathingSign #'text = \markup { \musicglyph #"scripts.rvarcomma" } \breathe d2 } diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly index 93fb0f05d6..873043409b 100644 --- a/input/lsr/combining-two-parts-on-the-same-staff.ly +++ b/input/lsr/combining-two-parts-on-the-same-staff.ly @@ -5,6 +5,27 @@ \header { lsrtags = "simultaneous-notes, text" + texidoces = " +La herramienta de combinación de partes ( instrucción +@code{\partcombine}) permite la combinación de varias partes +diferentes sobre el mismo pentagrama. Las indicaciones textuales +tales como \"solo\" o \"a2\" se añaden de forma predeterminada; +para quitarlas, sencillamente establezca la proopiedad +@code{printPartCombineTexts} al valor \"falso\". Para partituras +vocales (como himnos), no hay necesidad de añadir los textos +\"solo\" o \"a2\", por lo que se deben desactivar. Sin embargo, +podría ser mejor no usarlo si hay solos, porque éstos no se +indicarán. En tales casos podría ser preferible la notación +polifónica estándar. + +Este fragmento de código presenta las tres formas en que se pueden +imprimir dos partes sobre un solo pentagrama: polifonía estándar, +@code{\partcombine} sin textos, y @code{\partcombine} con +textos. + +" + doctitlees = "Combinar dos partes sobre el mismo pentagrama" + texidoc = " The part combiner tool ( @code{\\partcombine} command ) allows the combination of several different parts on the same staff. Text diff --git a/input/lsr/customizing-fretboard-fret-diagrams.ly b/input/lsr/customizing-fretboard-fret-diagrams.ly new file mode 100644 index 0000000000..30a3fb5882 --- /dev/null +++ b/input/lsr/customizing-fretboard-fret-diagrams.ly @@ -0,0 +1,67 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.55" + +\header { + lsrtags = "fretted-strings,tweaks-and-overrides" + + texidoc = "Fret diagram properties can be set through +@code{fret-diagram-details}. For FretBoard fret diagrams, +overrides are applied to the @code{FretBoards.FretBoard} object. +" + doctitle = "Customizing fretboard fret diagrams" +} % begin verbatim + +\include "predefined-guitar-fretboards.ly" +\storePredefinedDiagram \chordmode { c' } + #guitar-tuning + #"x;1-1-(;3-2;3-3;3-4;1-1-);" +<< + \context ChordNames { + \chordmode { c1 c c d } + } + \context FretBoards { + % Set global properties of fret diagram + \override FretBoards.FretBoard #'size = #'1.2 + \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'in-dot + \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'white + \chordmode { + c + \once \override FretBoards.FretBoard #'size = #'1.0 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'barre-type = #'straight + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'black + \once \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'below-string + c' + \once \override FretBoards.FretBoard #'fret-diagram-details + #'barre-type = #'none + \once \override FretBoards.FretBoard #'fret-diagram-details + #'number-type = #'arabic + \once \override FretBoards.FretBoard #'fret-diagram-details + #'orientation = #'landscape + \once \override FretBoards.FretBoard #'fret-diagram-details + #'mute-string = #"M" + \once \override FretBoards.FretBoard #'fret-diagram-details + #'label-dir = #-1 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'black + c' + \once \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'below-string + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-radius = #0.35 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-position = #0.5 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'fret-count = #3 + d + } + } + \context Voice { + c'1 c' c' d' + } +>> diff --git a/input/lsr/customizing-markup-fret-diagrams.ly b/input/lsr/customizing-markup-fret-diagrams.ly new file mode 100644 index 0000000000..23bbb82229 --- /dev/null +++ b/input/lsr/customizing-markup-fret-diagrams.ly @@ -0,0 +1,92 @@ +%% Do not edit this file; it is auto-generated from input/new +%% This file is in the public domain. +\version "2.11.55" + +\header { + lsrtags = "fretted-strings,tweaks-and-overrides" + + texidoc = "Fret diagram properties can be set through +@code{fret-diagram-details}. For markup fret diagrams, overrides +can be applied to the @code{Voice.TextScript} object or directly +to the markup. +" + doctitle = "Customizing markup fret diagrams" +} % begin verbatim + +<< + \chords { c1 c c d } + + \new Voice = "mel" { + \textLengthOn + % Set global properties of fret diagram + \override Voice.TextScript #'size = #'1.2 + \override Voice.TextScript #'fret-diagram-details + #'finger-code = #'in-dot + \override Voice.TextScript #'fret-diagram-details + #'dot-color = #'white + + %% C major for guitar, no barre, using defaults + % terse style + c'1^\markup { \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;" } + + %% C major for guitar, barred on third fret + % verbose style + % size 1.0 + % roman fret label, finger labels below string, straight barre + c'1^\markup { + % standard size + \override #'(size . 1.0) { + \override #'(fret-diagram-details . ( + (number-type . roman-lower) + (finger-code . in-dot) + (barre-type . straight))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, barred on third fret + % verbose style + % landscape orientation, arabic numbers, M for mute string + % no barre, fret label down or left, small mute label font + c'1^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (number-type . arabic) + (label-dir . -1) + (mute-string . "M") + (orientation . landscape) + (barre-type . none) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + + %% simple D chord + % terse style + % larger dots, centered dots, fewer frets + % label below string + d'1^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + } +>> diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list index c03626f27f..5237b9da62 100644 --- a/input/lsr/expressive-marks.snippet-list +++ b/input/lsr/expressive-marks.snippet-list @@ -10,7 +10,7 @@ adding-parentheses-around-an-expressive-mark-or-chordal-note.ly line-arrows.ly hiding-the-extender-line-for-text-dynamics.ly vertically-aligning-dynamics-across-multiple-notes.ly -modifying-default-values-for-articulation-shorthand-notation.ly +horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly changing-text-and-spanner-styles-for-text-dynamics.ly controlling-the-vertical-ordering-of-scripts.ly inserting-a-caesura.ly @@ -25,6 +25,7 @@ combining-dynamics-with-markup-texts.ly creating-slurs-across-voices.ly caesura-railtracks-with-fermata.ly changing-the-breath-mark-symbol.ly +modifying-default-values-for-articulation-shorthand-notation.ly creating-simultaneous-rehearsal-marks.ly setting-hairpin-behavior-at-bar-lines.ly changing--flageolet-mark-size.ly diff --git a/input/lsr/fretted-strings.snippet-list b/input/lsr/fretted-strings.snippet-list index 3f3fbe0e69..9cbdabd59a 100644 --- a/input/lsr/fretted-strings.snippet-list +++ b/input/lsr/fretted-strings.snippet-list @@ -10,7 +10,9 @@ letter-tablature-formatting.ly laissez-vibrer-ties.ly controlling-the-placement-of-chord-fingerings.ly allowing-fingerings-to-be-printed-inside-the-staff.ly +customizing-fretboard-fret-diagrams.ly faking-a-hammer-in-tablatures.ly fret-diagrams-explained-and-developed.ly modern-tab-text-clef.ly stem-and-beam-behavior-in-tablature.ly +customizing-markup-fret-diagrams.ly diff --git a/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly new file mode 100644 index 0000000000..748081171c --- /dev/null +++ b/input/lsr/horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly @@ -0,0 +1,117 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.55" + +\header { + lsrtags = "expressive-marks, tweaks-and-overrides" + + texidoc = " +Some dynamic expressions involve additional text, like \"sempre pp\". +Since lilypond aligns all dynamics centered on the note, the \\pp would +be displayed way after the note it applies to. + +To correctly align the \"sempre \\pp\" horizontally, so that it is +aligned as if it were only the \\pp, there are several approaches: + +* Simply use @code{\\once\\override DynamicText #'X-offset = #-9.2} +before the note with the dynamics to manually shift it to the correct +position. Drawback: This has to be done manually each time you use that +dynamic markup... * Add some padding (@code{#:hspace 7.1}) into the +definition of your custom dynamic mark, so that after lilypond +center-aligns it, it is already correctly aligned. Drawback: The +padding really takes up that space and does not allow any other markup +or dynamics to be shown in that position. + +* Shift the dynamic script @code{\\once\\override ... #'X-offset = ..}. +Drawback: @code{\\once\\override} is needed for every invocation! + +* Set the dimensions of the additional text to 0 (using +@code{#:with-dimensions '(0 . 0) '(0 . 0)}). Drawback: To lilypond +\"sempre\" has no extent, so it might put other stuff there and create +collisions (which are not detected by the collision dection!). Also, +there seems to be some spacing, so it's not exactly the same alignment +as without the additional text + +* Add an explicit shifting directly inside the scheme function for the +dynamic-script. + +* Set an explicit alignment inside the dynamic-script. By default, this +won't have any effect, only if one sets X-offset! Drawback: One needs +to set @code{DynamicText #'X-offset}, which will apply to all dynamic +texts! Also, it is aligned at the right edge of the additional text, +not at the center of pp. + + + + +" + doctitle = "Horizontally aligning custom dynamics (e.g. \"sempre pp\", \"piu f\", \"subito p\")" +} % begin verbatim +\header { title = "Horizontally aligning custom dynamics" } +\layout { ragged-right = ##t } + +% Solution 1: Using a simple markup with a particular halign value +% Drawback: It's a markup, not a dynamic command, so \dynamicDown etc. will have no effect +semppMarkup = \markup { \halign #1.4 \italic "sempre" \dynamic "pp" } + +% Solution 2: Using a dynamic script and shifting with \once\override ... #'X-offset = .. +% Drawback: \once\override needed for every invocation +semppK = #(make-dynamic-script (markup #:line( #:normal-text #:italic "sempre" #:dynamic "pp"))) + +% Solution 3: Padding the dynamic script so the center-alignment puts it to the correct position +% Drawback: the padding really reserves the space, nothing else can be there +semppT = #( + make-dynamic-script ( + markup #:line ( + #:normal-text #:italic "sempre" #:dynamic "pp" #:hspace 7.1 + ) + ) +) + +% Solution 4: Dynamic, setting the dimensions of the additional text to 0 +% Drawback: To lilypond "sempre" has no extent, so it might put other stuff there => collisions +% Drawback: Also, there seems to be some spacing, so it's not exactly the +% same alignment as without the additional text +semppM = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "pp"))) + +% Solution 5: Dynamic with explicit shifting inside the scheme function +semppG = #(make-dynamic-script + (markup + #:hspace 0 #:translate (cons -18.85 0 ) + #:line( #:normal-text #:italic "sempre" #:dynamic "pp")) +) + +% Solution 6: Dynamic with explicit alignment. This has only effect, if one sets X-offset! +% Drawback: One needs to set DynamicText #'X-offset! +% Drawback: Aligned at the right edge of the additional text, not at the center of pp +semppMII = #(make-dynamic-script (markup #:line(#:right-align #:normal-text #:italic "sempre" #:dynamic "pp"))) + + +\context StaffGroup << + \context Staff="s" << \set Staff.instrumentName = "Normal" + \relative c'' { \key es \major c4\pp c\p c c | c\ff c c\pp c } + >> + \context Staff="sMarkup" << \set Staff.instrumentName = \markup\column{"Normal" "Markup"} + \relative c'' { \key es \major c4-\semppMarkup c\p c c | c\ff c c-\semppMarkup c} + >> + \context Staff="sK" << \set Staff.instrumentName = \markup\column{"Explicit" "shifting"} + \relative c'' { \key es \major + \once \override DynamicText #'X-offset = #-9.2 c4\semppK c\p c c | + c\ff c \once \override DynamicText #'X-offset = #-9.2 c\semppK c } + >> + \context Staff="sT" << \set Staff.instrumentName = \markup\column{"Right" "padding"} + \relative c'' { \key es \major c4\semppT c\p c c | c\ff c c\semppT c } + >> + \context Staff="sM" << \set Staff.instrumentName = \markup\column{"Setting" "dimension" "to zero"} + \relative c'' { \key es \major c4\semppM c\p c c | c\ff c c\semppM c } + >> + \context Staff="sG" << \set Staff.instrumentName = \markup\column{"Shifting" "inside" "dynamics"} + \relative c'' { \key es \major c4\semppG c\p c c | c\ff c c\semppG c} + >> + \context Staff="sMII" << \set Staff.instrumentName = \markup\column{"Alignment" "inside" "dynamics"} + \relative c'' { \key es \major + \override DynamicText #'X-offset = #0 % Setting to ##f (false) gives the same resul + c4\semppMII c\p c c | c\ff c c\semppMII c } + >> +>> + diff --git a/input/lsr/lilypond-snippets.tely b/input/lsr/lilypond-snippets.tely index dad9d6a4ac..29d814ab57 100644 --- a/input/lsr/lilypond-snippets.tely +++ b/input/lsr/lilypond-snippets.tely @@ -21,7 +21,7 @@ @ifnottex @macro ruser{NAME} -These snippets illustrate the User Manual, +These snippets illustrate the Notation Reference, section @ref{\NAME\,,,lilypond,Notation Reference}. @end macro diff --git a/input/lsr/stem-and-beam-behavior-in-tablature.ly b/input/lsr/stem-and-beam-behavior-in-tablature.ly index 3d61a8715a..f8f86a4d29 100644 --- a/input/lsr/stem-and-beam-behavior-in-tablature.ly +++ b/input/lsr/stem-and-beam-behavior-in-tablature.ly @@ -17,7 +17,7 @@ example. \relative c { g16 b d g b d g b \stemDown - \override Beam #'damping = #100000 + \override Beam #'damping = #+inf.0 g,,16 b d g b d g b } } diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list index 9c196e61e7..12cce7b080 100644 --- a/input/lsr/tweaks-and-overrides.snippet-list +++ b/input/lsr/tweaks-and-overrides.snippet-list @@ -8,12 +8,14 @@ custodes.ly printing-a-repeat-sign-at-the-beginning-of-a-piece.ly creating-text-spanners.ly rest-styles.ly +horizontally-aligning-custom-dynamics-e.g.-sempre-pp,-piu-f,-subito-p.ly how-to-change-fret-diagram-position.ly using-the--tweak-command-to-tweak-individual-grobs.ly suppressing-warnings-for-clashing-note-columns.ly controlling-tuplet-bracket-visibility.ly positioning-multi--measure-rests.ly changing-the-staff-size.ly +customizing-markup-fret-diagrams.ly changing-text-and-spanner-styles-for-text-dynamics.ly fine-tuning-pedal-brackets.ly controlling-the-vertical-ordering-of-scripts.ly @@ -35,5 +37,6 @@ caesura-railtracks-with-fermata.ly changing-form-of-multi--measure-rests.ly time-signature-in-parentheses.ly changing-a-single-notes-size-in-a-chord.ly +customizing-fretboard-fret-diagrams.ly creating-simultaneous-rehearsal-marks.ly nesting-staves.ly diff --git a/input/lsr/vertically-centered-common-lyrics.ly b/input/lsr/vertically-centered-common-lyrics.ly new file mode 100644 index 0000000000..f73fe433c8 --- /dev/null +++ b/input/lsr/vertically-centered-common-lyrics.ly @@ -0,0 +1,55 @@ +%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it +%% This file is in the public domain. +\version "2.11.55" + +\header { + lsrtags = "vocal-music" + + texidoc = " +In a vocal piece where there are several (two,four or more) lines of +lyrics, and common lyrics for all voices at some point, these common +lyrics may be vertically centered regardingly, as shown in the +following example: + +" + doctitle = "Vertically centered common lyrics" +} % begin verbatim + +\include "english.ly" +leftbrace = \markup { \override #'(font-encoding . fetaBraces) \lookup #"brace240" } +rightbrace = \markup { \rotate #180 \leftbrace } + +dropLyrics = +{ + \override LyricText #'extra-offset = #'(0 . -5) + \override LyricHyphen #'extra-offset = #'(0 . -5) + \override LyricExtender #'extra-offset = #'(0 . -5) +} + +raiseLyrics = +{ + \revert LyricText #'extra-offset + \revert LyricHyphen #'extra-offset + \revert LyricExtender #'extra-offset +} + +skipFour = \repeat unfold 4 { \skip 8 } + +lyricsA = \lyricmode { The first verse has \dropLyrics the com -- mon +__ words \raiseLyrics used in all four. } +lyricsB = \lyricmode { In stan -- za two, \skipFour al -- so ap -- pear. } +lyricsC = \lyricmode { By the third verse, \skipFour are get -- ting dull. } +lyricsD = \lyricmode { Last stan -- za, and \skipFour get used once more. } + +melody = \relative c' { c4 d e f g f e8( e f) d4 c e d c } + +\score +{ + << + \new Voice = m \melody + \new Lyrics \lyricsto m \lyricsA + \new Lyrics \lyricsto m \lyricsB + \new Lyrics \lyricsto m \lyricsC + \new Lyrics \lyricsto m \lyricsD + >> +} diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list index 3933610301..472f7c8a35 100644 --- a/input/lsr/vocal-music.snippet-list +++ b/input/lsr/vocal-music.snippet-list @@ -12,6 +12,7 @@ vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly single-staff-template-with-notes,-lyrics,-and-chords.ly formatting-lyrics-syllables.ly vertically-aligning-ossias-and-lyrics.ly +vertically-centered-common-lyrics.ly demo-midiinstruments.ly vocal-ensemble-template.ly adjusting-lyrics-vertical-spacing.ly diff --git a/input/manual/display-predefined-fretboards.ly b/input/manual/display-predefined-fretboards.ly new file mode 100644 index 0000000000..a53fb372b4 --- /dev/null +++ b/input/manual/display-predefined-fretboards.ly @@ -0,0 +1,67 @@ +\include "predefined-guitar-fretboards.ly" + +mychords = \chordmode {c1 c:m c:aug c:dim c:7 c:maj7 c:m7 \break } + +chordsline = { + \mychords + \transpose c cis { + \mychords + } + \transpose c des { + \mychords + } + \transpose c d { + \mychords + } + \transpose c dis { + \mychords + } + \transpose c ees { + \mychords + } + \transpose c e { + \mychords + } + \transpose c f { + \mychords + } + \transpose c fis { + \mychords + } + \transpose c ges { + \mychords + } + \transpose c g { + \mychords + } + \transpose c gis { + \mychords + } + \transpose c aes { + \mychords + } + \transpose c a { + \mychords + } + \transpose c ais { + \mychords + } + \transpose c bes { + \mychords + } + \transpose c b { + \mychords + } +} + +<< + \context ChordNames { + \chordsline + } + \context FretBoards { + \chordsline + } + \context Staff { + \chordsline + } +>> diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly new file mode 100644 index 0000000000..139b8537b5 --- /dev/null +++ b/input/manual/wind-headword.ly @@ -0,0 +1,46 @@ +\version "2.11.55" +#(set-global-staff-size 15) +\paper { + line-width = 16\cm + indent = 0\cm +} + +% NR 2.whatever Wind + +% Tchaikovsky +% Nutcracker Suite, VII Dance of the Merlitons +\score { + \new StaffGroup << + \new Staff \relative c'' { + \set Staff.instrumentName = "Flauto I,II" + \once \override Score.RehearsalMark #'self-alignment-X = #-1 + \once \override Score.RehearsalMark #'break-align-symbols = +#'(time-signature) + \once \override Score.TimeSignature +#'break-align-anchor-alignment = #LEFT + \once \override Score.RehearsalMark #'padding = #4 + \mark \markup \large \bold {Moderato assai} + \key d \major + \time 2/4 + \compressFullBarRests + R2*2 + 16-.\p -. -. -. 8-. -. + -.\< 32( 4--)\mf + 16-. -. -. -. + (\> ) -. -.\! + 4--\sf \acciaccatura {8} 4--\mf + } + \new Staff \relative c' { + \set Staff.instrumentName = "Flauto III" + \key d \major + \time 2/4 + \compressFullBarRests + R2*2_\markup{Gr.Fl.} + fis16-.\p e-. fis-. e-. fis8-. e-. + g8-.\< fis32( a d fis a4--)\mf + b16-. a-. b-. a-. g(\> fis) d-. a-.\! + g4--\sf \acciaccatura fis'8 g4--\mf + } + >> +} + diff --git a/input/new/broken-crescendo-hairpin.ly b/input/new/broken-crescendo-hairpin.ly index 8ff4fc4229..6ead4937e3 100644 --- a/input/new/broken-crescendo-hairpin.ly +++ b/input/new/broken-crescendo-hairpin.ly @@ -26,7 +26,9 @@ draw the rectangle over the hairpin. \dynamicUp \override DynamicLineSpanner #'staff-padding = #4 r2 r16 c'8.\pp r4 - } \\ { + } + \\ + { \override DynamicLineSpanner #'layer = #0 des,2\mf\< ~ \override TextScript #'layer = #2 diff --git a/input/new/customizing-fretboard-fret-diagrams.ly b/input/new/customizing-fretboard-fret-diagrams.ly new file mode 100644 index 0000000000..1b9ab8f912 --- /dev/null +++ b/input/new/customizing-fretboard-fret-diagrams.ly @@ -0,0 +1,65 @@ +\version "2.11.55" + +\header { + lsrtags = "fretted-strings,tweaks-and-overrides" + + texidoc = "Fret diagram properties can be set through +@code{fret-diagram-details}. For FretBoard fret diagrams, +overrides are applied to the @code{FretBoards.FretBoard} object. +" + doctitle = "Customizing fretboard fret diagrams" +} + +\include "predefined-guitar-fretboards.ly" +\storePredefinedDiagram \chordmode { c' } + #guitar-tuning + #"x;1-1-(;3-2;3-3;3-4;1-1-);" +<< + \context ChordNames { + \chordmode { c1 c c d } + } + \context FretBoards { + % Set global properties of fret diagram + \override FretBoards.FretBoard #'size = #'1.2 + \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'in-dot + \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'white + \chordmode { + c + \once \override FretBoards.FretBoard #'size = #'1.0 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'barre-type = #'straight + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'black + \once \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'below-string + c' + \once \override FretBoards.FretBoard #'fret-diagram-details + #'barre-type = #'none + \once \override FretBoards.FretBoard #'fret-diagram-details + #'number-type = #'arabic + \once \override FretBoards.FretBoard #'fret-diagram-details + #'orientation = #'landscape + \once \override FretBoards.FretBoard #'fret-diagram-details + #'mute-string = #"M" + \once \override FretBoards.FretBoard #'fret-diagram-details + #'label-dir = #-1 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-color = #'black + c' + \once \override FretBoards.FretBoard #'fret-diagram-details + #'finger-code = #'below-string + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-radius = #0.35 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'dot-position = #0.5 + \once \override FretBoards.FretBoard #'fret-diagram-details + #'fret-count = #3 + d + } + } + \context Voice { + c'1 c' c' d' + } +>> diff --git a/input/new/customizing-markup-fret-diagrams.ly b/input/new/customizing-markup-fret-diagrams.ly new file mode 100644 index 0000000000..c170f847c4 --- /dev/null +++ b/input/new/customizing-markup-fret-diagrams.ly @@ -0,0 +1,90 @@ +\version "2.11.55" + +\header { + lsrtags = "fretted-strings,tweaks-and-overrides" + + texidoc = "Fret diagram properties can be set through +@code{fret-diagram-details}. For markup fret diagrams, overrides +can be applied to the @code{Voice.TextScript} object or directly +to the markup. +" + doctitle = "Customizing markup fret diagrams" +} + +<< + \chords { c1 c c d } + + \new Voice = "mel" { + \textLengthOn + % Set global properties of fret diagram + \override Voice.TextScript #'size = #'1.2 + \override Voice.TextScript #'fret-diagram-details + #'finger-code = #'in-dot + \override Voice.TextScript #'fret-diagram-details + #'dot-color = #'white + + %% C major for guitar, no barre, using defaults + % terse style + c'1^\markup { \fret-diagram-terse #"x;3-3;2-2;o;1-1;o;" } + + %% C major for guitar, barred on third fret + % verbose style + % size 1.0 + % roman fret label, finger labels below string, straight barre + c'1^\markup { + % standard size + \override #'(size . 1.0) { + \override #'(fret-diagram-details . ( + (number-type . roman-lower) + (finger-code . in-dot) + (barre-type . straight))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + } + + %% C major for guitar, barred on third fret + % verbose style + % landscape orientation, arabic numbers, M for mute string + % no barre, fret label down or left, small mute label font + c'1^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (number-type . arabic) + (label-dir . -1) + (mute-string . "M") + (orientation . landscape) + (barre-type . none) + (xo-font-magnification . 0.4) + (xo-padding . 0.3))) { + \fret-diagram-verbose #'((mute 6) + (place-fret 5 3 1) + (place-fret 4 5 2) + (place-fret 3 5 3) + (place-fret 2 5 4) + (place-fret 1 3 1) + (barre 5 1 3)) + } + } + + %% simple D chord + % terse style + % larger dots, centered dots, fewer frets + % label below string + d'1^\markup { + \override #'(fret-diagram-details . ( + (finger-code . below-string) + (dot-radius . 0.35) + (dot-position . 0.5) + (fret-count . 3))) { + \fret-diagram-terse #"x;x;o;2-1;3-2;2-3;" + } + } + } +>> diff --git a/input/regression/identifier-following-chordmode.ly b/input/regression/identifier-following-chordmode.ly new file mode 100644 index 0000000000..c635af1737 --- /dev/null +++ b/input/regression/identifier-following-chordmode.ly @@ -0,0 +1,22 @@ +\header { + + texidoc = "Identifiers following a chordmode section are not +interpreted as chordmode tokens. In the following snippet, the +identifier `m' is not interpreted by the lexer as as a minor chord +modifier." + +} + +\version "2.11.55" + +myDisplayMusic = +#(define-music-function (parser location music) + (ly:music?) + (display-scheme-music music) + (make-music 'SequentialMusic 'void #t)) + +\myDisplayMusic \chordmode { c } + +m = \relative c' { c4 d e f } + +\new Staff { \m } diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly new file mode 100644 index 0000000000..daa88bd03f --- /dev/null +++ b/input/regression/predefined-fretboards.ly @@ -0,0 +1,33 @@ +% add a chord shape + +\addChordShape #'bes #"x;1-1-(;3-2;3-3;3-4;1-1-);" + +% add chords + +\storePredefinedDiagram \chordmode {bes} + #guitar-tuning + #(chord-shape 'bes) + +\storePredefinedDiagram \chordmode {c} + #guitar-tuning + #(offset-fret 2 (chord-shape 'bes)) + +mychords = \chordmode { + bes +} + +chordline = { + \mychords + \transpose bes c { + \mychords + } +} + +<< + \context ChordNames { + \chordline + } + \context FretBoards { + \chordline + } +>> diff --git a/lily/fretboard-engraver.cc b/lily/fretboard-engraver.cc index b75156f545..f284161a80 100644 --- a/lily/fretboard-engraver.cc +++ b/lily/fretboard-engraver.cc @@ -97,7 +97,8 @@ ADD_TRANSLATOR (Fretboard_engraver, "minimumFret " "maximumFretStretch " "tablatureFormat " - "highStringOne ", + "highStringOne " + "predefinedDiagramTable", /* write */ "" diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index b07acd6ef0..509dece604 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -17,7 +17,6 @@ struct Lookup { static Stencil dot (Offset p, Real radius); static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot); - static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm); static Stencil rotated_box (Real slope, Real width, Real thick, Real blot); static Stencil round_filled_polygon (vector const &points, Real blotdiameter); static Stencil frame (Box b, Real thick, Real blot); diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 4a43a94e03..51fe44fc46 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -31,10 +31,8 @@ public: static Real line_thickness (Grob *); static Real staff_space (Grob *); static Grob *get_staff_symbol (Grob *); - static bool on_line (Grob *); static bool on_line (Grob *, int); static bool on_staff_line (Grob *, int); - static bool on_staff_line (Grob *); static int line_count (Grob *); static Real get_position (Grob *); static Real staff_radius (Grob *); diff --git a/lily/lexer.ll b/lily/lexer.ll index ef419634bb..47c3979336 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -824,7 +824,8 @@ Lily_lexer::scan_bare_word (string str) else if (scm_is_symbol (yylval.scm)) return DRUM_PITCH; } - else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) + else if ((YYSTATE == chords) + && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { yylval.scm = scm_cdr (handle); return CHORD_MODIFIER; diff --git a/lily/lookup.cc b/lily/lookup.cc index 62e0d97317..d2099d7c48 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -18,11 +18,9 @@ using namespace std; #include "warn.hh" #include "dimensions.hh" #include "bezier.hh" -#include "string-convert.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "font-metric.hh" Stencil Lookup::dot (Offset p, Real radius) @@ -461,207 +459,6 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) return Stencil (b, horizontal_bend); } -/* - TODO: junk me. -*/ -Stencil -Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) -{ - Stencil m; - string sym = ly_scm2string (scm_car (s)); - string reg = ly_scm2string (scm_car (scm_cdr (s))); - - if (sym == "Discant") - { - Stencil r = fm->find_by_name ("accordion.accDiscant"); - m.add_stencil (r); - if (reg.substr (0, 1) == "F") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - int eflag = 0x00; - if (reg.substr (0, 3) == "EEE") - { - eflag = 0x07; - reg = reg.substr (3); - } - else if (reg.substr (0, 2) == "EE") - { - eflag = 0x05; - reg = reg.substr (2); - } - else if (reg.substr (0, 2) == "Eh") - { - eflag = 0x04; - reg = reg.substr (2); - } - else if (reg.substr (0, 1) == "E") - { - eflag = 0x02; - reg = reg.substr (1); - } - if (eflag & 0x02) - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - } - if (eflag & 0x04) - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - d.translate_axis (0.8 * staff_space PT, X_AXIS); - m.add_stencil (d); - } - if (eflag & 0x01) - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_stencil (d); - } - if (reg.substr (0, 2) == "SS") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (0.5 * staff_space PT, Y_AXIS); - d.translate_axis (0.4 * staff_space PT, X_AXIS); - m.add_stencil (d); - d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_stencil (d); - reg = reg.substr (2); - } - if (reg.substr (0, 1) == "S") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (0.5 * staff_space PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - } - else if (sym == "Freebase") - { - Stencil r = fm->find_by_name ("accordion.accFreebase"); - m.add_stencil (r); - if (reg.substr (0, 1) == "F") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg == "E") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_stencil (d); - } - } - else if (sym == "Bayanbase") - { - Stencil r = fm->find_by_name ("accordion.accBayanbase"); - m.add_stencil (r); - if (reg.substr (0, 1) == "T") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - /* include 4' reed just for completeness. You don't want to use this. */ - if (reg.substr (0, 1) == "F") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg.substr (0, 2) == "EE") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - d.translate_axis (0.4 * staff_space PT, X_AXIS); - m.add_stencil (d); - d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_stencil (d); - reg = reg.substr (2); - } - if (reg.substr (0, 1) == "E") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - } - else if (sym == "Stdbase") - { - Stencil r = fm->find_by_name ("accordion.accStdbase"); - m.add_stencil (r); - if (reg.substr (0, 1) == "T") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 3.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg.substr (0, 1) == "F") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg.substr (0, 1) == "M") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 2 PT, Y_AXIS); - d.translate_axis (staff_space PT, X_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg.substr (0, 1) == "E") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - if (reg.substr (0, 1) == "S") - { - Stencil d = fm->find_by_name ("accordion.accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.substr (1); - } - } - /* ugh maybe try to use regular font for S.B. and B.B and only use one font - for the rectangle */ - else if (sym == "SB") - { - Stencil r = fm->find_by_name ("accordion.accSB"); - m.add_stencil (r); - } - else if (sym == "BB") - { - Stencil r = fm->find_by_name ("accordion.accBB"); - m.add_stencil (r); - } - else if (sym == "OldEE") - { - Stencil r = fm->find_by_name ("accordion.accOldEE"); - m.add_stencil (r); - } - else if (sym == "OldEES") - { - Stencil r = fm->find_by_name ("accordion.accOldEES"); - m.add_stencil (r); - } - return m; -} - Stencil Lookup::repeat_slash (Real w, Real s, Real t) { diff --git a/lily/script-interface.cc b/lily/script-interface.cc index f6957f9eea..a8fbc49fcd 100644 --- a/lily/script-interface.cc +++ b/lily/script-interface.cc @@ -33,9 +33,6 @@ Script_interface::get_stencil (Grob *me, Direction d) return Font_interface::get_default_font (me) ->find_by_name ("scripts." + ly_scm2string (str)); } - else if (key == ly_symbol2scm ("accordion")) - return Lookup::accordion (scm_cdr (s), 1.0, - Font_interface::get_default_font (me)); else assert (false); diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index dbff0245c6..38c39e04fe 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -20,22 +20,11 @@ Staff_symbol_referencer::line_count (Grob *me) return st ? Staff_symbol::line_count (st) : 0; } -bool -Staff_symbol_referencer::on_line (Grob *me) -{ - return on_line (me, (int) rint (get_position (me))); -} - -bool -Staff_symbol_referencer::on_staff_line (Grob *me) -{ - return on_staff_line (me, (int) rint (get_position (me))); -} - bool Staff_symbol_referencer::on_line (Grob *me, int pos) { - return Staff_symbol::on_line (me, pos); + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::on_line (st, pos) : false; } bool diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly deleted file mode 100644 index bb69331a7f..0000000000 --- a/ly/accordion-defs-init.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "2.10.0" -% Symbols needed to print accordion music -% -% 2' = T -% 4' = F -% 8' = E -% 16' = S -% - -accDiscant = #(make-articulation "accDiscant") -accDiscantF = #(make-articulation "accDiscantF") -accDiscantE = #(make-articulation "accDiscantE") -accDiscantEh = #(make-articulation "accDiscantEh") -accDiscantFE = #(make-articulation "accDiscantFE") -accDiscantFEh = #(make-articulation "accDiscantFEh") -accDiscantEE = #(make-articulation "accDiscantEE") -accDiscantFEE = #(make-articulation "accDiscantFEE") -accDiscantEEE = #(make-articulation "accDiscantEEE") -accDiscantFEEE = #(make-articulation "accDiscantFEEE") -accDiscantS = #(make-articulation "accDiscantS") -accDiscantFS = #(make-articulation "accDiscantFS") -accDiscantES = #(make-articulation "accDiscantES") -accDiscantEhS = #(make-articulation "accDiscantEhS") -accDiscantFES = #(make-articulation "accDiscantFES") -accDiscantFEhS = #(make-articulation "accDiscantFEhS") -accDiscantEES = #(make-articulation "accDiscantEES") -accDiscantFEES = #(make-articulation "accDiscantFEES") -accDiscantEEES = #(make-articulation "accDiscantEEES") -accDiscantFEEES = #(make-articulation "accDiscantFEEES") -accDiscantSS = #(make-articulation "accDiscantSS") -accDiscantESS = #(make-articulation "accDiscantESS") -accDiscantEESS = #(make-articulation "accDiscantEESS") -accDiscantEEESS = #(make-articulation "accDiscantEEESS") - -accFreebase = #(make-articulation "accFreebase") -accFreebaseF = #(make-articulation "accFreebaseF") -accFreebaseE = #(make-articulation "accFreebaseE") -accFreebaseFE = #(make-articulation "accFreebaseFE") - -accBayanbase = #(make-articulation "accBayanbase") -accBayanbaseT = #(make-articulation "accBayanbaseT") -accBayanbaseE = #(make-articulation "accBayanbaseE") -accBayanbaseTE = #(make-articulation "accBayanbaseTE") -accBayanbaseEE = #(make-articulation "accBayanbaseEE") -accBayanbaseTEE = #(make-articulation "accBayanbaseTEE") - -accStdbase = #(make-articulation "accStdbase") -accStdbaseFE = #(make-articulation "accStdbaseFE") -accStdbaseTFE = #(make-articulation "accStdbaseTFE") -accStdbaseMES = #(make-articulation "accStdbaseMES") -accStdbaseTFMES = #(make-articulation "accStdbaseTFMES") - -accSB = #(make-articulation "accSB") -accBB = #(make-articulation "accBB") -accOldEE = #(make-articulation "accOldEE") -accOldEES = #(make-articulation "accOldEES") diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index b8c36e4f33..88fdfe1c03 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -63,6 +63,7 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START) escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START) +#(define fretboard-table (make-hash-table 100)) \include "scale-definitions-init.ly" @@ -117,3 +118,6 @@ setDefaultDurationToQuarter = { c4 } #(define book-music-handler collect-book-music-for-book) #(define book-score-handler ly:book-add-score!) #(define book-text-handler ly:book-add-score!) + + +\include "predefined-fretboards-init.ly" diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index ffee024a1c..022fb8a1d9 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -22,6 +22,8 @@ \consists "Separating_line_group_engraver" \consists "Font_size_engraver" \consists "Instrument_name_engraver" + + predefinedDiagramTable = #fretboard-table } \context { diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly new file mode 100644 index 0000000000..c8b7ff0731 --- /dev/null +++ b/ly/predefined-fretboards-init.ly @@ -0,0 +1,46 @@ +%%%% predefined-fretboard-init.ly +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2008 Carl D. Sorensen + +%%%%% define storage structures + +% base-chord-shapes is an alist of chord shapes +% in the form of fret-diagram-terse strings with +% scheme symbols as keys. For convenience, the +% symbols are LilyPond chordmode chord descriptions, +% but that is unnecessary. + +#(define base-chord-shapes '()) + + +% music function for adding a chord shape to +% base-chord-shapes + +addChordShape = +#(define-music-function (parser location key-symbol shape-string) + (symbol? string?) + (set! base-chord-shapes + (acons key-symbol shape-string base-chord-shapes)) + (make-music 'SequentialMusic 'void #t)) + +% for convenience, to eliminate storage list in .ly references + +#(define (chord-shape shape-code) + (get-chord-shape shape-code base-chord-shapes)) + +% music function for adding a predefined diagram to +% fretboard-table + +storePredefinedDiagram = +#(define-music-function (parser location chord tuning terse-definition) + (ly:music? list? string?) + (let* ((pitches (event-chord-pitches + (car (extract-named-music chord 'EventChord)))) + (hash-key (cons tuning pitches))) + (hash-set! fretboard-table + hash-key + (parse-terse-string terse-definition))) + (make-music 'SequentialMusic 'void #t)) + diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly new file mode 100644 index 0000000000..2a08c4f002 --- /dev/null +++ b/ly/predefined-guitar-fretboards.ly @@ -0,0 +1,435 @@ +%%%% predefined-guitar-fretboards.ly +%%%% +%%%% source file of the GNU LilyPond music typesetter +%%%% +%%%% (c) 2008 Carl D. Sorensen + +%%% Add basic chordshapes + +\addChordShape #'f #"1-1-(;3-3;3-4;2-2;1-1;1-1-);" +\addChordShape #'f:m #"1-1-(;3-3;3-4;1-1;1-1;1-1-);" +\addChordShape #'f:7 #"1-1-(;3-3;1-1;2-2;1-1;1-1-);" +\addChordShape #'f:m7 #"1-1-(;3-3;1-1;1-1;1-1;1-1-);" +\addChordShape #'bes #"x;1-1-(;3-2;3-3;3-4;1-1-);" +\addChordShape #'bes:m #"x;1-1-(;3-3;3-4;2-2;1-1-);" +\addChordShape #'bes:m7 #"x;1-1-(;3-3;1-1;2-2;1-1-);" +\addChordShape #'bes:7 #"x;1-1-(;3-2;1-1;3-3;1-1-);" +\addChordShape #'bes:maj7 #"x;1-1;3-3;2-2;3-4;x;" +\addChordShape #'c:dim #"x;x;1-1;2-3;1-2;2-4;" +\addChordShape #'c:aug #"x;x;2-2;1-1-(;1-1-);4-4;" +\addChordShape #'cis #"x;x;3-3;1-1-(;2-2;1-1-);" +\addChordShape #'ees:dim #"x;x;1-1;2-3;1-2;2-4;" +\addChordShape #'a:dim #"x;x;1-1;2-3;1-2;2-4;" + +%%% Add predefined chords + +% definitions of predefined diagrams below here + +%%%% c chords +% +\storePredefinedDiagram \chordmode {c} + #guitar-tuning + #"x;3-3;2-2;o;1-1;o;" +\storePredefinedDiagram \chordmode {c:m} + #guitar-tuning + #(offset-fret 2 (chord-shape 'bes:m)) +\storePredefinedDiagram \chordmode {c:aug} + #guitar-tuning + #(chord-shape 'c:aug) +\storePredefinedDiagram \chordmode {c:dim} + #guitar-tuning + #(chord-shape 'c:dim) +\storePredefinedDiagram \chordmode {c:7} + #guitar-tuning + #"o;3-3;2-2;3-4;1-1;o;" +\storePredefinedDiagram \chordmode {c:maj7} + #guitar-tuning + #"x;3-3;2-2;o;o;o;" +\storePredefinedDiagram \chordmode {c:m7} + #guitar-tuning + #(offset-fret 2 (chord-shape 'bes:m7)) + +%%%% cis chords +% +\storePredefinedDiagram \chordmode {cis} + #guitar-tuning + #(chord-shape 'cis) +\storePredefinedDiagram \chordmode {cis:m} + #guitar-tuning + #"x;x;2-2;1-1;2-3;o;" +\storePredefinedDiagram \chordmode {cis:aug} + #guitar-tuning + #"x;4-4;3-3;2-1;2-2;x;" +\storePredefinedDiagram \chordmode {cis:dim} + #guitar-tuning + #(offset-fret 1 (chord-shape 'c:dim)) +\storePredefinedDiagram \chordmode {cis:7} + #guitar-tuning + #"x;x;3-2;4-3;2-1;4-4;" +\storePredefinedDiagram \chordmode {cis:maj7} + #guitar-tuning + #"x;4-4;3-3;1-1-(;1-1;1-1-);" +\storePredefinedDiagram \chordmode {cis:m7} + #guitar-tuning + #"x;4-4;2-2;1-1;o;o;" + +%%%% des chords +% +\storePredefinedDiagram \chordmode {des} + #guitar-tuning + #"x;x;3-3;1-1-(;2-2;1-1-);" +\storePredefinedDiagram \chordmode {des:m} + #guitar-tuning + #"x;x;2-2;1-1;2-3;o;" +\storePredefinedDiagram \chordmode {des:aug} + #guitar-tuning + #"x;4-4;3-3;2-1;2-2;x;" +\storePredefinedDiagram \chordmode {des:dim} + #guitar-tuning + #(offset-fret 1 (chord-shape 'c:dim)) +\storePredefinedDiagram \chordmode {des:7} + #guitar-tuning + #"x;x;3-2;4-3;2-1;4-4;" +\storePredefinedDiagram \chordmode {des:maj7} + #guitar-tuning + #"x;4-4;3-3;1-1-(;1-1;1-1-);" +\storePredefinedDiagram \chordmode {des:m7} + #guitar-tuning + #"x;4-4;2-2;1-1;o;o;" + +%%%% d chords +% +\storePredefinedDiagram \chordmode {d} + #guitar-tuning + #"x;x;o;2-1;3-2;2-3;" +\storePredefinedDiagram \chordmode {d:m} + #guitar-tuning + #"x;x;o;2-2;3-3;1-1;" +\storePredefinedDiagram \chordmode {d:aug} + #guitar-tuning + #"x;x;o;3-2;3-3;2-1;" +\storePredefinedDiagram \chordmode {d:dim} + #guitar-tuning + #"x;x;o;1-1;o;1-2;" +\storePredefinedDiagram \chordmode {d:7} + #guitar-tuning + #"x;x;o;2-2;1-1;2-3;" +\storePredefinedDiagram \chordmode {d:maj7} + #guitar-tuning + #"x;x;o;2-1;2-2;2-3;" +\storePredefinedDiagram \chordmode {d:m7} + #guitar-tuning + #"x;x;o;2-2;1-1-(;1-1-);" + +%%%% dis chords +% +\storePredefinedDiagram \chordmode {dis} + #guitar-tuning + #(offset-fret 2 (chord-shape 'cis)) +\storePredefinedDiagram \chordmode {dis:m} + #guitar-tuning + #"x;x;4-3;3-2;4-4;1-1;" +\storePredefinedDiagram \chordmode {dis:aug} + #guitar-tuning + #"3-3;2-2;1-1;o;o;3-4" +\storePredefinedDiagram \chordmode {dis:dim} + #guitar-tuning + #(chord-shape 'ees:dim) +\storePredefinedDiagram \chordmode {dis:7} + #guitar-tuning + #"x;x;1-1;3-3;2-2;3-4;" +\storePredefinedDiagram \chordmode {dis:maj7} + #guitar-tuning + #"x;x;1-1;3-2;3-3;3-4;" +\storePredefinedDiagram \chordmode {dis:m7} + #guitar-tuning + #"x;x;1-1;3-2;2-3;2-4;" + +%%%% ees chords +% +\storePredefinedDiagram \chordmode {ees} + #guitar-tuning + #(offset-fret 2 (chord-shape 'cis)) +\storePredefinedDiagram \chordmode {ees:m} + #guitar-tuning + #"x;x;4-3;3-2;4-4;1-1;" +\storePredefinedDiagram \chordmode {ees:aug} + #guitar-tuning + #"3-3;2-2;1-1;o;o;3-4" +\storePredefinedDiagram \chordmode {ees:dim} + #guitar-tuning + #(chord-shape 'ees:dim) +\storePredefinedDiagram \chordmode {ees:7} + #guitar-tuning + #"x;x;1-1;3-3;2-2;3-4;" +\storePredefinedDiagram \chordmode {ees:maj7} + #guitar-tuning + #"x;x;1-1;3-2;3-3;3-4;" +\storePredefinedDiagram \chordmode {ees:m7} + #guitar-tuning + #"x;x;1-1;3-2;2-3;2-4;" + +%%%% e chords +% +\storePredefinedDiagram \chordmode {e} + #guitar-tuning + #"o;2-2;2-3;1-1;o;o;" +\storePredefinedDiagram \chordmode {e:m} + #guitar-tuning + #"o;2-2;2-3;o;o;o;" +\storePredefinedDiagram \chordmode {e:aug} + #guitar-tuning + #"o;3-3;2-2;1-1;x;x;" +\storePredefinedDiagram \chordmode {e:dim} + #guitar-tuning + #(offset-fret 1 (chord-shape 'ees:dim)) +\storePredefinedDiagram \chordmode {e:7} + #guitar-tuning + #"o;2-2;o;1-1;o;o;" +\storePredefinedDiagram \chordmode {e:maj7} + #guitar-tuning + #"o;2-3;1-1;1-2;o;x;" +\storePredefinedDiagram \chordmode {e:m7} + #guitar-tuning + #"o;2-2;o;o;o;o;" + +%%%% f chords +% +\storePredefinedDiagram \chordmode {f} + #guitar-tuning + #(chord-shape 'f) +\storePredefinedDiagram \chordmode {f:m} + #guitar-tuning + #(chord-shape 'f:m) +\storePredefinedDiagram \chordmode {f:aug} + #guitar-tuning + #"x;x;1-1;4-3;4-4;3-2;" +\storePredefinedDiagram \chordmode {f:dim} + #guitar-tuning + #"x;x;o;1-1;o;1-2;" +\storePredefinedDiagram \chordmode {f:7} + #guitar-tuning + #(chord-shape 'f:7) +\storePredefinedDiagram \chordmode {f:maj7} + #guitar-tuning + #"x;3-3;3-4;2-2;1-1;" +\storePredefinedDiagram \chordmode {f:m7} + #guitar-tuning + #(chord-shape 'f:m7) + +%%%% fis chords +% +\storePredefinedDiagram \chordmode {fis} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f)) +\storePredefinedDiagram \chordmode {fis:m} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:m)) +\storePredefinedDiagram \chordmode {fis:aug} + #guitar-tuning + #"2-2;1-1;o;3-4-(;3-4-);2-3;" +\storePredefinedDiagram \chordmode {fis:dim} + #guitar-tuning + #"x;x;1-1;2-3;1-2;2-4;" +\storePredefinedDiagram \chordmode {fis:7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:7)) +\storePredefinedDiagram \chordmode {fis:maj7} + #guitar-tuning + #"x;x;4-4;3-3;2-2;1-1;" +\storePredefinedDiagram \chordmode {fis:m7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:m7)) + +%%%% ges chords +% +\storePredefinedDiagram \chordmode {ges} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f)) +\storePredefinedDiagram \chordmode {ges:m} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:m)) +\storePredefinedDiagram \chordmode {ges:aug} + #guitar-tuning + #"2-2;1-1;o;3-4-(;3-4-);2-3;" +\storePredefinedDiagram \chordmode {ges:dim} + #guitar-tuning + #"x;x;1-1;2-3;1-2;2-4;" +\storePredefinedDiagram \chordmode {ges:7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:7)) +\storePredefinedDiagram \chordmode {ges:maj7} + #guitar-tuning + #"x;x;4-4;3-3;2-2;1-1;" +\storePredefinedDiagram \chordmode {ges:m7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'f:m7)) + +%%%% g chords +% +\storePredefinedDiagram \chordmode {g} + #guitar-tuning + #"3-2;2-1;o;o;o;3-3;" +\storePredefinedDiagram \chordmode {g:m} + #guitar-tuning + #(offset-fret 2 (chord-shape 'f:m)) +\storePredefinedDiagram \chordmode {g:aug} + #guitar-tuning + #"x;x;5-1;8-3;8-4;7-2;" +\storePredefinedDiagram \chordmode {g:dim} + #guitar-tuning + #"x;x;5-2;6-4;5-3;3-1;" +\storePredefinedDiagram \chordmode {g:7} + #guitar-tuning + #"3-3;2-2;o;o;o;1-1;" +\storePredefinedDiagram \chordmode {g:maj7} + #guitar-tuning + #"x;x;5-4;4-3;3-2;2-1;" +\storePredefinedDiagram \chordmode {g:m7} + #guitar-tuning + #(offset-fret 2 (chord-shape 'f:m7)) + +%%%% gis chords +% +\storePredefinedDiagram \chordmode {gis} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f)) +\storePredefinedDiagram \chordmode {gis:m} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:m)) +\storePredefinedDiagram \chordmode {gis:aug} + #guitar-tuning + #"o;3-4;2-3;1-1;1-2;o;" +\storePredefinedDiagram \chordmode {gis:dim} + #guitar-tuning + #"x;x;o;1-1;o;1-2;" +\storePredefinedDiagram \chordmode {gis:7} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:7)) +\storePredefinedDiagram \chordmode {gis:maj7} + #guitar-tuning + #"x;x;1-1-(;1-1;1-1-);3-3;" +\storePredefinedDiagram \chordmode {gis:m7} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:m7)) + +%%%% aes chords +% +\storePredefinedDiagram \chordmode {aes} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f)) +\storePredefinedDiagram \chordmode {aes:m} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:m)) +\storePredefinedDiagram \chordmode {aes:aug} + #guitar-tuning + #"o;3-4;2-3;1-1;1-2;o;" +\storePredefinedDiagram \chordmode {aes:dim} + #guitar-tuning + #"x;x;o;1-1;o;1-2;" +\storePredefinedDiagram \chordmode {aes:7} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:7)) +\storePredefinedDiagram \chordmode {aes:maj7} + #guitar-tuning + #"x;x;1-1-(;1-1;1-1-);3-3;" +\storePredefinedDiagram \chordmode {aes:m7} + #guitar-tuning + #(offset-fret 3 (chord-shape 'f:m7)) + +%%%% a chords +% +\storePredefinedDiagram \chordmode {a} + #guitar-tuning + #"x;o;2-1;2-2;2-3;o;" +\storePredefinedDiagram \chordmode {a:m} + #guitar-tuning + #"x;o;2-2;2-3;1-1;o;" +\storePredefinedDiagram \chordmode {a:aug} + #guitar-tuning + #"x;o;3-4;2-2;2-3;1-1;" +\storePredefinedDiagram \chordmode {a:dim} + #guitar-tuning + #(chord-shape 'a:dim) +\storePredefinedDiagram \chordmode {a:7} + #guitar-tuning + #"x;o;2-1;o;2-3;o;" +\storePredefinedDiagram \chordmode {a:maj7} + #guitar-tuning + #"x;o;2-2;1-1;2-3;o;" +\storePredefinedDiagram \chordmode {a:m7} + #guitar-tuning + #"x;o;2-2;o;1-1;o;" + +%%%% ais chords +% +\storePredefinedDiagram \chordmode {ais} + #guitar-tuning + #(chord-shape 'bes) +\storePredefinedDiagram \chordmode {ais:m} + #guitar-tuning + #(chord-shape 'bes:m) +\storePredefinedDiagram \chordmode {ais:aug} + #guitar-tuning + #"2-2;1-1;o;3-4-(;3-4-);2-3;" +\storePredefinedDiagram \chordmode {ais:dim} + #guitar-tuning + #(offset-fret 1 (chord-shape 'a:dim)) +\storePredefinedDiagram \chordmode {ais:7} + #guitar-tuning + #(chord-shape 'bes:7) +\storePredefinedDiagram \chordmode {ais:maj7} + #guitar-tuning + #"x;1-1;3-3;2-2;3-4;x;" +\storePredefinedDiagram \chordmode {ais:m7} + #guitar-tuning + #(chord-shape 'bes:m7) + +%%%% bes chords +% +\storePredefinedDiagram \chordmode {bes} + #guitar-tuning + #(chord-shape 'bes) +\storePredefinedDiagram \chordmode {bes:m} + #guitar-tuning + #(chord-shape 'bes:m) +\storePredefinedDiagram \chordmode {bes:aug} + #guitar-tuning + #"2-2;1-1;o;3-4-(;3-4-);2-3;" +\storePredefinedDiagram \chordmode {bes:dim} + #guitar-tuning + #(offset-fret 1 (chord-shape 'a:dim)) +\storePredefinedDiagram \chordmode {bes:7} + #guitar-tuning + #(chord-shape 'bes:7) +\storePredefinedDiagram \chordmode {bes:maj7} + #guitar-tuning + #"x;1-1;3-3;2-2;3-4;x;" +\storePredefinedDiagram \chordmode {bes:m7} + #guitar-tuning + #(chord-shape 'bes:m7) + +%%%% b chords +% +\storePredefinedDiagram \chordmode {b} + #guitar-tuning + #(offset-fret 1 (chord-shape 'bes)) +\storePredefinedDiagram \chordmode {b:m} + #guitar-tuning + #(offset-fret 1 (chord-shape 'bes:m)) +\storePredefinedDiagram \chordmode {b:aug} + #guitar-tuning + #"x;3-2;2-1;o;o;x;" +\storePredefinedDiagram \chordmode {b:dim} + #guitar-tuning + #"x;x;o;1-1;o;1-2;" +\storePredefinedDiagram \chordmode {b:7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'bes:7)) +\storePredefinedDiagram \chordmode {b:maj7} + #guitar-tuning + #"x;2-1;4-3;3-2;4-4;x;" +\storePredefinedDiagram \chordmode {b:m7} + #guitar-tuning + #(offset-fret 1 (chord-shape 'bes:m7)) + diff --git a/ly/property-init.ly b/ly/property-init.ly index 9098d313cf..c0d43eb980 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -341,3 +341,18 @@ bassFigureStaffAlignmentNeutral = { \revert Staff.BassFigureAlignmentPositioning #'direction } +predefinedFretboardsOff = { + \set FretBoards.predefinedDiagramTable = ##f +} + +predefinedFretboardsOn = { + \set FretBoards.predefinedDiagramTable = #fretboard-table +} + +pointAndClickOff = #(define-music-function (parser location) () + (ly:set-option 'point-and-click #f) + (make-music 'SequentialMusic 'void #t)) + +pointAndClickOn = #(define-music-function (parser location) () + (ly:set-option 'point-and-click #t) + (make-music 'SequentialMusic 'void #t)) diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/make/doc-i18n-root-rules.make @@ -0,0 +1 @@ +# empty diff --git a/make/doc-i18n-root-targets.make b/make/doc-i18n-root-targets.make new file mode 100644 index 0000000000..4e917c5da0 --- /dev/null +++ b/make/doc-i18n-root-targets.make @@ -0,0 +1,4 @@ +default: + +local-WWW: $(OUT_HTML_FILES) + $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) $(HTML_FILES) diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make new file mode 100644 index 0000000000..fdf8664263 --- /dev/null +++ b/make/doc-i18n-root-vars.make @@ -0,0 +1,3 @@ +HTML_PAGE_NAMES = index translations +HTML_FILES = $(HTML_PAGE_NAMES:%=%.html) +OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html) diff --git a/make/doclang-vars.make b/make/doclang-vars.make index 6e36693044..08d17b919a 100644 --- a/make/doclang-vars.make +++ b/make/doclang-vars.make @@ -10,7 +10,7 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES) MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES) MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) -TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES) +TEXI2PDF_FLAGS += -q --batch $(DOCUMENTATION_INCLUDES) TELY_FILES = $(call src-wildcard,*.tely) OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi) diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index a9ca43f9f7..cbd0e1544b 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -345,6 +345,8 @@ the pedal.") sustain pedals: @code{text}, @code{bracket} or @code{mixed} (both).") (pedalUnaCordaStrings ,list? "See @code{pedalSustainStrings}.") (pedalUnaCordaStyle ,symbol? "See @code{pedalSustainStyle}.") + (predefinedDiagramTable ,hash-table? "The hash table of predefined +fret diagrams to use in FretBoards.") (printKeyCancellation ,boolean? "Print restoration alterations before a key signature change.") (printOctaveNames ,boolean? "Print octave marks for the @@ -466,8 +468,7 @@ setting this property, you can make brackets last shorter. (useBassFigureExtenders ,boolean? "Whether to use extender lines for repeated bass figures.") - - + (verticallySpacedContexts ,list? "List of symbols, containing context names whose vertical axis groups should be taken into account for vertical spacing of systems.") diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm index d5f5d36fcd..8b0dde24f8 100644 --- a/scm/define-grob-interfaces.scm +++ b/scm/define-grob-interfaces.scm @@ -53,7 +53,7 @@ note)." (ly:add-interface 'fret-diagram-interface "A fret diagram" - '(align-dir fret-diagram-details size string-fret-finger-combinations + '(align-dir fret-diagram-details size dot-placement-list thickness)) (ly:add-interface diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index b48cbc25fc..9015764dc1 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -168,6 +168,10 @@ other object. Otherwise, it determines whether the object is placed be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1}, @code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.") (dot-count ,integer? "The number of dots.") + (dot-placement-list ,list? "List +consisting of @code{(@var{description} @var{string-number} +@var{fret-number} @var{finger-number})} +entries used to define fret diagrams.") (duration-log ,integer? "The 2-log of the note head duration, i.e., @code{0} = whole note, @code{1} = half note, etc.") @@ -241,21 +245,24 @@ include the following: @itemize @bullet @item @code{barre-type} -- Type of barre indication used. -Choices include @code{curved} and @code{straight}. +Choices include @code{curved}, @code{straight}, and +@code{none}. Default @code{curved}. @item @code{dot-color} -- Color of dots. Options include -@code{black} and @code{white}. +@code{black} and @code{white}. Default @code{black}. @item @code{dot-label-font-mag} -- Magnification for font used to label fret dots. Default value 1. @item -@code{dot-radius} -- Radius of dots. +@code{dot-radius} -- Radius of dots, in terms of fret spaces. +Default value 0.425 for labeled dots, 0.25 for unlabeled dots. @item @code{finger-code} -- Code for the type of fingering indication used. Options include @code{none}, @code{in-dot}, and -@code{below-string}. +@code{below-string}. Default @code{none} for markup fret diagrams, +@code{below-string} for @code{FretBoards} fret diagrams. @item -@code{fret-count} -- The number of frets. +@code{fret-count} -- The number of frets. Default 4. @item @code{fret-label-font-mag} -- The magnification of the font used to label the lowest fret number. Default 0.5 @@ -266,21 +273,25 @@ from the fret. Default -0.2 @code{label-dir} -- Side to which the fret label is attached. @code{-1}, @code{#LEFT}, or @code{#DOWN} for left or down; @code{1}, @code{#RIGHT}, or @code{#UP} for right or up. +Default @code{#RIGHT}. @item -@code{mute-string} -- Character string to be used to indicate muted string. +@code{mute-string} -- Character string to be used to indicate muted +string. Default \"x\". @item @code{number-type} -- Type of numbers to use in fret label. Choices -include @code{roman-lower}, @code{roman-upper}, and @code{arabic}. +include @code{roman-lower}, @code{roman-upper}, and @code{arabic}. Default +@code{roman-lower}. @item -@code{open-string} -- Character string to be used to indicate open string. +@code{open-string} -- Character string to be used to indicate open +string. Default \"o\". @item @code{orientation} -- Orientation of fret-diagram. Options include -@code{normal} and @code{landscape} +@code{normal} and @code{landscape}. Default @code{normal}. @item -@code{string-count} -- The number of strings. +@code{string-count} -- The number of strings. Default 6. @item -@code{string-label-font-mag} -- The magnification of the font used to label fingerings -at the string, rather than in the dot. Default value 0.6. +@code{string-label-font-mag} -- The magnification of the font used to label +fingerings at the string, rather than in the dot. Default value 0.6. @item @code{top-fret-thickness} -- The thickness of the top fret line, as a multiple of the standard thickness. Default value 3. @@ -288,8 +299,8 @@ of the standard thickness. Default value 3. @code{xo-font-magnification} -- Magnification used for mute and open string indicators. Default value 0.5. @item -@code{xo-padding} -- Padding for open and mute indicators from top fret. Default -value 0.25. +@code{xo-padding} -- Padding for open and mute indicators from top fret. +Default value 0.25. @end itemize") ;" @@ -343,7 +354,7 @@ correction amount for kneed beams. Set between @code{0} for no correction and @code{1} for full correction.") (labels ,list? "List of labels (symbols) placed on a column") - (layer ,number? "The output layer (a value between 0 and@tie{}2: + (layer ,integer? "The output layer (a value between 0 and@tie{}2: Layers define the order of printing objects. Objects in lower layers are overprinted by objects in higher layers.") (ledger-line-thickness ,number-pair? "The thickness of ledger @@ -566,9 +577,6 @@ are not spaced separately, but put before musical columns.") (strict-note-spacing ,boolean? "If set, unbroken columns with non-musical material (clefs, bar lines, etc.) are not spaced separately, but put before musical columns.") - (string-fret-finger-combinations ,list? "List consisting of -@code{(@var{string-number} @var{fret-number} @var{finger-number})} -entries.") (stroke-style ,string? "Set to @code{\"grace\"} to turn stroke through flag on.") (style ,symbol? "This setting determines in what style a grob is diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm index 0d56e2c4a9..da2763f5aa 100644 --- a/scm/documentation-generate.scm +++ b/scm/documentation-generate.scm @@ -73,6 +73,15 @@ @c NOTE: This is documentation-generate.scm, not macros.itexi +@macro q{TEXT} +@quoteleft{}\\TEXT\\@quoteright{} +@end macro + +@macro qq{TEXT} +@quotedblleft{}\\TEXT\\@quotedblright{} +@end macro + + @ifhtml @c ***** HTML ***** @@ -83,22 +92,12 @@ @cindex \\TEXT\\ @end macro -@macro glossaryref{TEXT} -@vindex \\TEXT\\ -@ref{\\TEXT\\,,,music-glossary-big-page,Music Glossary} -@end macro - @end ifset @ifclear bigpage @macro ruser{NAME} -@ref{\\NAME\\,,,lilypond} -@cindex \\NAME\\ -@end macro - -@macro glossaryref{NAME} -@ref{\\NAME\\,,,music-glossary} +@ref{\\NAME\\,,,lilypond,Notation Reference} @cindex \\NAME\\ @end macro @@ -108,11 +107,6 @@ @uref{source/\\DIR\\/out-www/collated-files.html#\\NAME\\,@file{\\DIR\\/\\NAME\\}}@c @end macro -@macro q{TEXT} -@html -‘\\TEXT\\’ -@end html -@end macro @end ifhtml @@ -120,7 +114,7 @@ @c ***** info ***** @macro ruser{NAME} -@ref{\\NAME\\,,,lilypond} +@ref{\\NAME\\,,,lilypond,Notation Reference} @cindex \\NAME\\ @end macro @@ -128,9 +122,6 @@ @file{\\DIR\\/\\NAME\\} @end macro -@macro q{TEXT} -`\\TEXT\\' -@end macro @end ifinfo @@ -145,9 +136,6 @@ @file{\\DIR\\/\\NAME\\}@c @end macro -@macro q{TEXT} -`\\TEXT\\' -@end macro @end iftex diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 6378f7d12f..fb986f91b9 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004--2007 Carl D. Sorensen +;;;; (c) 2004--2008 Carl D. Sorensen (define (fret-parse-marking-list marking-list fret-count) (let* ((fret-range (list 1 fret-count)) @@ -366,7 +366,8 @@ Line thickness is given by @var{th}, fret & string spacing by (make-bezier-sandwich-list (* size barre-start-string-coordinate) (* size barre-end-string-coordinate) - (* size (+ 2 (- top-fret (+ low-fret barre-fret-coordinate)))) + (* size (+ 2 (- top-fret + (+ low-fret barre-fret-coordinate)))) (* size bezier-height) (* size bezier-thick) orientation) @@ -547,11 +548,14 @@ indications per string. (xo-list (cdr (assoc 'xo-list parameters))) (fret-range (cdr (assoc 'fret-range parameters))) (barre-list (cdr (assoc 'barre-list parameters))) + (barre-type + (assoc-get 'barre-type details 'curved)) (fret-diagram-stencil (ly:stencil-add (draw-strings string-count fret-range th size orientation) (draw-frets fret-range string-count th size orientation)))) - (if (not (null? barre-list)) + (if (and (not (null? barre-list)) + (not (eq? 'none barre-type))) (set! fret-diagram-stencil (ly:stencil-add (draw-barre layout props string-count fret-range size @@ -823,7 +827,8 @@ with @code{-(} to start a barre and @code{-)} to end the barre. (car definition-list) (cdr definition-list)))) -(define (fret-parse-terse-definition-string props definition-string) +(define-public + (fret-parse-terse-definition-string props definition-string) "Parse a fret diagram string that uses terse syntax; return a pair containing: props, modified to include the string-count determined by the definition-string, and diff --git a/scm/lily.scm b/scm/lily.scm index c324e2bab8..51038bcd29 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -338,7 +338,8 @@ The syntax is the same as `define*-public'." "encoding.scm" "fret-diagrams.scm" - "define-markup-commands.scm" + "predefined-fretboards.scm" + "define-markup-commands.scm" "define-grob-properties.scm" "define-grobs.scm" "define-grob-interfaces.scm" diff --git a/scm/music-functions.scm b/scm/music-functions.scm index c700f190db..7b2cc3404f 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -689,7 +689,6 @@ SkipEvent. Useful for extracting parts from crowded scores" ((< i 0)) (f (vector-ref v i)))) -;; TODO: make a remove-grace-property too. (define-public (add-grace-property context-name grob sym val) "Set SYM=VAL for GROB in CONTEXT-NAME. " (define (set-prop context) @@ -700,6 +699,25 @@ SkipEvent. Useful for extracting parts from crowded scores" (ly:context-set-property! where 'graceSettings new-settings))) (ly:export (context-spec-music (make-apply-context set-prop) 'Voice))) +(define-public (remove-grace-property context-name grob sym) + "Remove all SYM for GROB in CONTEXT-NAME. " + (define (sym-grob-context? property sym grob context-name) + (and (eq? (car property) context-name) + (eq? (cadr property) grob) + (eq? (caddr property) sym))) + (define (delete-prop context) + (let* ((where (ly:context-property-where-defined context 'graceSettings)) + (current (ly:context-property where 'graceSettings)) + (prop-settings (filter + (lambda(x) (sym-grob-context? x sym grob context-name)) + current)) + (new-settings current)) + (for-each (lambda(x) + (set! new-settings (delete x new-settings))) + prop-settings) + (ly:context-set-property! where 'graceSettings new-settings))) + (ly:export (context-spec-music (make-apply-context delete-prop) 'Voice))) + (defmacro-public def-grace-function (start stop) @@ -1002,3 +1020,34 @@ use GrandStaff as a context. " (ly:music-property (car evs) 'pitch) #f))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-public (extract-named-music music music-name) +"Return a flat list of all music named @code{music-name} +from @code{music}." + (let ((extracted-list + (if (ly:music? music) + (if (eq? (ly:music-property music 'name) music-name) + (list music) + (let ((elt (ly:music-property music 'element)) + (elts (ly:music-property music 'elements))) + (if (ly:music? elt) + (extract-named-music elt music-name) + (if (null? elts) + '() + (map (lambda(x) + (extract-named-music x music-name )) + elts))))) + '()))) + (flatten-list extracted-list))) + +(define-public (event-chord-notes event-chord) +"Return a list of all notes from @{event-chord}." + (filter + (lambda (m) (eq? 'NoteEvent (ly:music-property m 'name))) + (ly:music-property event-chord 'elements))) + +(define-public (event-chord-pitches event-chord) +"Return a list of all pitches from @{event-chord}." + (map (lambda (x) (ly:music-property x 'pitch)) + (event-chord-notes event-chord))) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index de4e658fe4..7a50af6c1e 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -650,44 +650,11 @@ centered, X==1 is at the right, X == -1 is at the left." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; fret boards -(define (string-frets->description string-frets string-count) - (let* - ((desc (list->vector - (map (lambda (x) (list 'mute (1+ x))) - (iota string-count))))) - - (for-each (lambda (sf) - (let* - ((string (car sf)) - (fret (cadr sf)) - (finger (caddr sf))) - - - (vector-set! desc (1- string) - (if (= 0 fret) - (list 'open string) - (if finger - (list 'place-fret string fret finger) - (list 'place-fret string fret)) - - - )) - )) - string-frets) - - (vector->list desc))) - (define-public (fret-board::calc-stencil grob) - (let* ((string-frets (ly:grob-property grob 'string-fret-finger-combinations)) - (string-count (assoc-get - 'string-count - (ly:grob-property grob 'fret-diagram-details) - 6))) - (grob-interpret-markup grob (make-fret-diagram-verbose-markup - (string-frets->description string-frets string-count))))) + (ly:grob-property grob 'dot-placement-list)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; scripts diff --git a/scm/predefined-fretboards.scm b/scm/predefined-fretboards.scm new file mode 100644 index 0000000000..7040add95e --- /dev/null +++ b/scm/predefined-fretboards.scm @@ -0,0 +1,68 @@ +;;;; predefined-fretboards.scm +;;;; +;;;; source file of the GNU LilyPOnd music typesetter +;;;; +;;;; (c) 2008 Carl D. Sorensen + + +(define-public (parse-terse-string terse-definition) +"Parse a fret-diagram-terse definition string @code{terse-definition} and +return a marking list, which can be used as with a fretboard grob." + (cdr (fret-parse-terse-definition-string (list '()) terse-definition))) + +(define-public (get-chord-shape shape-code base-chord-shapes) +"Return the chord shape associated with key @code{shape-code} in +the alist @code{base-chord-shapes}." + (assoc-get shape-code base-chord-shapes #f)) + +(define-public (offset-fret fret-offset terse-string) +"Add @code{fret-offset} to each fret indication in @code{terse-string} +and return the resulting fret-diagram-terse definition string." + + (define (split-fretstring fret-string) + (map (lambda (x) (split-item x)) + (string-split fret-string #\sp ))) + + (define (split-item item-string) + (string-split item-string #\- )) + + (define (split-terse-string terse-string) + (let ((long-list + (string-split terse-string #\;))) + (map (lambda (x) (split-fretstring x)) + (list-head long-list (1- (length long-list)))))) + + (define (join-terse-string terse-string-list) + (string-join + (map (lambda (x) (join-fretstring x)) terse-string-list) + ";" 'suffix)) + + (define (join-item item-list) + (string-join item-list "-" )) + + (define (join-fretstring fretstring-list) + (string-join + (map (lambda (x) (join-item x)) fretstring-list) + " " )) + + (define (add-item-fret-offset fret-offset item-list) + (let ((fretval (string->number (car item-list)))) + (if fretval + (cons (number->string (+ fretval fret-offset)) + (cdr item-list)) + item-list))) + + (define (add-fretstring-fret-offset fret-offset fretstring-list) + (map (lambda (x) (add-item-fret-offset fret-offset x)) + fretstring-list)) + + (define (add-terse-fret-offset fret-offset terse-string-list) + (map (lambda (x) (add-fretstring-fret-offset fret-offset x)) + terse-string-list)) + +;; body + (join-terse-string + (add-terse-fret-offset + fret-offset + (split-terse-string terse-string)))) + diff --git a/scm/song-util.scm b/scm/song-util.scm index 22e5d83bd9..2453a14ed3 100644 --- a/scm/song-util.scm +++ b/scm/song-util.scm @@ -116,15 +116,6 @@ `(set! ,list-var (append ,list-var (list ,object)))) (export add!) -(define-public (flatten lst) - (cond - ((null? lst) - lst) - ((pair? (car lst)) - (append (flatten (car lst)) (flatten (cdr lst)))) - (else - (cons (car lst) (flatten (cdr lst)))))) - (define-public (safe-car list) (if (null? list) #f diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm index 667b0e2679..79a924812a 100644 --- a/scm/translation-functions.scm +++ b/scm/translation-functions.scm @@ -168,26 +168,68 @@ ;; fret diagrams (define-public (determine-frets context grob notes string-numbers) + (define (ensure-number a b) (if (number? a) a b)) -(let* + + (define (string-frets->dot-placement string-frets string-count) + (let* + ((desc (list->vector + (map (lambda (x) (list 'mute (1+ x))) + (iota string-count))))) + + (for-each (lambda (sf) + (let* + ((string (car sf)) + (fret (cadr sf)) + (finger (caddr sf))) + + (vector-set! + desc (1- string) + (if (= 0 fret) + (list 'open string) + (if finger + (list 'place-fret string fret finger) + (list 'place-fret string fret)) + )) + )) + string-frets) + (vector->list desc))) + +;; body. + (let* ((tunings (ly:context-property context 'stringTunings)) + (my-string-count (length tunings)) (details (ly:grob-property grob 'fret-diagram-details)) + (predefined-frets + (ly:context-property context 'predefinedDiagramTable)) (minimum-fret (ensure-number (ly:context-property context 'minimumFret) 0)) (max-stretch (ensure-number (ly:context-property context 'maximumFretStretch) 4)) (string-frets (determine-frets-mf notes string-numbers minimum-fret max-stretch - tunings))) + tunings)) + (pitches (map (lambda (x) (ly:event-property x 'pitch)) notes))) + + (set! (ly:grob-property grob 'fret-diagram-details) - (set! (ly:grob-property grob 'fret-diagram-details) (if (null? details) (acons 'string-count (length tunings) '()) (acons 'string-count (length tunings) details))) - (set! (ly:grob-property grob 'string-fret-finger-combinations) string-frets))) + (set! (ly:grob-property grob 'dot-placement-list) + (if predefined-frets + (let ((hash-handle + (hash-get-handle + predefined-frets + (cons tunings pitches)))) + (if hash-handle + (cdr hash-handle) ;found default diagram + (string-frets->dot-placement + string-frets my-string-count))) + (string-frets->dot-placement string-frets my-string-count))))) (define-public (determine-frets-mf notes string-numbers minimum-fret max-stretch @@ -292,12 +334,13 @@ (if (note-string note) (set-fret note (note-string note)) (let* - ((string (find (lambda (string) (string-qualifies string - (note-pitch note))) - (reverse free-strings)))) - (if string - (set-fret note string) - (ly:warning "No string for pitch ~a (given frets ~a)" (note-pitch note) + ((fit-string (find (lambda (string) + (string-qualifies string (note-pitch note))) + free-strings))) + (if fit-string + (set-fret note fit-string) + (ly:warning "No string for pitch ~a (given frets ~a)" + (note-pitch note) specified-frets)) ))) diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 250eace2f8..0307404080 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -1,5 +1,5 @@ -.PHONY : all clean config default dist doc exe help html lib TAGS\ - po +.PHONY : all clean bin-clean config default dist doc exe help\ + html lib TAGS po all: default $(LOOP) @@ -11,6 +11,16 @@ clean: local-clean -rm -rf "./$(outdir)" $(LOOP) +ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES))) +bin-clean: local-bin-clean + -rm -rf "./$(outdir)" + $(LOOP) +else +bin-clean: +endif + +local-bin-clean: local-clean + ifneq ($(strip $(depth)),.) dist: $(MAKE) -C $(depth) dist @@ -48,6 +58,7 @@ help: generic-help local-help @echo -e "Generic targets:\n\ all * update everything except website documentation\n\ clean * remove all generated stuff in $(outdir)\n\ + bin-clean * same as clean, except that mf/out is preserved\n\ default same as the empty target\n\ exe update all executables\n\ help this help\n\ diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index d36ff83b81..d53bd8f7dd 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -14,6 +14,7 @@ TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper) MAKEINFO_FLAGS = --enable-encoding MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) +TEXI2PDF_FLAGS += -q # info stuff INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
    1 Introduction
    (3699)    		1 Introduction
    (3678)    		 Ludovic Sardain
    John Mandereau
    Jean-Charles Malahieude
    Jean-Yves Baudais
    translated
    - partially up to date
    + up to date
    		 Till Rettig
    partially translated (65 %)
    - partially up to date
    + partially up to date
    		 Francisco Vila
    - partially translated (65 %)
    - partially up to date
    + translated
    + partially up to date
    2 Tutorial
    (5652)    		2 Tutorial
    (5685)    		 Nicolas Grandclaude
    Ludovic Sardain
    Gauvain Pocentek
    @@ -105,15 +105,15 @@ translations.template.html.in; DO NOT EDIT !--> Valentin Villenave
    John Mandereau
    translated
    - partially up to date
    + up to date
    		 Till Rettig
    translated
    - partially up to date
    + partially up to date
    		 Francisco Vila
    translated
    - partially up to date
    + partially up to date
    4 Tweaking output
    (12262)    		4 Tweaking output
    (12334)    		 Valentin Villenave
    Nicolas Klutchnikoff
    Jean-Charles Malahieude
    @@ -148,7 +148,7 @@ translations.template.html.in; DO NOT EDIT !-->     		Francisco Vila
    translated
    - partially up to date
    + partially up to date
    es
    Section titles
    (544)    		Section titles
    (547)    		 John Mandereau
    Jean-Charles Malahieude
    translated
    @@ -299,11 +299,11 @@ translations.template.html.in; DO NOT EDIT !-->     		Till Rettig
    translated
    - partially up to date
    + partially up to date
    		 Francisco Vila
    translated
    - partially up to date
    + partially up to date
    John Mandereau
    Jean-Charles Malahieude
    translated
    - partially up to date
    + up to date
    		 Till Rettig
    translated
    @@ -323,7 +323,7 @@ translations.template.html.in; DO NOT EDIT !-->
    1.1 Pitches
    (2822)    		1.1 Pitches
    (2948)    		 Frédéric Chiasson
    Valentin Villenave
    Jean-Charles Malahieude
    @@ -336,11 +336,11 @@ translations.template.html.in; DO NOT EDIT !-->     		Francisco Vila
    translated
    - up to date
    + partially up to date
    1.2 Rhythms
    (6657)    		1.2 Rhythms
    (6785)    		 Frédéric Chiasson
    Valentin Villenave
    Jean-Charles Malahieude
    @@ -352,12 +352,12 @@ translations.template.html.in; DO NOT EDIT !--> partially up to date
    		 Francisco Vila
    - partially translated (96 %)
    - partially up to date
    + partially translated (95 %)
    + partially up to date
    1.3 Expressive marks
    (843)    		1.3 Expressive marks
    (1119)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    @@ -370,11 +370,11 @@ translations.template.html.in; DO NOT EDIT !-->     		Francisco Vila
    translated
    - partially up to date
    + partially up to date
    1.4 Repeats
    (940)    		1.4 Repeats
    (556)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    @@ -387,11 +387,11 @@ translations.template.html.in; DO NOT EDIT !-->     		Francisco Vila
    translated
    - partially up to date
    + partially up to date
    1.5 Simultaneous notes
    (883)    		1.5 Simultaneous notes
    (1000)    		 Frédéric Chiasson
    Valentin Villenave
    Jean-Charles Malahieude
    @@ -400,59 +400,59 @@ translations.template.html.in; DO NOT EDIT !--> partially up to date
    		 Till Rettig
    - partially translated (81 %)
    + partially translated (71 %)
    partially up to date
    		 Francisco Vila
    translated
    - partially up to date
    + partially up to date
    1.6 Staff notation
    (2310)    		1.6 Staff notation
    (1800)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    translated
    - partially up to date
    + partially up to date
    		 Till Rettig
    - partially translated (63 %)
    - partially up to date
    + partially translated (87 %)
    + partially up to date
    		 Francisco Vila
    translated
    - up to date
    + partially up to date
    1.7 Editorial annotations
    (827)    		1.7 Editorial annotations
    (908)    		 Jean-Charles Malahieude
    translated
    partially up to date
    		 Till Rettig
    - partially translated (47 %)
    + partially translated (44 %)
    partially up to date
    		 Francisco Vila
    translated
    - up to date
    + partially up to date
    1.8 Text
    (1851)    		1.8 Text
    (2082)    		 Jean-Charles Malahieude
    Valentin Villenave
    John Mandereau
    - partially translated (83 %)
    + partially translated (82 %)
    partially up to date
    		 not translated
    		 Francisco Vila
    - partially translated (85 %)
    - partially up to date
    + partially translated (86 %)
    + partially up to date
    John Mandereau
    Jean-Charles Malahieude
    translated
    - partially up to date
    + up to date
    		 Till Rettig
    translated
    @@ -472,7 +472,7 @@ translations.template.html.in; DO NOT EDIT !-->
    2.1 Vocal music
    (2745)    		2.1 Vocal music
    (2799)    		 Valentin Villenave
    Jean-Charles Malahieude
    partially translated (96 %)
    @@ -482,24 +482,24 @@ translations.template.html.in; DO NOT EDIT !-->     		Francisco Vila
    partially translated (96 %)
    - partially up to date
    + partially up to date
    2.2 Keyboard instruments
    (561)    		2.2 Keyboard instruments
    (668)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    - partially translated (90 %)
    - partially up to date
    + partially translated (89 %)
    + partially up to date
    		 Till Rettig
    - partially translated (90 %)
    - partially up to date
    + partially translated (89 %)
    + partially up to date
    		 Francisco Vila
    - partially translated (90 %)
    - partially up to date
    + partially translated (89 %)
    + partially up to date
    2.4 Fretted string instruments
    (857)    		2.4 Fretted string instruments
    (1369)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    - partially translated (32 %)
    + partially translated (16 %)
    partially up to date
    		 Till Rettig
    - partially translated (32 %)
    + partially translated (16 %)
    partially up to date
    		 Francisco Vila
    - partially translated (82 %)
    - partially up to date
    + partially translated (35 %)
    + partially up to date
    2.5 Percussion
    (546)    		2.5 Percussion
    (747)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    - partially translated (97 %)
    + partially translated (98 %)
    partially up to date
    		 Till Rettig
    - partially translated (95 %)
    + partially translated (96 %)
    partially up to date
    		 Francisco Vila
    - partially translated (97 %)
    - up to date
    + partially translated (98 %)
    + partially up to date
    2.7 Chord notation
    (1303)    		2.7 Chord notation
    (1352)    		 Valentin Villenave
    Jean-Charles Malahieude
    John Mandereau
    - partially translated (65 %)
    + partially translated (62 %)
    partially up to date
    		 Till Rettig
    - partially translated (65 %)
    + partially translated (62 %)
    partially up to date
    		 Francisco Vila
    translated
    - partially up to date
    + partially up to date
    3 Input syntax
    (5399)    		Jean-Charles Malahieude
    - partially translated (3 %)
    - partially up to date
    +     		2.9 World music
    (1115)    		 not translated
    		 not translated
    4 Spacing issues
    (8400)    		3 General input and output
    (5431)    		Jean-Charles Malahieude
    + Valentin Villenave
    + partially translated (6 %)
    + partially up to date
    +     		Till Rettig
    + partially translated (6 %)
    + partially up to date
    +     		Francisco Vila
    + partially translated (43 %)
    + up to date
    +
    4 Spacing issues
    (7896)    		 not translated
    		 not translated
    @@ -624,21 +638,21 @@ translations.template.html.in; DO NOT EDIT !-->
    5 Changing defaults
    (6855)    		5 Changing defaults
    (8377)    		 Valentin Villenave
    Gilles Thibault
    - partially translated (77 %)
    - partially up to date
    + partially translated (51 %)
    + partially up to date
    		 not translated
    		 Francisco Vila
    - partially translated (93 %)
    - partially up to date
    + partially translated (69 %)
    + partially up to date
    6 Interfaces for programmers
    (5213)    		6 Interfaces for programmers
    (5218)    		 not translated
    		 not translated
    @@ -660,19 +674,19 @@ translations.template.html.in; DO NOT EDIT !-->
    B Notation manual tables
    (1127)    		B Notation manual tables
    (1146)    		 Frédéric Chiasson
    Jean-Charles Malahieude
    - partially translated (12 %)
    - partially up to date
    + partially translated (7 %)
    + partially up to date
    		 Till Rettig
    - translated
    - partially up to date
    + partially translated (99 %)
    + partially up to date
    		 Francisco Vila
    - translated
    - partially up to date
    + partially translated (99 %)
    + partially up to date