From fd8e4f4ad347ef8f96c2e069be83f63f0f9da466 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Mon, 16 Oct 2017 17:03:43 +0200
Subject: [PATCH] New upstream version 2.19.80
---
.gitfilelist | 3 +
.../ca/learning/common-notation.itely | 2 +-
Documentation/ca/learning/tweaks.itely | 3 +-
Documentation/ca/notation/editorial.itely | 934 +++
Documentation/ca/notation/expressive.itely | 12 +-
Documentation/ca/notation/notation.itely | 2 +-
Documentation/ca/notation/pitches.itely | 6 +-
Documentation/ca/notation/repeats.itely | 4 +-
Documentation/ca/notation/rhythms.itely | 20 +-
Documentation/ca/notation/simultaneous.itely | 2 +-
Documentation/ca/notation/staff.itely | 2 +-
Documentation/ca/notation/text.itely | 1622 ++++
Documentation/ca/translations.itexi | 64 +-
Documentation/ca/web/introduction.itexi | 3 +-
Documentation/changes.tely | 1797 +++--
.../contributor/doc-translation-list.itexi | 12 +-
.../contributor/programming-work.itexi | 17 +-
Documentation/contributor/quick-start.itexi | 2 +-
Documentation/contributor/release-work.itexi | 1 -
Documentation/cs/translations.itexi | 4 +-
Documentation/de/notation/pitches.itely | 6 +-
Documentation/de/translations.itexi | 12 +-
Documentation/de/usage/running.itely | 10 +-
Documentation/es/notation/pitches.itely | 6 +-
Documentation/es/notation/simultaneous.itely | 39 +-
.../es/texidocs/three-sided-box.texidoc | 2 +-
Documentation/es/translations.itexi | 22 +-
Documentation/es/web/introduction.itexi | 4 +-
.../extending/programming-interface.itely | 12 +
Documentation/fr/changes.tely | 1714 +++--
.../fr/extending/programming-interface.itely | 13 +-
Documentation/fr/notation/input.itely | 104 +-
.../fr/notation/notation-appendices.itely | 8 +-
Documentation/fr/notation/pitches.itely | 6 +-
Documentation/fr/notation/simultaneous.itely | 6 +-
Documentation/fr/notation/text.itely | 179 +-
Documentation/fr/translations.itexi | 10 +-
Documentation/fr/usage/running.itely | 25 +-
Documentation/hu/translations.itexi | 8 +-
Documentation/it/changes.tely | 83 +-
.../it/notation/changing-defaults.itely | 10 +-
.../it/notation/notation-appendices.itely | 10 +-
Documentation/it/notation/pitches.itely | 6 +-
Documentation/it/notation/simultaneous.itely | 38 +-
Documentation/it/notation/spacing.itely | 4 +-
Documentation/it/notation/text.itely | 100 +-
.../analysis-brackets-with-labels.texidoc | 2 +-
Documentation/it/translations.itexi | 14 +-
Documentation/it/usage/running.itely | 27 +-
Documentation/it/web/introduction.itexi | 4 +-
Documentation/it/web/news-headlines.itexi | 8 +-
Documentation/it/web/news-new.itexi | 6 +-
.../ja/learning/common-notation.itely | 18 +-
Documentation/ja/learning/fundamental.itely | 360 +-
Documentation/ja/learning/templates.itely | 329 +-
Documentation/ja/learning/tutorial.itely | 2 +-
Documentation/ja/learning/tweaks.itely | 779 +-
Documentation/ja/notation.tely | 12 +-
.../ja/notation/changing-defaults.itely | 37 +-
Documentation/ja/notation/editorial.itely | 384 +-
Documentation/ja/notation/expressive.itely | 146 +-
Documentation/ja/notation/input.itely | 89 +-
Documentation/ja/notation/pitches.itely | 652 +-
Documentation/ja/notation/repeats.itely | 252 +-
Documentation/ja/notation/rhythms.itely | 1109 +--
Documentation/ja/notation/simultaneous.itely | 186 +-
Documentation/ja/notation/staff.itely | 332 +-
Documentation/ja/notation/text.itely | 37 +-
Documentation/ja/notation/vocal.itely | 94 +-
Documentation/ja/translations.itexi | 106 +-
Documentation/ja/usage/external.itely | 347 +-
Documentation/ja/usage/lilypond-book.itely | 80 +-
Documentation/ja/usage/running.itely | 198 +-
Documentation/ja/usage/suggestions.itely | 148 +-
Documentation/ja/usage/updating.itely | 238 +-
Documentation/nl/translations.itexi | 6 +-
Documentation/notation/input.itely | 94 +-
Documentation/notation/pitches.itely | 6 +-
Documentation/notation/simultaneous.itely | 4 +-
Documentation/notation/text.itely | 117 +-
Documentation/translations.itexi | 148 +-
Documentation/web/news-headlines.itexi | 6 +-
Documentation/web/news-new.itexi | 7 +-
Documentation/web/news-old.itexi | 12 +
Documentation/web/we-wrote.bib | 7 +
Documentation/zh/translations.itexi | 4 +-
NEWS.txt | 1266 ++--
VERSION | 4 +-
configure | 2 +-
configure.ac | 2 +-
input/regression/display-lily-tests.ly | 3 -
input/regression/markup-partial.ly | 10 +-
input/regression/merge-rests-engraver.ly | 4 +-
input/regression/note-head-funk.ly | 2 +-
input/regression/version-seen.ly | 14 +
lily/axis-group-interface.cc | 4 +-
lily/include/lily-imports.hh | 3 +
lily/lexer.ll | 9 +-
lily/lily-imports.cc | 3 +
lily/lyric-hyphen.cc | 1 -
lily/paper-column.cc | 5 +-
lily/parser.yy | 109 +-
lily/self-alignment-interface.cc | 25 +-
lily/separation-item.cc | 4 +-
lily/system.cc | 4 +-
lily/text-interface.cc | 9 +-
lily/tie.cc | 2 +-
ly/Welcome-to-LilyPond-MacOS.ly | 2 +-
ly/Welcome_to_LilyPond.ly | 2 +-
ly/predefined-fretboards-init.ly | 3 +-
out/ChangeLog | 2 +-
out/RELEASE-COMMIT | 16 +-
po/lilypond.pot | 135 +-
po/sv.po | 6547 +++++++++++------
scm/chord-entry.scm | 2 +-
scm/document-markup.scm | 78 +-
scm/markup-macros.scm | 218 +-
scm/music-functions.scm | 12 +-
scm/scheme-engravers.scm | 12 +
119 files changed, 15334 insertions(+), 6536 deletions(-)
create mode 100644 Documentation/ca/notation/editorial.itely
create mode 100644 Documentation/ca/notation/text.itely
create mode 100644 input/regression/version-seen.ly
diff --git a/.gitfilelist b/.gitfilelist
index 0bfe9f2c19..93269c5d4c 100644
--- a/.gitfilelist
+++ b/.gitfilelist
@@ -15,6 +15,7 @@ Documentation/ca/learning/tutorial.itely
Documentation/ca/learning/tweaks.itely
Documentation/ca/macros.itexi
Documentation/ca/notation.tely
+Documentation/ca/notation/editorial.itely
Documentation/ca/notation/expressive.itely
Documentation/ca/notation/notation.itely
Documentation/ca/notation/pitches.itely
@@ -22,6 +23,7 @@ Documentation/ca/notation/repeats.itely
Documentation/ca/notation/rhythms.itely
Documentation/ca/notation/simultaneous.itely
Documentation/ca/notation/staff.itely
+Documentation/ca/notation/text.itely
Documentation/ca/search-box.ihtml
Documentation/ca/translations.itexi
Documentation/ca/usage.tely
@@ -3909,6 +3911,7 @@ input/regression/unpure-pure-container.ly
input/regression/unset-once.ly
input/regression/utf-8-mixed-text.ly
input/regression/utf-8.ly
+input/regression/version-seen.ly
input/regression/voice-follower.ly
input/regression/voices-command.ly
input/regression/volta-bracket-add-volta-hook.ly
diff --git a/Documentation/ca/learning/common-notation.itely b/Documentation/ca/learning/common-notation.itely
index 9b7fb69bbb..acfee91906 100644
--- a/Documentation/ca/learning/common-notation.itely
+++ b/Documentation/ca/learning/common-notation.itely
@@ -512,7 +512,7 @@ a'2_\markup {
@seealso
Referència de la notació:
-@rusernamed{Writing text,Escriptura de text}.
+@ruser{Escriptura del text}.
@node Barres automà tiques i manuals
diff --git a/Documentation/ca/learning/tweaks.itely b/Documentation/ca/learning/tweaks.itely
index c3f89b8b1d..5a66aeddf2 100644
--- a/Documentation/ca/learning/tweaks.itely
+++ b/Documentation/ca/learning/tweaks.itely
@@ -2387,7 +2387,8 @@ Spanners): textos amb lÃnies extensores per sobre d'una secció de
música. L'extensor abasta des de l'ordre@code{\startTextSpan}
fins l'ordre @code{\stopTextSpan}, i el format del text es
defineix per mitjà de l'ordre @code{\override TextSpanner}. Per
-veure més detalls, consulteu@rusernamed{Text spanners,Extensions de text}.
+veure més detalls, consulteu
+@ruser{Extensions de text}.
També mostra la manera de crear indicadors d'octava alta i baixa.
diff --git a/Documentation/ca/notation/editorial.itely b/Documentation/ca/notation/editorial.itely
new file mode 100644
index 0000000000..2a046c6e4e
--- /dev/null
+++ b/Documentation/ca/notation/editorial.itely
@@ -0,0 +1,934 @@
+@c -*- coding: utf-8; mode: texinfo; documentlanguage: ca -*-
+@c This file is included from notation.itely
+@ignore
+ Translation of GIT committish: dbc2dd143e50e000a39883fc8217b4ec60e08657
+
+ When revising a translation, copy the HEAD committish of the
+ version that you are working on. For details, see the Contributors'
+ Guide, node Updating translation committishes..
+@end ignore
+
+@c \version "2.19.21"
+
+@c Translators: Walter Garcia-Fontes
+@c Translation checkers:
+
+@node Anotacions editorials
+@section Anotacions editorials
+@translationof Editorial annotations
+
+@lilypondfile[quote]{editorial-headword.ly}
+
+Aquesta secció tracta de les diverses maneres de modificar
+l'aspecte de les notes i d'aplicar èmfasi analÃtic o educatiu.
+
+@menu
+* Dins del pentagrama::
+* Fora del pentagrama::
+@end menu
+
+
+@node Dins del pentagrama
+@subsection Dins del pentagrama
+@translationof Inside the staff
+
+Aquesta secció tracta sobre com aplicar èmfasi als elements
+situats dins del pentagrama.
+
+@menu
+* Selecció del la mida del tipus de lletra per a la notació::
+* Indicacions de digitació::
+* Notes ocultes::
+* Acoloriment d'objectes::
+* Parèntesis::
+* Pliques::
+@end menu
+
+@node Selecció del la mida del tipus de lletra per a la notació
+@unnumberedsubsubsec Selecció del la mida del tipus de lletra per a la notació
+@translationof Selecting notation font size
+
+@cindex tipus de lletra (de notació), mida
+@cindex selecció de la mida del tipus de lletra (de notació)
+@cindex notació, mida del tipus de lletra
+@cindex notes, caps de
+
+@funindex fontSize
+@funindex font-size
+@funindex magnification->font-size
+@funindex magstep
+@funindex magnifyMusic
+@funindex teeny
+@funindex tiny
+@funindex small
+@funindex normalsize
+@funindex large
+@funindex huge
+@funindex \magnifyMusic
+@funindex \teeny
+@funindex \tiny
+@funindex \normalsize
+@funindex \small
+@funindex \large
+@funindex \huge
+
+@warning{@*
+Per a la mida del tipus de lletra del text consulteu
+@ref{Selecció del tipus de lletra i la seva mida}.@*
+Per a la mida del pentagrama, consulteu
+@rusernamed{Setting the staff size,Establiment de la mida del pentagrama}.@*
+Per a les notes guia, consulteu @ref{Format de les notes guia}.@*
+Per als pentagrames d'Ossia, consulteu @ref{Pentagrames d'Ossia}.}
+
+Per modificar la mida de la notació sense canviar la mida del
+pentagrama, especifiqueu un factor d'ampliació amb l'ordre
+@code{\magnifyMusic}:
+
+@c Grieg Piano Concerto (mvt.1 cadenza)
+@lilypond[verbatim,quote]
+\new Staff <<
+ \new Voice \relative {
+ \voiceOne
+ <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
+ }
+ \new Voice \relative {
+ \voiceTwo
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ r32 c'' a c a c a c r c a c a c a c
+ r c a c a c a c a c a c a c a c
+ }
+ }
+>>
+@end lilypond
+
+L'@code{\override} de l'exemple anterior és una solució
+provisional per solucionar un error del programa. Consulteu
+l'apartat de @qq{Problemes i advertiments coneguts} al final
+d'aquesta secció.
+
+Si una figura amb una mida normal de cap es barreja amb una altra
+més petita, la mida de la menor podria de necessitar de canviar-se
+(amb @w{@samp{\once@tie{}\normalsize}}) perquè les pliques i les
+alteracions accidentals mantinguin una bona alineació:
+
+@c Chopin Prelude op.28 no.8
+@lilypond[verbatim,quote]
+\new Staff <<
+ \key fis \minor
+ \mergeDifferentlyDottedOn
+ \new Voice \relative {
+ \voiceOne
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ \once \normalsize cis'32( cis' gis b a fis \once \normalsize d d'
+ \once \normalsize cis, cis' gis b a gis \once \normalsize fis fis'
+ \once \normalsize fis, fis' ais, cis b gis \once \normalsize eis eis'
+ \once \normalsize a, a' bis, d cis b \once \normalsize gis gis')
+ }
+ }
+ \new Voice \relative {
+ \voiceTwo
+ cis'8. d16 cis8. fis16 fis8. eis16 a8. gis16
+ }
+>>
+@end lilypond
+
+L'ordre @code{\magnifyMusic} no està pensada per a les notes guia,
+d'adorn, o per als pentagrames d'Ossia; hi ha mètodes més
+apropiats per a la introducció de cada un d'aquests elements. En
+comptes d'això, és útil quan la mida de la notació canvia dins
+d'una sola part instrumental sobre un pentagrama, i quan les notes
+d'adorn no són adequades, com a passatges de cadència o en casos
+com els dels exemples anteriors. Establir el valor de
+@code{\magnifyMusic} a 0.63 duplica les dimensions del context
+@code{CueVoice}.
+
+@warning{L'ordre @code{@bs{}magnifyMusic} @i{no} ha d'utilitzar-se
+si s'està canviant la mida del pentagrama al mateix temps. Consulteu
+@rusernamed{Setting the staff size,Establir la mida del pentagrama}.}
+
+
+@subsubsubheading Canviar la mida dels objectes individuals
+
+Es pot canviar de mida un objecte de presentació individual usant
+les ordres @code{\tweak} o @code{\override} per ajustar la seva
+propietat @code{font-size}:
+
+@lilypond[quote,verbatim]
+\relative {
+ % resize a note head
+ <f' \tweak font-size -4 b e>-5
+ % resize a fingering
+ bes-\tweak font-size 0 -3
+ % resize an accidental
+ \once \override Accidental.font-size = -4 bes!-^
+ % resize an articulation
+ \once \override Script.font-size = 4 bes!-^
+}
+@end lilypond
+
+El valor predeterminat de @code{font-size} per a cada objecte de
+presentació està explicat al Manual de Referència de Funcionament
+Intern. La propietat @code{font-size} sols es pot fixar per als
+objectes de presentació que respecten la interfÃcie de presentació
+@code{font-interface}. Si no està especificada @code{font-size} a
+la llista de @q{Ajustos@tie{}està ndard} de l'objecte, el seu valor
+és 0. Vegeu
+@rinternals{All layout objects}.
+
+
+@subsubsubheading Comprensió de la propietat @code{fontSize}
+
+La propietat de context @code{fontSize} ajusta la mida relativa de
+tots els elements de notació basats en glifs dins d'un context:
+
+@lilypond[verbatim,quote]
+\relative {
+ \time 3/4
+ d''4---5 c8( b a g) |
+ \set fontSize = -6
+ e'4-- c!8-4( b a g) |
+ \set fontSize = 0
+ fis4---3 e8( d) fis4 |
+ g2.
+}
+@end lilypond
+
+El valor @code{fontSize} és un número que indica la mida relativa
+a la mida està ndard per a l'alçada actual del pentagrama. El
+valor predeterminat de @code{fontSize} es 0; la addició de 6 a
+qualsevol valor de @code{fontSize} duplica la mida impresa dels
+glifs, i la substracció de 6 redueix la mida a la meitat. Cada
+pas augmenta la mida en un 12% aproximadament.
+
+La funció del Scheme @code{magnification->font-size} es proveeix
+per conveniència, atès que les unitats logarÃtmiques de la propietat
+@code{font-size} no són totalment intuïtives. Per exemple, per
+ajustar la notació musical al 75% de la mida predeterminada, usem:
+
+
+@example
+\set fontSize = #(magnification->font-size 0.75)
+@end example
+
+La funció de l'Scheme @code{magstep} té l'efecte oposat:
+converteix un valor de @code{font-size} a un factor d'ampliació.
+
+La propietat @code{fontSize} no afecta sols als elements
+de notació que es dibuixen amb glifs, com el cap de les figures,
+les alteracions accidentals, les inscripcions textuals, etc. No
+afecta la mida de la pròpia pauta, ni canvia l'escala de les
+pliques, barres, o espaiat horitzontal. Per canviar l'escala de
+les pliques, barres i l'espaiat horitzontal junt amb la mida de la
+notació (sense canviar la mida de la pauta), useu l'ordre
+@code{\magnifyMusic} que s'ha explicat anteriorment. Per canviar
+l'escala de la mida de tot, fins i tot la pauta, vegeu
+@rusernamed{Setting the staff size,Establiment de la mida del pentagrama}.
+
+Sempre que s'estableix el valor de la @i{propietat de context}
+@code{fontSize}, el seu valor s'afegeix al valor de la
+@i{propietat d'objecte grà fic} @code{font-size} per als objectes
+de presentació individuals, abans que s'imprimeixi qualsevol dels
+glifs. Això pot confondre quan s'estableix el valor de les propietats
+@code{font-size} individuals mentre @code{fontSize} ja està establert:
+
+@lilypond[verbatim,quote,fragment]
+% the default font-size for NoteHead is 0
+% the default font-size for Fingering is -5
+c''4-3
+
+\set fontSize = -3
+% the effective font size for NoteHead is now -3
+% the effective font size for Fingering is now -8
+c''4-3
+
+\override Fingering.font-size = 0
+% the effective font size for Fingering is now -3
+c''4-3
+@end lilypond
+
+També hi ha les següents ordres de drecera:
+
+@multitable @columnfractions .2 .4 .4
+@item @b{Ordre} @tab @b{Equivalent a} @tab @b{Mida relativa}
+@item @code{\teeny} @tab @code{\set fontSize = -3} @tab 71%
+@item @code{\tiny} @tab @code{\set fontSize = -2} @tab 79%
+@item @code{\small} @tab @code{\set fontSize = -1} @tab 89%
+@item @code{\normalsize} @tab @code{\set fontSize = 0} @tab 100%
+@item @code{\large} @tab @code{\set fontSize = 1} @tab 112%
+@item @code{\huge} @tab @code{\set fontSize = 2} @tab 126%
+@end multitable
+
+@lilypond[verbatim,quote]
+\relative c'' {
+ \teeny
+ c4.-> d8---3
+ \tiny
+ c4.-> d8---3
+ \small
+ c4.-> d8---3
+ \normalsize
+ c4.-> d8---3
+ \large
+ c4.-> d8---3
+ \huge
+ c4.-> d8---3
+}
+@end lilypond
+
+
+@cindex està ndard, mida del tipus de lletra (de notació)
+@cindex tipus de lletra (de notació), mida està ndard de
+
+@funindex font-interface
+@funindex font-size
+
+Els canvis a la mida del tipus de lletra s'obtenen per mitjà de
+l'escalat de la mida del disseny que es troba més a prop de la
+mida desitjada. La mida està ndard per al tipus de lletra (per a
+@w{@code{font-size = 0}}) depèn de l'alçada està ndard del
+pentagrama. Per a un pentagrama de 20 punts, se selecciona un
+tipus de lletra de 11 punts.
+
+@predefined
+@code{\magnifyMusic},
+@code{\teeny} (Ãnfim),
+@code{\tiny} (molt petit),
+@code{\small} (petit),
+@code{\normalsize} (normal),
+@code{\large} (gran),
+@code{\huge} (enorme).
+@endpredefined
+
+@seealso
+Referència de la notació:
+@ref{Selecció del tipus de lletra i la seva mida}
+@rusernamed{Setting the staff size,Establiment de la mida del pentagrama}.
+@ref{Format de les notes guia},
+@ref{Pentagrames d'Ossia}.
+
+Fitxers instal·lats:
+@file{ly/music-functions-init.ly},
+@file{ly/property-init.ly}.
+
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{font-interface}.
+
+@c The two issues mentioned below:
+@c http://code.google.com/p/lilypond/issues/detail?id=3987
+@c http://code.google.com/p/lilypond/issues/detail?id=3990
+@knownissues
+Actualment hi ha dos errors del programa que impedeixen un espaiat
+horitzontal correcte en usar @code{\magnifyMusic}. Solament hi ha
+una forma rodejar l'error, i el seu funcionament correcte no estÃ
+garantit en tots els casos. A l'exemple que apareix a
+continuació, substituïu la variable @var{mag} amb el vostre valor
+preferit. També podeu intentar treure una o ambdues ordres
+@code{\newSpacingSection}, i/o les ordres
+@code{\override} i @code{\revert}:
+
+@example
+\magnifyMusic @var{mag} @{
+ \newSpacingSection
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 @var{mag})
+ [@var{music}]
+ \newSpacingSection
+ \revert Score.SpacingSpanner.spacing-increment
+@}
+@end example
+
+
+@node Indicacions de digitació
+@unnumberedsubsubsec Indicacions de digitació
+@translationof Fingering instructions
+
+@cindex digitació
+@cindex canvi de dit
+
+@funindex \finger
+
+Les instruccions de digitació es poden introduir usant
+@samp{@var{nota}-@var{dÃgito}}:
+
+@lilypond[verbatim,quote]
+\relative { c''4-1 d-2 f-4 e-3 }
+@end lilypond
+
+Per als canvis de dit es poden usar elements de marcatge de text
+o de cadenes de carà cters.
+
+@lilypond[verbatim,quote]
+\relative {
+ c''4-1 d-2 f\finger \markup \tied-lyric #"4~3" c\finger "2 - 3"
+}
+@end lilypond
+
+@cindex thumb-script
+
+@funindex \thumb
+
+Podeu usar l'articulació de polze per indicar que una nota s'ha de
+tocar amb el polze (per exemple a música de violoncel).
+
+@lilypond[verbatim,quote]
+\relative { <a'_\thumb a'-3>2 <b_\thumb b'-3> }
+@end lilypond
+
+@cindex digitació de acords
+@cindex digitació, instruccions de, per a acords
+@cindex acords, digitació de
+
+Les digitacions per als acords també es poden afegir a les notes
+individuals escrivint-les després de les altures.
+
+@lilypond[verbatim,quote]
+\relative {
+ <c''-1 e-2 g-3 b-5>2 <d-1 f-2 a-3 c-5>
+}
+@end lilypond
+
+Les indicacions de digitació es poden situar manualment a sobre o
+a sota del pentagrama, vegeu
+@rusernamed{Direction and placement,Direcció i posició}.
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{controlling-the-placement-of-chord-fingerings.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{allowing-fingerings-to-be-printed-inside-the-staff.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{avoiding-collisions-with-chord-fingerings.ly}
+
+@seealso
+Referència de la notació:
+@rusernamed{Direction and placement,Direcció i posició}.
+
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{FingeringEvent},
+@rinternals{fingering-event},
+@rinternals{Fingering_engraver},
+@rinternals{New_fingering_engraver},
+@rinternals{Fingering}.
+
+
+@node Notes ocultes
+@unnumberedsubsubsec Notes ocultes
+@translationof Hidden notes
+
+@cindex ocultes, notes
+@cindex invisibles, notes
+@cindex transparents, notes
+@cindex notes ocultes
+@cindex notes invisibles
+@cindex notes transparents
+
+@funindex \hideNotes
+@funindex \unHideNotes
+
+Las notes ocultes (o invisibles, o transparents) poden ser
+d'utilitat en la preparació d'exercicis de teoria o de composició.
+
+@lilypond[verbatim,quote]
+\relative {
+ c''4 d
+ \hideNotes
+ e4 f
+ \unHideNotes
+ g a
+ \hideNotes
+ b
+ \unHideNotes
+ c
+}
+@end lilypond
+
+El cap, la plica i la barra de les figures, aixà com els silencis,
+són invisibles. Les barres són invisibles si comencen en una nota
+oculta. Els objectes de notació que estan ancorats a notes
+invisibles, són, malgrat això, visibles.
+
+@lilypond[verbatim,quote]
+\relative c'' {
+ e8(\p f g a)--
+ \hideNotes
+ e8(\p f g a)--
+}
+@end lilypond
+
+
+@predefined
+@code{\hideNotes},
+@code{\unHideNotes}.
+@endpredefined
+
+@seealso
+Manual d'aprenentatge:
+@rlearning{Visibilitat i color dels objectes}
+
+Referència de la notació:
+@ref{Silencis invisibles},
+@rusernamed{Visibility of objects,Visibilitat dels objectes},
+@ref{Ocultament de pentagrames}.
+
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{Note_spacing_engraver},
+@rinternals{NoteSpacing}.
+
+
+@node Acoloriment d'objectes
+@unnumberedsubsubsec Acoloriment d'objectes
+@translationof Coloring objects
+
+@cindex acolorits, objectes
+@cindex colors
+@cindex acolorir objectes
+@cindex objectes, acolorir
+@cindex acolorides, notes
+@cindex acolorir notes
+@cindex notes acolorides
+@cindex x11, color de
+@cindex x11-color
+@cindex colors d'x11
+@cindex with-color
+
+@funindex color
+@funindex \with-color
+@funindex x11-color
+
+Es poden assignar colors als objectes individuals. Els noms de
+color và lids es relacionen a la
+@rusernamed{List of colors,Llista de colors}.
+
+@lilypond[verbatim,quote,fragment]
+\override NoteHead.color = #red
+c''4 c''
+\override NoteHead.color = #(x11-color 'LimeGreen)
+d''
+\override Stem.color = #blue
+e''
+@end lilypond
+
+Es pot accedir a l'espectre complet de colors definit per a X11
+usant la funció de l'Scheme x11-color. Aquesta funció accepta un
+únic argument; pot ser un sÃmbol de la forma
+@code{@var{'PauPereBerenguera}} o una cadena de la forma
+@code{"@var{PauPereBerenguera}"}. La primera forma és més rà pida
+d'escriure i també més eficient. Tanmateix, en usar la segona
+forma és possible accedir als colors d'X11 per mitjà de la forma
+del nom que té diverses paraules.
+
+Si @code{x11-color} no entén el parà metre, el color predeterminat
+que retorna és el negre.
+
+@lilypond[verbatim,quote]
+\new Staff \with {
+ instrumentName = \markup {
+ \with-color #(x11-color 'red) "Clarinet"
+ }
+ }
+ \relative c'' {
+ \override Staff.StaffSymbol.color = #(x11-color 'SlateBlue2)
+ gis8 a
+ \override Beam.color = #(x11-color "medium turquoise")
+ gis a
+ \override Accidental.color = #(x11-color 'DarkRed)
+ gis a
+ \override NoteHead.color = #(x11-color "LimeGreen")
+ gis a
+ % això és un absurd deliberadament; noteu que les barres romanen negres
+ \override Stem.color = #(x11-color 'Boggle)
+ b2 cis
+}
+@end lilypond
+
+@cindex rgb-color
+@cindex color rgb
+@cindex rgb, color
+
+@funindex rgb-color
+
+Es poden especificar colors RGB exactes utilitzant la funció de
+l'Scheme @code{rgb-color}.
+
+@lilypond[verbatim,quote]
+\new Staff \with {
+ instrumentName = \markup {
+ \with-color #(x11-color 'red) "Clarinet"
+ }
+ }
+\relative c'' {
+ \override Staff.StaffSymbol.color = #(x11-color 'SlateBlue2)
+ \override Stem.color = #(rgb-color 0 0 0)
+ gis8 a
+ \override Stem.color = #(rgb-color 1 1 1)
+ gis8 a
+ \override Stem.color = #(rgb-color 0 0 0.5)
+ gis4 a
+}
+@end lilypond
+
+@seealso
+Referència de la notació:
+@rusernamed{List of colors,Llista de colors}.
+@rusernamed{The tweak command,L'ordre tweak}.
+
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+@cindex x11, color de
+@cindex acolorides, notes d'acord
+@cindex notes acolorides en acords
+@cindex color en acords
+
+@funindex x11-color
+
+@knownissues
+Un color d'X11 no és necessà riament de la mateixa tonalitat exacta
+que un color normal de nom semblant.
+
+No tots els colors d'X11 es distingeixen entre ells a un navegador
+web, és a dir, un navegador web podria no mostrar cap diferència
+entre @code{LimeGreen} (verd llima) i @code{ForestGreen} (verd
+bosc). Per a la web es recomanen els colors normals (o sigui:
+@code{blue}, blau, @code{green}, verd, i @code{red}, vermell).
+
+Les notes d'un acord no es poden acolorir individualment amb
+@code{\override}; en el seu lloc useu @code{\tweak} o el seu
+equivalent @code{\single\override} abans de la nota respectiva.
+Consulteu @rusernamed{The tweak command,L'ordre tweak} per veure
+més detalls.
+
+@node Parèntesis
+@unnumberedsubsubsec Parèntesis
+@translationof Parentheses
+
+@cindex fantasma, notes
+@cindex notes fantasma
+@cindex notes entre parèntesis
+@cindex parèntesis
+@cindex claus
+
+@funindex \parenthesize
+
+Es poden tancar els objectes entre parèntesis anteposant
+@code{\parenthesize} a l'esdeveniment musical. Si s'aplica a un
+acord, envolta cada nota dins d'un parell de parèntesis. També es
+poden posar entre parèntesis les notes individuals d'un acord.
+
+@lilypond[verbatim,quote]
+\relative {
+ c''2 \parenthesize d
+ c2 \parenthesize <c e g>
+ c2 <c \parenthesize e g>
+}
+@end lilypond
+
+Els objectes que no són notes també es poden posar entre
+parèntesis. Per a les articulacions cal un guió abans de l'ordre
+@code{\parenthesize}.
+
+@lilypond[verbatim,quote]
+\relative {
+ c''2-\parenthesize -. d
+ c2 \parenthesize r
+}
+@end lilypond
+
+@seealso
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{Parenthesis_engraver},
+@rinternals{ParenthesesItem},
+@rinternals{parentheses-interface}.
+
+@knownissues
+En posar un acord entre parèntesis, s'envolta cada una de les
+notes individuals entre parèntesis, en comptes d'un sols
+parèntesis gran envoltant l'acord complet.
+
+@node Pliques
+@unnumberedsubsubsec Pliques
+@translationof Stems
+
+@cindex plica
+@cindex plica invisible
+@cindex invisible, plica
+@cindex plica, direcció
+@cindex plica amunt
+@cindex plica avall
+@cindex plica neutral
+
+@funindex \stemUp
+@funindex \stemDown
+@funindex \stemNeutral
+
+Quan es troba amb una nota, es crea automà ticament un objecte
+@code{Stem} (plica). Per a les rodones i els silencis, també es
+creen però es fan invisibles.
+
+Es pot fer manualment que les pliques apuntin cap amunt o cap
+avall; vegeu @rusernamed{Direction and placement,Direcció i posició}.
+
+@predefined
+@code{\stemUp},
+@code{\stemDown},
+@code{\stemNeutral}.
+@endpredefined
+
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{default-direction-of-stems-on-the-center-line-of-the-staff.ly}
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly}
+
+@seealso
+Referència de la notació:
+@rusernamed{Direction and placement,Direcció i posició}.
+
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{Stem_engraver},
+@rinternals{Stem},
+@rinternals{stem-interface}.
+
+
+@node Fora del pentagrama
+@subsection Fora del pentagrama
+@translationof Outside the staff
+
+Aquest secció tracta sobre com emfatitzar element que estan dins
+del pentagrama, des de fora del pentagrama.
+
+@menu
+* Globus d'ajuda::
+* LÃnies de reixeta::
+* Claus d'anà lisi::
+@end menu
+
+@node Globus d'ajuda
+@unnumberedsubsubsec Globus d'ajuda
+@translationof Balloon help
+
+@cindex globus
+@cindex notació, explicació de
+@cindex globus de ajuda
+@cindex ajuda, globus de
+
+@funindex \balloonGrobText
+@funindex \balloonText
+@funindex Balloon_engraver
+@funindex balloonGrobText
+@funindex balloonText
+@funindex \balloonLengthOn
+@funindex \balloonLengthOff
+
+Els elements de notació es poden marcar i anomenar amb l'ajuda
+d'un cartell o globus d'ajuda rectangular. El propòsit principal
+d'aquesta funcionalitat és l'explicació de la notació.
+
+@c KEEP LY
+@lilypond[verbatim,quote]
+\new Voice \with { \consists "Balloon_engraver" }
+\relative c'' {
+ \balloonGrobText #'Stem #'(3 . 4) \markup { "Sóc una plica" }
+ a8
+ \balloonGrobText #'Rest #'(-4 . -4) \markup { "Sóc un silenci" }
+ r
+ <c, g'-\balloonText #'(-2 . -2) \markup { "Sóc un cap" } c>2.
+}
+@end lilypond
+
+Hi ha dues funcions musicals, @code{balloonGrobText} i
+@code{balloonText}; el primer s'usa com @code{\once\override} per
+adjuntar un text a qualsevol objecte grà fic, i l'últim s'usa com
+@code{\tweak}, normalment dins d'acords, per adjuntar un text a
+una nota individual.
+
+Els textos de globus no influeixen a l'espaiat de les notes, però
+això es pot canviar:
+
+@c KEEP LY
+@lilypond[verbatim,quote]
+\new Voice \with { \consists "Balloon_engraver" }
+\relative c'' {
+ \balloonGrobText #'Stem #'(3 . 4) \markup { "Sóc una plica" }
+ a8
+ \balloonGrobText #'Rest #'(-4 . -4) \markup { "Sóc un silenci" }
+ r
+ \balloonLengthOn
+ <c, g'-\balloonText #'(-2 . -2) \markup { "Sóc un cap" } c>2.
+}
+@end lilypond
+
+@predefined
+@code{\balloonLengthOn},
+@code{\balloonLengthOff}.
+@endpredefined
+
+@seealso
+Fragments de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament intern:
+@rinternals{Balloon_engraver},
+@rinternals{BalloonTextItem},
+@rinternals{balloon-interface}.
+
+
+@node LÃnies de reixeta
+@unnumberedsubsubsec LÃnies de reixeta
+@translationof Grid lines
+
+@cindex reixeta, lÃnies de
+@cindex lÃnies de reixeta
+@cindex vertical, lÃnia, entre pentagrames
+@cindex lÃnia vertical entre pentagrames
+
+@funindex Grid_point_engraver
+@funindex Grid_line_span_engraver
+@funindex gridInterval
+
+Es poden dibuixar lÃnies verticals entre els pentagrames
+sincronitzades amb les notes.
+
+S'ha d'usar el gravador @code{Grid_point_engraver} per crear els
+punts extrems de les lÃnies, mentre que el gravador
+@code{Grid_line_span_engraver} es pot utilitzar per traçar
+efectivament les lÃnies. De forma predeterminada, això centra les
+lÃnies de reixeta horitzontalment a sota i al costat esquerre del
+cap de les notes. Les lÃnies de reixeta s'estenen a partir de la
+lÃnia mitjana dels pentagrames. L'interval @code{gridInterval} ha
+d'especificar la duració entre les lÃnies de reixeta.
+
+@lilypond[verbatim,quote]
+\layout {
+ \context {
+ \Staff
+ \consists "Grid_point_engraver"
+ gridInterval = #(ly:make-moment 1/4)
+ }
+ \context {
+ \Score
+ \consists "Grid_line_span_engraver"
+ }
+}
+
+\score {
+ \new ChoirStaff <<
+ \new Staff \relative {
+ \stemUp
+ c''4. d8 e8 f g4
+ }
+ \new Staff \relative {
+ \clef bass
+ \stemDown
+ c4 g' f e
+ }
+ >>
+}
+@end lilypond
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{grid-lines--changing-their-appearance.ly}
+
+@seealso
+Fragment de codi:
+@rlsr{Editorial annotations}.
+
+Referència de funcionament interno:
+@rinternals{Grid_line_span_engraver},
+@rinternals{Grid_point_engraver},
+@rinternals{GridLine},
+@rinternals{GridPoint},
+@rinternals{grid-line-interface},
+@rinternals{grid-point-interface}.
+
+
+@node Claus d'anà lisi
+@unnumberedsubsubsec Claus d'anà lisi
+@translationof Analysis brackets
+
+@cindex claus
+@cindex fraseig, claus de
+@cindex claus de fraseig
+@cindex musicològic, anà lisi
+@cindex anà lisi musicològic
+@cindex notes, claus d'agrupació de
+@cindex horitzontal, clau
+@cindex clau horitzontal
+
+@funindex Horizontal_bracket_engraver
+@funindex \startGroup
+@funindex \stopGroup
+
+Les claus s'usen en anà lisi musical per indicar l'estructura de
+les peces musicals. Es permeten les claus horitzontals simples.
+
+@lilypond[verbatim,quote]
+\layout {
+ \context {
+ \Voice
+ \consists "Horizontal_bracket_engraver"
+ }
+}
+\relative {
+ c''2\startGroup
+ d\stopGroup
+}
+@end lilypond
+
+Les claus d'anà lisi es poden niuar.
+
+@lilypond[verbatim,quote]
+\layout {
+ \context {
+ \Voice
+ \consists "Horizontal_bracket_engraver"
+ }
+}
+\relative {
+ c''4\startGroup\startGroup
+ d4\stopGroup
+ e4\startGroup
+ d4\stopGroup\stopGroup
+}
+@end lilypond
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{analysis-brackets-above-the-staff.ly}
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{analysis-brackets-with-labels.ly}
+
+@seealso
+Referència de funcionament intern:
+@rinternals{Horizontal_bracket_engraver},
+@rinternals{HorizontalBracket},
+@rinternals{horizontal-bracket-interface},
+@rinternals{HorizontalBracketText},
+@rinternals{horizontal-bracket-text-interface},
+@rinternals{Staff}.
diff --git a/Documentation/ca/notation/expressive.itely b/Documentation/ca/notation/expressive.itely
index 7e7558bdec..a909da3bdc 100644
--- a/Documentation/ca/notation/expressive.itely
+++ b/Documentation/ca/notation/expressive.itely
@@ -191,7 +191,7 @@ R1\fermataMarkup
@end lilypond
A més d'articulacions, es poden adjuntar textos i elements de
-marcatge de les notes. Vegeu @rusernamed{Text scripts,Scripts de text}.
+marcatge de les notes. Vegeu @ref{Scripts de text}.
Per veure més informació quant a l'ordenació dels elements Script
i TextScript que s'annexen a les notes, consulteu
@@ -219,7 +219,7 @@ Manual d'aprenentatge:
@rlearning{Col·locació dels objectes}.
Referència de la notació:
-@rusernamed{Text scripts,Scripts de text},
+@ref{Scripts de text},
@rusernamed{Direction and placement,Direcció i posició},
@rusernamed{List of articulations,Llista d'articulacions},
@ref{Refilets}.
@@ -558,7 +558,7 @@ moltoF = \markup { molto \dynamic f }
En el mode de marcatge es poden crear indicacions dinà miques
editorials (entre parèntesis o claus). La sintaxi del mode
de marcatge es descriu a
-@rusernamed{Formatting text,Format del text}.
+@ref{Donar format al text}.
@lilypond[verbatim,quote]
roundF = \markup {
@@ -649,12 +649,12 @@ moltoF = \tweak DynamicText.self-alignment-X #LEFT
Els ajustos per als tipus de lletra en mode de marcatge es
descriuen a
-@rusernamed{Selecting font and font size,Selecció del tipus de lletra i la seva mida}.
+@ref{Selecció del tipus de lletra i la seva mida}.
@seealso
Referència de la notació:
-@rusernamed{Formatting text,Format del text},
-@rusernamed{Selecting font and font size,Selecció del tipus de lletra i la seva mida},
+@ref{Donar format al text},
+@ref{Selecció del tipus de lletra i la seva mida},
@rusernamed{Enhancing MIDI output,Enriquiment de la sortida MIDI},
@rusernamed{Controlling MIDI dynamics,Control de las dinà miques del MIDI}.
diff --git a/Documentation/ca/notation/notation.itely b/Documentation/ca/notation/notation.itely
index 23ba0c966a..28cfe6100d 100644
--- a/Documentation/ca/notation/notation.itely
+++ b/Documentation/ca/notation/notation.itely
@@ -26,7 +26,7 @@ Aquest capÃtol explica com crear notació musical.
* Repeticions:: Repeticions de música.
* Notes simultà nies:: Més d'una nota a l'hora.
* Notació dels pentagrames:: Impressió dels pentagrames.
-* Editorial annotations:: Notació especial per augmentar la llegibilitat.
+* Anotacions editorials:: Notació especial per augmentar la llegibilitat.
* Text:: Addicció de text a les partitures.
@end menu
diff --git a/Documentation/ca/notation/pitches.itely b/Documentation/ca/notation/pitches.itely
index 4c18ff3806..22bac501be 100644
--- a/Documentation/ca/notation/pitches.itely
+++ b/Documentation/ca/notation/pitches.itely
@@ -3154,7 +3154,7 @@ Referència de funcionament interno:
@cindex arpa sacra, caps de nota amb forma
@cindex Southern Harmony, caps de nota amb forma
@cindex Funk, caps de nota amb forma
-@cindex Harmonica Sacra, caps de nota amb forma
+@cindex Harmonia Sacra, caps de nota amb forma
@cindex Christian Harmony, caps de nota amb forma
@cindex Walker, caps de nota amb forma
@@ -3162,7 +3162,7 @@ Referència de funcionament interno:
@cindex notes, caps de, arpa sacra
@cindex notes, caps de, Southern Harmony
@cindex notes, caps de, Funk
-@cindex notes, caps de, Harmonica Sacra
+@cindex notes, caps de, Harmonia Sacra
@cindex notes, caps de, Christian Harmony
@cindex notes, caps de, Walker
@@ -3176,7 +3176,7 @@ A la notació de caps amb forma, la forma del cap correspon a la
funció harmònica d'una nota dins de l'escala. Aquesta notació es
va fer popular als llibres americans de cançons durant el segle
XIX. Els caps de nota amb formes es poden produir amb els estils
-@q{Arpa Sacra}, @q{Southern Harmony}, Funk (Harmonica Sacra),
+@q{Arpa Sacra}, @q{Southern Harmony}, Funk (Harmonia Sacra),
Walker i Aiken @q{(Christian Harmony)}:
@lilypond[verbatim,quote]
diff --git a/Documentation/ca/notation/repeats.itely b/Documentation/ca/notation/repeats.itely
index 1096296890..1710752c26 100644
--- a/Documentation/ca/notation/repeats.itely
+++ b/Documentation/ca/notation/repeats.itely
@@ -531,7 +531,7 @@ Es poden produir diverses ordres de repetició amb el mateix punt:
Es pot incloure text dins de la cela de primera i segona vegada.
El text pot ser un número o números, o un element de marcatge,
-vegeu @rusernamed{Formatting text,Format del text}. La forma
+vegeu @ref{Donar format al text}. La forma
més fà cil d'usar text de marcatge és definir el marcatge
prèviament, i després incloure'l dins d'una llista de l'Scheme.
@@ -552,7 +552,7 @@ voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
@seealso
Referència de la notació:
@ref{Barres de compà s},
-@rusernamed{Formatting text,Format del text}.
+@ref{Donar format al text}.
Fragments de codi:
@rlsr{Repeats}.
diff --git a/Documentation/ca/notation/rhythms.itely b/Documentation/ca/notation/rhythms.itely
index ef2f00b9c2..599785430c 100644
--- a/Documentation/ca/notation/rhythms.itely
+++ b/Documentation/ca/notation/rhythms.itely
@@ -185,7 +185,7 @@ Glossari musical:
Referència de la notació:
@ref{Barres automà tiques},
@ref{Lligadures d'unió},
-@rusernamed{Stems,Pliques},
+@ref{Pliques},
@ref{Escriptura de les duracions (valors rÃtmics)},
@ref{Escriptura dels silencis},
@rusernamed{Vocal music,Música vocal},
@@ -838,7 +838,7 @@ Manual de aprenentatge:
@rlearning{Visibilitat i color dels objectes}.
Referència de la notació:
-@rusernamed{Hidden notes,Notes ocultes},
+@ref{Notes ocultes},
@rusernamed{Visibility of objects,Visibilitat dels objectes}.
Fragments de codi:
@@ -1009,9 +1009,9 @@ Glossari musical:
Referència de la notació:
@ref{Duracions},
-@rusernamed{Text,Text},
-@rusernamed{Formatting text,Donar format al text},
-@rusernamed{Text scripts,Scripts de text}.
+@ref{Text},
+@ref{Donar format al text},
+@ref{Scripts de text}.
Fragments de codi:
@rlsr{Rhythms}.
@@ -1410,7 +1410,7 @@ d'ignorar les indicacions de tempo per a l'espaiat horitzontal.
@lilypondfile[verbatim,quote,texidoc,doctitle]
{creating-metronome-marks-in-markup-mode.ly}
-Para veure més detalls, consulteu @rusernamed{Formatting text,Donar format al text}.
+Para veure més detalls, consulteu @ref{Donar format al text}.
@seealso
Glossari musical:
@@ -1420,7 +1420,7 @@ Glossari musical:
@rglos{metronome mark}.
Referència de la notació:
-@rusernamed{Formatting text,Donar format al text},
+@ref{Donar format al text},
@rusernamed{Creating MIDI output,Creació de sortida MIDI}.
Fragments de codi:
@@ -3458,8 +3458,8 @@ per veure una llista dels sÃmbols que es poden imprimir amb
@code{\musicglyph}.
Per veure formes comuns d'ajustar la col·locació de les lletres
-d'assaig, consulteu @rusernamed{Formatting text,Donar format al
-text}. Per a un control més precÃs, consulteu
+d'assaig, consulteu @ref{Donar format al text}.
+Per a un control més precÃs, consulteu
@code{break-alignable-interface} a la secció
@rusernamed{Aligning objects,Alineació d'objectes}.
@@ -3471,7 +3471,7 @@ per escriure altres funcions per donar format.
@seealso
Referència de la notació:
@rusernamed{The Emmentaler font,El tipus de lletra Emmentaler},
-@rusernamed{Formatting text,Donar format al text},
+@ref{Donar format al text},
@rusernamed{Aligning objects,Alineació d'objectes}.
Fitxers d'inici:
diff --git a/Documentation/ca/notation/simultaneous.itely b/Documentation/ca/notation/simultaneous.itely
index 50e86c4ba8..a846fb572e 100644
--- a/Documentation/ca/notation/simultaneous.itely
+++ b/Documentation/ca/notation/simultaneous.itely
@@ -624,7 +624,7 @@ Manual d'aprenentatge:
Referència de la notació:
@rusernamed{Percussion staves,Pautes de percussió},
@ref{Silencis invisibles},
-@rusernamed{Stems,Pliques}.
+@ref{Pliques}.
Fragments de codi:
@rlsr{Simultaneous notes}.
diff --git a/Documentation/ca/notation/staff.itely b/Documentation/ca/notation/staff.itely
index b955856bbf..8c94550f94 100644
--- a/Documentation/ca/notation/staff.itely
+++ b/Documentation/ca/notation/staff.itely
@@ -836,7 +836,7 @@ Referència de la notació:
@rusernamed{Changing context default settings,Canvi dels valores per defecte dels contextos},
@ref{El sÃmbol del pentagrama},
@ref{Pentagrames d'Ossia},
-@rusernamed{Hidden notes,Notes ocultes},
+@ref{Notes ocultes},
@ref{Silencis invisibles},
@rusernamed{Visibility of objects,Visibilitat dels objectes}.
diff --git a/Documentation/ca/notation/text.itely b/Documentation/ca/notation/text.itely
new file mode 100644
index 0000000000..83bb363426
--- /dev/null
+++ b/Documentation/ca/notation/text.itely
@@ -0,0 +1,1622 @@
+@c -*- coding: utf-8; mode: texinfo; documentlanguage: ca -*-
+@ignore
+ Translation of GIT committish: 18d03fa6a724b0102ccc47d194209802cea02f2e
+
+ When revising a translation, copy the HEAD committish of the
+ version that you are working on. For details, see the Contributors'
+ Guide, node Updating translation committishes..
+@end ignore
+
+@c \version "2.19.21"
+
+@c Translators: Walter Garcia-Fontes
+@c Translation checkers:
+
+@node Text
+@section Text
+@translationof Text
+
+@lilypondfile[quote]{text-headword.ly}
+
+Aquesta secció explica com incloure text (amb diversos estils de
+format) a les partitures.
+
+@noindent
+Certs elements de text dels que no ens ocupem aquà es presenten a
+d'altres secciones especÃfiques:
+@rusernamed{Vocal music,Música vocal},
+@rusernamed{Titles and headers,TÃtols i encapçalaments}.
+
+@menu
+* Escriptura del text::
+* Donar format al text::
+* Tipus de lletra::
+@end menu
+
+@node Escriptura del text
+@subsection Escriptura del text
+@translationof Writing text
+
+Aquesta secció presenta les diferents formes d'afegir text a una
+partitura.
+
+@cindex text, en altres llengües
+@warning{Per escriure text amb carà cters accentuats i especials
+(com a les llengües diferents a l'anglès), senzillament inseriu
+els carà cters directament al fitxer del LilyPond. El fitxer s'ha
+de desar com a UTF-8. Per veure més informació, consulteu
+@rusernamed{Text encoding,Codificació del text}.}
+
+@menu
+* Scripts de text::
+* Extensions de text::
+* Indicacions de text::
+* Text separat::
+@end menu
+
+
+@node Scripts de text
+@unnumberedsubsubsec Scripts de text
+@translationof Text scripts
+
+@cindex text, inscripcions de
+@cindex text, elements no buits de
+@cindex no buits, textos
+@cindex text destacat
+
+Ãs possible afegir indicacions de @qq{text entre cometes} a una
+partitura, com es mostra a l'exemple següent. Aquestes
+indicacions es poden col·locar manualment per sobre o per sota del
+pentagrama, utilitzant la sintaxi que es descriu a
+@rusernamed{Direction and placement,Direcció i posició}.
+
+@lilypond[quote,verbatim]
+\relative { a'8^"pizz." g f e a4-"scherz." f }
+@end lilypond
+
+Aquesta sintaxi és en realitat una abreviatura; es pot afegir
+explÃcitament a una nota un format de text més complex utilitzant
+un bloc @code{\markup}, como es descriu a
+@ref{Donar format al text}.
+
+@lilypond[quote,verbatim]
+\relative {
+ a'8^\markup { \italic pizz. } g f e
+ a4_\markup { \tiny scherz. \bold molto } f }
+@end lilypond
+
+De format predeterminada, les indicacions de text no afecten a
+l'espaiat de les notes. Malgrat això, la seva amplada es podria
+tenir en compte: a l'exemple següent, la primera cadena de text no
+afecta l'espaiat, però la segon sà afecta.
+
+@lilypond[quote,verbatim]
+\relative {
+ a'8^"pizz." g f e
+ \textLengthOn
+ a4_"scherzando" f
+}
+@end lilypond
+
+Es poden adjuntar articulacions a les notes, a més d'inscripcions
+de text. Per veure més informació, consulteu
+@ref{Articulacions i ornaments}.
+
+Per veure més informació sobre l'ordre relatiu de les inscripcions
+de text i les articulacions, consulteu
+@rlearning{Col·locació dels objectes}.
+
+@funindex \textLengthOn
+@funindex \textLengthOff
+
+@predefined
+@code{\textLengthOn},
+@code{\textLengthOff}.
+@endpredefined
+
+@seealso
+Manual de aprenentatge:
+@rlearning{Col·locació dels objectes}.
+
+Referència de la notació:
+@ref{Donar format al text},
+@rusernamed{Direction and placement,Direcció i posició},
+@ref{Articulacions i ornaments}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+
+@cindex text fora del marge
+@cindex marge, text fora del
+@cindex text, mantenir dins del marge
+@cindex lletra, mantenir dins del marge
+
+@knownissues
+La comprovació necessà ria per assegurar que les inscripcions de
+text i la lletra de les cançons es mantenen dins dels marges,
+requereix de cà lculs addicionals. En cas que desitgeu un procés
+lleugerament més rà pid, podeu utilitzar
+
+@example
+\override Score.PaperColumn.keep-inside-line = ##f
+@end example
+
+
+@node Extensions de text
+@unnumberedsubsubsec Extensions de text
+@translationof Text spanners
+
+@cindex text, elements d'extensió
+
+Certes indicacions d'execució, per exemple @i{rallentando} o
+@i{accelerando}, s'escriuen com a text i s'estenen sobre molts
+compassos mitjançant lÃnies de punts. Aquests objectes, que reben
+el nom de @q{spanners} o objectes d'extensió, es poden crear des
+d'una nota fins una altra usant la sintaxi següent:
+
+@lilypond[verbatim,quote]
+\relative {
+ \override TextSpanner.bound-details.left.text = "rit."
+ b'1\startTextSpan
+ e,\stopTextSpan
+}
+@end lilypond
+
+@cindex text, format dels elements d'extensió
+@cindex format dels elements d'extensió de text
+
+@noindent
+La cadena de text que imprimeix s'estableix a través de propietats
+d'objecte. De forma predeterminada s'imprimeix en estil cursiva,
+però es poden aconseguir diferents efectes de format utilitzant blocs
+@code{\markup}, com es descriue a
+@ref{Donar format al text}.
+
+@lilypond[quote,verbatim]
+\relative {
+ \override TextSpanner.bound-details.left.text =
+ \markup { \upright "rit." }
+ b'1\startTextSpan c
+ e,\stopTextSpan
+}
+@end lilypond
+
+L'estil de la lÃnia, aixà com la cadena de text, es definir com
+una propietat d'objecte. Aquest sintaxi es descriu a
+@rusernamed{Line styles,Estils de lÃnia}.
+
+@funindex \textSpannerUp
+@funindex \textSpannerDown
+@funindex \textSpannerNeutral
+
+
+@predefined
+@code{\textSpannerUp},
+@code{\textSpannerDown},
+@code{\textSpannerNeutral}.
+@endpredefined
+
+@knownissues
+El LilyPond sols pot utilitzar un objecte d'extensió de text per
+cada veu.
+
+@snippets
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{dynamics-text-spanner-postfix.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{dynamics-custom-text-spanner-postfix.ly}
+
+@seealso
+Referència de la notació:
+@rusernamed{Line styles,Estils de lÃnia},
+@ref{Matisos dinà mics},
+@ref{Donar format al text}.
+
+Fragments de codi:
+@rlsr{Text},
+@rlsr{Expressive marks}.
+
+Referència de funcionament interno:
+@rinternals{TextSpanner}.
+
+
+@node Indicacions de text
+@unnumberedsubsubsec Indicacions de text
+@translationof Text marks
+
+@cindex text, indicacions de
+@cindex indicacions de text
+@cindex text sobre la barra de compà s
+@cindex coda sobre la lÃnia divisòria
+@cindex segno sobre la lÃnia divisòria
+@cindex calderó sobre la lÃnia divisòria
+@cindex lÃnies divisòries, sÃmbols sobre les
+
+@funindex \mark
+@funindex \markup
+
+Es poden afegir a la partitura diversos elements de text amb la
+sintaxi que es descriue a @ref{Marques d'assaig}.
+
+@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]
+\relative {
+ \mark "Verse"
+ c'2 g'
+ \bar "||"
+ \mark "Chorus"
+ g2 c,
+ \bar "|."
+}
+@end lilypond
+
+Aquesta sintaxi possibilitat col·locar qualsevol text sobre la
+lÃnia divisòria; es poden incorporar formats complexos per al text
+usant un bloc @code{\markup}, como està explicat a
+@ref{Donar format al text}:
+
+@lilypond[quote,verbatim]
+\relative {
+ <c' e>1
+ \mark \markup { \italic { colla parte } }
+ <d f>2 <e g>
+ <c f aes>1
+}
+@end lilypond
+
+@noindent
+Aquest sintaxi també permet imprimir sÃmbols especials com crides,
+segno o calderons, especificant el nom del sÃmbol corresponent com
+s'explica a
+@ref{Notació musical dins d'elements de marcatge}:
+
+@lilypond[quote,verbatim]
+\relative {
+ <bes' f>2 <aes d>
+ \mark \markup { \musicglyph #"scripts.ufermata" }
+ <e g>1
+}
+@end lilypond
+
+@noindent
+Aquests objectes es graven sols sobre el pentagrama superior de la
+partitura; depenent de si estan especificats al final o al mig
+d'un compà s, es col·locaran sobre la lÃnia divisòria o entre les
+notes. Si s'especifiquen a un salt de lÃnia, les crides
+s'imprimeixen al principi de la lÃnia següent.
+
+@lilypond[quote,verbatim,ragged-right]
+\relative c'' {
+ \mark "Allegro"
+ c1 c
+ \mark "assai" \break
+ c c
+}
+@end lilypond
+
+@funindex \markLengthOn
+@funindex \markLengthOff
+
+@predefined
+@code{\markLengthOn},
+@code{\markLengthOff}.
+@endpredefined
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{printing-marks-at-the-end-of-a-line.ly}
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{printing-marks-on-every-staff.ly}
+
+@seealso
+Referència de la notació:
+@ref{Marques d'assaig},
+@ref{Donar format al text},
+@ref{Notació musical dins d'elements de marcatge},
+@ref{The Emmentaler font,El tipus de lletra Emmentaler}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{MarkEvent},
+@rinternals{Mark_engraver},
+@rinternals{RehearsalMark}.
+
+
+@node Text separat
+@unnumberedsubsubsec Text separat
+@translationof Separate text
+
+@cindex separat, text
+@cindex text separat
+@cindex independent, text
+@cindex nivell superior, text del
+@cindex text del nivell superior
+@cindex text independent
+
+@funindex \markup
+
+Un bloc @code{\markup} pot existir de forma independent, fora de
+qualsevol bloc @code{\score}, como una @qq{expressió de nivell
+superior}. Aquesta sintaxi es descriu a
+@rusernamed{File structure,Estructura del fitxer}.
+
+@lilypond[verbatim,quote]
+\markup {
+ Tomorrow, and tomorrow, and tomorrow...
+}
+@end lilypond
+
+@noindent
+Això fa possible imprimir text separat de la música, cosa que és
+especialment útil quan el fitxer d'entrada conté diverses peces,
+tal i com es descriu a
+@rusernamed{Multiple scores in a book,Diverses partitures en un llibre}.
+
+@lilypond[quote,verbatim]
+\score {
+ c'1
+}
+\markup {
+ Tomorrow, and tomorrow, and tomorrow...
+}
+\score {
+ c'1
+}
+@end lilypond
+
+Els blocs de text independent poden abastar diverses pà gines,
+possibilitat la impressió de document o text o llibres Ãntegrament
+des del LilyPond. Aquesta funcionalitat i la sintaxi que
+requereix es descriuen a
+@ref{Elements de marcatge de diverses pà gines}.
+
+
+@funindex \markup
+@funindex \markuplist
+
+@predefined
+@code{\markup},
+@code{\markuplist}.
+@endpredefined
+
+
+@snippets
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{stand-alone-two-column-markup.ly}
+
+@seealso
+Referència de la notació:
+@ref{Donar format al text},
+@rusernamed{File structure,Estructura del fitxer},
+@rusernamed{Multiple scores in a book,Diverses partitures en un llibre},
+@ref{Elements de marcatge de diverses pà gines}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+
+@node Donar format al text
+@subsection Donar format al text
+@translationof Formatting text
+
+Aquesta secció presenta els formats bà sics i avançats de text,
+usant la sintaxi especÃfica del modo de @code{\markup}.
+
+@menu
+* Introducció al marcatge de text::
+* Selecció del tipus de lletra i la seva mida::
+* Alineació de text::
+* Notació grà fica dins d'elements de marcatge::
+* Notació musical dins d'elements de marcatge::
+* Elements de marcatge de diverses pà gines::
+@end menu
+
+@node Introducció al marcatge de text
+@unnumberedsubsubsec Introducció al marcatge de text
+@translationof Text markup introduction
+
+@cindex marcatge
+@cindex text, marcatge de
+@cindex marcatge de text
+@cindex gravació de text
+
+@funindex \markup
+
+S'usa un bloc @code{\markup} per gravar text amb una sintaxi
+ampliable que es denomina @qq{modo de marcatge}.
+
+@cindex marcatge, expressions de
+@cindex expressions de marcatge
+@cindex marcatge, sintaxi
+@cindex sintaxi del marcatge
+
+La sintaxi del marcatge és semblant a la sintaxi usual del
+LilyPond: una expressió @code{\markup} s'envolta entre claus
+@code{@{ @dots{} @}}. Una sola paraula es considera com una
+expressió mÃnima, i per tant no li cal estar envoltada entre
+claus.
+
+A diferència de les indicacions de @qq{text entre cometes}
+simples, els blocs @code{\markup} poden contenir expressions
+niuades o ordres de marcatge, que s'introdueixen utilitzant el
+carà cter de barra invertida @code{\} . Aquestes ordres sols
+afecten a l'expressió que segueix immediatament.
+
+@lilypond[quote,verbatim]
+\relative {
+ a'1-\markup intenso
+ a2^\markup { poco \italic più forte }
+ c e1
+ d2_\markup { \italic "string. assai" }
+ e
+ b1^\markup { \bold { molto \italic agitato } }
+ c
+}
+@end lilypond
+
+@cindex carà cters especials en mode de marcatge
+@cindex marcatge, carà cters especials en mode de
+@cindex reservats, impressió de carà cters
+@cindex impressió de carà cters especials
+@cindex text entre cometes en mode de marcatge
+
+Un bloc @code{\markup} pot contenir també cadenes de text entre
+cometes. Aquestes cadenes es tracten com a expressions de text
+mÃnimes, i per tant qualsevol ordre de marcatge o carà cter
+especial (com @code{\} i@tie{}@code{#}) s'imprimeixen literalment
+sense afectar el fomat del text. Es poden fer que s'imprimeixin
+les pròpies cometes si se les anteposa una barra invertida.
+
+@lilypond[quote,verbatim]
+\relative {
+ a'1^"\italic markup..."
+ a_\markup { \italic "... imprimeix lletres \"cursives\" !" }
+ a a
+}
+@end lilypond
+
+Perquè es tractin com a una expressió diferent, cal que les
+llistes de paraules estiguin envoltades entre cometes o precedides
+d'una ordre. La forma en la qual estan definides les expressions
+de marcatge afecta com es sobreposen, se centren i s'alineen
+aquestes expressions; a l'exemple següent, la segona expressió
+@code{\markup} es tracta igual que la primera:
+
+@lilypond[quote,verbatim]
+\relative c'' {
+ c1^\markup { \center-column { a bbb c } }
+ c1^\markup { \center-column { a { bbb c } } }
+ c1^\markup { \center-column { a \line { bbb c } } }
+ c1^\markup { \center-column { a "bbb c" } }
+}
+@end lilypond
+
+Els marcatges es poden emmagatzemar dins de variables. Aquests
+variables es poden adjuntar directament a les notes:
+
+@lilypond[quote,verbatim]
+allegro = \markup { \bold \large Allegro }
+
+{
+ d''8.^\allegro
+ d'16 d'4 r2
+}
+@end lilypond
+
+
+@noindent
+Es pot trobar una llista exhaustiva de les ordres especÃfiques
+@code{\markup} a @rusernamed{Text markup commands,Ordres de marcatge de text}.
+
+@seealso
+Referència de la notació:
+@rusernamed{Text markup commands,Ordres de marcatge de text}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Fitxers d'inici:
+@file{scm/markup.scm}.
+
+@knownissues
+Els missatges d'error de sintaxi per al mode de marcatge sovint
+produeixen confusió.
+
+@node Selecció del tipus de lletra i la seva mida
+@unnumberedsubsubsec Selecció del tipus de lletra i la seva mida
+@translationof Selecting font and font size
+
+@cindex tipus de lletra, canviar
+@cindex canvi del tipus de lletra
+
+@funindex \italic
+@funindex \bold
+@funindex \underline
+
+Es pot canviar de forma bà sica el tipus de lletra al mode de marcatge:
+
+@lilypond[quote,verbatim]
+\relative {
+ d''1^\markup {
+ \bold { Più mosso }
+ \italic { non troppo \underline Vivo }
+ }
+ r2 r4 r8
+ d,_\markup { \italic quasi \smallCaps Tromba }
+ f1 d2 r
+}
+@end lilypond
+
+@cindex tipus de lletra, mida de
+@cindex text, mida de
+
+@funindex \abs-fontsize
+@funindex \fontsize
+@funindex \smaller
+@funindex \larger
+@funindex \magnify
+
+La mida del tipus de lletra es pot alterar en relació a la mida
+global del pentagrama de diverses maneres, com es veu a continuació.
+
+Es pot fixar a una mida predefinida:
+
+@lilypond[quote,verbatim]
+\relative b' {
+ b1_\markup { \huge Sinfonia }
+ b1^\markup { \teeny da }
+ b1-\markup { \normalsize camera }
+}
+@end lilypond
+
+Es pot establir a un amida relativa a la mida anterior:
+
+@lilypond[quote,verbatim]
+\relative b' {
+ b1_\markup { \larger Sinfonia }
+ b1^\markup { \smaller da }
+ b1-\markup { \magnify #0.6 camera }
+}
+@end lilypond
+
+Es pot augmentar o disminuir de forma relativa al valor fixat per
+la mida global del pentagrama:
+
+@lilypond[quote,verbatim]
+\relative b' {
+ b1_\markup { \fontsize #-2 Sinfonia }
+ b1^\markup { \fontsize #1 da }
+ b1-\markup { \fontsize #3 camera }
+}
+@end lilypond
+
+També es pot establir a una mida de punts fix, independentment de
+la mida global del pentagrama:
+
+@lilypond[quote,verbatim]
+\relative b' {
+ b1_\markup { \abs-fontsize #20 Sinfonia }
+ b1^\markup { \abs-fontsize #8 da }
+ b1-\markup { \abs-fontsize #14 camera }
+}
+@end lilypond
+
+Si el text inclou espais, és millor escriure tot entre cometes, de
+forma que la mida de cada espai sigui correcte per a la mida dels
+altres carà cters.
+
+@lilypond[quote,verbatim]
+\markup \fontsize #6 \bold { Sinfonia da camera }
+\markup \fontsize #6 \bold { "Sinfonia da camera" }
+@end lilypond
+
+@cindex subÃndex
+@cindex superÃndex
+
+@funindex \super
+@funindex \sub
+@funindex \normal-size-super
+
+El text es pot imprimir com subÃndex o com superÃndex. De forma
+predeterminada s'imprimeix en una mida menor, però també es pot
+usar una mida normal:
+
+@lilypond[quote,verbatim]
+\markup {
+ \column {
+ \line { 1 \super st movement }
+ \line { 1 \normal-size-super st movement
+ \sub { (part two) } }
+ }
+}
+@end lilypond
+
+@cindex tipus de lletra, famÃlies de
+
+El mode de marcatge ofereix una manera fà cil d'escollir famÃlies
+de tipus de lletra alternatives. A no ser que s'especifiqui d'un
+altre mode, se selecciona automà ticament el tipus de lletra
+predeterminada amb serifa, de tipus romà : en l'última lÃnia de
+l'exemple següent, no hi ha diferència entre la primera i la
+segona paraula.
+
+@lilypond[quote,verbatim]
+\markup {
+ \column {
+ \line { Act \number 1 }
+ \line { \sans { Scene I. } }
+ \line { \typewriter { Verona. An open place. } }
+ \line { Enter \roman Valentine and Proteus. }
+ }
+}
+@end lilypond
+
+@noindent
+Algunes d'aquestes famÃlies, usades per elements especÃfics com
+números o matisos, no ofereixen tots els carà cters, com s'explica a
+@ref{Indicacions dinà miques contemporà nies} i
+@ref{Marques de repetició manual}.
+
+@c \concat is actually documented in Align (it is not
+@c a font-switching command). But we need it here. -vv
+
+Si s'usen dins d'una paraula, algunes instruccions de canvi de
+tipus de lletra o de format poden produir un espai buit no
+desitjat. Això es pot solucionar concatenant a un de sol els
+diferents elements de text:
+
+@lilypond[quote,verbatim]
+\markup {
+ \column {
+ \line {
+ \concat { 1 \super st }
+ movement
+ }
+ \line {
+ \concat { \dynamic p , }
+ \italic { con dolce espressione }
+ }
+ }
+}
+@end lilypond
+
+Es pot trobar una llista exhaustiva d'ordres de canvi i
+utilització personalitzada dels tipus de lletres a
+@ref{Tipus de lletra}.
+
+També es possible definir conjunts personalitzats de tipus de
+lletra, tal i com s'explica a @ref{Explicació dels tipus de lletra}.
+
+@funindex \teeny
+@funindex \tiny
+@funindex \small
+@funindex \normalsize
+@funindex \large
+@funindex \huge
+@funindex \smaller
+@funindex \larger
+
+
+@predefined
+@code{\teeny},
+@code{\tiny},
+@code{\small},
+@code{\normalsize},
+@code{\large},
+@code{\huge},
+@code{\smaller},
+@code{\larger}.
+@endpredefined
+
+@seealso
+Referència de la notació:
+@ref{Tipus de lletra},
+@ref{Indicacions dinà miques contemporà nies},
+@ref{Marques de repetició manual},
+@ref{Tipus de lletra}.
+
+Fitxers d'inici:
+@file{scm/define-markup-commands.scm}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+@knownissues
+La utilització de les ordres de mida de text
+@code{\teeny}, @code{\tiny}, @code{\small}, @code{\normalsize},
+@code{\large} i @code{\huge} condueixen a un espaiat de les lÃnies
+inconsistent comparat amb l'ús de @code{\fontsize}.
+
+@node Alineació de text
+@unnumberedsubsubsec Alineació de text
+@translationof Text alignment
+
+@cindex text, alineació de
+@cindex alinear text
+@cindex alinear text de marcatge
+@cindex alinear elements de marcatge
+@cindex marcatge, elements, alinear
+@cindex marcatge, text, alinear
+
+Aquesta subsecció tracta sobre com col·locar text al mode de
+marcatge. Els objecte de marcatge també es poden moure com un
+tot, usant la sintaxi que es descriu a
+@rlearning{Moviment d'objectes}.
+
+@c Padding commands should be mentioned on this page, but
+@c most of these require \box to be more clearly illustrated. -vv
+
+@cindex text, alineació horitzontal
+@cindex horitzontal, alineació de text
+
+@funindex \left-align
+@funindex \center-align
+@funindex \right-align
+
+Els objectes de marcatge es poden alinear de diferents maneres.
+De forma predeterminada, una indicació de text s'alinea sobre la
+vora esquerra: a l'exemple següent, no hi ha diferència entre els
+marcatges primer i segon.
+
+@lilypond[quote,verbatim]
+\relative {
+ d''1-\markup { poco }
+ f
+ d-\markup { \left-align poco }
+ f
+ d-\markup { \center-align { poco } }
+ f
+ d-\markup { \right-align poco }
+}
+@end lilypond
+
+@funindex \halign
+
+Es pot realitzar un ajust fi de l'alineació horitzontal usant un
+valor numèric:
+
+@lilypond[quote,verbatim]
+\relative {
+ a'1-\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
+
+@noindent
+Certs objectes poden posseir els seus propis procediments
+d'alineació, i per tant no resulten afectats per aquestes ordres.
+Ãs possible moure aquests objectes de marcatge com un tot, com es
+mostra per exemple a @ref{Indicacions de text}.
+
+@cindex text, alineació vertical
+@cindex vertical, alineació de text
+
+@funindex \raise
+@funindex \lower
+@funindex \null
+
+L'alineació vertical és una mica més complexa. Com s'ha dit més a
+dalt, els objectes de marcatge es poden moure com un tot;
+tanmateix, també és possible moure element especÃfics dins d'un
+bloc de marcatge. En aquest cas, l'element a moure s'ha de
+precedir d'un @emph{punt d'ancoratge}, que pot ser un altre
+element de marcatge o un objecte invisible. L'exemple següent
+exemplifica aquestes dues possibilitats; l'últim marcatge en
+aquest exemple no té punt d'ancoratge i per això no resulta
+mogut.
+
+@lilypond[quote,verbatim]
+\relative {
+ d'2^\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
+
+@funindex \general-align
+@funindex \translate
+@funindex \translate-scaled
+
+Algunes ordres poden afectar tant a l'alineació horitzontal com a
+la vertical dels objectes de text en el mode de marcatge.
+Qualsevol objecte afectat per aquestes instruccions s'han de
+precedir d'un punt d'ancoratge:
+
+@lilypond[quote,verbatim]
+\relative {
+ d'2^\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
+
+@cindex diverses lÃnies, marcatge
+@cindex marcatge de diverses lÃnies
+@cindex diverses lÃnies, text
+@cindex text de diverses lÃnies
+@cindex text en columnes
+@cindex columnes, text
+
+@funindex \column
+@funindex \center-column
+
+Un objecte de marcatge pot incloure diverses lÃnies de text. A
+l'exemple següent, cada element o expressió se situa a la seva
+pròpia lÃnia, ja sigui alineada per l'esquerra o centrada:
+
+@lilypond[quote,verbatim]
+\markup {
+ \column {
+ a
+ "b c"
+ \line { d e f }
+ }
+ \hspace #10
+ \center-column {
+ a
+ "b c"
+ \line { d e f }
+ }
+}
+@end lilypond
+
+@cindex centrar el text a la pà gina
+@cindex text, centrar a la pà gina
+@cindex marcatge, centrar a la pà gina
+
+@funindex \fill-line
+
+De forma semblant, una llesta d'elements o expressions es pot
+repartir de forma que ompli per complet l'amplada de la lÃnia
+horitzontal (si hi ha un sol element, se centra al paper). Al seu
+cop, aquestes expressions poden incloure text de diverses lÃnies o
+qualsevol altre expressió de marcatge:
+
+@lilypond[quote,verbatim]
+\markup {
+ \fill-line {
+ \line { William S. Gilbert }
+ \center-column {
+ \huge \smallCaps "The Mikado"
+ or
+ \smallCaps "The Town of Titipu"
+ }
+ \line { Sir Arthur Sullivan }
+ }
+}
+\markup {
+ \fill-line { 1885 }
+}
+@end lilypond
+
+@cindex text ajustat a paraules
+@cindex text justificat
+@cindex justificat, text
+@cindex ajustat a paraules, text
+@cindex marcatge, text, ajustat a paraules
+@cindex text de marcatge ajustat a paraules
+@cindex ajust de lÃnia, text amb
+
+@funindex \wordwrap
+@funindex \justify
+
+Les indicacions de text llargues es poden també ajustar
+automà ticament segons una amplada de lÃnia donada. Estaran
+alineades per l'esquerra o justificades, com es mostra a l'exemple
+següent:
+
+@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 ve 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
+
+@cindex text, instruccions de alineació
+@cindex marcatge, text, instruccions de alineació
+@cindex alineació, instruccions de text
+
+Hi ha una llista exhaustiva d'ordres d'alineació de text a
+@ref{Align}.
+
+@seealso
+Manual d'aprenentage:
+@rlearning{Moviment d'objectes}.
+
+Referència de la notació:
+@ref{Align},
+@ref{Indicacions de text}.
+
+Fitxers d'inici:
+@file{scm/define-markup-commands.scm}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+
+@node Notació grà fica dins d'elements de marcatge
+@unnumberedsubsubsec Notació grà fica dins d'elements de marcatge
+@translationof Graphic notation inside markup
+
+@cindex grà fics, inserir
+@cindex dibuixar objectes grà fics
+@cindex grà fics, dibuixar objectes
+@cindex inserir objectes grà fics
+@cindex grà fics, inserir objectes
+
+Es poden afegir diversos objectes grà fics a una partitura,
+utilitzant ordres de marcatge.
+
+@cindex emmarcar text
+@cindex text, emmarcar
+@cindex text, decorar
+@cindex marcatge, text, decorar
+@cindex marcatge, text, emmarcar
+@cindex decorar text
+
+@funindex \box
+@funindex \circle
+@funindex \rounded-box
+@funindex \bracket
+@funindex \hbracket
+
+Certes ordres de marcatge permeten la decoració d'elements de text
+amb grà fics, com es mostra a l'exemple següent.
+
+@lilypond[quote,verbatim]
+\markup \fill-line {
+ \center-column {
+ \circle Jack
+ \box "in the box"
+ \null
+ \line {
+ Erik Satie
+ \hspace #3
+ \bracket "1866 - 1925"
+ }
+ \null
+ \rounded-box \bold Prelude
+ }
+}
+@end lilypond
+
+@cindex farciment al voltant de text
+@cindex text, farciment de
+@cindex marcatge, farciment de textos de
+
+@funindex \pad-markup
+@funindex \pad-x
+@funindex \pad-to-box
+@funindex \pad-around
+
+Algunes poden requerir un augment del farciment al voltant del
+text: això es pot aconseguir amb algunes instruccions de marcatge
+descrites exhaustivament a @ref{Align}.
+
+@lilypond[quote,verbatim]
+\markup \fill-line {
+ \center-column {
+ \box "Charles Ives (1874 - 1954)"
+ \null
+ \box \pad-markup #2 "THE UNANSWERED QUESTION"
+ \box \pad-x #8 "A Cosmic Landscape"
+ \null
+ }
+}
+\markup \column {
+ \line {
+ \hspace #10
+ \box \pad-to-box #'(-5 . 20) #'(0 . 5)
+ \bold "Largo to Presto"
+ }
+ \pad-around #3
+ "String quartet keeps very even time,
+Flute quartet keeps very uneven time."
+}
+@end lilypond
+
+@cindex grà fica, notació
+@cindex sÃmbols no musicals
+@cindex no musicals, sÃmbols
+@cindex notació grà fica
+
+@funindex \combine
+@funindex \draw-circle
+@funindex \filled-box
+@funindex \triangle
+@funindex \draw-line
+@funindex \arrow-head
+
+Es poden imprimir altres sÃmbols o elements grà fics sense que es
+requereixi cap altre text. De igual manera que al cas de les
+expressions de marcatge, aquests objectes es poden combinar:
+
+@lilypond[quote,verbatim]
+\markup {
+ \combine
+ \draw-circle #4 #0.4 ##f
+ \filled-box #'(-4 . 4) #'(-0.5 . 0.5) #1
+ \hspace #5
+
+ \center-column {
+ \triangle ##t
+ \combine
+ \draw-line #'(0 . 4)
+ \arrow-head #Y #DOWN ##f
+ }
+}
+@end lilypond
+
+@cindex inserir grà fics
+@cindex imatges, inserir
+@cindex grà fics, inserir
+@cindex PostScript
+
+@funindex \epsfile
+@funindex \postscript
+
+Entre les funcionalitats grà fiques avançades es troben la
+possibilitat d'incloure fitxers d'imatge externs convertits als
+format PosScript Encapsulat (@emph{eps}), i la inclusió directa de
+grà fics dins del fitxer d'entrada, usant codi PostScript nadiu.
+En tal cas pot ser d'utilitat l'especificació explÃcita de la mida
+del dibuix, com s'exemplifica a continuació:
+
+@lilypond[quote,verbatim,fragment]
+c'1^\markup {
+ \combine
+ \epsfile #X #10 #"./context-example.eps"
+ \with-dimensions #'(0 . 6) #'(0 . 10)
+ \postscript #"
+ -2 3 translate
+ 2.7 2 scale
+ newpath
+ 2 -1 moveto
+ 4 -2 4 1 1 arct
+ 4 2 3 3 1 arct
+ 0 4 0 3 1 arct
+ 0 0 1 -1 1 arct
+ closepath
+ stroke"
+ }
+c'
+@end lilypond
+
+Hi una llista exhaustiva d'ordres especÃfiques de grà fics a
+@ref{Graphic}.
+
+@seealso
+Referència de la notació:
+@ref{Align},
+@ref{Dimensions},
+@ref{Anotacions editorials},
+@ref{Graphic}.
+
+Fitxers d'inici:
+@file{scm/define-markup-commands.scm},
+@file{scm/stencil.scm}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+
+@node Notació musical dins d'elements de marcatge
+@unnumberedsubsubsec Notació musical dins d'elements de marcatge
+@translationof Music notation inside markup
+
+@cindex notació dins de marcatge
+@cindex música dins de marcatge
+@cindex marcatge, notació musical dins de
+
+Es poden afegir a la partitura diversos elements de notació
+musical, dins d'una objecte de marcatge.
+
+Les notes i les alteracions es poden escriure utilitzant ordres de
+marcatge:
+
+@lilypond[quote,verbatim,fragment]
+a'2 a'^\markup {
+ \note #"4" #1
+ =
+ \note-by-number #1 #1 #1.5
+}
+b'1_\markup {
+ \natural \semiflat \flat
+ \sesquiflat \doubleflat
+}
+\glissando
+a'1_\markup {
+ \natural \semisharp \sharp
+ \sesquisharp \doublesharp
+}
+\glissando b'
+@end lilypond
+
+Altres objectes de notació es poden també imprimir al mode de marcatge:
+
+@lilypond[quote,verbatim]
+\relative {
+ g1 bes
+ ees\finger \markup \tied-lyric #"4~1"
+ fis_\markup { \dynamic rf }
+ bes^\markup {
+ \beam #8 #0.1 #0.5
+ }
+ cis
+ d-\markup {
+ \markalphabet #8
+ \markletter #8
+ }
+}
+@end lilypond
+
+De forma més general, qualsevol sÃmbol musical disponible es pot
+incloure per separat dins d'un objecte de marcatge, com
+s'exemplifica a continuació; hi ha una llista exhaustiva d'aquests
+sÃmbols i els seus noms a
+@rusernamed{The Emmentaler font,El tipus de lletra Emmentaler}.
+
+@lilypond[quote,verbatim]
+\relative {
+ c''2
+ c'^\markup { \musicglyph #"eight" }
+ c,4
+ c,8._\markup { \musicglyph #"clefs.G_change" }
+ c16
+ c2^\markup { \musicglyph #"timesig.neomensural94" }
+}
+@end lilypond
+
+Una altra forma d'imprimir glifs que no són de text es troba
+descrita a @ref{Explicació dels tipus de lletra}. Serveix per
+imprimir claus de diferents mides.
+
+El mode de marcatge també contempla diagrames per a instruments
+especÃfics:
+
+@lilypond[quote,verbatim]
+\relative {
+ c''1^\markup {
+ \fret-diagram-terse #"x;x;o;2;3;2;"
+ }
+ c^\markup {
+ \harp-pedal #"^-v|--ov^"
+ }
+ c
+ c^\markup {
+ \combine
+ \musicglyph #"accordion.discant"
+ \combine
+ \raise #0.5 \musicglyph #"accordion.dot"
+ \raise #1.5 \musicglyph #"accordion.dot"
+ }
+}
+@end lilypond
+
+@c The accordion diagram is actually taken from a snippet.
+
+@noindent
+Aquests diagrames es troben documentats a
+@ref{Instrument Specific Markup}.
+
+
+@cindex partitura, a dins de marcatge
+@cindex marcatge, partitura dins de
+
+Es pot incloure fins i tot una partitura completa dins d'un
+objecte de marcatge. En tal cas, el bloc niuat @code{\score} ha
+de contenir un bloc @code{\layout}, com es mostra aquÃ:
+
+@lilypond[quote,verbatim]
+\relative {
+ c'4 d^\markup {
+ \score {
+ \relative { c'4 d e f }
+ \layout { }
+ }
+ }
+ e f |
+ c d e f
+}
+@end lilypond
+
+Hi ha una llista exhaustiva d'ordres relacionades amb la notació
+musical a @ref{Music}.
+
+@seealso
+Referència de la notació:
+@ref{Music},
+@rusernamed{The Emmentaler font,El tipus de lletra Emmentaler},
+@ref{Explicació dels tipus de lletra}.
+
+Fitxers d'inici:
+@file{scm/define-markup-commands.scm},
+@file{scm/fret-diagrams.scm},
+@file{scm/harp-pedals.scm}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+
+@node Elements de marcatge de diverses pà gines
+@unnumberedsubsubsec Elements de marcatge de diverses pà gines
+@translationof Multi-page markup
+
+@cindex pà gines, marcatge de diverses
+@cindex marcatge de diverses pà gines
+@cindex marcatge, text de, diverses pà gines
+@cindex text que ocupa diverses pà gines
+
+@funindex \markuplist
+@funindex \justified-lines
+@funindex \wordwrap-lines
+
+Tot i que els objectes de marcatge està ndard no es poden dividir,
+una sintaxi especÃfica fa possible la introducció de lÃnies de
+text que poden abastar diverses pà gines:
+
+@c KEEP LY
+@lilypond[quote,verbatim]
+\markuplist {
+ \justified-lines {
+ Un text molt llarg de lÃnies justificades.
+ ...
+ }
+ \wordwrap-lines {
+ Un altre parà graf molt llarg.
+ ...
+ }
+ ...
+}
+@end lilypond
+
+Aquesta sintaxi accepta una llista d'elements de marcatge, que
+poden ser
+@itemize
+@item
+el resultat d'una ordre de llista de marcatge,
+@item
+una llista de marcatges,
+@item
+o una llista de llistes de marcatge.
+@end itemize
+
+Hi una llista exhaustiva de les ordres de llista de marcage a
+@rusernamed{Text markup list commands,Ordres de llistes de marcatge de text}.
+
+@seealso
+Referència de la notació:
+@rusernamed{Text markup list commands,Ordres de llistes de marcatge de text}.
+
+Fitxers d'inici:
+@file{scm/define-markup-commands.scm}.
+
+Manual de extensió:
+@rextendnamed{New markup list command definition,Definició de noves ordres de llista de marcatge}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+Referència de funcionament intern:
+@rinternals{TextScript}.
+
+@funindex \markuplist
+
+@predefined
+@code{\markuplist}.
+@endpredefined
+
+
+@node Tipus de lletra
+@subsection Tipus de lletra
+@translationof Fonts
+
+Aquesta secció presenta la forma en la qual es gestionen els
+tipus de lletra, i com es poden canviar a les partitures.
+
+@menu
+* Explicació dels tipus de lletra::
+* Tipus de lletra d'un sol element::
+* Tipus de lletra del document complet::
+@end menu
+
+
+@node Explicació dels tipus de lletra
+@unnumberedsubsubsec Explicació dels tipus de lletra
+@translationof Fonts explained
+
+@cindex Pango
+@cindex tipus de lletra, explicació
+@cindex claus de diverses mides
+@cindex tipus de lletra, explicació
+@cindex claus de diverses mides
+@cindex tipus de lletra de sÃmbols en marcatge
+@cindex sÃmbols, tipus de lletra al marcatge
+
+@funindex font-interface
+
+Els tipus de lletra es gestionen mitjançant diverses
+biblioteques. FontConfig s'utilitza per detectar els tipus de
+lletra disponibles al sistema; els tipus de lletra seleccionats es
+dibuixen fent servir Pango.
+
+Els tipus de lletra de notació musical es poden descriure com un
+conjunt de glifs especÃfics, ordenats en diverses famÃlies. La
+sintaxi següent permet usar directament diversos glifs del tipus
+de lletra @code{Feta} del LilyPond diferents a les de text en el
+mode de marcatge:
+
+@lilypond[quote,verbatim,fragment]
+a'1^\markup {
+ \vcenter {
+ \override #'(font-encoding . fetaBraces)
+ \lookup #"brace120"
+ \override #'(font-encoding . fetaText)
+ \column { 1 3 sf }
+ \override #'(font-encoding . fetaMusic)
+ \lookup #"noteheads.s0petrucci"
+ }
+}
+@end lilypond
+
+@noindent
+Tanmateix, tots aquests glifs excepte les claus de diverses mides
+que estan contingudes al tipus de lletra @code{fetaBraces} estan
+disponibles utilitzant la sintaxi més senzilla que es descriu a
+@ref{Notació musical dins d'elements de marcatge}.
+
+Quan s'usen els glifs del tipus de lletra de claus
+@code{fetaBraces}, la mida de la clau s'especifica per la part
+numèrica del nom del glif, en unitats arbitrà ries. Es pot
+especificar qualsevol enter de @code{0} a @code{575} inclusiu,
+sent @code{0} el que produeix la clau més petita. El valor òptim
+s'ha de determinar per prova i error. Tots aquests glifs són
+claus esquerra; les claus dreta es poden obtenir mitjançant
+rotació, vegeu
+@rusernamed{Rotating objects,Rotació d'objectes}.
+
+Estan disponibles tres famÃlies de tipus de lletra per al text:
+@itemize
+@item
+El tipus de lletra @emph{roman} (serif), que de forma
+predeterminada és LilyPond Serif (un à lies de TeX Gyre Schola).
+@item
+El tipus de lletra @emph{sans}, que de formam predeterminada és
+LilyPond Sans Serif (un à lies de TeX Gyre Heros).
+@item
+El tipus de lletra @emph{typewriter} mecanogrà fica (monoespaiada),
+que de forma predeterminada és LilyPond Monospace (un à lies de TeX
+Gyre Cursor).
+@end itemize
+
+Cada famÃlia pot incloure diferents formes i sèries. El següent
+exemple mostra la possibilitat de seleccionar famÃlies, formes,
+sèries i mides alternatius. El valor que es dóna a
+@code{font-size} és el canvi requerit a partir de la mida
+predeterminada.
+
+@lilypond[quote,verbatim,fragment]
+\override Score.RehearsalMark.font-family = #'typewriter
+\mark \markup "Ouverture"
+\override Voice.TextScript.font-shape = #'italic
+\override Voice.TextScript.font-series = #'bold
+d''2.^\markup "Allegro"
+\override Voice.TextScript.font-size = #-3
+c''4^smaller
+@end lilypond
+
+@noindent
+Es pot usar una sintaxi semblant el mode de marcatge, tot i que en
+aquest cas és preferible usar la sintaxi senzilla que s'explica a
+@ref{Selecció del tipus de lletra i la seva mida}.
+
+@lilypond[quote,verbatim]
+\markup {
+ \column {
+ \line {
+ \override #'(font-shape . italic)
+ \override #'(font-size . 4)
+ Idomeneo,
+ }
+ \line {
+ \override #'(font-family . typewriter)
+ {
+ \override #'(font-series . bold)
+ re
+ di
+ }
+ \override #'(font-family . sans)
+ Creta
+ }
+ }
+}
+@end lilypond
+
+Tot i que és fà cil canviar entre els tipus de lletra
+preconfigurats, també és possible usar altres tipus de lletra, com
+s'explica a les seccions següents:
+@ref{Tipus de lletra d'un sol element} i
+@ref{Tipus de lletra del document complet}.
+
+@seealso
+Referència de la notació:
+@rusernamed{The Emmentaler font,El tipus de lletra Emmentaler},
+@ref{Notació musical dins d'elements de marcatge},
+@rusernamed{Rotating objects,Rotació d'objectes},
+@ref{Selecció del tipus de lletra i la seva mida},
+@ref{Font}.
+
+
+@node Tipus de lletra d'un sol element
+@unnumberedsubsubsec Tipus de lletra d'un sol element
+@translationof Single entry fonts
+
+Es pot usar a una partitura qualsevol tipus de lletra que estigui
+instal·lada al sistema operatiu i reconeguda per part de
+FontConfig, usant la sintaxi següent:
+
+@lilypond[quote,verbatim,fragment]
+\override Staff.TimeSignature.font-name = #"Bitstream Charter"
+\override Staff.TimeSignature.font-size = #2
+\time 3/4
+
+a'1_\markup {
+ \override #'(font-name . "Bitstream Vera Sans,sans-serif, Oblique Bold")
+ { Vera Oblique Bold }
+}
+@end lilypond
+
+@cindex tipus de lletra, buscar, disponibles
+@cindex buscar tipus de lletra disponibles
+@cindex fer una llista de tipus de lletra disponibles
+@cindex disponibles, fer una llista de tipus de lletra
+
+Es pot descriure @var{font-name} usant una llista de
+@q{tipus de lletra} separats per comes i una llista de @q{estils}
+separats per espais. Sempre que el @q{tipus de lletra} de la
+llista estigui instal·lat i contingui el glif sol·licitat,
+s'usarà . En cas contrari, s'usarà com a substitució el tipus de
+lletra @emph{següent} de la llista.
+
+@funindex show-available-fonts
+
+L'execució del LilyPond amb l'opció següent presenta una llista de
+tots els tipus de lletra disponibles al sistema operatiu:
+
+@example
+lilypond -dshow-available-fonts x
+@end example
+
+@seealso
+Referència de la notació:
+@ref{Explicació dels tipus de lletra},
+@ref{Tipus de lletra del document complet}.
+
+Fragments de codi:
+@rlsr{Text}.
+
+@c A source file gets never installed...
+@c Installed files:
+@c @file{lily/font-config-scheme.cc}.
+
+
+@node Tipus de lletra del document complet
+@unnumberedsubsubsec Tipus de lletra del document complet
+@translationof Entire document fonts
+
+Es poden canviar els tipus de lletra que s'usen com tipus de
+lletra predeterminats a les famÃlies @emph{romana},
+@emph{sans-serif} i @emph{monoespaiada}, especificant-los en
+aquest ordre com es veu a l'exemple de sota, que escala els tipus
+de lletra automà ticament amb el valor fixat per a la mida global
+del pentagrama. De forma semblant a
+@ref{Tipus de lletra d'un sol element}, Es pot descriure usant una
+llista de @q{Tipus de lletra} separats per comes. Tanmateix, els
+@q{estils} de tipus de lletra no es poden descriure. Per llegir
+més explicacions sobre els tipus de lletra, consulteu
+@ref{Explicació dels tipus de lletra}.
+
+@cindex tipus de lletra, establir la famÃlia de
+@cindex tipus de lletra, canviar per a tot el document
+
+@funindex make-pango-font-tree
+
+@lilypond[verbatim,quote]
+\paper {
+ #(define fonts
+ (make-pango-font-tree "Times New Roman"
+ "Nimbus Sans,Nimbus Sans L"
+ "Luxi Mono"
+ (/ staff-height pt 20)))
+}
+
+\relative c'{
+ c1-\markup {
+ roman,
+ \sans sans,
+ \typewriter typewriter. }
+}
+@end lilypond
+
+@c we don't do Helvetica / Courier, since GS incorrectly loads
+@c Apple TTF fonts
+
+@seealso
+Referència de la notació:
+@ref{Explicació dels tipus de lletra},
+@ref{Tipus de lletra d'un sol element},
+@ref{Selecció del tipus de lletra i la seva mida},
+@ref{Font}.
diff --git a/Documentation/ca/translations.itexi b/Documentation/ca/translations.itexi
index 712dd1daa3..d89949f85c 100644
--- a/Documentation/ca/translations.itexi
+++ b/Documentation/ca/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Actualitzat el Sat Jun 24 12:50:41 UTC 2017
+@emph{Actualitzat el Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -475,6 +475,60 @@ si
parcialment
@end ifnothtml
@tab pre-GDP
+@item
+1.7 Anotacions editorials
+@*
+1481
+@tab Walter Garcia-Fontes
+@tab
+@tab
+@ifhtml
+
+@html
+<span style="background-color: #1fff1f">si</span>
+@end html
+@end ifhtml
+@ifnothtml
+si
+@end ifnothtml
+@tab
+@ifhtml
+
+@html
+<span style="background-color: #1fff1f">si</span>
+@end html
+@end ifhtml
+@ifnothtml
+si
+@end ifnothtml
+@tab pre-GDP
+@item
+1.8 Text
+@*
+2952
+@tab Walter Garcia-Fontes
+@tab
+@tab
+@ifhtml
+
+@html
+<span style="background-color: #1fff1f">si</span>
+@end html
+@end ifhtml
+@ifnothtml
+si
+@end ifnothtml
+@tab
+@ifhtml
+
+@html
+<span style="background-color: #39ff22">parcialment</span>
+@end html
+@end ifhtml
+@ifnothtml
+parcialment
+@end ifnothtml
+@tab pre-GDP
@end multitable
@@ -544,7 +598,7 @@ si
@item
1 Execució del LilyPond
@*
-5469
+5391
@tab Walter Garcia-Fontes
@tab
@tab
@@ -561,7 +615,7 @@ parcialment (95 %)
@ifhtml
@html
-<span style="background-color: #8aff2d">parcialment</span>
+<span style="background-color: #83fe2c">parcialment</span>
@end html
@end ifhtml
@ifnothtml
@@ -691,7 +745,7 @@ si
@item
Introducció
@*
-5793
+5800
@tab Walter Garcia-Fontes
@tab
@tab
@@ -708,7 +762,7 @@ si
@ifhtml
@html
-<span style="background-color: #2cff20">parcialment</span>
+<span style="background-color: #33ff21">parcialment</span>
@end html
@end ifhtml
@ifnothtml
diff --git a/Documentation/ca/web/introduction.itexi b/Documentation/ca/web/introduction.itexi
index 5a44ca0cde..6a8de8fb86 100644
--- a/Documentation/ca/web/introduction.itexi
+++ b/Documentation/ca/web/introduction.itexi
@@ -546,8 +546,7 @@ forma legal per a la seva còpia, modificacions i distribució.
@c @divClass{column-right-top}
@divClass{color3}
@divClass{keep-bullets}
-@subheading Perquè @@{regalen} els desenvolupadors del LilyPond la
-seva feina sense demanar res a canvi?
+@subheading Perquè @qq{regalen} els desenvolupadors del LilyPond la seva feina sense demanar res a canvi?
Gairebé tots nosaltres veiem el desenvolupament del LilyPond com un
hobby o un treball voluntari. Això doncs, la pregunta és realment
diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 570c1c308a..060aa464a1 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -40,286 +40,497 @@ See user manual, \NAME\
@allowcodebreaks false
-@itemize
@ignore
HINTS
-
* add new items at the top
-
* only show verbatim input for syntax/input changes
-
* try to be as brief possible in those cases
-
* don't try to provide real-world examples, they often get too big,
which scares away people.
-
* Write complete sentences.
-
* only show user-visible changes.
@end ignore
-@item
-It is now possible to move systems with reference to their current
-position using the @code{extra-offset} subproperty of
-@code{NonMusicalPaperColumn.line-break-system-details}. Both vertical
-and horizontal changes are possible. This feature is especially useful
-for making slight adjustments to the default vertical position of
-individual systems. See @ruser{Explicit staff and system positioning} for
-more information.
+
+
+@subheading New for musical notation
+
+
+@strong{Displaying pitch improvements}
+
+@itemize
@item
-It is now possible to add text to analysis brackets through the
-@code{HorizontalBracketText} object.
-@lilypond[quote,verbatim]
-\layout {
- \context {
- \Voice
- \consists "Horizontal_bracket_engraver"
- }
-}
+Pitches that have a sharp or flat in their name now need to be
+hyphenated;
-{
- \once \override HorizontalBracketText.text = "a"
- c''\startGroup d''\stopGroup
- e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
-}
-@end lilypond
+@example
+\key a-flat \major
+@end example
+
+@noindent
+instead of:
+
+@example
+\key aflat \major
+@end example
+
+@noindent
+Pitches that contain @emph{double} sharps or flats in their name,
+however, do not need a second hyphen. For example using the Dutch
+notation @code{cisis}:
+
+@example
+\key c-sharpsharp \major
+@end example
@item
-The ends of hairpins may now be fine-tuned using the @code{shorten-pair}
-grob property, which previously only affected text-spanners like
-@code{TupletBracket} and @code{OttavaBracket}. Positive values offset
-to the right, negative to the left.
-@lilypond[quote,verbatim]
-{ \once \override Hairpin.shorten-pair = #'(2 . 2)
- c'1~\<
- c'2~ c'\!
- \once \override Hairpin.shorten-pair = #'(-2 . -2)
- c'1~\<
- c'2~ c'\! }
-@end lilypond
+Accidental rules can now be defined @emph{across} @code{ChoirStaff}
+contexts.
@item
-In fret-diagrams the distance between frets and the distance between strings is
-now independently adjustable. Available are @code{fret-distance} and
-@code{string-distance} as subproperties of @code{fret-diagram-details}.
-@lilypond[verbatim,quote]
-fretMrkp = \markup { \fret-diagram-terse #"x;x;o;2;3;2;" }
+Two new accidental rules have been added. Both combine the
+characteristics of @code{modern-voice}, @code{piano} and their
+equivalents:
+@code{choral}
-\markuplist
-\override #'(padding . 2)
-\table #'(0 -1) {
- "default"
+@lilypond[quote]
+musicA = {
+ <<
+ \relative { cis''8 fis, bes4 <a cis>8 f bis4 | cis2. <c, g'>4 | }
+ \\
+ \relative { ais'2 cis, | fis8 b a4 cis2 | }
+ >>
+}
- \fretMrkp
+musicB = { \clef bass \new Voice { \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis> \change Staff = up
+ cis' cis \change Staff = down
+ <fis, a> <fis a>] \showStaffSwitch \change Staff = up
+ dis'4 | \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
- "fret-distance"
+\new ChoirStaff { << \context Staff = "up" {
+ \accidentalStyle choral \musicA }
+ \context Staff = "down" { \musicB } >>
+}
+@end lilypond
- \override #'(fret-diagram-details . ((fret-distance . 2)))
- \fretMrkp
+@noindent
+This is the now the default accidental style for @code{ChoirStaff}.
- "string-distance"
+@code{choral-cautionary}
- \override #'(fret-diagram-details . ((string-distance . 2)))
- \fretMrkp
+@lilypond[quote]
+musicA = {
+ <<
+ \relative { cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 | }
+ \\
+ \relative { ais'2 cis, | fis8 b a4 cis2 | }
+ >>
+}
+
+musicB = { \clef bass \new Voice { \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis> \change Staff = up
+ cis' cis \change Staff = down
+ <fis, a> <fis a>] \showStaffSwitch \change Staff = up
+ dis'4 | \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
+
+\new ChoirStaff { << \context Staff = "up" {
+ \accidentalStyle choral-cautionary \musicA }
+ \context Staff = "down" { \musicB } >>
}
@end lilypond
-@item
-Accidental rules can now be defined across @code{ChoirStaff} contexts.
-Two new rules @code{choral} and @code{choral-cautionary} are available
-that combine the characteristics of @code{modern-voice} and @code{piano}
-or their equivalents with cautionary accidentals.
+@noindent
+The same as @code{choral} but with the extra accidentals typeset as
+cautionaries instead.
-@item
-The music function @code{\unfoldRepeats} can now take an
-optional argument-list specifying which type(s) of repeated music
-should be unfolded. Possible entries are @code{percent}, @code{tremolo},
-@code{volta}.
-If the optional argument-list is unspecified, @code{repeated-music} will be
-used, unfolding all.
+@noindent
+Also see @ruser{Automatic accidentals}.
@item
-A new @code{output-attributes} grob property is now used for svg output
-instead of the @code{id} grob property. It allows multiple attributes
-to be defined as an association list. For example, @code{#'((id . 123)
-(class . foo) (data-whatever . @qq{bar}))} will produce the following
-group tag in an SVG file: @code{<g id=@qq{123} class=@qq{foo}
-data-whatever=@qq{bar}> @dots{} </g>}.
+Four new clef glyphs are now available; @q{GG} (double-G),
+@q{Tenor G}, @q{varC} plus related tessitura and
+@q{Varpercussion}:
+
+@multitable @columnfractions .30 .2 .30 .2
+
+@headitem
+Example
+@tab
+Output
+@tab
+Example
+@tab
+Output
@item
-Slurs and phrasing slurs may now be started from individual notes
-in a chord. Several simultanous slurs per @code{Voice} need to be
-distinguished by @code{spanner-id} setting.
+@code{\clef GG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef GG c1
+@end lilypond
+@tab
+@code{\clef tenorG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorG c1
+@end lilypond
@item
-The music and grob property @code{spanner-id} for distinguishing
-simultaneous slurs and phrasing slurs has been changed from a
-string to a @q{key}, a non-negative integer or symbol.
+@code{\clef varC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varC c1
+@end lilypond
+@tab
+@code{\clef altovarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef altovarC c1
+@end lilypond
@item
-There is a new command @code{\=} for specifying the
-@code{spanner-id} for simultaneous slurs and phrasing slurs.
-@lilypond[verbatim,quote]
-\fixed c' {
- <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
-}
+@code{\clef tenorvarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorvarC c1
+@end lilypond
+@tab
+@code{\clef baritonevarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef baritonevarC c1
@end lilypond
@item
-Blocks introduced with @code{\header} can be stored in variables
-and used as arguments to music and scheme functions and as the
-body of @code{#@{@dots{}#@}} constructs. They are represented as
-a Guile module.
+@code{\clef varpercussion}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varpercussion c1
+@end lilypond
-While @code{\book}, @code{\bookpart}, @code{\score}, @code{\with},
-@code{\layout}, @code{\midi}, @code{\paper} blocks can be passed
-around in similar manner, they are represented by different data
-types.
+@end multitable
+
+@noindent
+Also see @emph{Clef styles}.
@item
-Dot-separated symbol lists like @code{FretBoard.stencil} were
-already supported as of version@tie{}2.18. They may now also
-contain unsigned integers, and may alternatively be separated by
-commata. This allows usage such as
-@lilypond[quote,verbatim]
-{ \time 2,2,1 5/8 g'8 8 8 8 8 }
+French note names are now explicitly defined -- previously they were
+aliased to Italian note names. The @var{d} pitch may be entered as
+either @code{re} or @code{ré}.
+
+@lilypond[fragment,verbatim,quote,ragged-right,relative=1]
+\language "français"
+do ré mi fa | sol la si do | ré1
@end lilypond
-and
-@example
-\tagGroup violin,oboe,bassoon
-@end example
-@item
-Such lists may also be used in expressions for assignments, sets,
-and overrides. This allows usage such as
-@lilypond[quote,verbatim]
-{ \unset Timing.beamExceptions
- \set Timing.beatStructure = 1,2,1
- g'8 8 8 8 8 8 8 8 }
+@noindent
+Double sharps are entered using an @code{x} suffix.
+
+@lilypond[fragment,verbatim,quote,ragged-right,relative=2]
+\language "français"
+dob, rebb misb fabsb | sold ladd six dosd | rédsd1
@end lilypond
-@item
-Association list elements could previously be assigned values
-individually (for example, paper variables like
-@code{system-system-spacing.basic-distance}). They may now be
-also referenced in this manner, as with
-@example
-\paper @{
- \void \displayScheme \system-system-spacing.basic-distance
-@}
-@end example
+@end itemize
-In combination with the previously mentioned changes, this allows
-setting and referencing pseudovariables like @code{violin.1}.
+
+@strong{Rhythm improvements}
+
+@itemize
@item
-LilyPond source files may now be embedded inside the generated PDF files.
-This experimental feature is disabled by default and may be regarded as unsafe,
-as PDF documents with hidden content tend to present a security risk.
-Please note that not all PDF viewers have the ability to handle embedded
-documents (if not, the PDF output will appear normally and source files
-will remain invisible). This feature only works with the PDF backend.
+Multi-measure rests have length according to their total duration,
+under the control of @code{MultiMeasureRest.space-increment}. Note the
+default value is @code{2.0}.
+
+@lilypond[fragment,verbatim,quote]
+\compressFullBarRests
+R1*2 R1*4 R1*64 R1*16
+@end lilypond
+
+@lilypond[fragment,verbatim,quote]
+\compressFullBarRests
+\override Staff.MultiMeasureRest.space-increment = 2.5
+R1*2 R1*4 R1*64 R1*16
+@end lilypond
@item
-French note names are now defined specifically instead of
-being aliased to Italian note names: in addition to the
-generic Italian-derived syntax, the @var{d} pitch may be
-entered as @code{ré}. Double sharps may also be
-entered using the @code{-x} suffix.
+Improvements to the @code{\partial} command have been made when used
+with parallel music and/or multiple contexts.
@item
-Additional bass strings (for lute tablature) are supported.
-@lilypond[quote,verbatim]
-m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
+It is now possible to change the time signature mid-measure by using
+both the @code{\time} and @code{\partial} commands together.
-\score {
- \new TabStaff \m
- \layout {
- \context {
- \Score
- tablatureFormat = #fret-letter-tablature-format
- }
- \context {
- \TabStaff
- stringTunings = \stringTuning <a, d f a d' f'>
- additionalBassStrings = \stringTuning <c, d, e, fis, g,>
- fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
- }
- }
-}
+@lilypond[verbatim,quote,relative=1]
+f f f f | f2. \bar "||"
+\time 3/4 \partial 4
+f8 8 | f2 f8 f |
@end lilypond
@item
-The markup-list-command @code{\table} is now available.
-Each column may be aligned differently.
-@lilypond[quote,verbatim]
-\markuplist {
- \override #'(padding . 2)
- \table
- #'(0 1 0 -1)
- {
- \underline { center-aligned right-aligned center-aligned left-aligned }
- one "1" thousandth "0.001"
- eleven "11" hundredth "0.01"
- twenty "20" tenth "0.1"
- thousand "1000" one "1.0"
- }
-}
+Isolated durations in music now stand for unpitched notes. Pitches are
+taken from the preceding note or chord. This is especially convenient
+for specifying rhythms in both music and scheme functions and can help
+improve the readability of LilyPond source files.
+
+@lilypond[verbatim,quote,fragment,relative=2]
+c64[ 64] 32 16 8^- <g b d>4~ 2 | 1
@end lilypond
-@item
-A new markup-command, @code{\with-dimensions-from}, makes
-@code{\with-dimensions} easier to use by taking the new
-dimensions from a markup object, given as first argument.
-@lilypond[quote,verbatim]
-\markup {
- \pattern #5 #Y #0 "x"
- \pattern #5 #Y #0 \with-dimensions-from "x" "f"
- \pattern #5 #Y #0 \with-dimensions-from "x" "g"
- \override #'(baseline-skip . 2)
- \column {
- \pattern #5 #X #0 "n"
- \pattern #5 #X #0 \with-dimensions-from "n" "m"
- \pattern #5 #X #0 \with-dimensions-from "n" "!"
- }
+@lilypond[verbatim,quote]
+\new DrumStaff \with { \override StaffSymbol.line-count = 1 }
+\drummode {
+ \time 3/4
+ tambourine 8 \tuplet 3/2 { 16 16 16 }
+ 8 \tuplet 3/2 { 16 16 16 } 8 8 |
}
@end lilypond
@item
-There are two new page breaking functions. @code{ly:one-page-breaking}
-automatically adjusts the height of the page to fit the music, so that
-everything fits on one page. @code{ly:one-line-auto-height-breaking}
-is like @code{ly:one-line-breaking}, placing the music on a single
-line and adjusting the page width accordingly, however it also
-automatically adjusts the page height to fit the music.
-
-@item
-Markup-command @code{\draw-squiggle-line} is now available.
-Customizing is possible with overrides of @code{thickness}, @code{angularity},
-@code{height} and @code{orientation}
-@lilypond[quote,verbatim]
-\markup
- \overlay {
- \draw-squiggle-line #0.5 #'(3 . 3) ##t
+Beaming exceptions can now be constructed using the simpler
+@code{\beamExceptions} scheme function. Previously, this would have
+required writing:
- \translate #'(3 . 3)
- \override #'(thickness . 4)
- \draw-squiggle-line #0.5 #'(3 . -3) ##t
+@example
+\set Timing.beamExceptions =
+#'( ;start of alist
+ (end . ;entry for end of beams
+ ( ;start of alist of end points
+ ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16
+ )))
- \translate #'(6 . 0)
- \override #'(angularity . -5)
- \draw-squiggle-line #0.5 #'(-3 . -3) ##t
+\time #'(2 1) 3/16
+c16 c c
+\repeat unfold 6 @{ c32 @}
+@end example
- \translate #'(3 . -3)
- \override #'(angularity . 2)
- \override #'(height . 0.3)
- \override #'(orientation . -1)
- \draw-squiggle-line #0.2 #'(-3 . 3) ##t
+@noindent
+With the new @code{\beamExceptions} scheme function, this becomes:
+
+@lilypond[verbatim,quote,relative=1]
+\set Timing.beamExceptions =
+ \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
+
+\time #'(2 1) 3/16
+c16 c c |
+\repeat unfold 6 { c32 } |
+@end lilypond
+
+@noindent
+with multiple exceptions separated by bar checks. Note that writing the
+exception pattern without pitches is convenient but not mandatory (also
+see the previous documented rhythm improvement --
+@ruser{Isolated durations in music now stand for unpitched notes}.
+
+@item
+The positioning of tuplet numbers for kneed beams has been improved.
+Previously, tuplet numbers were placed according to the position of the
+tuplet bracket, even if the bracket was not printed. This could lead to
+tuplet numbers being @q{stranded}.
+
+@noindent
+Previously:
+
+@lilypond[fragment,quote,relative=1]
+% This is a contrived example to simulate the previous behaviour
+\time 3/4
+\override Beam.auto-knee-gap = 3
+\override TupletNumber.knee-to-beam = ##f
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\tuplet 3/2 4 { g,,8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { c'8 g,, e'' }
+\tuplet 3/2 4 { c'8 g,, e'' }
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 2/2 4 { g,8[ e''] }
+\tuplet 2/2 4 { g,,8[ e''] }
+@end lilypond
+
+@noindent
+Now, when the bracket is not drawn, tuplet numbers are positioned
+closer.
+
+@lilypond[fragment,quote,relative=1]
+% This is a contrived example to simulate the previous behaviour
+\time 3/4
+\override Beam.auto-knee-gap = 3
+\override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { g,,8 c'' e, }
+\tuplet 3/2 4 { c'8 g,, e'' }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { c'8 g,, e'' }
+\tuplet 2/2 4 { g,8[ e''] }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 2/2 4 { g,,8[ e''] }
+@end lilypond
+
+@item
+Collision detection for the kneed beam tuplet numbers has also been
+added, shifting the offset horizontally if the number is too close to
+an adjoining note column (but still preserving the number's vertical
+distance). In the event of a collision -- for example with an
+accidental -- the tuplet number will be shifted vertically instead. If
+the tuplet number is itself too large to fit within the available space,
+the original, @q{bracket-based}, positioning system will be used
+instead.
+
+@lilypond[fragment,quote,relative=1]
+\time 2/4
+\override Beam.auto-knee-gap = 3
+\tuplet 3/2 4 { g8 c'' e, c'8 g,, e'' }
+\tuplet 3/2 4 { g,,8 e''' g,, g,8 e''' ges,, }
+@end lilypond
+
+@noindent
+The original kneed-beam tuplet behavior is still available with a new,
+@code{knee-to-beam} property for the @code{TupletNumber} layout object.
+
+@lilypond[verbatim,fragment,quote,relative=1]
+\time 2/4
+\override Beam.auto-knee-gap = 3
+\override TupletNumber.knee-to-beam = ##f
+\override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { g,,8 c'' e, }
+@end lilypond
+
+@end itemize
+
+
+@strong{Expressive mark improvements}
+
+@itemize
+
+@item
+The ends of hairpins may now be fine-tuned using the @code{shorten-pair}
+grob property. This previously only affected text-spanners (e.g.
+@code{TupletBracket} and @code{OttavaBracket}).
+
+@noindent
+Positive and negative values offset right and left respectively.
+
+@lilypond[quote,verbatim,relative=2]
+\once \override Hairpin.shorten-pair = #'(0 . 2)
+a1\< | a2 a\!
+
+\once \override Hairpin.shorten-pair = #'(2 . 0)
+\once \override Hairpin.stencil = #constante-hairpin
+a1\< | a2 a\!
+
+\once \override Hairpin.shorten-pair = #'(-1 . -1)
+\once \override Hairpin.stencil = #flared-hairpin
+a1\< | a2 a\!
+@end lilypond
+
+@item
+Individual slurs and phrasing slurs may now be started from an explicit
+note within a chord.
+
+@lilypond[quote,verbatim,relative=1]
+<f a( c>1 | <c') e g(> | <a c) e>
+@end lilypond
+
+@lilypond[quote,verbatim,relative=1]
+<f( a\( c>1 | <c'\) e\( g> | <a c e\)>
+@end lilypond
+
+@item
+A new command @code{\=X} has been added -- where @q{X} can be any
+non-negative integer or symbol -- so that a specific @q{id} can be
+assigned to the start and end of slurs and phrasing slurs.
+
+@noindent
+This is useful when simultaneous slurs are required or if one slur
+overlaps another or when nesting short slurs within a longer one.
+
+@lilypond[quote,verbatim,relative=2]
+<a c e\=7\(>1 | <g b d\=£(> |
+<f\=A( a c\="foo"(> | <c'\="foo")\=A) e\=£) g\=7\)> |
+@end lilypond
+
+@noindent
+Also see @ruser{Expressive marks as curves}.
+
+@end itemize
+
+
+@strong{Repeat notation improvements}
+
+@itemize
+
+@item
+The visual style of tremolo slashes (shape, style and slope)
+is now more finely controlled.
+@lilypond[quote,relative=2]
+ a8:32 b: c: d:
+ \override StemTremolo.shape = #'beam-like
+ a: b: c: d:
+ \override StemTremolo.style = #'constant
+ a: b: c: d:
+ g,2
+@end lilypond
+
+@item
+The music function @code{\unfoldRepeats} can now take an
+optional argument-list specifying which type(s) of repeated music
+should be unfolded. Possible entries are @code{percent}, @code{tremolo},
+@code{volta}.
+If the optional argument-list is unspecified, @code{repeated-music} will be
+used, unfolding all.
+
+@end itemize
+
+
+@strong{Staff notation improvements}
+
+@itemize
+
+@item
+A new command @code{\magnifyStaff} has been added which scales staff
+sizes, staff lines, bar lines, beamlets and horizontal spacing generally
+at the @code{Staff} context level. Staff lines are prevented from being
+scaled smaller than the default since the thickness of stems, slurs, and
+the like are all based on the staff line thickness.
+
+@item
+A new command @code{\magnifyMusic} has been added, which allows
+the notation size to be changed without changing the staff size,
+while automatically scaling stems, beams, and horizontal spacing.
+
+@lilypond[verbatim,quote]
+\new Staff <<
+ \new Voice \relative {
+ \voiceOne
+ <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
+ }
+ \new Voice \relative {
+ \voiceTwo
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ r32 c'' a c a c a c r c a c a c a c
+ r c a c a c a c a c a c a c a c
+ }
}
+>>
@end lilypond
@item
@@ -328,37 +539,133 @@ acts exactly like @code{\RemoveEmptyStaves}, except for also removing empty
staves on the first system in a score.
@item
-Markup-commands @code{\undertie} and @code{\overtie} are now available, as well
-as the generic markup-command @code{\tie}.
-@lilypond[quote,verbatim]
-\markup {
- \undertie "undertied"
- \overtie "overtied"
-}
+A new markup command @code{\justify-line} has been added. Similar to
+the @code{\fill-line} markup command except that instead of setting
+@emph{words} in columns, the @code{\justify-line} command balances the
+whitespace between them ensuring that when there are three or more
+words in a markup, the whitespace is always consistent.
-m = {
- c''1 \prall -\tweak text \markup \tie "131" -1
-}
+@lilypond[quote,verbatim,papersize=a6]
+\markup \fill-line {oooooo oooooo oooooo oooooo}
+\markup \fill-line {ooooooooo oooooooo oo ooo}
+@end lilypond
-{ \voiceOne \m \voiceTwo \m }
+@lilypond[quote,verbatim,papersize=a6]
+\markup \justify-line {oooooo oooooo oooooo oooooo}
+\markup \justify-line {ooooooooo oooooooo oo ooo}
@end lilypond
+@end itemize
+
+
+@strong{Editorial annotation improvements}
+
+@itemize
+
@item
-@code{TabStaff} is now able to print micro-tones for bendings etc.
+It is now possible to add text to analysis brackets through the
+@code{HorizontalBracketText} object.
@lilypond[quote,verbatim]
\layout {
\context {
- \Score
- supportNonIntegerFret = ##t
+ \Voice
+ \consists "Horizontal_bracket_engraver"
}
}
-mus = \relative { c'4 cih d dih }
+{
+ \once \override HorizontalBracketText.text = "a"
+ c''\startGroup d''\stopGroup
+ e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
+}
+@end lilypond
-<<
- \new Staff << \clef "G_8" \mus >>
- \new TabStaff \mus
->>
+@end itemize
+
+
+@strong{Text formatting improvements}
+
+@itemize
+
+@item
+Support for making it easier to use alternative @q{music} fonts other
+than the default Emmentaler in LilyPond has been added. See
+@ruser{Replacing the notation font} for more information.
+
+@item
+Default text fonts have been changed from
+@code{Century Schoolbook L}, @code{sans-serif}, and @code{monospace}.
+
+For @code{svg} backend:
+@multitable @columnfractions .15 .30
+@headitem Family @tab Default font
+@item @emph{roman} @tab @code{serif}
+@item @emph{sans} @tab @code{sans-serif}
+@item @emph{typewriter} @tab @code{monospace}
+@end multitable
+
+@code{serif}, @code{sans-serif}, and @code{monospace} are
+@code{generic-family} in SVG and CSS specifications.
+
+For other backends:
+@multitable @columnfractions .15 .30 .55
+@headitem Family @tab Default font (alias) @tab Alias definition lists
+@item @emph{roman}
+@tab @code{LilyPond Serif}
+@tab
+TeX Gyre Schola,
+C059, Century SchoolBook URW, Century Schoolbook L,
+DejaVu Serif,
+..., serif
+@item @emph{sans}
+@tab @code{LilyPond Sans Serif}
+@tab
+TeX Gyre Heros,
+Nimbus Sans, Nimbus Sans L, DejaVu Sans,
+..., sans-serif
+@item @emph{typewriter}
+@tab @code{LilyPond Monospace}
+@tab
+TeX Gyre Cursor,
+Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
+DejaVu Sans Mono,
+..., monospace
+@end multitable
+
+@code{LilyPond Serif}, @code{LilyPond Sans Serif},
+and @code{LilyPond Monospace} are font aliases defined
+in the LilyPond dedicated FontConfig configuration file
+@code{00-lilypond-fonts.conf}.
+Where a character dosen't exist in the first font listed,
+the next font listed will be used instead for that character.
+For details of alias definitions, please see
+to @code{00-lilypond-fonts.conf} under the installed directory.
+
+@item
+When using OpenType fonts, font features can be used.
+Note: Not all OpenType fonts have all functions.
+
+@lilypond[quote,verbatim]
+% True small caps
+\markup { Normal Style: Hello HELLO }
+\markup { \caps { Small Caps: Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { True Small Caps: Hello } }
+
+% Number styles
+\markup { Normal Number Style: 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Old Number Style: 0123456789 } }
+
+% Stylistic Alternates
+\markup { \override #'(font-features . ("salt 0"))
+ { Stylistic Alternates 0: εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Stylistic Alternates 1: εÏÏÏθ } }
+
+% Multiple features
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Multiple features: Hello 0123456789 εÏÏÏθ } }
@end lilypond
@item
@@ -399,158 +706,422 @@ customized.
@end lilypond
@item
-All of @code{\override}, @code{\revert}, @code{\set}, and
-@code{\unset} now work with the @code{\once} prefix for making
-one-time settings.
+A new markup-command, @code{\with-dimensions-from}, makes
+@code{\with-dimensions} easier to use by taking the new
+dimensions from a markup object, given as first argument.
@lilypond[quote,verbatim]
-\relative {
- c'4 d
- \override NoteHead.color = #red
- e4 f |
- \once \override NoteHead.color = #green
- g4 a
- \once \revert NoteHead.color
- b c |
- \revert NoteHead.color
- f2 c |
+\markup {
+ \pattern #5 #Y #0 "x"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "f"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "g"
+ \override #'(baseline-skip . 2)
+ \column {
+ \pattern #5 #X #0 "n"
+ \pattern #5 #X #0 \with-dimensions-from "n" "m"
+ \pattern #5 #X #0 \with-dimensions-from "n" "!"
+ }
}
@end lilypond
@item
-When outputting MIDI, LilyPond will now store the @code{title}
-defined in a score's @code{\header} block (or, if there is no
-such definition on the @code{\score} level, the first such
-definition found in a @code{\header} block of the score's
-enclosing @code{\bookpart}, @code{\book}, or top-level scope)
-as the name of the MIDI sequence in the MIDI file. Optionally,
-the name of the MIDI sequence can be overridden using the new
-@code{midititle} @code{\header} field independently of
-@code{title} (for example, in case @code{title} contains markup
-code which does not render as plain text in a satisfactory way
-automatically).
+Markup-command @code{\draw-squiggle-line} is now available.
+Customizing is possible with overrides of @code{thickness}, @code{angularity},
+@code{height} and @code{orientation}
+@lilypond[quote,verbatim]
+\markup
+ \overlay {
+ \draw-squiggle-line #0.5 #'(3 . 3) ##t
+
+ \translate #'(3 . 3)
+ \override #'(thickness . 4)
+ \draw-squiggle-line #0.5 #'(3 . -3) ##t
+
+ \translate #'(6 . 0)
+ \override #'(angularity . -5)
+ \draw-squiggle-line #0.5 #'(-3 . -3) ##t
+
+ \translate #'(3 . -3)
+ \override #'(angularity . 2)
+ \override #'(height . 0.3)
+ \override #'(orientation . -1)
+ \draw-squiggle-line #0.2 #'(-3 . 3) ##t
+ }
+@end lilypond
@item
-Music (and scheme and void) functions and markup commands that
-just supply the final parameters to a chain of overrides, music
-function and markup command calls can now be defined in the form
-of just writing the expression cut short with @code{\etc}.
+Markup-commands @code{\undertie} and @code{\overtie} are now available, as well
+as the generic markup-command @code{\tie}.
+@lilypond[quote,verbatim]
+\markup {
+ \undertie "undertied"
+ \overtie "overtied"
+}
+
+m = {
+ c''1 \prall -\tweak text \markup \tie "131" -1
+}
+
+{ \voiceOne \m \voiceTwo \m }
+@end lilypond
+@end itemize
+
+
+
+@subheading New for specialist notation
+
+
+@strong{Vocal music improvements}
+
+@itemize
+
+@item
+A new flexible template suitable for a range of choral music, is now
+provided. This may be used to create simple choral music, with or
+without piano accompaniment, in two or four staves. Unlike other
+templates, this template is @q{built-in}, which means it does not
+need to be copied and edited: instead it is simply @code{\include}'d
+in the input file. For details, see @rlearning{Built-in templates}.
+
+@item
+The @code{\addlyrics} function now works with arbitrary contexts
+incuding @code{Staff}.
+
+@item
+@code{\lyricsto} and @code{\addLyrics} have been @q{harmonized}. Both
+now accept the same kind of delimited argument list that @code{\lyrics}
+and @code{\chords} accept. Backward compatibility has been added so
+music identifiers (i.e. @code{\mus}) are permitted as arguments. A
+@code{convert-ly} rule has been added that removes redundant uses of
+@code{\lyricmode} and rearranges combinations with context starters such
+that @code{\lyricsto} in general is applied last (i.e. like
+@code{\lyricmode} would be).
+
+@end itemize
+
+
+@strong{Unfretted and fretted string instrument improvements}
+
+@itemize
+
+@item
+A new note head style for Tabulature has been added --
+@code{TabNoteHead.style = #'slash}.
+
+@item
+In fret-diagrams the distance between frets and the distance between strings is
+now independently adjustable. Available are @code{fret-distance} and
+@code{string-distance} as subproperties of @code{fret-diagram-details}.
@lilypond[verbatim,quote]
-bold-red-markup = \markup \bold \with-color #red \etc
-highlight = \tweak font-size 3 \tweak color #red \etc
+fretMrkp = \markup { \fret-diagram-terse #"x;x;o;2;3;2;" }
-\markup \bold-red "text"
-\markuplist \column-lines \bold-red { One Two }
+\markuplist
+\override #'(padding . 2)
+\table #'(0 -1) {
+ "default"
-{ c' \highlight d' e'2-\highlight -! }
+ \fretMrkp
+
+ "fret-distance"
+
+ \override #'(fret-diagram-details . ((fret-distance . 2)))
+ \fretMrkp
+
+ "string-distance"
+
+ \override #'(fret-diagram-details . ((string-distance . 2)))
+ \fretMrkp
+}
@end lilypond
@item
-LilyPond functions defined with @code{define-music-function},
-@code{define-event-function}, @code{define-scheme-function} and
-@code{define-void-function} can now be directly called from Scheme
-as if they were genuine Scheme procedures. Argument checking and
-matching will still be performed in the same manner as when
-calling the function through LilyPond input. This includes the
-insertion of defaults for optional arguments not matching their
-predicates. Instead of using @code{\default} in the actual
-argument list for explicitly skipping a sequence of optional
-arguments, @code{*unspecified*} can be employed.
+It is now possible to individually color both the dots and parentheses
+in fret diagrams when using the @code{\fret-diagram-verbose} markup
+command.
+
+@lilypond[verbatim,quote,relative=1]
+\new Voice {
+ c1^\markup {
+ \override #'(fret-diagram-details . (
+ (finger-code . in-dot))) {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1 red)
+ (place-fret 4 5 2 inverted)
+ (place-fret 3 5 3 green)
+ (place-fret 2 5 4 blue inverted)
+ (place-fret 1 3 1 violet)
+ (barre 5 1 3 ))
+ }
+ }
+ c1^\markup {
+ \override #'(fret-diagram-details . (
+ (finger-code . below-string))) {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1 red parenthesized)
+ (place-fret 4 5 2 yellow
+ default-paren-color
+ parenthesized)
+ (place-fret 3 5 3 green)
+ (place-fret 2 5 4 blue )
+ (place-fret 1 3 1)
+ (barre 5 1 3))
+ }
+ }
+}
+@end lilypond
@item
-Current input location and parser are now stored in GUILE fluids
-and can be referenced via the function calls @code{(*location*)}
-and @code{(*parser*)}. Consequently, a lot of functions
-previously taking an explicit @code{parser} argument no longer do
-so.
+Two new properties have been added for use in
+@code{fret-diagram-details} when using the @code{\fret-diagram-verbose}
+markup command; @code{fret-label-horizontal-offset} which affects the
+@code{fret-label-indication} and @code{paren-padding} which controls the
+space between the dot and the parentheses surrounding it.
-Functions defined with @code{define-music-function},
-@code{define-event-function}, @code{define-scheme-function} and
-@code{define-void-function} no longer use @code{parser} and
-@code{location} arguments.
+@lilypond[verbatim,quote,relative=1]
+\new Voice {
+ c1^\markup {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1)
+ (place-fret 4 5 2)
+ (place-fret 3 5 3)
+ (place-fret 1 6 4 parenthesized)
+ (place-fret 2 3 1)
+ (barre 5 2 3))
+ }
+ c1^\markup {
+ \override #'(fret-diagram-details . (
+ (fret-label-horizontal-offset . 2)
+ (paren-padding . 0.25))) {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1)
+ (place-fret 4 5 2)
+ (place-fret 3 5 3)
+ (place-fret 1 6 4 parenthesized)
+ (place-fret 2 3 1)
+ (barre 5 2 3))
+ }
+ }
+}
+@end lilypond
-With those particular definitions, LilyPond will try to recognize
-legacy use of @code{parser} and @code{location} arguments,
-providing backwards-compatible semantics for some time.
+@item
+Additional bass strings (for lute tablature) are supported.
+@lilypond[quote,verbatim]
+m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
+
+\score {
+ \new TabStaff \m
+ \layout {
+ \context {
+ \Score
+ tablatureFormat = #fret-letter-tablature-format
+ }
+ \context {
+ \TabStaff
+ stringTunings = \stringTuning <a, d f a d' f'>
+ additionalBassStrings = \stringTuning <c, d, e, fis, g,>
+ fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
+ }
+ }
+}
+@end lilypond
@item
-In the "english" notename language, the long notenames for pitches
-with accidentals now contain a hyphen for better readability. You
-now have to write
+String numbers can now also be used to print roman numerals
+(e.g. for unfretted string instruments).
+@lilypond[verbatim,quote,relative=2]
+c2\2
+\romanStringNumbers
+c\2
+\arabicStringNumbers
+c1\3
+@end lilypond
+
+@item
+@code{TabStaff} is now able to print micro-tones for bendings etc.
+@lilypond[quote,verbatim]
+\layout {
+ \context {
+ \Score
+ supportNonIntegerFret = ##t
+ }
+}
+
+mus = \relative { c'4 cih d dih }
+
+<<
+ \new Staff << \clef "G_8" \mus >>
+ \new TabStaff \mus
+>>
+@end lilypond
+
+@end itemize
+
+
+@strong{Chord notation improvements}
+
+@itemize
+
+@item @code{\chordmode} can now use @code{< >} and @code{<< >>}
+constructs.
+
+@item
+It is now possible to override the @code{text} property of
+chord names.
+
+@lilypond[verbatim,fragment,quote]
+<<
+\new ChordNames \chordmode {
+ a' b c:7
+ \once \override ChordName.text = #"foo"
+ d
+}
+>>
+@end lilypond
+
+@end itemize
+
+
+
+@subheading New for input and output
+
+
+@strong{Input structure improvements}
+
+@itemize
+
+@item
+Blocks introduced with @code{\header} can be stored in variables
+and used as arguments to music and scheme functions and as the
+body of @code{#@{@dots{}#@}} constructs. They are represented as
+a Guile module.
+
+While @code{\book}, @code{\bookpart}, @code{\score}, @code{\with},
+@code{\layout}, @code{\midi}, @code{\paper} blocks can be passed
+around in similar manner, they are represented by different data
+types.
+
+@end itemize
+
+
+@strong{Titles and header improvements}
+
+@itemize
+
+@item
+Page numbers may now be printed in roman numerals, by setting the
+@code{page-number-type} paper variable.
+
+@end itemize
+
+
+@strong{Input file improvements}
+
+@itemize
+
+@item
+A new command @code{\tagGroup} has now been added. This complements
+the existing @code{\keepWithTag} and @code{\removeWithTag} commands.
+For Example:
+
@example
-\key a-flat \major
+\tagGroup #'(violinI violinII viola cello)
@end example
-instead of the previous
+
+declares a list of @q{tags} that belong to a single @q{tag group}.
+
@example
-\key aflat \major
+\keepWithTag #'violinI
@end example
-Double accidentals do not get another hyphen, so the Dutch
-@code{cisis} has the long English notename @code{c-sharpsharp}.
+Is now only concerned with @q{tags} from @q{violinI}âs tag group.
+
+Any element of the included music tagged with one or more tags from the
+group, but @emph{not} with @var{violinI}, will be removed.
+
+@end itemize
+
+
+@strong{Output improvements}
+
+@itemize
@item
-The visual style of tremolo slashes (shape, style and slope)
-is now more finely controlled.
-@lilypond[quote,relative=2]
- a8:32 b: c: d:
- \override StemTremolo.shape = #'beam-like
- a: b: c: d:
- \override StemTremolo.style = #'constant
- a: b: c: d:
- g,2
-@end lilypond
+LilyPond source files may now be embedded inside the generated PDF files.
+This experimental feature is disabled by default and may be regarded as unsafe,
+as PDF documents with hidden content tend to present a security risk.
+Please note that not all PDF viewers have the ability to handle embedded
+documents (if not, the PDF output will appear normally and source files
+will remain invisible). This feature only works with the PDF backend.
+@item
+The @code{output-classic-framework} procedure and the @code{-dclip-systems}
+are now available with the @code{SVG} backend.
@item
-Multi-measure rests have length according to their total duration,
-under the control of @code{MultiMeasureRest.space-increment}.
-@lilypond[quote]
-{ \compressFullBarRests
- \override Staff.MultiMeasureRest.space-increment = 3.0
- R1*2 R1*12 R1*64 }
-@end lilypond
+An argument, @code{-dcrop}, has been added, formatting @code{SVG} and
+@code{PDF} output without margins or page-breaks.
@item
-Page numbers may now be printed in roman numerals, by setting the
-@code{page-number-type} paper variable.
+A new @code{output-attributes} grob property is now used for svg output
+instead of the @code{id} grob property. It allows multiple attributes
+to be defined as an association list. For example, @code{#'((id . 123)
+(class . foo) (data-whatever . @qq{bar}))} will produce the following
+group tag in an SVG file: @code{<g id=@qq{123} class=@qq{foo}
+data-whatever=@qq{bar}> @dots{} </g>}.
+
+@item
+The PostScript functionality of stroke adjustment is no longer
+applied automatically but left to the discretion of the PostScript
+device (by default, Ghostscript uses it for resolutions up to
+150dpi when generating raster images). When it is enabled, a more
+complex drawing algorithm designed to benefit from stroke
+adjustment is employed mostly for stems and bar lines.
+
+Stroke adjustment can be forced by specifying the command line
+option @samp{-dstrokeadjust} to LilyPond. When generating
+@code{PDF} files, this will usually result in markedly better
+looking @code{PDF} previews but significantly larger file size.
+Print quality at high resolutions will be unaffected.
+
+@item
+Added a new @code{make-path-stencil} function that supports all
+@code{path} commands both relative and absolute:
+
+@code{lineto}, @code{rlineto}, @code{curveto}, @code{rcurveto},
+@code{moveto}, @code{rmoveto}, @code{closepath}. The function also
+supports @q{single-letter} syntax used in standard SVG path commands:
-@item
-It is now possible to use @code{\time} and @code{\partial}
-together to change the time signature in mid measure.
+@code{L}, @code{l}, @code{C}, @code{c}, @code{M}, @code{m}, @code{Z} and
+@code{z}. The new command is also backward-compatible with the original
+@code{make-connected-path-stencil} function. Also see
+@file{scm/stencil.scm}.
-@lilypond[verbatim,quote,relative=1]
-\override Score.BarNumber.break-visibility = #end-of-line-invisible
-\partial 4 \time 3/4 f4 | 2 4 | 2 \bar "||"
-\time 9/8 \partial 4. f8 8 8 | 2. 8 8 8 |
-@end lilypond
+@end itemize
-@item
-It is now possible to override the @code{text} property of
-chord names.
-@lilypond[verbatim,fragment,quote]
-<<
-\new ChordNames \chordmode {
- a' b c:7
- \once \override ChordName.text = #"foo"
- d
-}
->>
-@end lilypond
+@strong{MIDI improvements}
-@item
-Improved horizontal alignment when using @code{TextScript},
-with @code{DynamicText} or @code{LyricText}.
+@itemize
@item
-A new command @code{\magnifyStaff} has been added which scales staff
-sizes, staff lines, bar lines, beamlets and horizontal spacing generally
-at the @code{Staff} context level. Staff lines are prevented from being
-scaled smaller than the default since the thickness of stems, slurs, and
-the like are all based on the staff line thickness.
+The most common articulations are now reflected in MIDI output.
+Accent and marcato make notes louder; staccato, staccatissimo and
+portato make them shorter. Breath marks shorten the previous
+note.
+
+This behavior is customizable through the @code{midiLength} and
+@code{midiExtraVelocity} properties on @code{ArticulationEvent}.
+See @file{script-init.ly} for examples.
@item
-@code{InstrumentName} now supports @code{text-interface}.
+Improved MIDI output for breathe marks. After tied notes, breaths take
+time @emph{only} from the last note of the tie; e.g.
+@code{@{ c4~ c8 \breathe @}} performs as @code{@{ c4~ c16 r @}} instead
+of @code{@{ c4 r8 @}}. This is more consistent with articulations and
+how humans interpret breaths after ties. It now also makes it easier to
+align simultaneous breathe marks over multiple parts, all with different
+note lengths.
@item
There is now support for controlling the @q{expression level} of
@@ -584,240 +1155,68 @@ This can be used to alter the perceived volume of even sustained notes
@end example
@item
-Support for making it easier to use alternative @q{music} fonts other
-than the default Emmentaler in LilyPond has been added. See
-@uref{http://fonts.openlilylib.org/} for more information.
-
-@item
-Grobs and their parents can now be aligned separately allowing
-more flexibility for grob positions. For example the @q{left} edge of a
-grob can now be aligned on the @q{center} of its parent.
-
-@item
-Improvements to the @code{\partial} command have been made to
-avoid problems when using multiple, parallel contexts.
+When outputting MIDI, LilyPond will now store the @code{title}
+defined in a score's @code{\header} block (or, if there is no
+such definition on the @code{\score} level, the first such
+definition found in a @code{\header} block of the score's
+enclosing @code{\bookpart}, @code{\book}, or top-level scope)
+as the name of the MIDI sequence in the MIDI file. Optionally,
+the name of the MIDI sequence can be overridden using the new
+@code{midititle} @code{\header} field independently of
+@code{title} (for example, in case @code{title} contains markup
+code which does not render as plain text in a satisfactory way
+automatically).
-@item @code{\chordmode} can now use @code{< >} and @code{<< >>}
-constructs.
+@end itemize
-@item
-A new command @code{\tagGroup} has now been added. This complements
-the existing @code{\keepWithTag} and @code{\removeWithTag} commands.
-For Example:
-@example
-\tagGroup #'(violinI violinII viola cello)
-@end example
+@strong{Extracting music improvements}
-declares a list of @q{tags} that belong to a single @q{tag group}.
+@itemize
+@item
+@code{\displayLilyMusic} and its underlying Scheme functions no
+longer omit redundant note durations. This makes it easier to
+reliably recognize and format standalone durations in expressions
+like
@example
-\keepWithTag #'violinI
+@{ c4 d4 8 @}
@end example
-Is now only concerned with @q{tags} from @q{violinI}âs tag group.
-
-Any element of the included music tagged with one or more tags from the
-group, but @emph{not} with @var{violinI}, will be removed.
-
-@item
-The @code{\addlyrics} function now works with arbitrary contexts
-incuding @code{Staff}.
-
-@item
-String numbers can now also be used to print roman numerals
-(e.g. for unfretted string instruments).
-@lilypond[verbatim,quote,relative=2]
-c2\2
-\romanStringNumbers
-c\2
-\arabicStringNumbers
-c1\3
-@end lilypond
-
-@item
-The @code{thin-kern} property of the @code{BarLine} grob has been
-renamed to @code{segno-kern}.
-
-@item
-@code{KeyCancellation} grobs now ignore cue clefs (like
-@code{KeySignature} grobs do).
-
-@item
-Add support for @code{\once@tie{}\unset}
-
-@item
-It is now possible to individually color both the dots and parentheses
-in fret diagrams when using the @code{\fret-diagram-verbose} markup
-command.
-
-@lilypond[verbatim,quote,relative=1]
-\new Voice {
- c1^\markup {
- \override #'(fret-diagram-details . (
- (finger-code . in-dot))) {
- \fret-diagram-verbose #'((mute 6)
- (place-fret 5 3 1 red)
- (place-fret 4 5 2 inverted)
- (place-fret 3 5 3 green)
- (place-fret 2 5 4 blue inverted)
- (place-fret 1 3 1 violet)
- (barre 5 1 3 ))
- }
- }
- c1^\markup {
- \override #'(fret-diagram-details . (
- (finger-code . below-string))) {
- \fret-diagram-verbose #'((mute 6)
- (place-fret 5 3 1 red parenthesized)
- (place-fret 4 5 2 yellow
- default-paren-color
- parenthesized)
- (place-fret 3 5 3 green)
- (place-fret 2 5 4 blue )
- (place-fret 1 3 1)
- (barre 5 1 3))
- }
- }
-}
-@end lilypond
-
-@item
-Two new properties have been added for use in
-@code{fret-diagram-details} when using the @code{\fret-diagram-verbose}
-markup command; @code{fret-label-horizontal-offset} which affects the
-@code{fret-label-indication} and @code{paren-padding} which controls the
-space between the dot and the parentheses surrounding it.
-
-@lilypond[verbatim,quote,relative=1]
-\new Voice {
- c1^\markup {
- \fret-diagram-verbose #'((mute 6)
- (place-fret 5 3 1)
- (place-fret 4 5 2)
- (place-fret 3 5 3)
- (place-fret 1 6 4 parenthesized)
- (place-fret 2 3 1)
- (barre 5 2 3))
- }
- c1^\markup {
- \override #'(fret-diagram-details . (
- (fret-label-horizontal-offset . 2)
- (paren-padding . 0.25))) {
- \fret-diagram-verbose #'((mute 6)
- (place-fret 5 3 1)
- (place-fret 4 5 2)
- (place-fret 3 5 3)
- (place-fret 1 6 4 parenthesized)
- (place-fret 2 3 1)
- (barre 5 2 3))
- }
- }
-}
-@end lilypond
-
-@item
-A new markup command @code{\justify-line} has been added. Similar to
-the @code{\fill-line} markup command except that instead of setting
-@emph{words} in columns, the @code{\justify-line} command balances the
-whitespace between them ensuring that when there are three or more
-words in a markup, the whitespace is always consistent.
-
-@lilypond[quote,verbatim,papersize=a6]
-\markup \fill-line {oooooo oooooo oooooo oooooo}
-\markup \fill-line {ooooooooo oooooooo oo ooo}
-@end lilypond
-
-@lilypond[quote,verbatim,papersize=a6]
-\markup \justify-line {oooooo oooooo oooooo oooooo}
-\markup \justify-line {ooooooooo oooooooo oo ooo}
-@end lilypond
-
-@item
-A new command @code{\magnifyMusic} has been added, which allows
-the notation size to be changed without changing the staff size,
-while automatically scaling stems, beams, and horizontal spacing.
-
-@lilypond[verbatim,quote]
-\new Staff <<
- \new Voice \relative {
- \voiceOne
- <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
- }
- \new Voice \relative {
- \voiceTwo
- \magnifyMusic 0.63 {
- \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
- r32 c'' a c a c a c r c a c a c a c
- r c a c a c a c a c a c a c a c
- }
- }
->>
-@end lilypond
+@end itemize
-@item
-A new flexible template suitable for a range of choral music, is now
-provided. This may be used to create simple choral music, with or
-without piano accompaniment, in two or four staves. Unlike other
-templates, this template is @q{built-in}, which means it does not
-need to be copied and edited: instead it is simply @code{\include}'d
-in the input file. For details, see @rlearning{Built-in templates}.
-@item
-The positioning of tuplet numbers for kneed beams has been significantly
-improved. Previously, tuplet numbers were placed according to the
-position of the tuplet bracket, even if it was not printed. This could
-lead to stranded tuplet numbers. Now they are now positioned
-closer to the kneed-beam when an appropriate beam segment exists for its
-placement and when the bracket is not drawn.
-Collision detection is also added, offsetting horizontally if too close
-to an adjoining note column but preserving the number's vertical
-distance from the kneed beam. If the number itself is too large to
-fit in the available space the original, bracket-based, positioning
-system is used instead; and in the event of a collision (e.g. with an
-accidental) the tuplet number is moved vertically away instead.
+@subheading New for spacing issues
-@lilypond[verbatim,fragment,quote,relative=1]
-\time 3/4
-\override Beam.auto-knee-gap = 3
-\tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
-}
-@end lilypond
-@noindent
-The original kneed-beam tuplet behavior is still available through an
-@code{\override} via a new, @code{knee-to-beam} property.
+@strong{Page breaking improvements}
-@lilypond[verbatim,fragment,quote,relative=1]
-\time 3/4
-\override Beam.auto-knee-gap = 3
-\override TupletNumber.knee-to-beam = ##f
-\tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
-}
-@end lilypond
+@itemize
@item
-@code{\lyricsto} and @code{\addLyrics} have been @q{harmonized}. Both
-now accept the same kind of delimited argument list that @code{\lyrics}
-and @code{\chords} accept. Backward compatibility has been added so
-music identifiers (i.e. @code{\mus}) are permitted as arguments. A
-@code{convert-ly} rule has been added that removes redundant uses of
-@code{\lyricmode} and rearranges combinations with context starters such
-that @code{\lyricsto} in general is applied last (i.e. like
-@code{\lyricmode} would be).
+There are two new page breaking functions. @code{ly:one-page-breaking}
+automatically adjusts the height of the page to fit the music, so that
+everything fits on one page. @code{ly:one-line-auto-height-breaking}
+is like @code{ly:one-line-breaking}, placing the music on a single
+line and adjusting the page width accordingly, however it also
+automatically adjusts the page height to fit the music.
-@item
-Scheme functions and identifiers can now be used as output definitions.
+@end itemize
+
+
+@strong{Vertical and Horizontal spacing improvements}
+
+@itemize
@item
-Scheme expressions can now be used as chord constituents.
+It is now possible to move systems with reference to their current
+position using the @code{extra-offset} subproperty of
+@code{NonMusicalPaperColumn.line-break-system-details}. Both vertical
+and horizontal changes are possible. This feature is especially useful
+for making slight adjustments to the default vertical position of
+individual systems. See @ruser{Explicit staff and system positioning} for
+more information.
@item
Improved visual spacing of small and regular @q{MI} Funk and Walker
@@ -831,24 +1230,61 @@ well as with the thin variants.
@rinternals{LeftEdge}.
@item
-Added a new @code{make-path-stencil} function that supports all
-@code{path} commands both relative and absolute:
+Grobs and their parents can now be aligned separately allowing
+more flexibility for grob positions. For example the @q{left} edge of a
+grob can now be aligned on the @q{center} of its parent.
-@code{lineto}, @code{rlineto}, @code{curveto}, @code{rcurveto},
-@code{moveto}, @code{rmoveto}, @code{closepath}. The function also
-supports @q{single-letter} syntax used in standard SVG path commands:
+@item
+Improved horizontal alignment when using @code{TextScript},
+with @code{DynamicText} or @code{LyricText}.
-@code{L}, @code{l}, @code{C}, @code{c}, @code{M}, @code{m}, @code{Z} and
-@code{z}. The new command is also backward-compatible with the original
-@code{make-connected-path-stencil} function. Also see
-@file{scm/stencil.scm}.
+@end itemize
+
+
+
+@subheading New for changing defaults
+
+@itemize
+
+@item
+All of @code{\override}, @code{\revert}, @code{\set}, and
+@code{\unset} now work with the @code{\once} prefix for making
+one-time settings.
+@lilypond[quote,verbatim]
+\relative {
+ c'4 d
+ \override NoteHead.color = #red
+ e4 f |
+ \once \override NoteHead.color = #green
+ g4 a
+ \once \revert NoteHead.color
+ b c |
+ \revert NoteHead.color
+ f2 c |
+}
+@end lilypond
+
+@end itemize
+
+
+
+@subheading New for Internal interfaces and functions
+
+@itemize
+
+@item
+The music and grob property @code{spanner-id}, used for distinguishing
+simultaneous slurs and phrasing slurs, has been changed from a string to
+a @emph{key} which can be either a non-negative integer or symbol (also
+see the previous documented expressive mark improvement --
+@emph{A new command \=X has been added}).
@item
Context properties named in the @samp{alternativeRestores} property are
restored to their value at the start of the @emph{first} alternative in
all subsequent alternatives.
-Currently the default set restores @q{current meter};
+Currently the default set restores @q{current meter}:
@lilypond[verbatim,fragment,quote,relative=2]
\time 3/4
@@ -861,7 +1297,7 @@ g2. |
@end lilypond
@noindent
-@q{measure position};
+@q{measure position}:
@lilypond[verbatim,fragment,quote,relative=2]
\time 3/4
@@ -876,7 +1312,7 @@ g2. |
@end lilypond
@noindent
-and @q{chord changes};
+and @q{chord changes}:
@lilypond[verbatim,fragment,quote]
<<
@@ -896,172 +1332,122 @@ and @q{chord changes};
@end lilypond
@item
-Improved MIDI output for breathe marks. After tied notes, breaths take
-time @emph{only} from the last note of the tie; e.g.
-@code{@{ c4~ c8 \breathe @}} performs as @code{@{ c4~ c16 r @}} instead
-of @code{@{ c4 r8 @}}. This is more consistent with articulations and
-how humans interpret breaths after ties. It now also makes it easier to
-align simultaneous breathe marks over multiple parts, all with different
-note lengths.
+LilyPond functions defined with @code{define-music-function},
+@code{define-event-function}, @code{define-scheme-function} and
+@code{define-void-function} can now be directly called from Scheme
+as if they were genuine Scheme procedures. Argument checking and
+matching will still be performed in the same manner as when
+calling the function through LilyPond input. This includes the
+insertion of defaults for optional arguments not matching their
+predicates. Instead of using @code{\default} in the actual
+argument list for explicitly skipping a sequence of optional
+arguments, @code{*unspecified*} can be employed.
@item
-A new note head style for Tabulature has been added;
-@code{TabNoteHead.style = #'slash}.
+Current input location and parser are now stored in GUILE fluids
+and can be referenced via the function calls @code{(*location*)}
+and @code{(*parser*)}. Consequently, a lot of functions
+previously taking an explicit @code{parser} argument no longer do
+so.
+
+Functions defined with @code{define-music-function},
+@code{define-event-function}, @code{define-scheme-function} and
+@code{define-void-function} no longer use @code{parser} and
+@code{location} arguments.
+
+With those particular definitions, LilyPond will try to recognize
+legacy use of @code{parser} and @code{location} arguments,
+providing backwards-compatible semantics for some time.
@item
-Four new Clef glyphs have been added @emph{Double G}, @emph{Tenor G},
-@emph{Varpercussion} and @emph{varC} and their related tessitura.
-@lilypond[verbatim,quote,fragment]
- \override Staff.Clef.full-size-change = ##t
-
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
-
- \break
- \override Staff.Clef.full-size-change = ##f
-
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
-@end lilypond
+Scheme functions and identifiers can now be used as output definitions.
@item
-Isolated durations in music sequences now stand for unpitched
-notes. This may be useful for specifying rhythms to music or
-scheme functions. When encountered in the final score, the
-pitches are provided by the preceding note or chord. Here are two
-examples where this makes for readable input:
+Scheme expressions can now be used as chord constituents.
-@lilypond[verbatim,quote]
-\new DrumStaff \with { \override StaffSymbol.line-count = 1 }
-\drummode {
- \time 3/4
- tambourine 8 \tuplet 3/2 { 16 16 16 }
- 8 \tuplet 3/2 { 16 16 16 } 8 8 |
-}
-@end lilypond
+@item
+Music (and scheme and void) functions and markup commands that
+just supply the final parameters to a chain of overrides, music
+function and markup command calls can now be defined in the form
+of just writing the expression cut short with @code{\etc}.
@lilypond[verbatim,quote]
-\new Staff { r16 c'16 ~ 8 ~ 4 ~ 2 | }
+\markup bold-red = \markup \bold \with-color #red \etc
+highlight = \tweak font-size 3 \tweak color #red \etc
+
+\markup \bold-red "text"
+\markuplist \column-lines \bold-red { One Two }
+
+{ c' \highlight d' e'2-\highlight -! }
@end lilypond
@item
-@code{\displayLilyMusic} and its underlying Scheme functions no
-longer omit redundant note durations. This makes it easier to
-reliably recognize and format standalone durations in expressions
-like
+Dot-separated symbol lists like @code{FretBoard.stencil} were
+already supported as of version@tie{}2.18. They may now also
+contain unsigned integers, and may alternatively be separated by
+commata. This allows usage such as
+@lilypond[quote,verbatim]
+{ \time 2,2,1 5/8 g'8 8 8 8 8 }
+@end lilypond
+and
@example
-@{ c4 d4 8 @}
+\tagGroup violin,oboe,bassoon
@end example
@item
-Beaming exceptions can now be constructed using the
-@code{\beamExceptions} scheme function. One can now write
-
-@lilypond[verbatim,quote,relative=1]
-\time #'(2 1) 3/16
-\set Timing.beamExceptions =
- \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
-c16 c c |
-\repeat unfold 6 { c32 } |
+Such lists may also be used in expressions for assignments, sets,
+and overrides. This allows usage such as
+@lilypond[quote,verbatim]
+{ \unset Timing.beamExceptions
+ \set Timing.beatStructure = 1,2,1
+ g'8 8 8 8 8 8 8 8 }
@end lilypond
-@noindent
-with multiple exceptions separated with @code{|} bar checks
-(writing the exception pattern without pitches is convenient but
-not mandatory). Previously, setting the beam exceptions would
-have required writing
-
+@item
+Association list elements could previously be assigned values
+individually (for example, paper variables like
+@code{system-system-spacing.basic-distance}). They may now be
+also referenced in this manner, as with
@example
-\set Timing.beamExceptions =
-#'( ;start of alist
- (end . ;entry for end of beams
- ( ;start of alist of end points
- ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16
- )))
+\paper @{
+ \void \displayScheme \system-system-spacing.basic-distance
+@}
@end example
-@item
-The most common articulations are now reflected in MIDI output.
-Accent and marcato make notes louder; staccato, staccatissimo and
-portato make them shorter. Breath marks shorten the previous
-note.
-
-This behavior is customizable through the @code{midiLength} and
-@code{midiExtraVelocity} properties on @code{ArticulationEvent}.
-See @file{script-init.ly} for examples.
+In combination with the previously mentioned changes, this allows
+setting and referencing pseudovariables like @code{violin.1}.
@item
-The PostScript functionality of stroke adjustment is no longer
-applied automatically but left to the discretion of the PostScript
-device (by default, Ghostscript uses it for resolutions up to
-150dpi when generating raster images). When it is enabled, a more
-complex drawing algorithm designed to benefit from stroke
-adjustment is employed mostly for stems and bar lines.
-
-Stroke adjustment can be forced by specifying the command line
-option @samp{-dstrokeadjust} to LilyPond. When generating
-@code{PDF} files, this will usually result in markedly better
-looking @code{PDF} previews but significantly larger file size.
-Print quality at high resolutions will be unaffected.
+The markup-list-command @code{\table} is now available.
+Each column may be aligned differently.
+@lilypond[quote,verbatim]
+\markuplist {
+ \override #'(padding . 2)
+ \table
+ #'(0 1 0 -1)
+ {
+ \underline { center-aligned right-aligned center-aligned left-aligned }
+ one "1" thousandth "0.001"
+ eleven "11" hundredth "0.01"
+ twenty "20" tenth "0.1"
+ thousand "1000" one "1.0"
+ }
+}
+@end lilypond
@item
-Default text fonts have been changed from
-@code{Century Schoolbook L}, @code{sans-serif}, and @code{monospace}.
-
-For @code{svg} backend:
-@multitable @columnfractions .15 .30
-@headitem Family @tab Default font
-@item @emph{roman} @tab @code{serif}
-@item @emph{sans} @tab @code{sans-serif}
-@item @emph{typewriter} @tab @code{monospace}
-@end multitable
+@code{InstrumentName} now supports @code{text-interface}.
-@code{serif}, @code{sans-serif}, and @code{monospace} are
-@code{generic-family} in SVG and CSS specifications.
+@item
+The @code{thin-kern} property of the @code{BarLine} grob has been
+renamed to @code{segno-kern}.
-For other backends:
-@multitable @columnfractions .15 .30 .55
-@headitem Family @tab Default font (alias) @tab Alias definition lists
-@item @emph{roman}
-@tab @code{LilyPond Serif}
-@tab
-TeX Gyre Schola,
-C059, Century SchoolBook URW, Century Schoolbook L,
-DejaVu Serif,
-..., serif
-@item @emph{sans}
-@tab @code{LilyPond Sans Serif}
-@tab
-TeX Gyre Heros,
-Nimbus Sans, Nimbus Sans L, DejaVu Sans,
-..., sans-serif
-@item @emph{typewriter}
-@tab @code{LilyPond Monospace}
-@tab
-TeX Gyre Cursor,
-Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
-DejaVu Sans Mono,
-..., monospace
-@end multitable
+@item
+@code{KeyCancellation} grobs now ignore cue clefs (like
+@code{KeySignature} grobs do).
-@code{LilyPond Serif}, @code{LilyPond Sans Serif},
-and @code{LilyPond Monospace} are font aliases defined
-in the LilyPond dedicated FontConfig configuration file
-@code{00-lilypond-fonts.conf}.
-Where a character dosen't exist in the first font listed,
-the next font listed will be used instead for that character.
-For details of alias definitions, please see
-to @code{00-lilypond-fonts.conf} under the installed directory.
+@item
+Add support for @code{\once@tie{}\unset}
@end itemize
@@ -1071,7 +1457,6 @@ For older news, go to
@uref{http://lilypond.org/doc/v2.16/Documentation/changes/},
or @uref{../,go back} to the Documentation index.
-
@end ifhtml
@bye
diff --git a/Documentation/contributor/doc-translation-list.itexi b/Documentation/contributor/doc-translation-list.itexi
index 63db61ac56..07530e4681 100644
--- a/Documentation/contributor/doc-translation-list.itexi
+++ b/Documentation/contributor/doc-translation-list.itexi
@@ -26,13 +26,13 @@ procedures}.
@example
-1- Web site
760 web.texi
-5793 web/introduction.itexi
+5800 web/introduction.itexi
1158 web/download.itexi
1139 macros.itexi
9 po/lilypond-doc.pot (translate to po/@var{MY_LANGUAGE}.po)
0 search-box.ihtml
--- lilypond-texi2html.init (section TRANSLATIONS)
-8859 total
+8866 total
-2- Tutorial
1314 web/manuals.itexi
@@ -44,10 +44,10 @@ procedures}.
-3- Fundamental Concepts, starting of Usage and Community
11240 learning/fundamental.itely -- Fundamental concepts
135 usage.tely
-5469 usage/running.itely
+5391 usage/running.itely
2097 usage/updating.itely
2449 web/community.itexi
-21390 total
+21312 total
-4- Rest of Learning manual and Suggestions on writing LilyPond files
16592 learning/tweaks.itely -- Tweaking output
@@ -65,7 +65,7 @@ procedures}.
2979 notation/simultaneous.itely
2554 notation/staff.itely
1481 notation/editorial.itely
-2754 notation/text.itely
+2952 notation/text.itely
81 notation/specialist.itely -- Specialist notation
4977 notation/vocal.itely
1975 notation/chords.itely
@@ -82,7 +82,7 @@ procedures}.
5187 notation/programming-interface.itely -- Interfaces for programmers
3079 notation/notation-appendices.itely -- Notation manual tables
252 notation/cheatsheet.itely -- Cheat sheet
-92311 total
+92509 total
-6- Rest of Application Usage
4211 usage/lilypond-book.itely -- LilyPond-book
diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi
index d13b68099c..7973f35e62 100644
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -146,6 +146,15 @@ website.
Python documentation is available at @uref{http://www.python.org/doc/,
python.org}.
+@subsection Scalable Vector Graphics (SVG)
+
+Scalable Vector Graphics (SVG) is an XML-based markup language used to generate
+graphical output. A brief SVG tutorial is
+@uref{https://www.w3schools.com/graphics/svg_intro.asp, available online} through
+W3 Schools. The World Wide Web Consortium's
+@uref{https://www.w3.org/TR/SVG/REC-SVG11-20110816.pdf, SVG 1.2 Recommendation}
+is available online in PDF format.
+
@node Programming without compiling
@section Programming without compiling
@@ -755,7 +764,7 @@ option.
@unnumberedsubsec Functions for debug and log output
LilyPond has two different types of error and log functions:
-@itemize
+@itemize
@item
If a warning or error is caused by an identified position in the input file,
@@ -765,8 +774,8 @@ in addition to the message.
@item
If a message can not be associated with a particular position in an input file,
-e.g. the output file cannot be written, then the functions in the
-@code{flower/include/warn.hh} file will provide logging functionality that
+e.g. the output file cannot be written, then the functions in the
+@code{flower/include/warn.hh} file will provide logging functionality that
only prints out the message, but no location.
@end itemize
@@ -775,7 +784,7 @@ There are also Scheme functions to access all of these logging functions from
scheme. In addition, the Grob class contains some convenience wrappers for
even easier access to these functions.
-The message and debug functions in @code{warn.hh} also have an optional
+The message and debug functions in @code{warn.hh} also have an optional
argument @code{newline}, which specifies whether the message should always
start on a new line or continue a previous message.
By default, @code{progress_indication} does NOT start on a new line, but rather
diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi
index d41b7ad3e7..3ed751985f 100644
--- a/Documentation/contributor/quick-start.itexi
+++ b/Documentation/contributor/quick-start.itexi
@@ -261,7 +261,7 @@ the software directly. See @ref{Manually installing lily-git.tcl}.
@item
lily-git is part of the LilyPond source code and is located in
-@file{$LILYPOND_GIT/scripts/auxillar/lily-git.tcl}.
+@file{$LILYPOND_GIT/scripts/auxiliar/lily-git.tcl}.
@end itemize
diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index cc05df8c65..5693432053 100644
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -488,7 +488,6 @@ http://www.apple.com/downloads
harmony-central.com (news@@harmony-central.com)
versiontracker.com [auto]
hitsquad.com [auto]
-http://www.svgx.org
https://savannah.gnu.org/news/submit.php?group_id=1673 @c => planet.gnu.org
@end example
diff --git a/Documentation/cs/translations.itexi b/Documentation/cs/translations.itexi
index 93bdfbec07..e63033c335 100644
--- a/Documentation/cs/translations.itexi
+++ b/Documentation/cs/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Naposledy obnoveno Sat Jun 24 12:50:41 UTC 2017
+@emph{Naposledy obnoveno Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -285,7 +285,7 @@ ano
@item
Ãvod
@*
-5793
+5800
@tab Pavel Fric
@tab
@tab
diff --git a/Documentation/de/notation/pitches.itely b/Documentation/de/notation/pitches.itely
index 9466ed06e2..b8217dfb1c 100644
--- a/Documentation/de/notation/pitches.itely
+++ b/Documentation/de/notation/pitches.itely
@@ -2931,8 +2931,8 @@ Referenz der Interna:
@cindex Southern-Harmony-Notenköpfe
@cindex Funk-Formnotenköpfe
@cindex Notenköpfe, Funk
-@cindex Notenköpfe, Harmonica Sacra
-@cindex Harmonica Sacra-Notenköpfe
+@cindex Notenköpfe, Harmonia Sacra
+@cindex Harmonia Sacra-Notenköpfe
@cindex Christian Harmony-Notenköpfe
@cindex Notenköpfe, Christian Harmony
@cindex Walker-Formnotenköpfe
@@ -2950,7 +2950,7 @@ In dieser Notation haben die Notenköpfe eine Form, die ihrer
harmonischen Funktion innerhalb der Tonleiter entspricht. Die
Notation war sehr beliebt in amerikanischen Liederbüchern des
19. Jahrhunderts. Auf diese Weise können die Formen
-Sacred Harp, Southern Harmony, Funk (Harmonica Sacra), Walker
+Sacred Harp, Southern Harmony, Funk (Harmonia Sacra), Walker
und Aiken (Christian Harmony) benutzt werden:
@lilypond[verbatim,quote]
diff --git a/Documentation/de/translations.itexi b/Documentation/de/translations.itexi
index 264ad2e3f2..a3376bc02c 100644
--- a/Documentation/de/translations.itexi
+++ b/Documentation/de/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Zuletzt aktualisiert am Sat Jun 24 12:50:41 UTC 2017
+@emph{Zuletzt aktualisiert am Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -759,7 +759,7 @@ teilweise
@item
1.8 Text
@*
-2754
+2952
@tab Till Paala
@tab
@tab
@@ -776,7 +776,7 @@ ja
@ifhtml
@html
-<span style="background-color: #9eff30">teilweise</span>
+<span style="background-color: #acff31">teilweise</span>
@end html
@end ifhtml
@ifnothtml
@@ -1284,7 +1284,7 @@ ja
@item
1 @command{lilypond} starten
@*
-5469
+5391
@tab Reinhold Kainhofer
@*
Till Paala
@@ -1493,7 +1493,7 @@ ja
@item
Einleitung
@*
-5793
+5800
@tab Till Paala
@*
Michael Gerdau
@@ -1512,7 +1512,7 @@ ja
@ifhtml
@html
-<span style="background-color: #2cff20">teilweise</span>
+<span style="background-color: #33ff21">teilweise</span>
@end html
@end ifhtml
@ifnothtml
diff --git a/Documentation/de/usage/running.itely b/Documentation/de/usage/running.itely
index be66d12d03..7cebeb38b4 100644
--- a/Documentation/de/usage/running.itely
+++ b/Documentation/de/usage/running.itely
@@ -440,26 +440,26 @@ vermeiden.
@code{EPS}-Backend.
@item @code{backend}
-@tab @code{'ps}
+@tab @code{ps}
@tab Auswahl des Backend. Poststscript-Dateien (Standart) enthalten
@code{TTF}, @code{Type1} und @code{OTF}-Schriftarten. Ihr Zeichenvorrat
wird nicht reduziert (Subsetting). Die Benutzung von östlichen
Schriftarten kann zu sehr groÃen Dateien führen.
@item
-@tab @code{'eps}
+@tab @code{eps}
@tab Encapsulated PostScript. Hiermit wird jede Seite (System) als eine
eigene @file{EPS}-Datei gespeichert, ohne Schriftarten, sowie als eine
kombinierte @file{EPS}-Datei mit allen Seiten (Systemen) inclusive
Schriftarten. Wird als Standard von @command{lilypond-book} benützt.
@item
-@tab @code{'null}
+@tab @code{null}
@tab Keine graphische Partitur ausgeben; hat den gleichen Effekt wie
@code{-dno-print-pages}.
@item
-@tab @code{'svg}
+@tab @code{svg}
@tab Scalable Vector Graphics. Hiermit wird eine einzelne @code{SVG}-Datei
für jede Seite der Ausgabe erstellt, ohne Schriftarten. Es wird
empfohlen, die Century Schoolbook-Schriftarten zu installieren, welche
@@ -471,7 +471,7 @@ oder -Editoren kompatibel sein. Es gibt auch die Option @code{svg-woff}
(siehe unten) um woff-Schriftarten im SVG-Backend zu benützen.
@item
-@tab @code{'scm}
+@tab @code{scm}
@tab Ausgabe der rohen internen Scheme-basierten Zeichnungsbefehle.
@item @code{check-internal-types}
diff --git a/Documentation/es/notation/pitches.itely b/Documentation/es/notation/pitches.itely
index 6282800918..2eee8a81db 100644
--- a/Documentation/es/notation/pitches.itely
+++ b/Documentation/es/notation/pitches.itely
@@ -3329,7 +3329,7 @@ Referencia de funcionamiento interno:
@cindex arpa sacra, cabezas de nota con forma
@cindex Southern Harmony, cabezas de nota con forma
@cindex Funk, cabezas de nota con forma
-@cindex Harmonica Sacra, cabezas de nota con forma
+@cindex Harmonia Sacra, cabezas de nota con forma
@cindex Christian Harmony, cabezas de nota con forma
@cindex Walker, cabezas de nota con forma
@@ -3337,7 +3337,7 @@ Referencia de funcionamiento interno:
@cindex notas, cabezas de, arpa sacra
@cindex notas, cabezas de, Southern Harmony
@cindex notas, cabezas de, Funk
-@cindex notas, cabezas de, Harmonica Sacra
+@cindex notas, cabezas de, Harmonia Sacra
@cindex notas, cabezas de, Christian Harmony
@cindex notas, cabezas de, Walker
@@ -3352,7 +3352,7 @@ corresponde a la función armónica de una nota dentro de la
escala. Esta notación se hizo popular en los libros americanos de
canciones durante el s.XIX. Las cabezas de nota con formas se
pueden producir en los estilos @q{Sacred Harp}, @q{Southern
-Harmony}, Funk (Harmonica Sacra), Walker y Aiken @q{(Christian
+Harmony}, Funk (Harmonia Sacra), Walker y Aiken @q{(Christian
Harmony)}:
@lilypond[verbatim,quote]
diff --git a/Documentation/es/notation/simultaneous.itely b/Documentation/es/notation/simultaneous.itely
index c5e0f9376b..65384025b6 100644
--- a/Documentation/es/notation/simultaneous.itely
+++ b/Documentation/es/notation/simultaneous.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
@ignore
- Translation of GIT committish: 4244c3a9fbf1f3ff2e20e665f92516d35b61de53
+ Translation of GIT committish: 212ca268e813cd72eca8c07e714e1b6669cba747
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -417,6 +417,7 @@ pentagramas.
* PolifonÃa en un solo pentagrama::
* Estilos de voz::
* Resolución de las colisiones::
+* Combinación de silencios::
* Combinación automática de las partes::
* Escribir música en paralelo::
@end menu
@@ -955,6 +956,42 @@ tienen también distinto puntillo, no están claros.
@end ignore
+@node Combinación de silencios
+@unnumberedsubsubsec Combinación de silencios
+@translationof Merging rests
+
+Al usar más de una voz, es frecuente combinar los silencios que
+aparecen en las dos partes. Esto puede hacerse mediante el uso
+del grabador @code{Merge_rests_engraver}.
+
+@lilypond[quote,verbatim]
+voiceA = \relative { d''4 r d2 | R1 | }
+voiceB = \relative { fis'4 r g2 | R1 | }
+\score {
+ <<
+ \new Staff \with {
+ instrumentName = "unmerged"
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ \new Staff \with {
+ instrumentName = "merged"
+ \consists #Merge_rests_engraver
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ >>
+}
+@end lilypond
+
+Al establecer el valor de la propiedad de contexto
+@code{suspendRestMerging} a @code{##t} podemos desactivar
+temporalmente la combinación de silencios.
+
@node Combinación automática de las partes
@unnumberedsubsubsec Combinación automática de las partes
@translationof Automatic part combining
diff --git a/Documentation/es/texidocs/three-sided-box.texidoc b/Documentation/es/texidocs/three-sided-box.texidoc
index 159a739129..be39b3a0bf 100644
--- a/Documentation/es/texidocs/three-sided-box.texidoc
+++ b/Documentation/es/texidocs/three-sided-box.texidoc
@@ -1,4 +1,4 @@
-%% Translation of GIT committish: 8ffecf6be17c6ec2ff87cf31873121a8cce29b09
+%% Translation of GIT committish: 79c17e0eaedca79e5f7605f5b9f92db27c68e679
texidoces = "
Este ejemplo muestra cómo añadir ina instrucción de marcado para
obtener un rectángulo de tres segmentos visibles rodeando un elemento
diff --git a/Documentation/es/translations.itexi b/Documentation/es/translations.itexi
index 16fed501aa..2fea8b0add 100644
--- a/Documentation/es/translations.itexi
+++ b/Documentation/es/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Actualizado en Sat Jun 24 12:50:41 UTC 2017
+@emph{Actualizado en Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -30,7 +30,7 @@ Registro de cambios de LilyPond
@item
TÃtulos de sección
@*
-2784
+2988
@tab Francisco Vila
@tab
@tab
@@ -47,11 +47,11 @@ sÃ
@ifhtml
@html
-<span style="background-color: #1fff1f">sÃ</span>
+<span style="background-color: #33ff21">parcialmente</span>
@end html
@end ifhtml
@ifnothtml
-sÃ
+parcialmente
@end ifnothtml
@tab pre-GDP
@item
@@ -743,11 +743,11 @@ sÃ
@ifhtml
@html
-<span style="background-color: #25fe1f">parcialmente</span>
+<span style="background-color: #1fff1f">sÃ</span>
@end html
@end ifhtml
@ifnothtml
-parcialmente
+sÃ
@end ifnothtml
@tab post-GDP
@item
@@ -807,7 +807,7 @@ sÃ
@item
1.8 Texto
@*
-2754
+2952
@tab Francisco Vila
@tab
@tab
@@ -824,11 +824,11 @@ sÃ
@ifhtml
@html
-<span style="background-color: #1fff1f">sÃ</span>
+<span style="background-color: #39ff22">parcialmente</span>
@end html
@end ifhtml
@ifnothtml
-sÃ
+parcialmente
@end ifnothtml
@tab pre-GDP
@item
@@ -1332,7 +1332,7 @@ sÃ
@item
1 Ejecutar LilyPond
@*
-5469
+5391
@tab Francisco Vila
@tab
@tab
@@ -1533,7 +1533,7 @@ sÃ
@item
Introducción
@*
-5793
+5800
@tab Francisco Vila
@tab
@tab
diff --git a/Documentation/es/web/introduction.itexi b/Documentation/es/web/introduction.itexi
index dd2917f09a..ba93e9ded5 100644
--- a/Documentation/es/web/introduction.itexi
+++ b/Documentation/es/web/introduction.itexi
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
@ignore
- Translation of GIT committish: d1c9544af1b810d0eb4075106f9576347224a1b4
+ Translation of GIT committish: f0887364f183175facfde169447845a2390a6ed2
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1006,7 +1006,7 @@ de bueno que el mÃo!}
@divClass{testimonial-item}
@imageFloat{orm-finnendahl,jpg, left}
-@subsubheading @uref{http://icem-www.folkwang-hochschule.de/~finnendahl/, Orm Finnendahl}, profesor de composición, Conservatorio Superior de Friburgo
+@subsubheading @uref{http://icem-www.folkwang-hochschule.de/~finnendahl/, Orm Finnendahl}, profesor de composición, Hochschule für Musik und Darstellende Kunst Frankfurt am Main
@qq{Aún cuando no domino [LilyPond] todavÃa, estoy @strong{muy}
impresionado. Usé el programa para digitalizar un motete de
diff --git a/Documentation/extending/programming-interface.itely b/Documentation/extending/programming-interface.itely
index 5e63eabcd4..05da85a631 100644
--- a/Documentation/extending/programming-interface.itely
+++ b/Documentation/extending/programming-interface.itely
@@ -1374,6 +1374,18 @@ can by found in the Internals Reference or the file 'define-grobs.scm':
@}
@end example
+It is also possible to get the value of the existing default by
+employing the function @code{grob-transformer}:
+
+@lilypond[verbatim,quote]
+\relative {
+ \override Flag.X-offset = #(grob-transformer 'X-offset
+ (lambda (flag default) (* default 4.0)))
+ c''4. d8 a4. g8
+}
+@end lilypond
+
+
From within a callback, the easiest method for evaluating a markup is
to use grob-interpret-markup. For example:
diff --git a/Documentation/fr/changes.tely b/Documentation/fr/changes.tely
index 9556de5585..e73eb3675c 100644
--- a/Documentation/fr/changes.tely
+++ b/Documentation/fr/changes.tely
@@ -1,6 +1,6 @@
\input texinfo @c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 8e2eaf4959bec63a1128a444591a540f4f1e2937
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -51,429 +51,440 @@ Voir le manuel d'utilisation, \NAME\
@allowcodebreaks false
-@itemize
-
@ignore
HINTS
-
* add new items at the top
-
* only show verbatim input for syntax/input changes
-
* try to be as brief possible in those cases
-
* don't try to provide real-world examples, they often get too big,
which scares away people.
-
* Write complete sentences.
-
* only show user-visible changes.
@end ignore
+
+@subheading Nouveautés en matière de notation musicale
+@c VO New for musical notation
+
+@strong{Améliorations de la représentation des hauteurs}
+
+@itemize
+
@item
-Il est désormais possible de déplacer des systèmes relativement Ã
-leur positionnement actuel, à l'aide de la sous-propriété
-@code{extra-offset} de
-@code{NonMusicalPaperColumn.line-break-system-details}, que ce soit sur
-l'axe horizontal ou vertical. Cette fonctionnalité s'avère très utile
-pour effectuer un léger ajustement dans le positionnement vertical par
-défaut d'un système particulier. Voir
-@ruser{Positionnement explicite des portées et systèmes} pour de plus
-amples explications.
+Dans la langue de notes @code{english}, le nom développé des notes
+altérées comprend désormais un trait d'union, pour une meilleure
+lisibilité. Il faut donc maintenant saisir
+@example
+\key a-flat \major
+@end example
+
+@noindent
+au lieu de
+
+@example
+\key aflat \major
+@end example
+
+Les altérations doubles ne prennent pas de trait d'union
+supplémentaire ; le @code{cisis} batave s'écrit @code{c-sharpsharp} en
+anglais développé.
@item
-Il est désormais possible d'ajouter du texte à un crochet d'analyse,
-grâce à l'objet @code{HorizontalBracketText}.
+Les règles en matière d'altération peuvent désormais se définir au
+niveau d'un contexte @code{ChoirStaff}.
-@lilypond[quote,verbatim]
-\layout {
- \context {
- \Voice
- \consists "Horizontal_bracket_engraver"
+@item
+Deux nouvelles règles -- @code{choral} et @code{choral-cautionary} --
+sont disponibles. Elles combinent les caractéristiques de
+@code{modern-voice} et @code{piano} ou leurs équivalents avec
+altérations de précaution.
+
+@lilypond[quote]
+musicA = {
+ <<
+ \relative { cis''8 fis, bes4 <a cis>8 f bis4 | cis2. <c, g'>4 | }
+ \\
+ \relative { ais'2 cis, | fis8 b a4 cis2 | }
+ >>
+}
+
+musicB = { \clef bass \new Voice { \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis> \change Staff = up
+ cis' cis \change Staff = down
+ <fis, a> <fis a>] \showStaffSwitch \change Staff = up
+ dis'4 | \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
}
}
-{
- \once \override HorizontalBracketText.text = "a"
- c''\startGroup d''\stopGroup
- e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
+\new ChoirStaff { << \context Staff = "up" {
+ \accidentalStyle choral \musicA }
+ \context Staff = "down" { \musicB } >>
}
@end lilypond
-@item
-Les règles en matière d'altération peuvent désormais se définir au
-niveau d'un contexte @code{ChoirStaff}. Deux nouvelles règles --
-@code{choral} et @code{choral-cautionary} -- sont disponibles. Elles
-combinent les caractéristiques de @code{modern-voice} et @code{piano} ou
-leurs équivalents avec altérations de précaution.
-
-@item
-La fonction musicale @code{\unfoldRepeats} peut maintenant prendre en
-argument optionnel une liste spécifiant le ou les types de musique Ã
-répéter dans le développement. Sont disponibles les arguments
-@code{percent}, @code{tremolo} et @code{volta}. En l'absence de liste
-optionnelle d'arguments, sera utilisé @code{repeated-music} et tout sera
-développé.
+@noindent
+Ceci constitue désormais le style par défaut pour un @code{ChoirStaff}.
-@item
-La propriété d'objet graphique @code{output-attributes} remplace, dans
-les sorties SVG, la propriété de @emph{grob} @code{id}. Ceci permet de
-définir, à l'aide d'une liste associative, de multiples attributs. Par
-exemple, @code{#'((id . 123) (class . foo) (data-whatever . @qq{bar}))}
-produira dans un fichier SVG le groupe de balise : @code{<g id=@qq{123}
-class=@qq{foo} data-whatever=@qq{bar}> @dots{} </g>}.
+@code{choral-cautionary}
-@item
-Liaisons d'articulation ou de phrasé peuvent dorénavant débuter sur une
-note particulière d'un accord. Des liaisons simultanées dans un même
-contexte @code{Voice} devront se distinguer par l'attribution d'un
-@code{spanner-id}.
+@lilypond[quote]
+musicA = {
+ <<
+ \relative { cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 | }
+ \\
+ \relative { ais'2 cis, | fis8 b a4 cis2 | }
+ >>
+}
-@item
-La propriété musicale et d'objet graphique @code{spanner-id}, qui permet
-de distinguer des liaisons d'articulation ou de phrasé simultanées,
-prend en argument une « clé » -- entrier positif ou symbole -- au lieu
-d'une chaîne.
+musicB = { \clef bass \new Voice { \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis> \change Staff = up
+ cis' cis \change Staff = down
+ <fis, a> <fis a>] \showStaffSwitch \change Staff = up
+ dis'4 | \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
-@item
-Le nouvelle commande @code{\=} permet de spécifier le @code{spanner-id}
-(identificateur d'extension) pour des liaisons d'articulation ou de
-phrasé simultanées.
-@lilypond[verbatim,quote]
-\fixed c' {
- <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
+\new ChoirStaff { << \context Staff = "up" {
+ \accidentalStyle choral-cautionary \musicA }
+ \context Staff = "down" { \musicB } >>
}
@end lilypond
+@noindent
+Identique au style @code{choral}, à ceci près que les altérations
+supplémentaires apparaissent comme des altérations de précaution.
+
+@noindent
+Voir aussi : @ruser{Altérations accidentelles automatiques}.
+
@item
-Les blocs introduits par @code{\header} peuvent être stockés dans des
-variables et utilisés en argument à la musique ou à des fonctions Scheme
-ainsi que dans le corps de constructions @code{#@{@dots{}#@}}. Ils sont
-représentés en tant que module Guile.
+Quatre nouveaux glyphes de clef sont désormais disponibles : @emph{GG}
+ou @emph{double-G}, @emph{Tenor G}, @emph{varC}, ainsi que leur
+tessiture respective, et @emph{Varpercussion}.
-Les blocs @code{\book}, @code{\bookpart}, @code{\score}, @code{\with},
-@code{\layout}, @code{\midi} et @code{\paper} peuvent être passés de
-façon similaire, mais sont représentés par des types de donnée différents.
+@multitable @columnfractions .30 .2 .30 .2
+
+@headitem
+Exemple
+@tab
+Résultat
+@tab
+Exemple
+@tab
+Résultat
@item
-Les listes de symboles séparés par des points, à l'instar de
-@code{FretBoard.stencil} sont pris en charge depuis la version 2.18.
-Elles peuvent désormais contenir des entiers non signés, et leurs
-membres être séparés par des virgules. Ceci permet des libellés tels que
-@lilypond[quote,verbatim]
-{ \time 2,2,1 5/8 g'8 8 8 8 8 }
+@code{\clef GG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef GG c1
+@end lilypond
+@tab
+@code{\clef tenorG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorG c1
@end lilypond
-ou
-@example
-\tagGroup violin,oboe,bassoon
-@end example
@item
-De telles listes peuvent aussi apparaître au sein d'expressions aux fins
-d'assignation, de définition ou de dérogation. Ceci permet des libellés
-tels que
-@lilypond[quote,verbatim]
-{ \unset Timing.beamExceptions
- \set Timing.beatStructure = 1,2,1
- g'8 8 8 8 8 8 8 8 }
+@code{\clef varC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varC c1
+@end lilypond
+@tab
+@code{\clef altovarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef altovarC c1
@end lilypond
@item
-Les éléments d'une liste associative pouvaient déjà se voir attribuer
-des valeurs individuellement, comme par exemple
-@code{system-system-spacing.basic-distance} pour les variables
-concernant le papier. Ils peuvent désormais être référencés de la même
-manière, comme ici
-@example
-\paper @{
- \void \displayScheme \system-system-spacing.basic-distance
-@}
-@end example
-
-Par extension à ces modifications, il est dorénavant possible de définir
-et faire référence à des pseudovariables telles que @code{violon.1}.
+@code{\clef tenorvarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorvarC c1
+@end lilypond
+@tab
+@code{\clef baritonevarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef baritonevarC c1
+@end lilypond
@item
-Les fichiers sources LilyPond peuvent désormais être empaquetés dans les
-fichiers PDF générés. Cette fonctionnalité est pour l'instant désactivée
-par défaut car susceptible d'être considérée comme peu sure dans la
-mesure où des documents PDF comportant des fichiers cachés peuvent
-présenter des risques en matière de sécurité. Attention cependant :
-les lecteurs de PDF ne sont pas tous capables de gérer les fichiers
-joints ; si tel est le cas, le rendu PDF apparaîtra normalement mais les
-fichiers joints seront invisibles. Cette fonctionnalité n'est
-opérationnelle qu'avec le moteur PDF.
+@code{\clef varpercussion}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varpercussion c1
+@end lilypond
+
+@end multitable
+
+@noindent
+Voir aussi : @ruser{Styles de clef}.
@item
Les noms de note en français sont maintenant définis spécifiquement,
-plutôt qu'en alias de l'italien. En plus de la syntaxe dérivée de
-l'italien, la hauteur @var{d} peut se saisir @var{ré}, et un
-double-dièse par le suffice @var{-x}.
+plutôt qu'en alias de l'italien. En plus de la syntaxe dérivée de
+l'italien, la hauteur @var{d} peut se saisir @var{ré} ou @code{re}, et
+un double-dièse par le suffice @var{-x}.
-@item
-Dans le cadre des tablatures pour luth sont désormais disponibles les
-cordes de basse additionnelles.
-@lilypond[quote,verbatim]
-m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
+@lilypond[fragment,verbatim,quote,ragged-right,relative=1]
+\language "français"
+do ré mi fa | sol la si do | ré1
+@end lilypond
-\score {
- \new TabStaff \m
- \layout {
- \context {
- \Score
- tablatureFormat = #fret-letter-tablature-format
- }
- \context {
- \TabStaff
- stringTunings = \stringTuning <a, d f a d' f'>
- additionalBassStrings = \stringTuning <c, d, e, fis, g,>
- fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
- }
- }
-}
+@noindent
+Les doubles dièses s'indiquent par l'adjonction d'un @code{x}.
+
+@lilypond[fragment,verbatim,quote,ragged-right,relative=2]
+\language "français"
+dob, rebb misb fabsb | sold ladd six dosd | rédsd1
@end lilypond
+@end itemize
+
+
+@strong{Améliorations en matière de rythme}
+
+@itemize
+
@item
-La commande @code{\table}, pour gérer des listes de @emph{markups} est
-disponible. Chaque colonne peut disposer de son propre alignement.
-@lilypond[quote,verbatim]
-\markuplist {
- \override #'(padding . 2)
- \table
- #'(0 1 0 -1)
- {
- \underline { center-aligned right-aligned center-aligned left-aligned }
- one "1" thousandth "0.001"
- eleven "11" hundredth "0.01"
- twenty "20" tenth "0.1"
- thousand "1000" one "1.0"
- }
-}
+Les silences multimesures ont une longueur dépendant de leur durée
+totale, sous contrôle de @code{MultiMeasureRest.space-increment}. La
+valeur par défaut est fixée à  @code{2.0}.
+
+@lilypond[fragment,verbatim,quote]
+\compressFullBarRests
+R1*2 R1*4 R1*64 R1*16
@end lilypond
-@item
-Une nouvelle commande de @emph{markup}, @code{\with-dimensions-from},
-rend plus aisée l'utilisation de @code{\with-dimensions} en adoptant les
-dimensions d'un objet @emph{markup} fourni en premier argument.
-@lilypond[quote,verbatim]
-\markup {
- \pattern #5 #Y #0 "x"
- \pattern #5 #Y #0 \with-dimensions-from "x" "f"
- \pattern #5 #Y #0 \with-dimensions-from "x" "g"
- \override #'(baseline-skip . 2)
- \column {
- \pattern #5 #X #0 "n"
- \pattern #5 #X #0 \with-dimensions-from "n" "m"
- \pattern #5 #X #0 \with-dimensions-from "n" "!"
- }
-}
+@lilypond[fragment,verbatim,quote]
+\compressFullBarRests
+\override Staff.MultiMeasureRest.space-increment = 2.5
+R1*2 R1*4 R1*64 R1*16
@end lilypond
@item
-Deux nouvelles fonctions permettent de gérer les sauts de page.
-@code{ly:one-page-breaking} ajuste automatiquement la hauteur de la page
-de telle sorte que toute la musique tienne sur une seule page.
-@code{ly:one-line-auto-height-breaking} fonctionne comme
-@code{ly:one-line-breaking} mais, en plus de placer la musique sur une
-seule ligne et d'adapter la largeur de la page en conséquence, elle
-adapte la hauteur de la page automatiquement.
+La commande @code{\partial} a connu des améliorations notables afin
+d'éviter les problèmes en cas de contextes multiples ou parallèles.
@item
-La nouvelle commande de @emph{markup} @code{\draw-squiggle-line} permet
-de tracer des lignes ondulées. Sont adaptables l'épaisseur du trait
-(@code{thickness}), l'amplitude (@code{angularity}), la hauteur
-(@code{height}) et l'orientation (@code{orientation}).
-@lilypond[quote,verbatim]
-\markup
- \overlay {
- \draw-squiggle-line #0.5 #'(3 . 3) ##t
+Il est désormais possible d'utiliser @code{\time} et @code{\partial} de
+concert pour modifier une métrique en cours de mesure.
- \translate #'(3 . 3)
- \override #'(thickness . 4)
- \draw-squiggle-line #0.5 #'(3 . -3) ##t
+@lilypond[verbatim,quote,relative=1]
+f f f f | f2. \bar "||"
+\time 3/4 \partial 4
+f8 8 | f2 f8 f |
+@end lilypond
- \translate #'(6 . 0)
- \override #'(angularity . -5)
- \draw-squiggle-line #0.5 #'(-3 . -3) ##t
+@item
+Des durées isolées dans une séquence musicale sont désormais considérées
+comme des notes sans hauteur. Dans la partition finale, les hauteurs
+sont déterminées à partir de la note ou de l'accord qui précède. Ceci
+peut s'avérer utile pour affecter des rythmes à de la musique ou dans
+une fonction Scheme.
- \translate #'(3 . -3)
- \override #'(angularity . 2)
- \override #'(height . 0.3)
- \override #'(orientation . -1)
- \draw-squiggle-line #0.2 #'(-3 . 3) ##t
- }
+@lilypond[verbatim,quote,fragment,relative=2]
+c64[ 64] 32 16 8^- <g b d>4~ 2 | 1
@end lilypond
-@item
-La nouvelle commande @code{\RemoveAllEmptyStaves} agit exactement comme
-@code{\RemoveEmptyStaves}, à ceci près qu'elle supprime aussi les lignes
-du premier système de la partition.
+@lilypond[verbatim,quote]
+\new DrumStaff \with { \override StaffSymbol.line-count = 1 }
+\drummode {
+ \time 3/4
+ tambourine 8 \tuplet 3/2 { 16 16 16 }
+ 8 \tuplet 3/2 { 16 16 16 } 8 8 |
+}
+@end lilypond
@item
-Deux commandes de @emph{markup} font leur apparition : @code{\undertie}
-et @code{\overtie}, ainsi qu'une version générique @code{\tie}.
-@lilypond[quote,verbatim]
-\markup {
- \undertie "undertied"
- \overtie "overtied"
-}
+Les exceptions en matière de ligature peuvent désormais se libeller Ã
+l'aide de la fonction Scheme @code{\beamExceptions}. Ce qui auparavant
+se définissait par
-m = {
- c''1 \prall -\tweak text \markup \tie "131" -1
-}
+@example
+\set Timing.beamExceptions =
+#'( ;début de la liste associative
+ (end . ;entrée pour la terminaison des ligatures
+ ( ;début de la liste des terminaisons
+ ((1 . 32) . (2 2 2)) ;règle pour les triples croches -- groupées à la double
+ )))
-{ \voiceOne \m \voiceTwo \m }
+\time #'(2 1) 3/16
+c16 c c
+\repeat unfold 6 @{ c32 @}
+@end example
+
+@noindent
+se libelle, grâce à la fonction Scheme @code{\beamExceptions}
+
+@lilypond[verbatim,quote,relative=1]
+\set Timing.beamExceptions =
+ \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
+
+\time #'(2 1) 3/16
+c16 c c |
+\repeat unfold 6 { c32 } |
@end lilypond
+@noindent
+tout en séparant les exceptions par un @code{|} (contrôle de barre de
+mesure) -- l'absence de hauteur dans les motifs d'exception n'est pas
+obligatoire.
+
@item
-Les microaltérations peuvent désormais s'imprimer aussi sur des
-@code{TabStaff}, notamment pour indiquer des @emph{bends}.
-@lilypond[quote,verbatim]
-\layout {
- \context {
- \Score
- supportNonIntegerFret = ##t
- }
-}
+Amélioration significative du positionnement du nombre des n-olets dans
+le cas de ligatures coudées. Jusqu'à présent, ce nombre était placé
+selon la position du crochet même lorsque ce dernier n'était pas
+imprimé, ce qui pouvait amener à un positionnement disgracieux :
-mus = \relative { c'4 cih d dih }
+@lilypond[fragment,quote,relative=1]
+% This is a contrived example to simulate the previous behaviour
+\time 3/4
+\override Beam.auto-knee-gap = 3
+\override TupletNumber.knee-to-beam = ##f
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\tuplet 3/2 4 { g,,8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { c'8 g,, e'' }
+\tuplet 3/2 4 { c'8 g,, e'' }
+\once \override TupletBracket.bracket-visibility = ##t
+\tuplet 2/2 4 { g,8[ e''] }
+\tuplet 2/2 4 { g,,8[ e''] }
+@end lilypond
-<<
- \new Staff << \clef "G_8" \mus >>
- \new TabStaff \mus
->>
+@noindent
+Le nombre est désormais positionné plus près du coude en présence d'un
+tronçon de ligature approprié à son placement et en l'absence de
+crochet.
+
+@lilypond[fragment,quote,relative=1]
+% This is a contrived example to simulate the previous behaviour
+\time 3/4
+\override Beam.auto-knee-gap = 3
+\override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { g,,8 c'' e, }
+\tuplet 3/2 4 { c'8 g,, e'' }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { c'8 g,, e'' }
+\tuplet 2/2 4 { g,8[ e''] }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 2/2 4 { g,,8[ e''] }
@end lilypond
@item
-Deux nouveaux styles de contours à blanc sont disponibles. Le style
-@code{outline} agit un peu comme un ombrage des glyphes, son galbe étant
-le résultat de multiples copies du glyphe. Le style @code{rounded-box}
-produit un rectangle aux coins arrondis. Pour tous les styles, y
-compris le style par défaut @code{box}, l'épaisseur (@code{thickness})
-du contour, mesuré en épaisseur de ligne de portée, est adaptable.
+De plus, la détection de collision ajoutée décalera horizontalement le
+nombre s'il était trop proche d'un empilement adjacent, tout en
+préservant son écartement de la ligature. Dans le cas où ce nombre
+serait trop large pour tenir dans l'espace disponible, LilyPond
+reviendra au positionnement basé sur le crochet. Dans le cas d'une
+collision avec, par exemple, une altération accidentelle, le nombre sera
+plutôt écarté verticalement.
-@lilypond[verbatim,quote]
-\markup {
- \combine
- \filled-box #'(-1 . 15) #'(-3 . 4) #1
- \override #'(thickness . 3)
- \whiteout whiteout-box
-}
-\markup {
- \combine
- \filled-box #'(-1 . 24) #'(-3 . 4) #1
- \override #'(style . rounded-box)
- \override #'(thickness . 3)
- \whiteout whiteout-rounded-box
-}
-\markup {
- \combine
- \filled-box #'(-1 . 18) #'(-3 . 4) #1
- \override #'(style . outline)
- \override #'(thickness . 3)
- \whiteout whiteout-outline
-}
-\relative {
- \override Staff.Clef.whiteout-style = #'outline
- \override Staff.Clef.whiteout = 3
- g'1
-}
+@lilypond[fragment,quote,relative=1]
+\time 2/4
+\override Beam.auto-knee-gap = 3
+\tuplet 3/2 4 { g8 c'' e, c'8 g,, e'' }
+\tuplet 3/2 4 { g,,8 e''' g,, g,8 e''' ges,, }
@end lilypond
-@item
-Les différentes instructions @code{\override}, @code{\revert},
-@code{\set} et @code{\unset} acceptent désormais le préfixe @code{\once}
-qui en réduit les effets à un seule occurrence.
-@lilypond[quote,verbatim]
-\relative {
- c'4 d
- \override NoteHead.color = #red
- e4 f |
- \once \override NoteHead.color = #green
- g4 a
- \once \revert NoteHead.color
- b c |
- \revert NoteHead.color
- f2 c |
-}
+@noindent
+L'ancien comportement des n-olets en présence de ligature coudée reste
+disponible au moyen d'une nouvelle propriété @code{knee-to-beam}
+affectée à l'objet de rendu @code{TupletNumber}.
+
+@lilypond[verbatim,fragment,quote,relative=1]
+\time 2/4
+\override Beam.auto-knee-gap = 3
+\override TupletNumber.knee-to-beam = ##f
+\override TupletBracket.bracket-visibility = ##t
+\tuplet 3/2 4 { g8 c'' e, }
+\once \override TupletBracket.bracket-visibility = ##f
+\tuplet 3/2 4 { g,,8 c'' e, }
@end lilypond
-@item
-Lorsqu'il génère un fichier MIDI, LilyPond enregistre désormais le
-@code{title} défini dans le bloc @code{\header} d'une partition en tant
-que nom de la séquence MIDI du fichier MIDI. En l'absence de
-@code{title} au niveau @code{\score}, sera retenue la première
-définition trouvée dans l'ordre suivant : @code{\bookpart}, @code{\book}
-et enfin @code{\header} de premier niveau. De manière optionnelle, le
-nom de la séquence MIDI peut se définir à l'aide du nouveau champ de
-@code{\header} @code{midititle} indépendamment au cas où le champ
-@code{title} contiendrait du code @emph{markup} qui ne serait pas rendu
-correctement en texte plat.
+@end itemize
+
+
+@strong{Améliorations en matière d'expressivité}
+
+@itemize
@item
-Les fonctions, qu'elles soient musicales, Scheme ou fantômes, ainsi que
-les commandes de @emph{markup} pour lesquelles le paramètre final est
-l'objet de dérogations en chaîne peuvent se définir en remplaçant
-l'expression à laquelle elle s'appliquera par @code{\etc}. Il en va de
-même pour les appels à une fonction ou une commande de @emph{markup}.
+Les terminaisons des soufflets peut désormais s'affiner à l'aide de la
+propriété de @code{grob} @code{shorten-pair}. Celle-ci n'affectait
+auparavant que les extensions de type textuel tels que
+@code{TupletBracket} et @code{OttavaBracket}.
-@lilypond[verbatim,quote]
-bold-red-markup = \markup \bold \with-color #red \etc
-highlight = \tweak font-size 3 \tweak color #red \etc
+@noindent
+Les valeurs positives décalent vers la droite, les négatives vers la
+gauche.
-\markup \bold-red "text"
-\markuplist \column-lines \bold-red { One Two }
+@lilypond[quote,verbatim,relative=2]
+\once \override Hairpin.shorten-pair = #'(0 . 2)
+a1\< | a2 a\!
-{ c' \highlight d' e'2-\highlight -! }
+\once \override Hairpin.shorten-pair = #'(2 . 0)
+\once \override Hairpin.stencil = #constante-hairpin
+a1\< | a2 a\!
+
+\once \override Hairpin.shorten-pair = #'(-1 . -1)
+\once \override Hairpin.stencil = #flared-hairpin
+a1\< | a2 a\!
@end lilypond
@item
-Les fonctions LilyPond définies à l'aide de
-@code{define-music-function}, @code{define-event-function},
-@code{define-scheme-function} et @code{define-void-function} peuvent
-désormais être appelées directement à partir de Scheme, comme s'il
-s'agissait de pures procédures Scheme. Le contrôle et la correspondance
-des arguments seront réalisés de manière identique à ce qui se passe
-lorsque la fonction est appelée au fil du code LilyPond. Ceci inclut
-l'insertion de valeurs par défaut pour des arguments optionnels qui ne
-correspondraient pas à leur prédicat. Dans la liste des arguments, il
-est possible d'utiliser @code{*unspecified*} au lieu de @code{\default}
-pour omettre explicitement une séquence d'argument optionnels.
+Les liaisons, qu'elles soient d'articulation ou de phrasé, peuvent
+désormais débuter sur une hauteur particulière d'un accord.
+
+@lilypond[quote,verbatim,relative=1]
+<f a( c>1 | <c') e g(> | <a c) e>
+@end lilypond
+
+@lilypond[quote,verbatim,relative=1]
+<f( a\( c>1 | <c'\) e\( g> | <a c e\)>
+@end lilypond
@item
-Les données @code{location} pour la saisie courante et @code{parser}
-sont désormais gérées directement dans les flux GUILE ; elles peuvent
-donc être référencées par des appels de fonction@code{(*location*)}
-et @code{(*parser*)}. Par voie de conséquence, nombre de fonctions ont
-vu disparaître leur argument @code{parser} explicite.
+Le nouvelle commande @code{\=} permet de spécifier le @code{spanner-id}
+(identificateur d'extension) pour des liaisons d'articulation ou de
+phrasé simultanées ; l'identificateur est soit un entier positif, soit
+un symbole.
-Les fonctions définies par @code{define-music-function},
-@code{define-event-function}, @code{define-scheme-function} et
-@code{define-void-function} n'ont désormais nul besoin d'argument
-@code{parser} ou @code{location}.
+@noindent
+Ceci s'avère utile en présence de multiples liaisons ou lorsqu'une
+liaison en recouvre une autre ou bien encore lorsque plusieurs courtes
+laisons sont englobées dans une plus grande.
-Avec ces définitions particulières, LilyPond tentera de reconnaître
-l'utilisation héritée des arguments @code{parser} et @code{location},
-fournissant ainsi une compatibilité ascendante de la sémantique pour un
-certain temps.
-@item
-Dans la langue de notes @code{english}, le nom développé des notes
-altérées comprend désormais un trait d'union, pour une meilleure
-lisibilité. Il faut donc maintenant saisir
-@example
-\key a-flat \major
-@end example
-au lieu de
-@example
-\key aflat \major
-@end example
+@lilypond[verbatim,quote]
+\fixed c' {
+ <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
+}
+@end lilypond
-Les altérations doubles ne prennent pas de trait d'union
-supplémentaire ; le @code{cisis} batave s'écrit @code{c-sharpsharp} en
-anglais développé.
+@noindent
+Voir aussi : @ruser{Signes d'interprétation sous forme de courbe}.
+
+@end itemize
+
+
+@strong{Améliorations en matière de reprises}
+
+@itemize
@item
Le style visuel des traits de tremolo (allure, style et pente) est
@@ -487,47 +498,20 @@ maintenant plus finement contrôlé.
g,2
@end lilypond
-
-@item
-Les silences multimesures ont une longueur dépendant de leur durée
-totale, sous contrôle de @code{MultiMeasureRest.space-increment}.
-@lilypond[quote]
-{ \compressFullBarRests
- \override Staff.MultiMeasureRest.space-increment = 3.0
- R1*2 R1*12 R1*64 }
-@end lilypond
-
-@item
-Les numéros de page peuvent désormais s'imprimer en chiffres romains, en
-ajustant la variable de papier @code{page-number-type}.
-
@item
-Il est désormais possible d'utiliser @code{\time} et @code{\partial} de
-concert pour modifier une métrique en cours de mesure.
+La fonction musicale @code{\unfoldRepeats} peut maintenant prendre en
+argument optionnel une liste spécifiant le ou les types de musique Ã
+répéter dans le développement. Sont disponibles les arguments
+@code{percent}, @code{tremolo} et @code{volta}. En l'absence de liste
+optionnelle d'arguments, sera utilisé @code{repeated-music} et tout sera
+développé.
-@lilypond[verbatim,quote,relative=1]
-\override Score.BarNumber.break-visibility = #end-of-line-invisible
-\partial 4 \time 3/4 f4 | 2 4 | 2 \bar "||"
-\time 9/8 \partial 4. f8 8 8 | 2. 8 8 8 |
-@end lilypond
+@end itemize
-@item
-Il est désormais possible de modifier la propriété @code{text} des noms
-d'accord.
-@lilypond[verbatim,fragment,quote]
-<<
-\new ChordNames \chordmode {
- a' b c:7
- \once \override ChordName.text = #"foo"
- d
-}
->>
-@end lilypond
+@strong{Améliorations en matière de notation sur la portée}
-@item
-Amélioration de l'alignement horizontal lors de l'utilisation de
-@code{TextScript}, Ã l'aide de @code{DynamicText} ou @code{LyricText}.
+@itemize
@item
Ajout d'une nouvelle commande @code{\magnifyStaff}, qui échelonne de
@@ -539,105 +523,331 @@ hampes, liaisons et autres est basée sur l'épaisseur des lignes de
portée.
@item
-@code{InstrumentName} prend désormais en charge la
-@code{text-interface}.
-
-@item
-Il est désormais possible de contrôler le « niveau d'expression » des
-canaux MIDI à l'aide de la propriété de contexte
-@code{Staff.midiExpression}. Ceci permet d'altérer le volume perçu y
-compris des notes tenues, bien que légèrement. L'ajustement prend une
-valeur entre @code{0.0} et @code{1.0}.
+La nouvelle commande @code{\magnifyMusic} permet de modifier la
+taille de la musique sans changer la taille de la portée, tout en
+ajustant automatiquement les hampes, ligatures et l'espacement
+horizontal.
-@example
-\score @{
- \new Staff \with @{
- midiExpression = #0.6
- midiInstrument = #"clarinet"
- @}
- <<
- @{ a'1~ a'1 @}
- @{
- \set Staff.midiExpression = #0.7 s4\f\<
- \set Staff.midiExpression = #0.8 s4
- \set Staff.midiExpression = #0.9 s4
- \set Staff.midiExpression = #1.0 s4
+@lilypond[verbatim,quote]
+\new Staff <<
+ \new Voice \relative {
+ \voiceOne
+ <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
+ }
+ \new Voice \relative {
+ \voiceTwo
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ r32 c'' a c a c a c r c a c a c a c
+ r c a c a c a c a c a c a c a c
+ }
+ }
+>>
+@end lilypond
- \set Staff.midiExpression = #0.9 s4\>
- \set Staff.midiExpression = #0.8 s4
- \set Staff.midiExpression = #0.7 s4
- \set Staff.midiExpression = #0.6 s4\!
- @}
- >>
- \midi @{ @}
-@}
-@end example
+@item
+La nouvelle commande @code{\RemoveAllEmptyStaves} agit exactement comme
+@code{\RemoveEmptyStaves}, à ceci près qu'elle supprime aussi les lignes
+du premier système de la partition.
+
+@item
+Ajout de la commande de @emph{markup} @code{\justify-line}. Cette
+fonction est comparable à @code{\fill-line}, à ceci près qu'au lieu de
+répartir les @emph{mots} en colonnes, la commande @code{\justify-line}
+répartit les vides de telle sorte qu'en présence de trois @emph{mots} ou
+plus, ces blancs soient d'égale longueur.
+
+@lilypond[quote,verbatim,papersize=a6]
+\markup \fill-line {oooooo oooooo oooooo oooooo}
+\markup \fill-line {ooooooooo oooooooo oo ooo}
+@end lilypond
+
+@lilypond[quote,verbatim,papersize=a6]
+\markup \justify-line {oooooo oooooo oooooo oooooo}
+\markup \justify-line {ooooooooo oooooooo oo ooo}
+@end lilypond
+
+@end itemize
+
+
+@strong{Améliorations en matière d'annotations éditoriales}
+
+@itemize
+
+@item
+Il est désormais possible d'ajouter du texte à un crochet d'analyse,
+grâce à l'objet @code{HorizontalBracketText}.
+
+@lilypond[quote,verbatim]
+\layout {
+ \context {
+ \Voice
+ \consists "Horizontal_bracket_engraver"
+ }
+}
+
+{
+ \once \override HorizontalBracketText.text = "a"
+ c''\startGroup d''\stopGroup
+ e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
+}
+@end lilypond
+
+@end itemize
+
+
+@strong{Améliorations en matière de mise en forme du texte}
+
+@itemize
@item
La prise en charge de fontes musicales alternative, autrement dit autres
que Emmentaler, est facilitée. Voir
-@uref{http://fonts.openlilylib.org/} pour de plus amples informations.
+@ruser{Changement des fontes musicales} pour de plus amples
+informations.
+
+@item
+Les fontes textuelles par défaut -- @code{Century Schoolbook L},
+@code{sans-serif} et @code{monospace} -- ont été modifiées.
+
+Pour le moteur @code{svg}Â :
+@multitable @columnfractions .15 .30
+@headitem Famille @tab Fonte par défaut
+@item @emph{roman} @tab @code{serif}
+@item @emph{sans} @tab @code{sans-serif}
+@item @emph{typewriter} @tab @code{monospace}
+@end multitable
+
+@code{serif}, @code{sans-serif} et @code{monospace} sont des
+@code{generic-family} au titre des spécifications SVG et CSS.
+
+Pour les autres moteurs :
+@multitable @columnfractions .15 .30 .55
+@headitem Famille @tab Fonte par défaut (alias) @tab Listes de définition des alias
+@item @emph{roman}
+@tab @code{LilyPond Serif}
+@tab
+TeX Gyre Schola,
+C059, Century SchoolBook URW, Century Schoolbook L,
+DejaVu Serif,
+..., serif
+@item @emph{sans}
+@tab @code{LilyPond Sans Serif}
+@tab
+TeX Gyre Heros,
+Nimbus Sans, Nimbus Sans L, DejaVu Sans,
+..., sans-serif
+@item @emph{typewriter}
+@tab @code{LilyPond Monospace}
+@tab
+TeX Gyre Cursor,
+Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
+DejaVu Sans Mono,
+..., monospace
+@end multitable
+
+@code{LilyPond Serif}, @code{LilyPond Sans Serif} et @code{LilyPond
+Monospace} sont des alias de fonte définis dans le fichier de
+configuration de FontConfig spécifique à LilyPond
+@code{00-lilypond-fonts.conf}. Lorsqu'un caractère est absent de la
+première fonte listée, il sera remplacé par celui de la fonte suivante.
+Pour plus de détails sur les définitions des alias, consultez le fichier
+@code{00-lilypond-fonts.conf} dans le répertoire d'installation.
+
+@item
+Le recours aux fontes OpenType permet d'utiliser certaines
+fonctionnalités de ces fontes. Toutefois, les fontes OpenType ne
+disposent pas toutes de l'intégralité de ces fonctions.
+
+@lilypond[quote,verbatim]
+% Vraies petites capitales
+\markup { Style normal : Hello HELLO }
+\markup { \caps { Petites capitales : Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { Vraies petites capitales : Hello } }
+
+% Styles numériques
+\markup { Style numérique normal : 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Style numérique ancien : 0123456789 } }
+
+% Alternatives stylistiques
+\markup { \override #'(font-features . ("salt 0"))
+ { Alternative stylistique 0 : εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Alternative stylistique 1 : εÏÏÏθ } }
+
+% Fonctionnalités multiples
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Fonctionnalités multiples : Hello 0123456789 εÏÏÏθ } }
+@end lilypond
@item
-Les objets graphiques et leurs parents peuvent désormais s'aligner de
-manière indépendante, ce qui permet une flexibilité accrue dans le
-positionnement des @emph{grobs}. Par exemple, le bord « gauche » d'un
-objet peut désormais s'aligner sur le « centre » de son parent.
+Deux nouveaux styles de contours à blanc sont disponibles. Le style
+@code{outline} agit un peu comme un ombrage des glyphes, son galbe étant
+le résultat de multiples copies du glyphe. Le style @code{rounded-box}
+produit un rectangle aux coins arrondis. Pour tous les styles, y
+compris le style par défaut @code{box}, l'épaisseur (@code{thickness})
+du contour, mesuré en épaisseur de ligne de portée, est adaptable.
+
+@lilypond[verbatim,quote]
+\markup {
+ \combine
+ \filled-box #'(-1 . 15) #'(-3 . 4) #1
+ \override #'(thickness . 3)
+ \whiteout whiteout-box
+}
+\markup {
+ \combine
+ \filled-box #'(-1 . 24) #'(-3 . 4) #1
+ \override #'(style . rounded-box)
+ \override #'(thickness . 3)
+ \whiteout whiteout-rounded-box
+}
+\markup {
+ \combine
+ \filled-box #'(-1 . 18) #'(-3 . 4) #1
+ \override #'(style . outline)
+ \override #'(thickness . 3)
+ \whiteout whiteout-outline
+}
+\relative {
+ \override Staff.Clef.whiteout-style = #'outline
+ \override Staff.Clef.whiteout = 3
+ g'1
+}
+@end lilypond
@item
-La commande @code{\partial} a connu des améliorations notables afin
-d'éviter les problèmes en cas de contextes multiples et parallèles.
+Une nouvelle commande de @emph{markup}, @code{\with-dimensions-from},
+rend plus aisée l'utilisation de @code{\with-dimensions} en adoptant les
+dimensions d'un objet @emph{markup} fourni en premier argument.
+@lilypond[quote,verbatim]
+\markup {
+ \pattern #5 #Y #0 "x"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "f"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "g"
+ \override #'(baseline-skip . 2)
+ \column {
+ \pattern #5 #X #0 "n"
+ \pattern #5 #X #0 \with-dimensions-from "n" "m"
+ \pattern #5 #X #0 \with-dimensions-from "n" "!"
+ }
+}
+@end lilypond
@item
-@code{\chordmode} prend désormais en charge les constructions @code{< >}
-et @code{<<Â >>}.
+La nouvelle commande de @emph{markup} @code{\draw-squiggle-line} permet
+de tracer des lignes ondulées. Sont adaptables l'épaisseur du trait
+(@code{thickness}), l'amplitude (@code{angularity}), la hauteur
+(@code{height}) et l'orientation (@code{orientation}).
+@lilypond[quote,verbatim]
+\markup
+ \overlay {
+ \draw-squiggle-line #0.5 #'(3 . 3) ##t
+
+ \translate #'(3 . 3)
+ \override #'(thickness . 4)
+ \draw-squiggle-line #0.5 #'(3 . -3) ##t
+
+ \translate #'(6 . 0)
+ \override #'(angularity . -5)
+ \draw-squiggle-line #0.5 #'(-3 . -3) ##t
+
+ \translate #'(3 . -3)
+ \override #'(angularity . 2)
+ \override #'(height . 0.3)
+ \override #'(orientation . -1)
+ \draw-squiggle-line #0.2 #'(-3 . 3) ##t
+ }
+@end lilypond
@item
-La nouvelle commande @code{\tagGroup} vient en complément des commandes
-@code{\keepWithTag} et @code{\removeWithTag} déjà existantes. Par exemple,
+Deux commandes de @emph{markup} font leur apparition : @code{\undertie}
+et @code{\overtie}, ainsi qu'une version générique @code{\tie}.
+@lilypond[quote,verbatim]
+\markup {
+ \undertie "undertied"
+ \overtie "overtied"
+}
-@example
-\tagGroup #'(violinI violinII viola cello)
-@end example
+m = {
+ c''1 \prall -\tweak text \markup \tie "131" -1
+}
-déclare une liste de balises appartenant à un unique « groupe de
-balises ».
+{ \voiceOne \m \voiceTwo \m }
+@end lilypond
-@example
-\keepWithTag #'violinI
-@end example
+@end itemize
-n'est maintenant plus concerné que par les balises du groupe auquel
-« violinI » appartient.
-Tout élément balisé par une ou plusieurs balises du groupe, Ã
-l'exception de @var{violinI}, sera ignoré.
-@item
-La fonction @code{\addlyrics} est désormais fonctionnelle avec n'importe
-quel contexte arbitraire, y compris @code{Staff}.
+@subheading Nouveautés en matière de notation spécialisée
+@c VO New for specialist notation
+
+
+@strong{Améliorations pour la musique vocale}
+
+@itemize
@item
-Les numéros de cordes peuvent désormais s'imprimer en chiffres romains,
-pour les instruments à cordes non frettées par exemple.
-@lilypond[verbatim,quote,relative=2]
-c2\2
-\romanStringNumbers
-c\2
-\arabicStringNumbers
-c1\3
-@end lilypond
+Création d'un gabarit flexible dans le domaine de la musique chorale.
+Il s'utilise pour de la musique chorale simple, avec ou sans
+accompagnement de piano, sur deux ou quatre portées. Contrairement aux
+autres gabarits, celui-ci est directement intégré à LilyPond ; il n'est
+donc pas besoin d'être recopié et édité, mais simplement appelé à l'aide
+d'un @code{\include} dans le fichier source. Pour de plus amples
+détails, voir @rlearning{Gabarits préprogrammés}.
+
@item
-La propriété @code{thin-kern} du @emph{grob} @code{BarLine} est renommée
-en @code{segno-kern}.
+@code{\lyricsto} et @code{\addLyrics} ont été « harmonisés ». Tous deux
+acceptent désormais la même sorte de liste délimitée d'arguments, Ã
+l'instar de @code{\lyrics} et @code{\chords}. Une rétrocompatibilité a
+été ajoutée, de sorte à accepter des identificateurs musicaux (tel
+@code{\mus}) en tant qu'arguments. Une règle a été ajoutée Ã
+@code{convert-ly} visant à supprimer les utilisations redondantes de
+@code{\lyricmode} et réarranger les combinaisons avec les déclencheurs
+de contexte afin d'appliquer @code{\lyricsto} généralement en dernier
+(comme le ferait @code{\lyricmode}).
+
+@end itemize
+
+
+@strong{Améliorations pour les cordes frettées ou non}
+
+@itemize
@item
-Les objets @code{KeyCancellation} ignorent désormais les clefs de
-citation, Ã l'instar des objets @code{KeySignature}.
+Ajout d'un nouveau style de tête de note pour les tablature :
+@code{TabNoteHead.style = #'slash}.
@item
-Prise en charge de @code{\once@tie{}\unset}
+L'écartement entre les diagrammes de fret et entre les cordes peut
+désormais s'ajuster de manière indépendante, à l'aide des
+sous-propriétés de @code{fret-diagram-details} @code{fret-distance} et
+@code{string-distance}.
+@lilypond[verbatim,quote]
+fretMrkp = \markup { \fret-diagram-terse #"x;x;o;2;3;2;" }
+
+\markuplist
+\override #'(padding . 2)
+\table #'(0 -1) {
+ "default"
+
+ \fretMrkp
+
+ "fret-distance"
+
+ \override #'(fret-diagram-details . ((fret-distance . 2)))
+ \fretMrkp
+
+ "string-distance"
+
+ \override #'(fret-diagram-details . ((string-distance . 2)))
+ \fretMrkp
+}
+@end lilypond
@item
Dans le cadre de l'utilisation de la commande de @emph{markup}
@@ -710,121 +920,324 @@ contrôle l'espacement entre le point et les parenthèses qui l'entourent.
@end lilypond
@item
-Ajout de la commande de @emph{markup} @code{\justify-line}. Cette
-fonction est comparable à @code{\fill-line}, à ceci près qu'au lieu de
-répartir les @emph{mots} en colonnes, la commande @code{\justify-line}
-répartit les vides de telle sorte qu'en présence de trois @emph{mots} ou
-plus, ces blancs soient d'égale longueur.
+Dans le cadre des tablatures pour luth sont désormais disponibles les
+cordes de basse additionnelles.
+@lilypond[quote,verbatim]
+m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
-@lilypond[quote,verbatim,papersize=a6]
-\markup \fill-line {oooooo oooooo oooooo oooooo}
-\markup \fill-line {ooooooooo oooooooo oo ooo}
+\score {
+ \new TabStaff \m
+ \layout {
+ \context {
+ \Score
+ tablatureFormat = #fret-letter-tablature-format
+ }
+ \context {
+ \TabStaff
+ stringTunings = \stringTuning <a, d f a d' f'>
+ additionalBassStrings = \stringTuning <c, d, e, fis, g,>
+ fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
+ }
+ }
+}
@end lilypond
-@lilypond[quote,verbatim,papersize=a6]
-\markup \justify-line {oooooo oooooo oooooo oooooo}
-\markup \justify-line {ooooooooo oooooooo oo ooo}
+@item
+Les numéros de cordes peuvent désormais s'imprimer en chiffres romains,
+pour les instruments à cordes non frettées par exemple.
+@lilypond[verbatim,quote,relative=2]
+c2\2
+\romanStringNumbers
+c\2
+\arabicStringNumbers
+c1\3
@end lilypond
@item
-La nouvelle commande @code{\magnifyMusic} permet de modifier la
-taille de la musique sans changer la taille de la portée, tout en
-ajustant automatiquement les hampes, ligatures et l'espacement
-horizontal.
-
-@lilypond[verbatim,quote]
-\new Staff <<
- \new Voice \relative {
- \voiceOne
- <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
- }
- \new Voice \relative {
- \voiceTwo
- \magnifyMusic 0.63 {
- \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
- r32 c'' a c a c a c r c a c a c a c
- r c a c a c a c a c a c a c a c
- }
+Les microaltérations peuvent désormais s'imprimer aussi sur des
+@code{TabStaff}, notamment pour indiquer des @emph{bends}.
+@lilypond[quote,verbatim]
+\layout {
+ \context {
+ \Score
+ supportNonIntegerFret = ##t
}
+}
+
+mus = \relative { c'4 cih d dih }
+
+<<
+ \new Staff << \clef "G_8" \mus >>
+ \new TabStaff \mus
>>
@end lilypond
+@end itemize
+
+
+@strong{Amélirations pour la notation des accords}
+
+@itemize
+
@item
-Création d'un gabarit flexible dans le domaine de la musique chorale.
-Il s'utilise pour de la musique chorale simple, avec ou sans
-accompagnement de piano, sur deux ou quatre portées. Contrairement aux
-autres gabarits, celui-ci est directement intégré à LilyPond ; il n'est
-donc pas besoin d'être recopié et édité, mais simplement appelé à l'aide
-d'un @code{\include} dans le fichier source. Pour de plus amples
-détails, voir @rlearning{Gabarits préprogrammés}.
+@code{\chordmode} prend désormais en charge les constructions @code{< >}
+et @code{<<Â >>}.
@item
-Amélioration significative du positionnement du nombre des n-olets dans
-le cas de ligatures coudées. Jusqu'à présent, ce nombre était placé
-selon la position du crochet même lorsque ce dernier n'était pas
-imprimé, ce qui pouvait amener à un positionnement disgracieux. Le
-nombre est désormais positionné plus près du coude en présence d'un
-tronçon de ligature approprié à son placement et en l'absence de
-crochet.
+Il est désormais possible de modifier la propriété @code{text} des noms
+d'accord.
+
+@lilypond[verbatim,fragment,quote]
+<<
+\new ChordNames \chordmode {
+ a' b c:7
+ \once \override ChordName.text = #"foo"
+ d
+}
+>>
+@end lilypond
+
+@end itemize
+
+
+
+@subheading Nouveautés en matière d'entrée et sortie
+@c VO New for input and output
+
+
+@strong{Améliorations pour la structure}
+
+@itemize
+
+@item
+Les blocs introduits par @code{\header} peuvent être stockés dans des
+variables et utilisés en argument à la musique ou à des fonctions Scheme
+ainsi que dans le corps de constructions @code{#@{@dots{}#@}}. Ils sont
+représentés en tant que module Guile.
+
+Les blocs @code{\book}, @code{\bookpart}, @code{\score}, @code{\with},
+@code{\layout}, @code{\midi} et @code{\paper} peuvent être passés de
+façon similaire, mais sont représentés par des types de donnée différents.
+
+@end itemize
+
+
+@strong{Améliorations pour les titrages et entêtes}
+
+@itemize
+
+@item
+Les numéros de page peuvent désormais s'imprimer en chiffres romains, en
+ajustant la variable de papier @code{page-number-type}.
+
+@end itemize
+
+
+@strong{Améliorations pour les fichiers source}
+
+@itemize
+
+@item
+La nouvelle commande @code{\tagGroup} vient en complément des commandes
+@code{\keepWithTag} et @code{\removeWithTag} déjà existantes. Par exemple,
+
+@example
+\tagGroup #'(violinI violinII viola cello)
+@end example
+
+déclare une liste de balises appartenant à un unique « groupe de
+balises ».
+
+@example
+\keepWithTag #'violinI
+@end example
+
+n'est maintenant plus concerné que par les balises du groupe auquel
+« violinI » appartient.
+
+Tout élément balisé par une ou plusieurs balises du groupe, Ã
+l'exception de @var{violinI}, sera ignoré.
+
+@end itemize
+
+
+@strong{Améliorations pour les fichiers résultants}
+
+@itemize
+
+@item
+Les fichiers sources LilyPond peuvent désormais être empaquetés dans les
+fichiers PDF générés. Cette fonctionnalité est pour l'instant désactivée
+par défaut car susceptible d'être considérée comme peu sure dans la
+mesure où des documents PDF comportant des fichiers cachés peuvent
+présenter des risques en matière de sécurité. Attention cependant :
+les lecteurs de PDF ne sont pas tous capables de gérer les fichiers
+joints ; si tel est le cas, le rendu PDF apparaîtra normalement mais les
+fichiers joints seront invisibles. Cette fonctionnalité n'est
+opérationnelle qu'avec le moteur PDF.
+
+@item
+La procédure @code{output-classic-framework} et l'option
+@code{-dclip-systems} sont désormais prises en charge par le moteur
+@code{SVG}.
+
+@item
+Le nouvel argument @code{-dcrop} permet de formater une sortie
+@code{SVG} ou @code{PDF} sans marges ni saut de page.
+
+@item
+La propriété d'objet graphique @code{output-attributes} remplace, dans
+les sorties SVG, la propriété de @emph{grob} @code{id}. Ceci permet de
+définir, à l'aide d'une liste associative, de multiples attributs. Par
+exemple, @code{#'((id . 123) (class . foo) (data-whatever . @qq{bar}))}
+produira dans un fichier SVG le groupe de balise : @code{<g id=@qq{123}
+class=@qq{foo} data-whatever=@qq{bar}> @dots{} </g>}.
+
+@item
+La fonctionnalité PostScript d'ajustement des traits ne s'applique plus
+de manière automatique ; elle est désormais laissée à l'appréciation du
+périphérique PostScript -- Ghostscript l'utilise par défaut pour des
+résolutions inférieures à 150 dpi lorsqu'il génère des images
+@emph{raster}. Lorsqu'elle est activée, un algorithme de dessin plus
+complexe tirant profit des ajustements de trait servira notamment pour
+les ligatures et barres de mesure.
+
+L'ajustement des traits peut se forcer, en ligne de commande, Ã l'aide
+de l'option @samp{-dstrokeadjust}. En ce qui concerne la génération de
+fichiers @code{PDF}, ceci améliorera nettement la prévisualisation, au
+détriment cependant de la taille du fichier. La qualité d'impression Ã
+haute résolution n'est pas affectée.
+
+@item
+Une nouvelle fonction -- @code{make-path-stencil} -- supporte toutes les
+commandes @code{path}, tant relatives qu'absolues :
+
+@code{lineto}, @code{rlineto}, @code{curveto}, @code{rcurveto},
+@code{moveto}, @code{rmoveto}, @code{closepath}. La fonction prend
+aussi en charge la syntaxe « lettre unique » utilisée dans les commandes
+de chemin du standard SVGÂ :
+
+@code{L}, @code{l}, @code{C}, @code{c}, @code{M}, @code{m}, @code{Z} et
+@code{z}. Cette nouvelle commande est rétrocompatible avec la fonction
+originale @code{make-connected-path-stencil}. Voir aussi le fichier
+@file{scm/stencil.scm}.
+
+@end itemize
+
+
+@strong{Améliorations pour le MIDI}
+
+@itemize
+
+@item
+La plupart des articulations communes sont réflétées dans le rendu MIDI.
+Accent et marcato donnent des notes plus fortes ; staccato,
+staccatissimo et portato abrègent les notes. Une marque de respiration
+raccourcit la note qui précède.
+
+Ce comportement est ajustable au travers des propriétés
+@code{midiLength} et @code{midiExtraVelocity} affectées Ã
+@code{ArticulationEvent}. Voir le fichier @file{script-init.ly} pour
+des exemples.
+
+@item
+Amélioration du rendu MIDI des respirations. Après une note liée, la
+respiration prend son temps uniquement sur la dernière note de la
+prolongation. Autrement dit, @code{@{ c4~ c8 \breathe @}} s'entendra
+comme @code{@{ c4~ c16 r @}} au lieu de @code{@{ c4 r8 @}}. Ceci est
+plus cohérent en matière d'articulation et avec la manière dont un
+instrumentiste interprète une respiration après une note prolongée par
+une liaison. Ceci permet aussi d'aligner plus facilement une
+respiration simultanée à plusieurs parties dont les notes différent dans
+leur durée.
+
+@item
+Il est désormais possible de contrôler le « niveau d'expression » des
+canaux MIDI à l'aide de la propriété de contexte
+@code{Staff.midiExpression}. Ceci permet d'altérer le volume perçu y
+compris des notes tenues, bien que légèrement. L'ajustement prend une
+valeur entre @code{0.0} et @code{1.0}.
+
+@example
+\score @{
+ \new Staff \with @{
+ midiExpression = #0.6
+ midiInstrument = #"clarinet"
+ @}
+ <<
+ @{ a'1~ a'1 @}
+ @{
+ \set Staff.midiExpression = #0.7 s4\f\<
+ \set Staff.midiExpression = #0.8 s4
+ \set Staff.midiExpression = #0.9 s4
+ \set Staff.midiExpression = #1.0 s4
+
+ \set Staff.midiExpression = #0.9 s4\>
+ \set Staff.midiExpression = #0.8 s4
+ \set Staff.midiExpression = #0.7 s4
+ \set Staff.midiExpression = #0.6 s4\!
+ @}
+ >>
+ \midi @{ @}
+@}
+@end example
+
+@item
+Lorsqu'il génère un fichier MIDI, LilyPond enregistre désormais le
+@code{title} défini dans le bloc @code{\header} d'une partition en tant
+que nom de la séquence MIDI du fichier MIDI. En l'absence de
+@code{title} au niveau @code{\score}, sera retenue la première
+définition trouvée dans l'ordre suivant : @code{\bookpart}, @code{\book}
+et enfin @code{\header} de premier niveau. De manière optionnelle, le
+nom de la séquence MIDI peut se définir à l'aide du nouveau champ de
+@code{\header} @code{midititle} indépendamment au cas où le champ
+@code{title} contiendrait du code @emph{markup} qui ne serait pas rendu
+correctement en texte plat.
+
+@end itemize
+
+
+@strong{Améliorations en matière d'extraction de la musique}
+
+@itemize
+
+@item
+@code{\displayLilyMusic} et ses fonctions Scheme sous-jacentes
+n'omettent plus les durées de note redondantes. Il est désormais plus
+facile et sûr de reconnaître et formater les durées isolées dans des
+expressions telles que
+@example
+@{ c4 d4 8 @}
+@end example
+
+@end itemize
-De plus, la détection de collision ajoutée décalera horizontalement le
-nombre s'il était trop proche d'un empilement adjacent, tout en
-préservant son écartement de la ligature. Dans le cas où ce nombre
-serait trop large pour tenir dans l'espace disponible, LilyPond
-reviendra au positionnement basé sur le crochet. Dans le cas d'une
-collision avec, par exemple, une altération accidentelle, le nombre sera
-plutôt écarté verticalement.
-@lilypond[verbatim,fragment,quote,relative=1]
-\time 3/4
-\override Beam.auto-knee-gap = 3
-\tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
-}
-@end lilypond
-@noindent
-L'ancien comportement des n-olets en présence de ligature coudée reste
-disponible au moyen d'un @code{\override} sur la nouvelle propriété
-@code{knee-to-beam}.
+@subheading Nouveautés en matière d'espacements
+@c VO New for spacing issues
-@lilypond[verbatim,fragment,quote,relative=1]
-\time 3/4
-\override Beam.auto-knee-gap = 3
-\override TupletNumber.knee-to-beam = ##f
-\tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
-}
-@end lilypond
-@item
-@code{\lyricsto} et @code{\addLyrics} ont été « harmonisés ». Tous deux
-acceptent désormais la même sorte de liste délimitée d'arguments, Ã
-l'instar de @code{\lyrics} et @code{\chords}. Une rétrocompatibilité a
-été ajoutée, de sorte à accepter des identificateurs musicaux (tel
-@code{\mus}) en tant qu'arguments. Une règle a été ajoutée Ã
-@code{convert-ly} visant à supprimer les utilisations redondantes de
-@code{\lyricmode} et réarranger les combinaisons avec les déclencheurs
-de contexte afin d'appliquer @code{\lyricsto} généralement en dernier
-(comme le ferait @code{\lyricmode}).
+@strong{Améliorations pour les sauts de page}
-@item
-Les définitions et identificateurs Scheme peuvent désormais s'utiliser
-en tant que définition de sortie.
+@itemize
@item
-Les expressions Scheme peuvent désormais s'utiliser en tant que
-constituants d'un accord.
+Il est désormais possible de déplacer des systèmes relativement Ã
+leur positionnement actuel, à l'aide de la sous-propriété
+@code{extra-offset} de
+@code{NonMusicalPaperColumn.line-break-system-details}, que ce soit sur
+l'axe horizontal ou vertical. Cette fonctionnalité s'avère très utile
+pour effectuer un léger ajustement dans le positionnement vertical par
+défaut d'un système particulier. Voir
+@ruser{Positionnement explicite des portées et systèmes} pour de plus
+amples explications.
@item
Amélioration de l'espacement visuel du « MI », tant à taille réduite que
normale, dans les styles Funk et Walker, de telle sorte qu'il ait la
même taille que les autres têtes de note profilées. Les « SOL » sont
-aussi améliorés dans les styles Aiken et Harpe sacrée normaux ou leur
+aussi améliorés dans les styles Aiken et Harpe sacrée normaux ou leurs
variantes fines.
@item
@@ -832,18 +1245,52 @@ variantes fines.
verticale) définissable. Voir @rinternals{LeftEdge}.
@item
-Une nouvelle fonction -- @code{make-path-stencil} -- supporte toutes les
-commandes @code{path}, tant relatives qu'absolues :
+Les objets graphiques et leurs parents peuvent désormais s'aligner de
+manière indépendante, ce qui permet une flexibilité accrue dans le
+positionnement des @emph{grobs}. Par exemple, le bord « gauche » d'un
+objet peut désormais s'aligner sur le « centre » de son parent.
-@code{lineto}, @code{rlineto}, @code{curveto}, @code{rcurveto},
-@code{moveto}, @code{rmoveto}, @code{closepath}. La fonction prend
-aussi en charge la syntaxe « lettre unique » utilisée dans les commandes
-de chemin du standard SVGÂ :
+@end itemize
-@code{L}, @code{l}, @code{C}, @code{c}, @code{M}, @code{m}, @code{Z} et
-@code{z}. Cette nouvelle commande est rétrocompatible avec la fonction
-originale @code{make-connected-path-stencil}. Voir aussi le fichier
-@file{scm/stencil.scm}.
+
+
+@subheading Nouveautés en matière de modification des réglages par défaut
+@c VO New for changing defaults
+
+@itemize
+
+@item
+Les différentes instructions @code{\override}, @code{\revert},
+@code{\set} et @code{\unset} acceptent désormais le préfixe @code{\once}
+qui en réduit les effets à un seule occurrence.
+@lilypond[quote,verbatim]
+\relative {
+ c'4 d
+ \override NoteHead.color = #red
+ e4 f |
+ \once \override NoteHead.color = #green
+ g4 a
+ \once \revert NoteHead.color
+ b c |
+ \revert NoteHead.color
+ f2 c |
+}
+@end lilypond
+
+@end itemize
+
+
+
+@subheading Nouveautés en matière d'interfaces et fonctions internes
+@c VO New for Internal interfaces and functions
+
+@itemize
+
+@item
+La propriété musicale et d'objet graphique @code{spanner-id}, qui permet
+de distinguer des liaisons d'articulation ou de phrasé simultanées,
+prend en argument une « clé » -- entrier positif ou symbole -- au lieu
+d'une chaîne.
@item
Les propriétés de contexte nommées dans la propriété
@@ -898,131 +1345,130 @@ et les « changements d'accord »:
@end lilypond
@item
-Amélioration du rendu MIDI des respirations. Après une note liée, la
-respiration prend son temps uniquement sur la dernière note de la
-prolongation. Autrement dit, @code{@{ c4~ c8 \breathe @}} s'entendra
-comme @code{@{ c4~ c16 r @}} au lieu de @code{@{ c4 r8 @}}. Ceci est
-plus cohérent en matière d'articulation et avec la manière dont un
-instrumentiste interprète une respiration après une note prolongée par
-une liaison. Ceci permet aussi d'aligner plus facilement une
-respiration simultanée à plusieurs parties dont les notes différent dans
-leur durée.
-
-@item
-Ajout d'un nouveau style de tête de note pour les tablature :
-@code{TabNoteHead.style = #'slash}.
+Les fonctions LilyPond définies à l'aide de
+@code{define-music-function}, @code{define-event-function},
+@code{define-scheme-function} et @code{define-void-function} peuvent
+désormais être appelées directement à partir de Scheme, comme s'il
+s'agissait de pures procédures Scheme. Le contrôle et la correspondance
+des arguments seront réalisés de manière identique à ce qui se passe
+lorsque la fonction est appelée au fil du code LilyPond. Ceci inclut
+l'insertion de valeurs par défaut pour des arguments optionnels qui ne
+correspondraient pas à leur prédicat. Dans la liste des arguments, il
+est possible d'utiliser @code{*unspecified*} au lieu de @code{\default}
+pour omettre explicitement une séquence d'argument optionnels.
@item
-Quatre nouveaux glyphes de clef, ainsi que leur tessiture respective,
-sont désormais disponibles : @emph{Double G}, @emph{Tenor G},
-@emph{Varpercussion} et @emph{varC}.
+Les données @code{location} pour la saisie courante et @code{parser}
+sont désormais gérées directement dans les flux GUILE ; elles peuvent
+donc être référencées par des appels de fonction@code{(*location*)}
+et @code{(*parser*)}. Par voie de conséquence, nombre de fonctions ont
+vu disparaître leur argument @code{parser} explicite.
-@lilypond[verbatim,quote,fragment]
- \override Staff.Clef.full-size-change = ##t
+Les fonctions définies par @code{define-music-function},
+@code{define-event-function}, @code{define-scheme-function} et
+@code{define-void-function} n'ont désormais nul besoin d'argument
+@code{parser} ou @code{location}.
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
+Avec ces définitions particulières, LilyPond tentera de reconnaître
+l'utilisation héritée des arguments @code{parser} et @code{location},
+fournissant ainsi une compatibilité ascendante de la sémantique pour un
+certain temps.
- \break
- \override Staff.Clef.full-size-change = ##f
+@item
+Les définitions et identificateurs Scheme peuvent désormais s'utiliser
+en tant que définition de sortie.
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
-@end lilypond
+@item
+Les expressions Scheme peuvent désormais s'utiliser en tant que
+constituants d'un accord.
@item
-Des durées isolées dans une séquence musicale sont désormais considérées
-comme des notes sans hauteur. Ceci peut s'avérer utile pour affecter
-des rythmes à de la musique ou dans une fonction Scheme. Dans la
-partition finale, les hauteurs sont déterminées à partir de la note ou
-de l'accord qui précède. Les deux exemples suivant ont un code tout Ã
-fait lisible :
+Les fonctions, qu'elles soient musicales, Scheme ou fantômes, ainsi que
+les commandes de @emph{markup} pour lesquelles le paramètre final est
+l'objet de dérogations en chaîne peuvent se définir en remplaçant
+l'expression à laquelle elle s'appliquera par @code{\etc}. Il en va de
+même pour les appels à une fonction ou une commande de @emph{markup}.
@lilypond[verbatim,quote]
-\new DrumStaff \with { \override StaffSymbol.line-count = 1 }
-\drummode {
- \time 3/4
- tambourine 8 \tuplet 3/2 { 16 16 16 }
- 8 \tuplet 3/2 { 16 16 16 } 8 8 |
-}
-@end lilypond
+bold-red-markup = \markup \bold \with-color #red \etc
+highlight = \tweak font-size 3 \tweak color #red \etc
-@lilypond[verbatim,quote]
-\new Staff { r16 c'16 ~ 8 ~ 4 ~ 2 | }
+\markup \bold-red "text"
+\markuplist \column-lines \bold-red { One Two }
+
+{ c' \highlight d' e'2-\highlight -! }
@end lilypond
@item
-@code{\displayLilyMusic} et ses fonctions Scheme sous-jacentes
-n'omettent plus les durées de note redondantes. Il est désormais plus
-facile et sûr de reconnaître et formater les durées isolées dans des
-expressions telles que
-
+Les listes de symboles séparés par des points, à l'instar de
+@code{FretBoard.stencil} sont pris en charge depuis la version 2.18.
+Elles peuvent désormais contenir des entiers non signés, et leurs
+membres être séparés par des virgules. Ceci permet des libellés tels que
+@lilypond[quote,verbatim]
+{ \time 2,2,1 5/8 g'8 8 8 8 8 }
+@end lilypond
+ou
@example
-@{ c4 d4 8 @}
+\tagGroup violin,oboe,bassoon
@end example
@item
-Les exceptions en matière de ligature peuvent désormais se libeller Ã
-l'aide de la fonction Scheme @code{\beamExceptions}. Il suffit d'écrire
-
-@lilypond[verbatim,quote,relative=1]
-\time #'(2 1) 3/16
-\set Timing.beamExceptions =
- \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
-c16 c c |
-\repeat unfold 6 { c32 } |
+De telles listes peuvent aussi apparaître au sein d'expressions aux fins
+d'assignation, de définition ou de dérogation. Ceci permet des libellés
+tels que
+@lilypond[quote,verbatim]
+{ \unset Timing.beamExceptions
+ \set Timing.beatStructure = 1,2,1
+ g'8 8 8 8 8 8 8 8 }
@end lilypond
-@noindent
-tout en séparant les exceptions par un @code{|} (contrôle de barre de
-mesure) -- l'absence de hauteur dans les motifs d'exception n'est pas
-obligatoire. Auparavant, une telle règle d'exception devait se définir
-ainsi :
-
+@item
+Les éléments d'une liste associative pouvaient déjà se voir attribuer
+des valeurs individuellement, comme par exemple
+@code{system-system-spacing.basic-distance} pour les variables
+concernant le papier. Ils peuvent désormais être référencés de la même
+manière, comme ici
@example
-\set Timing.beamExceptions =
-#'( ;début de la liste associative
- (end . ;entrée pour la terminaison des ligatures
- ( ;début de la liste des terminaisons
- ((1 . 32) . (2 2 2)) ;règle pour les triples croches -- groupées à la double
- )))
+\paper @{
+ \void \displayScheme \system-system-spacing.basic-distance
+@}
@end example
+Par extension à ces modifications, il est dorénavant possible de définir
+et faire référence à des pseudovariables telles que @code{violon.1}.
+
@item
-La plupart des articulations communes sont réflétées dans le rendu MIDI.
-Accent et marcato donnent des notes plus fortes ; staccato,
-staccatissimo et portato abrègent les notes. Une marque de respiration
-raccourcit la note qui précède.
+La commande @code{\table}, pour gérer des listes de @emph{markups} est
+disponible. Chaque colonne peut disposer de son propre alignement.
+@lilypond[quote,verbatim]
+\markuplist {
+ \override #'(padding . 2)
+ \table
+ #'(0 1 0 -1)
+ {
+ \underline { center-aligned right-aligned center-aligned left-aligned }
+ one "1" thousandth "0.001"
+ eleven "11" hundredth "0.01"
+ twenty "20" tenth "0.1"
+ thousand "1000" one "1.0"
+ }
+}
+@end lilypond
-Ce comportement est ajustable au travers des propriétés
-@code{midiLength} et @code{midiExtraVelocity} affectées Ã
-@code{ArticulationEvent}. Voir le fichier @file{script-init.ly} pour
-des exemples.
+@item
+@code{InstrumentName} prend désormais en charge la
+@code{text-interface}.
@item
-La fonctionnalité PostScript d'ajustement des traits ne s'applique plus
-de manière automatique ; elle est désormais laissée à l'appréciation du
-périphérique PostScript -- Ghostscript l'utilise par défaut pour des
-résolutions inférieures à 150 dpi lorsqu'il génère des images
-@emph{raster}. Lorsqu'elle est activée, un algorithme de dessin plus
-complexe tirant profit des ajustements de trait servira notamment pour
-les ligatures et barres de mesure.
+La propriété @code{thin-kern} du @emph{grob} @code{BarLine} est renommée
+en @code{segno-kern}.
-L'ajustement des traits peut se forcer, en ligne de commande, Ã l'aide
-de l'option @samp{-dstrokeadjust}. En ce qui concerne la génération de
-fichiers @code{PDF}, ceci améliorera nettement la prévisualisation, au
-détriment cependant de la taille du fichier. La qualité d'impression Ã
-haute résolution n'est pas affectée.
+@item
+Les objets @code{KeyCancellation} ignorent désormais les clefs de
+citation, Ã l'instar des objets @code{KeySignature}.
+
+@item
+Prise en charge de @code{\once@tie{}\unset}
@end itemize
diff --git a/Documentation/fr/extending/programming-interface.itely b/Documentation/fr/extending/programming-interface.itely
index 0aa792c663..4e09986fe8 100644
--- a/Documentation/fr/extending/programming-interface.itely
+++ b/Documentation/fr/extending/programming-interface.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 8c1840ca28a05b3dad8d595e04d03779ba0a286a
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1502,6 +1502,17 @@ valeur usuelle de la propriété :
@}
@end example
+La valeur par défaut est aussi accessible à l'aide de la fonction
+@code{grob-transformer}Â :
+
+@lilypond[verbatim,quote]
+\relative {
+ \override Flag.X-offset = #(grob-transformer 'X-offset
+ (lambda (flag default) (* default 4.0)))
+ c''4. d8 a4. g8
+}
+@end lilypond
+
Au sein d'un @emph{callback}, le meilleur moyen d'évaluer un
@emph{markup} consiste à utiliser la fonction
@code{grob-interpret-markup}, comme ici :
diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely
index 52d555e6a7..bd66939dca 100644
--- a/Documentation/fr/notation/input.itely
+++ b/Documentation/fr/notation/input.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 1e5c6b0f54079eb3285dcc4c7e53f17d8bb03933
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -2967,22 +2967,66 @@ Et ces même mesures avec les glyphes @emph{Feta} de LilyPond :
@sourceimage{Gonville_before,15cm,,}
-@subsubheading Instructions d'installation pour MacOS
-@translationof Installation Instructions for MacOS
+@subsubheading Instructions d'installation
+@translationof Installation Instructions
+
+Téléchargez puis extrayez les fichiers de fonte.
+Copiez les fichiers
+@file{gonville-11.otf},
+@file{gonville-13.otf},
+@file{gonville-14.otf},
+@file{gonville-16.otf},
+@file{gonville-18.otf},
+@file{gonville-20.otf},
+@file{gonville-23.otf},
+@file{gonville-26.otf} et @file{gonville-brace.otf} dans
+@file{@dots{}/share/lilypond/current/fonts/otf} ou
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/otf}.
+Si vous disposez des fichiers @file{gonville-*.svg} et
+@file{gonville-*.woff}, copiez les dans
+@file{@dots{}/share/lilypond/current/fonts/svg} ou
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/svg}.
+Pour de plus amples informations, reportez-vous Ã
+@rlearning{Autres sources de documentation}.
+
+Il est à noter que les fichiers @file{gonville-*.otf} sont destinés au
+moteurs @code{ps} et @code{eps} (pour obtenir des fichiers PDF ou
+PostScript) ; les fichiers @file{gonville-*.svg} sont destinés au moteur
+@code{svg} sans l'option @code{svg-woff}Â ; les fichiers
+@file{gonville-*.woff} sont destinés au moteur @code{svg} avec l'option
+@code{svg-woff}. Pour de plus amles informations, consultez
+@rprogram{Options avancées de lilypond}.
+
+La syntaxe suivante substitue aux fontes musicales (générale et
+accolades) les fontes Gonville.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "gonville"
+ #:brace "gonville"
+ ))
+@}
+@end example
-Téléchargez puis décompressez l'archive zip. Recopiez le répertoire
-@code{lilyfonts} dans @file{@var{SHARE_DIR}/lilypond/current} -- voir
-@rlearning{Autres sources de documentation} Ã ce sujet. Renommez le
-répertoire @code{fonts} qui s'y trouve en @code{fonts_orig}, puis le
-répertoire @code{lilyfonts} en @code{fonts}. Il vous suffira, pour
-retrouver la fonte Emmentaler, de renommer @code{fonts_orig} en
-@code{fonts}.
+En tout état de cause, tout appel à @code{set-global-fonts} réinitialise
+aussi bien les fontes musicales que les fontes textuelles. Dès lors que
+l'une de ces catégories n'est pas mentionnée sera utilisée la fonte par
+défaut y afférente.@*
+Par ailleurs, chaque appel à @code{set-global-fonts} modifie les fontes
+du @code{\book} qui le suit, qu'il ait été créé explicitement ou non.
+Par voie de conséquence, chaque @code{\book} peut disposer de son propre
+jeu de fontes principales s'il est précédé d'un appel Ã
+@code{set-global-fonts}. Pour plus d'informations, voir
+@ref{Choix des fontes par défaut}.
@seealso
Manuel d'initiation :
@rlearning{Autres sources de documentation}.
Manuel de notation :
+@ref{Choix des fontes par défaut},
@ref{La fonte Emmentaler}.
@knownissues
@@ -2992,6 +3036,46 @@ Consultez le site de l'auteur pour de plus amples informations ainsi
qu'Ã propos des conditions d'utilisation.
+@subsubheading Autres fontes musicales
+@translationof Other notation fonts
+
+Si vous disposez d'autres fontes musicales telles que
+@file{@var{nomfonte}-*.otf}, @file{@var{nomfonte}-*.svg} et
+@file{@var{nomfonte}-*.woff}, vous pouvez les utiliser de façon
+comparable à Gonville.
+
+Autrement dit, copiez les fichiers @file{@var{nomfonte}-*.otf} dans
+@file{@dots{}/share/lilypond/current/fonts/otf} ou
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/otf}.
+Si vous disposez de fichiers @file{@var{nomfonte}-*.svg} et
+@file{@var{nomfonte}-*.woff}, copiez les dans
+@file{@dots{}/share/lilypond/current/fonts/svg} ou
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/svg}.
+
+Noteâ Ã ce jour, et pour fonctionner correctement, LilyPond requiert la
+présence des suffixes suivants dans les dossiers d'instalation :
+@file{-11}, @file{-13}, @file{-14}, @file{-16}, @file{-18}, @file{-20},
+@file{-23}, @file{-26}, @file{-brace}. Par exemple,
+@file{emmentaler-11.otf}, @file{emmentaler-20.svg},
+@file{emmentaler-brace.woff}, etc.
+
+La syntaxe suivante substitue aux fontes musicales (générale et
+accolades) les fontes @var{nomfonte}.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "@var{nomfonte}" ; fichier de fonte sans suffixe ni extension
+ #:brace "@var{nomfonte}" ; fichier de fonte sans suffixe ni extension
+ ))
+@}
+@end example
+
+Note : pour les catégories @code{music} et @code{brace}, le nom du
+fichier de fonte se spécifie sans suffixe ni extension.
+
+
@node Génération de fichiers MIDI
@section Génération de fichiers MIDI
@translationof Creating MIDI output
diff --git a/Documentation/fr/notation/notation-appendices.itely b/Documentation/fr/notation/notation-appendices.itely
index 9ea74cd8ef..03ba91a5bc 100644
--- a/Documentation/fr/notation/notation-appendices.itely
+++ b/Documentation/fr/notation/notation-appendices.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 1e5c6b0f54079eb3285dcc4c7e53f17d8bb03933
+ Translation of GIT committish: 87fb7f0387225886cff0c3bf332e1ab1b60afabb
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1549,6 +1549,12 @@ c1
@appendixsec Commandes pour @emph{markup}
@translationof Text markup commands
+@ignore
+All the .tely files included in this appendix are automatically
+generated from source files during the build.
+For translators: you cannot translate the content of these files.
+@end ignore
+
Les commandes suivantes peuvent être utilisées dans un bloc
@code{\markup @{ @}}.
diff --git a/Documentation/fr/notation/pitches.itely b/Documentation/fr/notation/pitches.itely
index 1888031678..6b33a71a69 100644
--- a/Documentation/fr/notation/pitches.itely
+++ b/Documentation/fr/notation/pitches.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 64c8064154e24ff2a07e553ecdbda409f1726487
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -3221,8 +3221,8 @@ Référence des propriétés internes :
@cindex harpe sacrée, tête de note
@cindex Funk, tête de note
@cindex tête de note, Funk
-@cindex tête de note, Harmonica Sacra
-@cindex Harmonica Sacra, tête de note
+@cindex tête de note, Harmonia Sacra
+@cindex Harmonia Sacra, tête de note
@cindex Christian Harmony, tête de note
@cindex tête de note, Christian Harmony
@cindex Walker shape, tête de note
diff --git a/Documentation/fr/notation/simultaneous.itely b/Documentation/fr/notation/simultaneous.itely
index 3f8c3be77a..aec4cc0ed0 100644
--- a/Documentation/fr/notation/simultaneous.itely
+++ b/Documentation/fr/notation/simultaneous.itely
@@ -1,13 +1,13 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: be622e24546dff283da6810c798bb4155c95242a
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.19.29"
+@c \version "2.19.80"
@c Translators: Frédéric Chiasson, Valentin Villenave, Jean-Charles Malahieude
@c Translation checkers: Jean-Charles Malahieude, John Mandereau
@@ -975,7 +975,7 @@ voiceB = \relative { fis'4 r g2 | R1 | }
>>
\new Staff \with {
instrumentName = "merged"
- \consists #Merge_rests_engraver
+ \consists "Merge_rests_engraver"
}
<<
\new Voice { \voiceOne \voiceA }
diff --git a/Documentation/fr/notation/text.itely b/Documentation/fr/notation/text.itely
index 345543a585..305e2e797a 100644
--- a/Documentation/fr/notation/text.itely
+++ b/Documentation/fr/notation/text.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 1e5c6b0f54079eb3285dcc4c7e53f17d8bb03933
+ Translation of GIT committish: f9d8763d2e83aa653582123d79731e029aea83d9
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1451,18 +1451,54 @@ que des accolades ouvrantes. Pour obtenir une accolade fermante, il
suffit d'appliquer une rotation au glyphe sélectionné, comme indiqué Ã
la rubrique @ref{Rotation des objets}.
-Vous disposez de trois familles de fontes textuelles :
-@itemize
-@item
-@emph{roman} pour la police sérif ou avec empattement -- fixée par
-défaut à LilyPond Serif (alias de TeX Gyre Schola),
-@item
-une police sans empattement (@emph{sans} sérif) -- fixée par défaut Ã
-LilyPond Sans Serif (alias de TeX Gyre Heros) et
-@item
-une police à chasse fixe (monospace ou @emph{typewriter}) -- fixée par
-défaut à LilyPond Monospace (alias de TeX Gyre Cursor).
-@end itemize
+Vous disposez de trois familles de fontes textuelles : @emph{roman} pour
+la police sérif ou avec empattement, une police sans empattement
+(@emph{sans} sérif) et une police à chasse fixe (monospace ou
+@emph{typewriter}).
+
+Pour le moteur @code{svg}Â :
+@multitable @columnfractions .15 .30
+@headitem Famille @tab Fonte par défaut
+@item @emph{roman} @tab @code{serif}
+@item @emph{sans} @tab @code{sans-serif}
+@item @emph{typewriter} @tab @code{monospace}
+@end multitable
+
+@code{serif}, @code{sans-serif} et @code{monospace} sont des
+@code{generic-family} au titre des spécifications SVG et CSS.
+
+Pour les autres moteurs :
+@multitable @columnfractions .15 .30 .55
+@headitem Famille @tab Fonte par défaut (alias) @tab Listes de définition des alias
+@item @emph{roman}
+@tab @code{LilyPond Serif}
+@tab
+TeX Gyre Schola,
+C059, Century SchoolBook URW, Century Schoolbook L,
+DejaVu Serif,
+..., serif
+@item @emph{sans}
+@tab @code{LilyPond Sans Serif}
+@tab
+TeX Gyre Heros,
+Nimbus Sans, Nimbus Sans L, DejaVu Sans,
+..., sans-serif
+@item @emph{typewriter}
+@tab @code{LilyPond Monospace}
+@tab
+TeX Gyre Cursor,
+Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
+DejaVu Sans Mono,
+..., monospace
+@end multitable
+
+@code{LilyPond Serif}, @code{LilyPond Sans Serif} et @code{LilyPond
+Monospace} sont des alias de fonte définis dans le fichier de
+configuration de FontConfig spécifique à LilyPond
+@code{00-lilypond-fonts.conf}. Lorsqu'un caractère est absent de la
+première fonte listée, il sera remplacé par celui de la fonte suivante.
+Pour plus de détails sur les définitions des alias, consultez le fichier
+@code{00-lilypond-fonts.conf} dans le répertoire d'installation.
Chaque famille dispose en principe de différents styles et niveaux de
gras. L'exemple qui suit illustre la manière de changer la famille, le
@@ -1507,6 +1543,44 @@ dispose d'une syntaxe allégée comme nous l'avons vu dans
}
@end lilypond
+@noindent
+Le recours aux fontes OpenType permet d'utiliser certaines
+fonctionnalités de ces fontes. Toutefois, les fontes OpenType ne
+disposent pas toutes de l'intégralité de ces fonctions. Dans le cas où
+la fonctionnalité demandée n'est pas disponible dans la fonte choisie,
+cette fonctionnalité est tout bonnement ignorée.
+
+@lilypond[quote,verbatim]
+% Vraies petites capitales
+\markup { Style normal : Hello HELLO }
+\markup { \caps { Petites capitales : Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { Vraies petites capitales : Hello } }
+
+% Styles numériques
+\markup { Style numérique normal : 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Style numérique ancien : 0123456789 } }
+
+% Alternatives stylistiques
+\markup { \override #'(font-features . ("salt 0"))
+ { Alternative stylistique 0 : εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Alternative stylistique 1 : εÏÏÏθ } }
+
+% Fonctionnalités multiples
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Fonctionnalités multiples : Hello 0123456789 εÏÏÏθ } }
+@end lilypond
+
+@noindent Une liste exhaustive des fonctionnalités des fontes OpenType
+est disponible à l'adresse
+@uref{https://www.microsoft.com/typography/otspec/featurelist.htm}
+
+@noindent Les différents types de fonctionnalité des fontes OpenType
+sont recensées dans le message
+@uref{http://lists.gnu.org/archive/html/lilypond-devel/2017-08/msg00004.html}
+
En plus de pouvoir jongler entre les différentes fontes prédéfinies,
LilyPond vous permet d'en utiliser d'autres, ce qui fait l'objet des
deux prochaines parties :
@@ -1610,12 +1684,91 @@ d'explications sur les fontes, relisez @ref{Tout savoir sur les fontes}.
}
@end lilypond
+Note : @code{make-pango-font-tree} réinitialise les fontes musicales Ã
+leur valeur par défaut, à savoir Emmentaler.
+
@c we don't do Helvetica / Courier, since GS incorrectly loads
@c Apple TTF fonts
+La syntaxe suivante permet de substituer une fonte particulière tout en
+laissant les autres à leur valeur par défaut. L'exemple ci-dessous
+produit les mêmes effets que celui utilisant
+@code{make-pango-font-tree}. De même qu'avec
+@code{make-pango-font-tree}, il est possible de fournir une liste de
+fontes séparées par une virgule pour les catégories @code{roman},
+@code{sans} et @code{typewriter}. Dès lors que la taille de portée reste
+à sa valeur par défaut de 20 pt, l'instruction
+@code{#:factor (/ staff-height pt 20)} n'est pas nécessaire.
+
+@funindex set-global-fonts
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:roman "Times New Roman"
+ #:sans "Nimbus Sans,Nimbus Sans L"
+ #:typewriter "Luxi Mono"
+ #:factor (/ staff-height pt 20) ; inutile si taille de portée par défaut
+ ))
+@}
+@end example
+
+Il est aussi posible de substituer les fontes musicales. L'exemple
+ci-dessous produit les mêmes effets que ceux qui précèdent dans la
+mesure où les fontes musicales sont fixées à leur valeur par défaut.
+Pour de plus amples informations, voir
+@ref{Changement des fontes musicales}.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "emmentaler" ; défaut
+ #:brace "emmentaler" ; défaut
+ #:roman "Times New Roman"
+ #:sans "Nimbus Sans,Nimbus Sans L"
+ #:typewriter "Luxi Mono"
+ #:factor (/ staff-height pt 20) ; inutile si taille de portée par défaut
+ ))
+@}
+@end example
+
+En tout état de cause, tout appel à @code{set-global-fonts} réinitialise
+aussi bien les fontes musicales que les fontes textuelles. Dès lors que
+l'une de ces catégories n'est pas mentionnée sera utilisée la fonte par
+défaut y afférente.@*
+Par ailleurs, chaque appel à @code{set-global-fonts} affecte les fontes
+du bloc @code{\book} qui le suit ; chaque bloc @code{\book} consécutif
+peut donc disposer de son propre jeu de fontes grâce à un simple appel Ã
+@code{set-global-fonts}, comme ici :
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ @dots{}
+ ))
+@}
+\book @{
+ @dots{}
+@}
+
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ @dots{}
+ ))
+@}
+\book @{
+ @dots{}
+@}
+@end example
+
@seealso
Manuel de notation :
@ref{Attribution d'une fonte en particulier},
@rusernamed{Font,Fonte},
+@ref{Changement des fontes musicales},
@ref{Sélection de la fonte et de la taille},
@ref{Tout savoir sur les fontes}.
diff --git a/Documentation/fr/translations.itexi b/Documentation/fr/translations.itexi
index 070c6d89cf..f62c8981d2 100644
--- a/Documentation/fr/translations.itexi
+++ b/Documentation/fr/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Dernière mise à jour Sat Jun 24 12:50:41 UTC 2017
+@emph{Dernière mise à jour Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -30,7 +30,7 @@ LilyPond Changes
@item
Titre des chapitres
@*
-2784
+2988
@tab Jean-Charles Malahieude
@tab
@tab
@@ -875,7 +875,7 @@ oui
@item
1.8 Texte
@*
-2754
+2952
@tab Jean-Charles Malahieude
@tab Valentin Villenave
@*
@@ -1438,7 +1438,7 @@ oui
@item
1 Exécution de @command{lilypond}
@*
-5469
+5391
@tab Jean-Charles Malahieude
@tab
@tab
@@ -1645,7 +1645,7 @@ oui
@item
Introduction
@*
-5793
+5800
@tab Gauvain Pocentek
@*
Jean-Charles Malahieude
diff --git a/Documentation/fr/usage/running.itely b/Documentation/fr/usage/running.itely
index e040ca627c..24ced6f9f3 100644
--- a/Documentation/fr/usage/running.itely
+++ b/Documentation/fr/usage/running.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: fr -*-
@ignore
- Translation of GIT committish: 6b8cabe379e8b4b945797a4e55759c56117223d4
+ Translation of GIT committish: 87fb7f0387225886cff0c3bf332e1ab1b60afabb
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -527,30 +527,7 @@ ni aux listes de fontes si la visionneuse de fichier SVG ne peut le
traîter correctement. L'option supplémentaire @code{--svg-woff} -- voir
ci-après -- permet d'utiliser les fontes WOFF (@emph{Web Open Font
Format}) avec le moteur SVG.
-@end multitable
-
-@noindent
-@strong{Note à propos des sorties SVG :}
-Par défaut, LilyPond utilise des valeurs de @code{font-family}
-génériques -- @code{Serif}, @code{Sans Serif} et @code{Monospace}. Le
-recours au moteur @code{svg} requiert donc que ces polices par défaut
-soient explicitement définies dans le fichier source :
-@quotation
-@verbatim
-\paper {
- #(define fonts
- (make-pango-font-tree "TeX Gyre Schola"
- "TeX Gyre Heros"
- "TeX Gyre Cursor"
- (/ staff-height pt 20)))
-}
-@end verbatim
-@end quotation
-
-Voir aussi @ruser{Choix des fontes par défaut}.
-
-@multitable @columnfractions .33 .16 .51
@item @code{check-internal-types}
@tab @code{#f}
@tab Vérifie qu'à chaque propriété est bien affecté un type.
diff --git a/Documentation/hu/translations.itexi b/Documentation/hu/translations.itexi
index 5be9a8b71d..b66c2af215 100644
--- a/Documentation/hu/translations.itexi
+++ b/Documentation/hu/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Last updated Sat Jun 24 12:50:41 UTC 2017
+@emph{Last updated Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -415,7 +415,7 @@ partially
@item
1 A @command{lilypond} használata
@*
-5469
+5391
@tab Harmath Dénes
@tab
@tab
@@ -432,7 +432,7 @@ partially (91 %)
@ifhtml
@html
-<span style="background-color: #ffad4a">partially</span>
+<span style="background-color: #ffaf4a">partially</span>
@end html
@end ifhtml
@ifnothtml
@@ -562,7 +562,7 @@ partially
@item
Bevezetés
@*
-5793
+5800
@tab Harmath Dénes
@tab
@tab
diff --git a/Documentation/it/changes.tely b/Documentation/it/changes.tely
index 12f95245ab..4137450aba 100644
--- a/Documentation/it/changes.tely
+++ b/Documentation/it/changes.tely
@@ -1,6 +1,6 @@
\input texinfo @c -*- coding: UTF-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: 24dd6365d3d05f13b9259f547be9b2517851a5d1
+ Translation of GIT committish: 640edfbe2c332ccd7ddedc819106d001eed51c76
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -435,7 +435,7 @@ ora possono essere definite semplicemente scrivendo l'espressione
seguita da @code{\etc}.
@lilypond[verbatim,quote]
-bold-red-markup = \markup \bold \with-color #red \etc
+\markup bold-red = \markup \bold \with-color #red \etc
highlight = \tweak font-size 3 \tweak color #red \etc
\markup \bold-red "text"
@@ -1035,6 +1035,85 @@ Quando si generano file @code{PDF}, di solito ciò produce anteprime
La qualità della stampa ad alte risoluzioni non è interessata da questa
modifica.
+@item
+Il font predefinito del testo è cambiato da
+@code{Century Schoolbook L}, @code{sans-serif}, e @code{monospace}.
+
+Per il backend @code{svg}:
+@multitable @columnfractions .15 .30
+@headitem Famiglia @tab Font predefinito
+@item @emph{roman} @tab @code{serif}
+@item @emph{sans} @tab @code{sans-serif}
+@item @emph{typewriter} @tab @code{monospace}
+@end multitable
+
+@code{serif}, @code{sans-serif}, e @code{monospace} sono
+@code{generic-family} (famiglie generiche) nelle specifiche
+SVG e CSS.
+
+Per gli altri backend:
+@multitable @columnfractions .15 .30 .55
+@headitem Famiglia @tab Font predefinito (alias) @tab Elenchi di definizione di alias
+@item @emph{roman}
+@tab @code{LilyPond Serif}
+@tab
+TeX Gyre Schola,
+C059, Century SchoolBook URW, Century Schoolbook L,
+DejaVu Serif,
+..., serif
+@item @emph{sans}
+@tab @code{LilyPond Sans Serif}
+@tab
+TeX Gyre Heros,
+Nimbus Sans, Nimbus Sans L, DejaVu Sans,
+..., sans-serif
+@item @emph{typewriter}
+@tab @code{LilyPond Monospace}
+@tab
+TeX Gyre Cursor,
+Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
+DejaVu Sans Mono,
+..., monospace
+@end multitable
+
+@code{LilyPond Serif}, @code{LilyPond Sans Serif},
+e @code{LilyPond Monospace} sono font alias definiti
+nel file di configurazione FontConfig specifico per LilyPond
+@code{00-lilypond-fonts.conf}.
+Se un carattere non esiste nel primo font elencato, il font successivo
+dell'elenco verrà usato al suo posto per quel carattere.
+I dettagli delle definizioni degli alias si trovano nel file
+@code{00-lilypond-fonts.conf} all'interno della directory
+di installazione.
+
+@item
+Quando si usano i font OpenType, sono disponibili le funzionalitÃ
+dei font.
+Nota: non tutti i font OpenType hanno tutte le funzioni.
+
+@lilypond[quote,verbatim]
+% Maiuscoletto vero
+\markup { Stile normale: Hello HELLO }
+\markup { \caps { Maiuscoletto: Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { Maiuscoletto vero: Hello } }
+
+% Stili numerici
+\markup { Stile numerico normale: 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Stile numerico vecchio: 0123456789 } }
+
+% Alternative stilistiche
+\markup { \override #'(font-features . ("salt 0"))
+ { Alternative stilistiche 0: εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Alternative stilistiche 1: εÏÏÏθ } }
+
+% Funzionalità multiple
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Funzionalità multiple: Hello 0123456789 εÏÏÏθ } }
+@end lilypond
+
@end itemize
@ifhtml
diff --git a/Documentation/it/notation/changing-defaults.itely b/Documentation/it/notation/changing-defaults.itely
index 102a25a8f1..d72684230f 100644
--- a/Documentation/it/notation/changing-defaults.itely
+++ b/Documentation/it/notation/changing-defaults.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: 18d03fa6a724b0102ccc47d194209802cea02f2e
+ Translation of GIT committish: c377d85f06e524599d20e9edf102ae186ede5e77
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -2562,9 +2562,10 @@ prende un @code{numero}, a @var{offset} viene fornita una lista di
@code{numeri} per rendere conto dei due segmenti creati dall'interruzione
di linea.
Il pezzo di parentesi dell'ottava sulla prima linea non viene modificato
-perché viene aggiunto @code{0} al suo valore predefinito. Il segmento sulla
-seconda linea viene alzato di tre spazi rigo dalla sua altezza predefinita.
-L'altezza predefinita è @code{2}, anche se non è necessario saperlo.
+perché viene aggiunto @code{0} al suo valore predefinito di @code{staff-padding}.
+Il segmento sulla seconda linea viene alzato di tre spazi rigo dalla sua
+altezza predefinita. L'altezza predefinita è @code{2}, anche se non è
+necessario saperlo per ottenere la posizione desiderata.
@lilypond[quote,verbatim]
{
@@ -5009,4 +5010,3 @@ tempoPadded =
@end lilypond
@c TODO: add appropriate @@ref's here.
-
diff --git a/Documentation/it/notation/notation-appendices.itely b/Documentation/it/notation/notation-appendices.itely
index 2df11b7af2..2a7cf96a0f 100644
--- a/Documentation/it/notation/notation-appendices.itely
+++ b/Documentation/it/notation/notation-appendices.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: 1e5c6b0f54079eb3285dcc4c7e53f17d8bb03933
+ Translation of GIT committish: 2dcca6dacd9f419922a7d056389b152f195d6e4c
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1540,10 +1540,14 @@ c1
@appendixsec Comandi per @emph{markup}
@translationof Text markup commands
+@ignore
+Tutti i file .tely inclusi in questa appendice sono generati automaticamente
+dai file sorgente durante la compilazione. Non è possibile tradurre il
+contenuto di questi file.
+@end ignore
+
Tutti i comandi seguenti possono essere usati all'interno di @code{\markup}.
-@c Le descrizioni di questi comandi sono estratti dal codice sorgente
-@c al momento della compilazione e pertanto non sono traducibili. - fb
@include markup-commands.tely
diff --git a/Documentation/it/notation/pitches.itely b/Documentation/it/notation/pitches.itely
index b0f14e9e79..050024e2b4 100644
--- a/Documentation/it/notation/pitches.itely
+++ b/Documentation/it/notation/pitches.itely
@@ -3265,8 +3265,8 @@ Guida al funzionamento interno:
@cindex Southern Harmony, testa di nota
@cindex Funk, testa di nota
@cindex testa di nota, Funk
-@cindex testa di nota, Harmonica Sacra
-@cindex Harmonica Sacra, testa di nota
+@cindex testa di nota, Harmonia Sacra
+@cindex Harmonia Sacra, testa di nota
@cindex Christian Harmony, testa di nota
@cindex testa di nota, Christian Harmony
@cindex Walker, testa di nota
@@ -3282,7 +3282,7 @@ In alcune notazioni, la forma della testa della nota corrisponde
alla funzione armonica di una nota nella scala. Questa notazione
era comune nei canzonieri americani del diciannovesimo secolo.
Gli stili possibili sono Sacred Harp, Southern Harmony,
-Funk (Harmonica Sacra), Walker e Aiken (Christian Harmony):
+Funk (Harmonia Sacra), Walker e Aiken (Christian Harmony):
@lilypond[verbatim,quote]
\relative c'' {
diff --git a/Documentation/it/notation/simultaneous.itely b/Documentation/it/notation/simultaneous.itely
index 6fc7f34da9..f778e95d0f 100644
--- a/Documentation/it/notation/simultaneous.itely
+++ b/Documentation/it/notation/simultaneous.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: 4244c3a9fbf1f3ff2e20e665f92516d35b61de53
+ Translation of GIT committish: 212ca268e813cd72eca8c07e714e1b6669cba747
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -400,6 +400,7 @@ Questa sezione presenta le note simultanee in più voci o più righi.
* Polifonia su un solo rigo::
* Stili di voce::
* Risoluzione delle collisioni::
+* Accorpare le pause::
* Combinazione automatica delle parti::
* Scrivere la musica in parallelo::
@end menu
@@ -924,6 +925,41 @@ are at the same time differently dotted are not clear.
@end ignore
+@node Accorpare le pause
+@unnumberedsubsubsec Accorpare le pause
+@translationof Merging rests
+
+In caso di voci multiple, di solito si accorpano le pause che capitano in
+entrambe. Per farlo si usa l'incisore @code{Merge_rests_engraver}.
+
+@lilypond[quote,verbatim]
+voiceA = \relative { d''4 r d2 | R1 | }
+voiceB = \relative { fis'4 r g2 | R1 | }
+\score {
+ <<
+ \new Staff \with {
+ instrumentName = "non accorpato"
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ \new Staff \with {
+ instrumentName = "accorpato"
+ \consists #Merge_rests_engraver
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ >>
+}
+@end lilypond
+
+Impostando la proprietà di contesto @code{suspendRestMerging} su @code{##t} è
+possibile disattivare temporaneamente l'accorpamento delle pause.
+
+
@node Combinazione automatica delle parti
@unnumberedsubsubsec Combinazione automatica delle parti
@translationof Automatic part combining
diff --git a/Documentation/it/notation/spacing.itely b/Documentation/it/notation/spacing.itely
index 1df6e060be..dd7ffbaced 100644
--- a/Documentation/it/notation/spacing.itely
+++ b/Documentation/it/notation/spacing.itely
@@ -2907,8 +2907,8 @@ sola biscroma (1/32) a un brano che usa solo crome e semicrome, la
spaziatura orizzontale dell'intero brano sarebbe troppo larga. Infatti
la nota più breve non è più una semicroma ma una biscroma, aggiungendo
quindi 1 LTN a ogni nota. Per impedire ciò, la durata più breve per
-la spaziatura non è la nota più breve, bensì la che ricorre più
-frequentemente nel brano.
+la spaziatura non deriva dalla nota più breve, bensì dalla nota che
+ricorre più frequentemente nel brano.
La durata più breve più comune viene individuata nel modo seguente. In ogni
misura viene determinata la durata più breve e quella più frequente viene
diff --git a/Documentation/it/notation/text.itely b/Documentation/it/notation/text.itely
index 26a20a2ec3..37bca4fe00 100644
--- a/Documentation/it/notation/text.itely
+++ b/Documentation/it/notation/text.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; -*-
@ignore
- Translation of GIT committish: 18d03fa6a724b0102ccc47d194209802cea02f2e
+ Translation of GIT committish: 640edfbe2c332ccd7ddedc819106d001eed51c76
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -1403,18 +1403,55 @@ più piccola. Il valore ottimale deve essere determinato per tentativi.
Questi glifi sono tutte graffe sinistre; le graffe destre si possono
ottenere con la rotazione, vedi @ref{Rotating objects}.
-Sono disponibili tre famiglie di tipi di carattere:
-@itemize
-@item
-Il tipo @emph{roman} (con grazie), il cui valore predefinito è LilyPond Serif
-(un alias di TeX Gyre Schola).
-@item
-Il tipo @emph{sans} (senza grazie), il cui valore predefinito è LilyPond Sans
-Serif (un alias di TeX Gyre Heros).
-@item
-Il tipo monospaziato @emph{typewriter}, il cui valore predefinito è LilyPond
-Monospace (un alias di TeX Gyre Cursor).
-@end itemize
+Sono disponibili tre famiglie di font: il font @emph{roman} (con grazie), il
+font @emph{sans} (senza grazie) e il font monospaziato @emph{typewriter}.
+
+Per il backend @code{svg}:
+@multitable @columnfractions .15 .30
+@headitem Famiglia @tab Font predefinito
+@item @emph{roman} @tab @code{serif}
+@item @emph{sans} @tab @code{sans-serif}
+@item @emph{typewriter} @tab @code{monospace}
+@end multitable
+
+@code{serif}, @code{sans-serif}, e @code{monospace} sono
+@code{generic-family} (famiglie generiche) nelle specifiche
+SVG e CSS.
+
+Per gli altri backend:
+@multitable @columnfractions .15 .30 .55
+@headitem Famiglia @tab Font predefinito (alias) @tab Elenchi di definizione di alias
+@item @emph{roman}
+@tab @code{LilyPond Serif}
+@tab
+TeX Gyre Schola,
+C059, Century SchoolBook URW, Century Schoolbook L,
+DejaVu Serif,
+..., serif
+@item @emph{sans}
+@tab @code{LilyPond Sans Serif}
+@tab
+TeX Gyre Heros,
+Nimbus Sans, Nimbus Sans L, DejaVu Sans,
+..., sans-serif
+@item @emph{typewriter}
+@tab @code{LilyPond Monospace}
+@tab
+TeX Gyre Cursor,
+Nimbus Mono PS, Nimbus Mono, Nimbus Mono L,
+DejaVu Sans Mono,
+..., monospace
+@end multitable
+
+@code{LilyPond Serif}, @code{LilyPond Sans Serif},
+e @code{LilyPond Monospace} sono font alias definiti
+nel file di configurazione FontConfig specifico per LilyPond
+@code{00-lilypond-fonts.conf}.
+Se un carattere non esiste nel primo font elencato, il font successivo
+dell'elenco verrà usato al suo posto per quel carattere.
+I dettagli delle definizioni degli alias si trovano nel file
+@code{00-lilypond-fonts.conf} all'interno della directory
+di installazione.
Ogni famiglia può avere forme e serie differenti. L'esempio seguente
illustra la possibilità di scegliere famiglie, forme, serie e
@@ -1458,6 +1495,43 @@ caso è preferibile usare la sintassi più semplice spiegata in
}
@end lilypond
+@noindent
+Quando si usano i font OpenType, sono disponibili le funzionalitÃ
+dei font.
+Nota bene: non tutti i font OpenType hanno a disposizione tutte le funzioni.
+Se si richiede una funzionalità che non esiste nel font scelto, tale
+funzionalità viene semplicemente ignorata.
+
+@lilypond[quote,verbatim]
+% Maiuscoletto vero
+\markup { Stile normale: Hello HELLO }
+\markup { \caps { Maiuscoletto: Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { Maiuscoletto vero: Hello } }
+
+% Stili numerici
+\markup { Stile numerico normale: 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Stile numerico vecchio: 0123456789 } }
+
+% Alternative stilistiche
+\markup { \override #'(font-features . ("salt 0"))
+ { Alternative stilistiche 0: εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Alternative stilistiche 1: εÏÏÏθ } }
+
+% Funzionalità multiple
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Funzionalità multiple: Hello 0123456789 εÏÏÏθ } }
+@end lilypond
+
+@noindent L'elenco completo delle funzionalità del font OpenType è
+consultabile qui:
+@uref{https://www.microsoft.com/typography/otspec/featurelist.htm}
+
+@noindent Per identificare le funzionalità dei font OpenType leggere qui:
+@uref{http://lists.gnu.org/archive/html/lilypond-devel/2017-08/msg00004.html}
+
Sebbene sia semplice passare a un tipo di carattere preconfigurato, è anche
possibile usare altri tipi, come viene spiegato nelle sezioni successive:
@ref{Single entry fonts} e @ref{Tipi di carattere per l'intero documento}.
diff --git a/Documentation/it/texidocs/analysis-brackets-with-labels.texidoc b/Documentation/it/texidocs/analysis-brackets-with-labels.texidoc
index 02a15c69b2..421d418b1c 100644
--- a/Documentation/it/texidocs/analysis-brackets-with-labels.texidoc
+++ b/Documentation/it/texidocs/analysis-brackets-with-labels.texidoc
@@ -1,4 +1,4 @@
-%% Translation of GIT committish: 8ef5f99e63cc9e52c7c0071cde4d99e057d10329
+%% Translation of GIT committish: 79c17e0eaedca79e5f7605f5b9f92db27c68e679
texidocit = "
Si può aggiungere del testo alle parentesi analitiche tramite la proprietÃ
@code{text} del grob @code{HorizontalBracketText}. L'aggiunta di vari frammenti
diff --git a/Documentation/it/translations.itexi b/Documentation/it/translations.itexi
index c229fda69d..7ee6e6c17a 100644
--- a/Documentation/it/translations.itexi
+++ b/Documentation/it/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Ultimo aggiornamento Sat Jun 24 12:50:41 UTC 2017
+@emph{Ultimo aggiornamento Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -30,7 +30,7 @@ Cambiamenti in LilyPond
@item
Section titles
@*
-2784
+2988
@tab Federico Bruni
@tab
@tab
@@ -623,11 +623,11 @@ sì
@ifhtml
@html
-<span style="background-color: #25fe1f">parzialmente</span>
+<span style="background-color: #1fff1f">sì</span>
@end html
@end ifhtml
@ifnothtml
-parzialmente
+sì
@end ifnothtml
@tab pre-GDP
@item
@@ -687,7 +687,7 @@ sì
@item
1.8 Testo
@*
-2754
+2952
@tab Federico Bruni
@tab
@tab
@@ -996,7 +996,7 @@ sì
@item
1 Eseguire @command{lilypond}
@*
-5469
+5391
@tab Federico Bruni
@tab Luca Rossetto Casel
@tab
@@ -1197,7 +1197,7 @@ sì
@item
Introduzione
@*
-5793
+5800
@tab Federico Bruni
@tab Luca Rossetto Casel
@tab
diff --git a/Documentation/it/usage/running.itely b/Documentation/it/usage/running.itely
index e0e7d94e9b..80c7b9b13c 100644
--- a/Documentation/it/usage/running.itely
+++ b/Documentation/it/usage/running.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: cd1ac38996d3de35770ea31f819b392fe686bf39
+ Translation of GIT committish: 97956152eba4292886a47c74b45bc6be5a0349e8
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -495,30 +495,6 @@ rendere in modo adeguato il testo. Si raccomanda di non usare
@q{liste} o @q{alias} dei tipi di carattere se il lettore SVG non è
in grado di gestirli. Se si usano i file @emph{Web Open Font Format} (WOFF),
è richiesta anche l'opzione @code{svg-woff}.
-@end multitable
-
-@noindent
-@strong{Nota per l'output del backend svg:}
-Nell'output svg LilyPond usa i valori generici @code{serif}, @code{sans-serif} o
-@code{monospace} di @code{font-family}. Dunque quando si usa il backend
-@code{svg} è obbligatorio definire esplicitamente specifici tipi di carattere
-predefiniti nel proprio file di input:
-
-@quotation
-@verbatim
-\paper {
- #(define fonts
- (make-pango-font-tree "TeX Gyre Schola"
- "TeX Gyre Heros"
- "TeX Gyre Cursor"
- (/ staff-height pt 20)))
-}
-@end verbatim
-@end quotation
-
-Leggere anche @ruser{Tipi di carattere per l'intero documento}.
-
-@multitable @columnfractions .33 .16 .51
@item @code{check-internal-types}
@tab @code{#f}
@@ -1271,4 +1247,3 @@ naturale (quando le note di @code{\voiceThree} sono più alte di quelle di
@rlearning{Esempio musicale},
@ruser{Polifonia su un solo rigo},
@ruser{Risoluzione delle collisioni}.
-
diff --git a/Documentation/it/web/introduction.itexi b/Documentation/it/web/introduction.itexi
index 6511636a88..3dd1a0f24a 100644
--- a/Documentation/it/web/introduction.itexi
+++ b/Documentation/it/web/introduction.itexi
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: it -*-
@ignore
- Translation of GIT committish: d1c9544af1b810d0eb4075106f9576347224a1b4
+ Translation of GIT committish: f0887364f183175facfde169447845a2390a6ed2
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -941,7 +941,7 @@ nemmeno la metà della mia!}
@divClass{testimonial-item}
@imageFloat{orm-finnendahl,jpg, left}
-@subsubheading @uref{http://icem-www.folkwang-hochschule.de/~finnendahl/, Orm Finnendahl}, professore di Composizione, Musikhochschule Freiburg
+@subsubheading @uref{http://icem-www.folkwang-hochschule.de/~finnendahl/, Orm Finnendahl}, professore di Composizione, Hochschule für Musik und Darstellende Kunst Frankfurt am Main
@qq{Anche se non conosco [LilyPond] molto bene ancora, sono
@strong{molto} colpito. Ho usato il programma per scrivere un mottetto di
diff --git a/Documentation/it/web/news-headlines.itexi b/Documentation/it/web/news-headlines.itexi
index 6d38f76aae..9c3dd580e8 100644
--- a/Documentation/it/web/news-headlines.itexi
+++ b/Documentation/it/web/news-headlines.itexi
@@ -2,7 +2,7 @@
@c This file is used in the web.texi file.
@ignore
- Translation of GIT committish: 2e46ee8ff6e49e9863db34b95cce23927c4e5ee7
+ Translation of GIT committish: 6233e12249f74e19aff5ee5afa66e81c0f8b7259
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -19,7 +19,7 @@
@ifclear web_version
@c no anchor links, just link to News page
-@ref{News, Rilasciato LilyPond 2.19.60 - @emph{8 maggio 2016}}
+@ref{News, Rilasciato LilyPond 2.19.65 - @emph{6 agosto 2017}}
@ref{News, Due progetti LilyPond nel Google Summer of Code 2016 - @emph{23 aprile 2016}}
@@ -31,8 +31,8 @@
@ifset web_version
@c anchor links, link to individual news items by their <a> tag
-@uref{news.html#LilyPond-2_002e19_002e60-released-May-08_002c-2017,
- Rilasciato LilyPond 2.19.60 - @emph{8 maggio 2016}}
+@uref{news.html#LilyPond-2_002e19_002e65-released-August-06_002c-2017,
+ Rilasciato LilyPond 2.19.65 - @emph{6 agosto 2017}}
@uref{news.html#Two-LilyPond-projects-in-Google-Summer-of-Code-2016-April-23_002c-2016,
Due progetti LilyPond nel Google Summer of Code 2016 - @emph{23 aprile 2016}}
diff --git a/Documentation/it/web/news-new.itexi b/Documentation/it/web/news-new.itexi
index c9c3d8a74d..4ffa75e717 100644
--- a/Documentation/it/web/news-new.itexi
+++ b/Documentation/it/web/news-new.itexi
@@ -2,7 +2,7 @@
@c This file is part of community.itexi
@ignore
- Translation of GIT committish: 2e46ee8ff6e49e9863db34b95cce23927c4e5ee7
+ Translation of GIT committish: 6233e12249f74e19aff5ee5afa66e81c0f8b7259
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -17,10 +17,10 @@
@c used for news about the upcoming release; see CG on Release Work
@newsItem
-@subheading Rilasciato LilyPond 2.19.60 @emph{8 maggio 2017}
+@subheading Rilasciato LilyPond 2.19.65 @emph{6 agosto 2017}
Siamo felici di annunciare il rilascio di LilyPond
-2.19.60. Questo rilascio comprende vari miglioramenti e contiene anche
+2.19.65. Questo rilascio comprende vari miglioramenti e contiene anche
funzionalità non ancora complete. Permette di avere accesso alle funzionalitÃ
più recenti, ma è bene tenere presente che alcune potrebbero essere incomplete
e non si possono escludere difetti o crash del programma. A chi necessita di
diff --git a/Documentation/ja/learning/common-notation.itely b/Documentation/ja/learning/common-notation.itely
index 6dca8c5856..e5023992a1 100644
--- a/Documentation/ja/learning/common-notation.itely
+++ b/Documentation/ja/learning/common-notation.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: 76ee88f5adfc7bcd8eff487543e3605e43a93d80
+ Translation of GIT committish: 9bb7fa99aa8bc7c14a45a42224545c726bb6c592
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -25,7 +25,7 @@ Tutorial guidelines: (different from policy.txt!)
@end ignore
-@c Translators: Masamichi Hosoda, Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Masamichi Hosoda, Yoshiki Sawada
@c Translation status: post-GDP
@@ -1379,8 +1379,7 @@ cello = \new Staff {
@end lilypond
@noindent
-å¤æ°ã®ååã«ä½¿ããã®ã¯ã¢ã«ãã¡ãããã ãã§ãããæ°åãã¢ã³ãã¹ã³ã¢ãããã·ã¥ã@c
-使ããã¨ã¯ã§ãã¾ããã
+æ
£ç¿çã«ãå¤æ°ã®ååã«ã¯ã¢ã«ãã¡ãããã®ã¿ãç¨ãã¾ãã
å¤æ°ã¯ã¡ã¤ã³ã®é³æ¥½è¡¨è¨ã® @emph{å} ã«å®ç¾©ããã¦ããªããã°ãªãã¾ããã@c
ããããªããå®ç¾©å¾ã¯å¿
è¦ã¨ãããå ´æã§ä½åº¦ã§ã使ç¨ã§ãã¾ãã@c
@@ -1398,10 +1397,11 @@ barA = { \tripletA \tripletA \tripletA \tripletA }
使ç¨ã§ãã¾ãã
ä¾ãã°ä»¥ä¸ã®ããã«ã§ã:
+@c KEEP LY
@example
-width = 4.5\cm
-name = "Wendy"
-aFivePaper = \paper @{ paperheight = 21.0 \cm @}
+myWidth = 60 % \paper å¤æ°ã«æ¸¡ãæ°å (åä½ã¯ mm)
+myName = "Wendy" % ãã¼ã¯ã¢ããã«æ¸¡ãæåå
+aFivePaper = \paper @{ #(set-paper-size "a5") @}
@end example
å¤æ°ã®å
容次第ã§ã¯ãå¤æ°ã¯ä»ã®å ´æã§ä½¿ç¨ãããã¨ãã§ãã¾ãã@c
@@ -1410,11 +1410,11 @@ aFivePaper = \paper @{ paperheight = 21.0 \cm @}
@example
\paper @{
\aFivePaper
- line-width = \width
+ line-width = \myWidth
@}
@{
- c4^\name
+ c4^\myName
@}
@end example
diff --git a/Documentation/ja/learning/fundamental.itely b/Documentation/ja/learning/fundamental.itely
index 3ae1f86046..62439f024e 100644
--- a/Documentation/ja/learning/fundamental.itely
+++ b/Documentation/ja/learning/fundamental.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: 9bb7fa99aa8bc7c14a45a42224545c726bb6c592
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.22"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@node åºç¤ã¨ãªãã³ã³ã»ãã
@@ -66,7 +66,7 @@ LilyPond å
¥åãã¡ã¤ã«ã®åºæ¬ä¾ã¯ä»¥ä¸ã®ãããªãã®ã§ã:
\header @{ @}
\score @{
- @var{...è¤åé³æ¥½è¡¨è¨...} % ãã¹ã¦ã®é³æ¥½ãããã«å
¥ãã¾ãï¼
+ @var{ @dots{} è¤åé³æ¥½è¡¨è¨ @dots{} } % ãã¹ã¦ã®é³æ¥½ãããã«å
¥ãã¾ãï¼
\layout @{ @}
\midi @{ @}
@}
@@ -136,21 +136,19 @@ LilyPond ã¯ã¾ãã§ãã®é³æ¥½è¡¨è¨ãä¸ã§ç¤ºãããã³ãã³ãã§å
@code{\score} ãããã¯ã¯å¸¸ã«ãã 1 ã¤ã®é³æ¥½è¡¨è¨ã@c
ä¿æãã¦ããªããã°ãªãã¾ããã@c
-ããã¦ããã®é³æ¥½è¡¨è¨ã¯ @code{\score} ã³ãã³ãã®ããå¾ã«@c
-ç½®ãããªããã°ãªãã¾ããã@c
é³æ¥½è¡¨è¨ã¯åä¸ã®é³ç¬¦ã§ããå ´åãããã¾ããã以ä¸ã®ãããª@c
巨大ãªè¤å表è¨ã§ããå ´åãããã¨ãããã¨ãè¦ãã¦ããã¦ãã ãã:
@example
@{
\new StaffGroup <<
- @var{...ã¯ã¼ã°ãã¼ã®ãªãã©ã®æ¥½èå
¨ä½ãããã«å
¥ãã¾ã...}
+ @var{ @dots{} ã¯ã¼ã°ãã¼ã®ãªãã©ã®æ¥½èå
¨ä½ãããã«å
¥ãã¾ã @dots{} }
>>
@}
@end example
@noindent
-ãã¹ã¦ã¯ @code{@{ ... @}} ã®å
é¨ã«ããããã@c
+ãã¹ã¦ã¯ @code{@{ @dots{} @}} ã®å
é¨ã«ããããã@c
ãã㯠1 ã¤ã®é³æ¥½è¡¨è¨ã§ããã¨ã«ã¦ã³ãããã¾ãã
以åè¦ã¦ããããã«ã@code{\score} ãããã¯ã¯ä»ã®ãã®ãå«ãå¯è½æ§ãããã¾ãã@c
@@ -188,7 +186,7 @@ LilyPond ã¯ã¾ãã§ãã®é³æ¥½è¡¨è¨ãä¸ã§ç¤ºãããã³ãã³ãã§å
ããããä¸è¨ã®ããã«è¨è¿°ãããå ´åãLilyPond ã¯ããããèå»ããã楽èã¨
MIDI åºåãä½ãåºãã¾ãã@c
ãããã¯è¨èæ³ãªãã¡ã¬ã³ã¹ã® @ruser{Score layout} ã¨
-@ruser{Creating MIDI files} ã§å®å
¨ã«è¨è¿°ããã¦ãã¾ãã
+@ruser{Creating MIDI output} ã§å®å
¨ã«è¨è¿°ããã¦ãã¾ãã
@cindex scores, multiple (è¤æ°ã® Score)
@cindex book block, implicit (æé»ã® book ãããã¯)
@@ -281,11 +279,11 @@ LilyPond å
¥åãã¡ã¤ã«ã®ä¸è¬çãªæ§é ã«ã¤ãã¦è¦ã¦ãã¾ãã
以ä¸ã®è¡ããã®è¬ã«ã¤ãã¦ãã¹ã¦ã説æãã¦ãã¾ã:
@quotation
-@emph{@code{\score} ãããã¯ã¯ 1 ã¤ã®è¤åé³æ¥½è¡¨è¨ã§å§ã¾ããªãã¦ã¯ãªãã¾ããã}
+@emph{@code{\score} ãããã¯ã¯ãã 1 ã¤ã®é³æ¥½è¡¨è¨ã®ã¿ãå«ã¾ãªãã¦ã¯ãªãã¾ããã}
@end quotation
@noindent
-é³æ¥½è¡¨è¨ã¨è¤åé³æ¥½è¡¨è¨ãæå³ãã¦ãããã®ãç解ããã«ã¯ããã¥ã¼ããªã¢ã«ã®
+é³æ¥½è¡¨è¨ãæå³ãã¦ãããã®ãç解ããã«ã¯ããã¥ã¼ããªã¢ã«ã®
@ref{é³æ¥½è¡¨è¨ã«ã¤ãã¦ã®èª¬æ} ãèªã¿è¿ãã¨å½¹ã«ç«ã¤ããããã¾ããã@c
ããã§ã¯ãå°ããªé³æ¥½è¡¨è¨ -- é³ç¬¦ããå§ãã¦ãããããåé³ãªã© -- ãã@c
大ããªé³æ¥½è¡¨è¨ãæ§ç¯ããæ¹æ³ã説æãã¦ãã¾ãã@c
@@ -346,11 +344,11 @@ LilyPond å
¥åãã¡ã¤ã«ã®ä¸è¬çãªæ§é ã«ã¤ãã¦è¦ã¦ãã¾ãã
@end example
@end ignore
-ææã¨ãã¢ããåæé²è¡ã§ãããã¨ã示ãããã« @code{@{ ... @}} ã®ä»£ããã«
-@code{<< ... >>} ã使ç¨ããã¨ãããã¨ãæãåºãã¦ãã ããã@c
+ææã¨ãã¢ããåæé²è¡ã§ãããã¨ã示ãããã« @code{@{ @dots{} @}} ã®ä»£ããã«
+@code{<< @dots{} >>} ã使ç¨ããã¨ãããã¨ãæãåºãã¦ãã ããã@c
ãããããã¨ã§ããã¼ã«ã« ãã¼ãã¯ãã¢ã ãã¼ãã®ä¸ã«è¡¨ç¤ºããã¾ãã@c
ä¸ã®ä¾ã§ææã®èãä¸ç¶ãã®é³æ¥½è¡¨è¨ãä¿æããã ãã§ããã®ãªã
-@code{<< ... >>} ã使ãå¿
è¦ã¯ããã¾ãããã@c
+@code{<< @dots{} >>} ã使ãå¿
è¦ã¯ããã¾ãããã@c
èãåæé²è¡ããè¤æ°ã®é³æ¥½è¡¨è¨
-- ä¾ãã°ãåæé²è¡ãã 2 ã¤ã®å£°é¨ãã声é¨ã¨æè©ã§ã
-- ãä¿æããã®ã§ããã°å¿
é ã¨ãªãã¾ãã@c
@@ -530,27 +528,27 @@ lower = \relative { b,2 e }
@multitable @columnfractions .3 .7
@headitem æ¬å¼§ã®ã¿ã¤ã
@tab æ©è½
-@item @code{@{ .. @}}
+@item @code{@{ @dots{} @}}
@tab ä¸ç¶ãã®é³æ¥½ãå²ã¿ã¾ã
-@item @code{< .. >}
+@item @code{< @dots{} >}
@tab åé³ã¨ãªãé³ç¬¦ãå²ã¿ã¾ã
-@item @code{<< .. >>}
+@item @code{<< @dots{} >>}
@tab åæé²è¡ããé³æ¥½è¡¨è¨ãå²ã¿ã¾ã
-@item @code{( .. )}
+@item @code{( @dots{} )}
@tab ã¹ã©ã¼ã®éå§ç¹ã¨çµäºç¹ãæå³ãã¾ã
-@item @code{\( .. \)}
+@item @code{\( @dots{} \)}
@tab ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã®éå§ç¹ã¨çµäºç¹ãæå³ãã¾ã
-@item @code{[ .. ]}
+@item @code{[ @dots{} ]}
@tab æåé£æ¡ã®éå§ç¹ã¨çµäºç¹ãæå³ãã¾ã
@end multitable
ãããã«å¯¾ãã¦ãé³ç¬¦ã®éãé³ç¬¦ãã¾ããã£ã¦ç·ãçæããä»ã®æ§æã@c
ä»ãå ããã¹ãã§ã: ã¿ã¤ (ãã«ã @code{~} ã«ãã£ã¦è¨è¿°ããã¾ã)ã@c
-é£ç¬¦ (@code{\times x/y @{..@}} ã¨ãã¦è¨è¿°ããã¾ã)ã@c
-ã°ã¬ã¤ã¹ ãã¼ã (@code{\grace@{..@}} ã¨ãã¦è¨è¿°ããã¾ã) ã§ãã
+é£ç¬¦ (@code{\tuplet x/y @{ @dots{} @}} ã¨ãã¦è¨è¿°ããã¾ã)ã@c
+ã°ã¬ã¤ã¹ ãã¼ã (@code{\grace @{ @dots{} @}} ã¨ãã¦è¨è¿°ããã¾ã) ã§ãã
LilyPond 以å¤ã§ã¯ã種é¡ã®ç°ãªãæ¬å¼§ãé©åã«ãã¹ãããããã¨
--- @code{[ @{ ( .. ) @} ]} ã®ããã« --
+-- @code{[ @{ ( @dots{} ) @} ]} ã®ããã« --
ãä¸è¬çãªä½¿ãæ¹ã§ããã@c
æ¬å¼§ã®çµããã®é åºã¯æ£ç¢ºã«æ¬å¼§ã®å§ã¾ãã®é åºã¨éã«ãªãã¾ãã@c
ãã®ãã¨ã¯ä¸è¨ã®è¡¨ã§ @q{å²ã¿ã¾ã} ã¨ããè¨èã§è¨è¿°ããã¦ãã
@@ -567,8 +565,8 @@ LilyPond 以å¤ã§ã¯ã種é¡ã®ç°ãªãæ¬å¼§ãé©åã«ãã¹ãããã
ãã®æåé£æ¡ã®åã«çµããå¯è½æ§ãããã¾ã -- ãã¶ãé³æ¥½çã§ã¯@c
ãªãããããã¾ããããå¯è½æ§ã¯ããã¾ã:
-@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
- { g8\( a b[ c b\) a] }
+@lilypond[quote,verbatim,ragged-right]
+\relative { g'8\( a b[ c b\) a] g4 }
@end lilypond
ä¸è¬ã«ã種é¡ã®ç°ãªãæ¬å¼§ãæ¬å¼§ã®ãããªæ§æç©ã@c
@@ -640,12 +638,14 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
ããã§ã¯ãè¤æ°ã®ãã¤ã¹ãå®éã«å¿
è¦ã¨ãããã®ã¯ã©ããªå ´åãªã®ã§ããããï¼@c
ã¾ãã¯ã4 ã¤ã®åé³ãæã¤ä»¥ä¸ã®ä¾ãè¦ã¦ãã ãã:
-@lilypond[quote,verbatim,fragment,ragged-right,relative=1]
-\key g \major
-<d g>4 <d fis> <d a'> <d g>
+@lilypond[quote,verbatim,ragged-right]
+\relative {
+ \key g \major
+ <d' g>4 <d fis> <d a'> <d g>
+}
@end lilypond
-ãã®ä¾ã¯åä¸ã®å±±æ¬å¼§ãããªãåé³è¨å· @code{< ... >} ã使ã£ã¦@c
+ãã®ä¾ã¯åä¸ã®å±±æ¬å¼§ãããªãåé³è¨å· @code{< @dots{} >} ã使ã£ã¦@c
表è¨ãããã¨ãã§ããå¿
è¦ã¨ããããã¤ã¹ã¯ 1 ã¤ã ãã§ãã@c
ããããªãããF ã·ã£ã¼ãã A ã«ç§»è¡ããéã«ãF ã·ã£ã¼ãã¯å®éã«ã¯
8 åé³ç¬¦ã§ããããã®ãã¨ã« 8 åé³ç¬¦ã® G ãç¶ãã¨ãããã©ãã§ããããï¼@c
@@ -665,8 +665,8 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
1 ã¤ã®èã«è¤æ°ã®ãã¤ã¹ããã楽èãå
¥åããæãç°¡åãªæ¹æ³ã¯ã@c
åãã¤ã¹ãã·ã¼ã±ã³ã¹ã« (ç¶ãã¦) å
¥åã
-(åãã¤ã¹ã @code{@{...@}} ã®ä¸ã«å
¥ãã¾ã)ã@c
-ãããã®ãã¤ã¹ã @code{<<...>>} ã使ã£ã¦åæé²è¡ããããçµã¿åããã¾ãã@c
+(åãã¤ã¹ã @code{@{ @dots{} @}} ã®ä¸ã«å
¥ãã¾ã)ã@c
+ãããã®ãã¤ã¹ã @code{<< @dots{} >>} ã使ã£ã¦åæé²è¡ããããçµã¿åããã¾ãã@c
ããã«ãåæçã¯ããããããå¥ã®æçã§ãããã¨ã示ãããã«ã@c
ããã« ããã¯ã¹ã©ãã·ã¥ @code{\\} ã§åºåãããªããã°ãªãã¾ããã@c
ããã« ããã¯ã¹ã©ãã·ã¥ãç¡ããã°ããã¹ã¦ã®é³ç¬¦ã¯åä¸ã®ãã¤ã¹ã®ä¸ã«æ¿å
¥ããã@c
@@ -688,12 +688,14 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
ä»åº¦ã¯ãã 1 ã¤ç°¡åãªä¾ãæãã¦ã¿ã¾ã:
-@lilypond[quote,verbatim,fragment,ragged-right,relative=2]
-\key d \minor
-% Voice = "1" Voice = "2"
-<< { r4 g g4. a8 } \\ { d,2 d4 g } >> |
-<< { bes4 bes c bes } \\ { g4 g g8( a) g4 } >> |
-<< { a2. r4 } \\ { fis2. s4 } >> |
+@lilypond[quote,verbatim,ragged-right]
+\relative {
+ \key d \minor
+ % Voice = "1" Voice = "2"
+ << { r4 g' g4. a8 } \\ { d,2 d4 g } >> |
+ << { bes4 bes c bes } \\ { g4 g g8( a) g4 } >> |
+ << { a2. r4 } \\ { fis2. s4 } >> |
+}
@end lilypond
åå°ç¯ã§å¥ã
ã« @code{<< \\ >>} æ§é ã使ç¨ããå¿
è¦ã¯ããã¾ããã@c
@@ -736,19 +738,36 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
ãããã®åã³ã³ããã¹ãã§ã¯ãã¹ã©ã¼ã符幹ãã¿ã¤ãå¼·å¼±è¨å·ãªã©ã®åç´æ¹åã®@c
åãã¯é©åã«ã»ããããã¾ãã
-@lilypond[quote,verbatim,fragment]
+@lilypond[quote,verbatim]
\new Staff \relative {
% Main voice
c'16 d e f
- % Voice = "1" Voice = "2" Voice = "3"
- << { g4 f e } \\ { r8 e4 d c8 ~ } >> |
- << { d2 e2 } \\ { c8 b16 a b8 g ~ 2 } \\ { s4 b4 c2 } >> |
+ % Voice = "1" Voice = "2" Voice = "3"
+ << { g4 f e } \\ { r8 e4 d c8~ } >> |
+ << { d2 e } \\ { c8 b16 a b8 g~ 2 } \\ { s4 b c2 } >> |
+}
+@end lilypond
+
+@funindex \voices
+ããå¥ã®é çªã§ -- ä¾ãã°ä¸ããä¸ã®é çªã« -- ãã¤ã¹ãå
¥åãããå ´åã
+@code{<< @dots{} >>} æ§é ã®åã« @code{\voices} ãç¨ãããã¨ã§ã@c
+åãã¤ã¹ã®çªå·ãæå®ãããã¨ãã§ãã¾ãã以ä¸ã¯ä¾ã§ãã
+
+@lilypond[quote,verbatim]
+\new Staff \relative {
+ % Main voice
+ c'16 d e f
+ % Voice = "1" Voice = "2"
+ << { g4 f e } \\ { r8 e4 d c8~ } >> |
+ \voices 1,3,2
+ % Voice = "1" Voice = "3" Voice = "2"
+ << { d2 e } \\ { s4 b c2 } \\ { c8 b16 a b8 g~ 2 } >> |
}
@end lilypond
ãããã®ãã¤ã¹ã¯ãã¹ã¦ã¡ã¤ã³ã®ãã¤ã¹ããã¯åããã¦ãã¾ãã@c
-ã¡ã¤ã³ã®ãã¤ã¹ã®é³ç¬¦ã¯@code{<< .. >>} æ§é ã®å¤ã«ããããã§ãã@c
-ãã® @code{<< .. >>} æ§é ã @emph{åæé²è¡æ§é } ã¨å¼ã¶ãã¨ã«ãã¾ãããã@c
+ã¡ã¤ã³ã®ãã¤ã¹ã®é³ç¬¦ã¯@code{<< @dots{} >>} æ§é ã®å¤ã«ããããã§ãã@c
+ãã® @code{<< @dots{} >>} æ§é ã @emph{åæé²è¡æ§é } ã¨å¼ã¶ãã¨ã«ãã¾ãããã@c
ã¹ã©ã¼ã¨ã¿ã¤ã¯åããã¤ã¹å
ã«ããé³ç¬¦ã ããã¤ãªãã¾ãã@c
ãã®ãããã¹ã©ã¼ã¨ã¿ã¤ã¯åæé²è¡æ§é ãåºããå
¥ã£ãããããã¨ã¯ããã¾ããã@c
å対ã«ãåãèä¸ã«ããåã
ã®åæé²è¡æ§é ã§ã@c
@@ -808,7 +827,7 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
@code{\voiceNeutralStyle} (ãããããã§ã¯ä½¿ç¨ããã¦ãã¾ãã) ã¯@c
符é ã®ã¹ã¿ã¤ã«ãããã©ã«ãã«æ»ãã¾ãã@c
å¾ã»ã©ãã¦ã¼ã¶ããã®ãããªã³ãã³ããä½æããããã®æ¹æ³ãè¦ã¦ããã¾ãã@c
-@ref{ãªãã¸ã§ã¯ãã®å¯è¦æ§ã¨è²} 㨠@ref{調æ´ã®ããã«å¤æ°ã使ç¨ãã}
+@ref{ãªãã¸ã§ã¯ãã®å¯è¦æ§ã¨è²} 㨠@ref{ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã}
ãåç
§ãã¦ãã ããã
@cindex polyphony and relative note entry (å¤å£°ã¨ç¸å¯¾é³ç¬¦å
¥å)
@@ -819,7 +838,7 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
ãã®ããã以ä¸ã®ä¾ã§ã¯
@example
-\relative c' @{ noteA << < noteB noteC > \\ noteD >> noteE @}
+\relative @{ noteA << < noteB noteC > \\ noteD >> noteE @}
@end example
@noindent
@@ -833,13 +852,13 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
åãã¤ã¹ã®å§ãã« @code{\relative} ã³ãã³ããç½®ãã¨æçã«ãªãããããã¾ãã:
@example
-\relative c' @{ noteA ... @}
+\relative @{ noteA @dots{} @}
<<
- \relative c'' @{ < noteB noteC > ... @}
-@bs{}@bs{}
- \relative g' @{ noteD ... @}
+ \relative @{ < noteB noteC > @dots{} @}
+\\
+ \relative @{ noteD @dots{} @}
>>
-\relative c' @{ noteE ... @}
+\relative @{ noteE @dots{} @}
@end example
æå¾ã«ããã£ã¨è¤éãªæ¥½æ²ã®ä¸ã«ãããã¤ã¹ãåæãã¦ã¿ã¾ãããã@c
@@ -850,20 +869,21 @@ LilyPond ã®æ¥½èã®ä¸ã§æãä½ã¬ãã«ã§ãæãåºç¤çã§ããã
é³æ¥½ã¨ãã¤ã¹ã ãã«æ³¨ç®ãã¦ãã ãã -- è¾¼ã¿å
¥ã£ãå
容ã¯å¾ã»ã©èª¬æãã¾ãã
@c The following should appear as music without code
+@c KEEP LY
@lilypond[quote,ragged-right]
\new Staff \relative {
\key aes \major
+ \voices 1,2,4 % ãã¤ã¹ 3 ã¯ããã¾ãã
<< % Voice one
{ c''2 aes4. bes8 }
\\ % Voice two
{
- % Ignore these for now - they are explained in Ch 4
- \once \override NoteColumn.ignore-collision = ##t
+ % ããã¯ä»ã¯ç¡è¦ãã¦ãã ãã - 4 ç« ã§èª¬æãã¾ã
+ \once \override NoteColumn.force-hshift = #0
<ees, c>2
\once \override NoteColumn.force-hshift = #0.5
des2
}
- \\ % No voice three
\\ % Voice four
{
\override NoteColumn.force-hshift = #0
@@ -896,23 +916,24 @@ A ãã©ããã¯ä»ç¹ 4 åé³ç¬¦ã§ãããF 㯠4 åé³ç¬¦ãD ãã©ã
@c The following should appear as music without code
@c The three voice styles should be defined in -init
+@c KEEP LY
@lilypond[quote,ragged-right]
\new Staff \relative {
\key aes \major
+ \voices 1,2,4 % ãã¤ã¹ 3 ã¯ããã¾ãã (符幹ãä¸åãã«ããããã)
<<
- { % Voice one
+ { % Voice one
\voiceOneStyle
c''2 aes4. bes8
}
\\ % Voice two
{ \voiceTwoStyle
- % Ignore these for now - they are explained in Ch 4
- \once \override NoteColumn.ignore-collision = ##t
+ % ããã¯ä»ã¯ç¡è¦ãã¦ãã ãã - 4 ç« ã§èª¬æãã¾ã
+ \once \override NoteColumn.force-hshift = #0
<ees, c>2
\once \override NoteColumn.force-hshift = #0.5
des2
}
- \\ % No Voice three (we want stems down)
\\ % Voice four
{ \voiceThreeStyle
\override NoteColumn.force-hshift = #0
@@ -1077,7 +1098,7 @@ LilyPond ã¯é³ç¬¦ã®æ°´å¹³æ¹åã®ä½ç½®ã調ç¯ããããã®æ段ãã
@end lilypond
ä»åº¦ã¯ãåã®ã»ã¯ã·ã§ã³ã®ä¾ã使ã£ã¦åãå¤å£°é¨é³æ¥½ã®ããã»ã¼ã¸ã
-3 ã¤ã®ç°ãªãæ¹æ³ã§è¡¨è¨ããä¾ãè¦ã¦ããã¾ãã@c
+4 ã¤ã®ç°ãªãæ¹æ³ã§è¡¨è¨ããä¾ãè¦ã¦ããã¾ãã@c
ããããç°ãªãç¶æ³ã§å©ç¹ãããã¾ãã
1 ã¤ã¯ã¡ã¤ã³ ãã¤ã¹ã«å±ãã @code{<< >>} ã®å
é¨ã«ç´æ¥è¡¨è¨ãè¨è¿°ããæ¹æ³ã§ã
@@ -1113,6 +1134,37 @@ LilyPond ã¯é³ç¬¦ã®æ°´å¹³æ¹åã®ä½ç½®ã調ç¯ããããã®æ段ãã
}
@end lilypond
+@cindex voices, continued (ç¶ããã¤ã¹)
+@funindex \voices
+
+@code{\voices} ã³ãã³ãã¯ã¡ã¤ã³ã®ãã¤ã¹ãåæé²è¡è¡¨è¨ã¸ã¨@c
+ç¶ããããã«ã使ãã¾ãã
+
+@c KEEP LY
+@lilypond[quote,ragged-right,verbatim]
+\new Staff \relative {
+ \new Voice = "main" {
+ \voiceOneStyle
+ % ããã¯å声ã§ã
+ c'16^( d e f
+ % 3 ãã¤ã¹ã®åæé²è¡è¡¨è¨ãéå§
+ \voices "main",2,3
+ <<
+ % ã¡ã¤ã³ã®ãã¤ã¹ã®ç¶ã
+ { g4 f e | d2 e) | }
+ \\
+ % ãã¤ã¹ 2 ã®éå§
+ % 符幹ãªã©ã®åããä¸ã«ãªãã¾ã
+ { r8 e4 d c8~ | 8 b16 a b8 g~ 2 | }
+ \\
+ % ãã¤ã¹ 3 ã®éå§
+ % 符幹ãªã©ã®åããä¸ã«ãªãã¾ã
+ { s2. | s4 b c2 | }
+ >>
+ }
+}
+@end lilypond
+
@cindex nesting music expressions (é³æ¥½è¡¨è¨ããã¹ãããã)
@cindex nesting simultaneous constructs (åæé²è¡æ§é ããã¹ãããã)
@cindex nesting voices (ãã¤ã¹ããã¹ãããã)
@@ -1210,11 +1262,16 @@ LilyPond ã¯é³ç¬¦ã®æ°´å¹³æ¹åã®ä½ç½®ã調ç¯ããããã®æ段ãã
ä¿æãããã¨ãã§ãã¾ãã@c
åãåãã®ç¬¦å¹¹ãæ㤠2 ã¤ã®ãã¤ã¹ããã®é³ç¬¦ãåãä½ç½®ã«ç½®ããã両æ¹ã®ãã¤ã¹ã«@c
ã·ãããæå®ããã¦ããªãããããã¯åãã·ãããæå®ããã¦ããå ´åã@c
-ã¨ã©ã¼ ã¡ãã»ã¼ã¸ @qq{Too many clashing note columns} (é³ç¬¦ãå¤ããã¦é³ç¬¦åã§@c
-è¡çªãèµ·ãã£ã¦ãã¾ã) ãçæããã¾ãã
+ã¨ã©ã¼ ã¡ãã»ã¼ã¸
+@qq{This voice needs a @code{@bs{}voiceXx} or @code{@bs{}shiftXx} setting}
+(ãã®ãã¤ã¹ã¯ @code{@bs{}voiceXx} ã @code{@bs{}shiftXx} ã®è¨å®ãå¿
è¦ã§ã)
+ãçæããã¾ãã
@seealso
+å¦ç¿ããã¥ã¢ã«:
+@ruser{Moving objects}
+
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ruser{è¤æ°ã®ãã¤ã¹}
@@ -1491,10 +1548,10 @@ LilyPond å
é¨ã§ã¯ããããã®è¦åã¨æ
å ±ãããã¯@emph{ã³ã³ã
@cindex creating contexts (ã³ã³ããã¹ããä½æãã)
@cindex contexts, creating (ã³ã³ããã¹ããä½æãã)
-å
¥åãã¡ã¤ã«ã®ä¸ã§ã@code{\score} ã³ãã³ãã«ãã£ã¦å°å
¥ããã
-score ãããã¯ã¯åä¸ã®é³æ¥½è¡¨è¨ã¨ããã«é¢é£ããåºåå®ç¾©
-(@code{\layout} ãããã¯ããã㯠@code{\midi} ãããã¯)
-ãä¿æãã¾ãã@c
+å
¥åãã¡ã¤ã«ã®ä¸ã§ã(@code{\score} ã³ãã³ãã«ãã£ã¦å°å
¥ããã)
+score ãããã¯ã¯åä¸ã®é³æ¥½è¡¨è¨ãä¿æãã¾ãããããã«é¢é£ããåºåå®ç¾©
+(@code{\layout} ãããã¯ã¨ @code{\midi} ãããã¯ã®ãããããããã¯ä¸¡æ¹)
+ãä¿æãããã¨ãã§ãã¾ãã@c
é常ã@code{Score} ã³ã³ããã¹ãã¯çç¥ããã@c
é³æ¥½è¡¨è¨ã®è§£éãå§ã¾ã£ãæç¹ã§èªåçã«ä½æããã¾ãã
@@ -1773,21 +1830,21 @@ LilyPond ã«ãã£ã¦ä½æããã楽èä¸ã«ãããã¹ã¦ã®è¨å·ã¯
ããã¯æãããªå ´åãããã¾ããããããããå ´åãããã¾ãã@c
ééã£ãã³ã³ããã¹ããæå®ãããå ´åãã¨ã©ã¼ ã¡ãã»ã¼ã¸ã¯è¡¨ç¤ºããã¾ãããã@c
äºæããã¢ã¯ã·ã§ã³ãèµ·ããã¾ããã@c
-ä¾ãã°ã@code{instrumentName} ã¯ééããªã @code{Staff} ã³ã³ããã¹ãã®ä¸ã«@c
+ä¾ãã°ã@code{clefGlyph} ã¯ééããªã @code{Staff} ã³ã³ããã¹ãã®ä¸ã«@c
ãã¾ãã@c
-ãªããªãããã®ããããã£ãååãä»ããã®ã¯è表ã ããã§ãã@c
-以ä¸ã®ä¾ã§ã¯ãæåã®è表ã«ã¯ååãä»ãããã¦ãã¾ããã2 çªç®ã®è表ã«ã¯@c
-ä»ãããã¦ãã¾ããã@c
-ãªããªããã³ã³ããã¹ãåãçç¥ãã¦ããããã§ãã
+ãªããªããå¤æ´ããããã®ã¯è表ã«å±ããé³é¨è¨å·ã ããã§ãã@c
+以ä¸ã®ä¾ã§ã¯ãæåã®è表ã®é³é¨è¨å·ã¯æ£ãã表示ããã¦ãã¾ããã2 çªç®ã®è表ã¯@c
+æ£ããããã¾ãã -- ãé³è¨å·ãæå®ããã¯ãã§ãããããã©ã«ãã§ãããé³è¨å·ã@c
+表示ããã¦ãã¾ã -- ãªããªããã³ã³ããã¹ãåãçç¥ãã¦ããããã§ãã
@lilypond[quote,verbatim,ragged-right]
<<
\new Staff \relative {
- \set Staff.instrumentName = #"Soprano"
+ \set Staff.clefGlyph = "clefs.C"
c''2 c
}
\new Staff \relative {
- \set instrumentName = #"Alto" % Wrong!
+ \set clefGlyph = "clefs.F" % Wrong!
d'2 d
}
>>
@@ -1795,7 +1852,7 @@ LilyPond ã«ãã£ã¦ä½æããã楽èä¸ã«ãããã¹ã¦ã®è¨å·ã¯
ããã©ã«ãã®ã³ã³ããã¹ãå㯠@code{Voice} ã§ãããã¨ãæãåºãã¦ãã ããã@c
ãã®ããã2 çªç®ã® @code{@bs{}set} ã³ãã³ã㯠@code{Voice} ã³ã³ããã¹ãã®@c
-ãããã㣠@code{instrumentName} ã @qq{Alto} ã«ã»ãããã¦ãã¾ãã@c
+ãããã㣠@code{clefGlyph} ã @qq{clefs.F} ã«ã»ãããã¦ãã¾ãã@c
ããããªãããLilyPond 㯠@code{Voice} ã³ã³ããã¹ãã§ãã®ãããªããããã£ã@c
è¦ã¤ãåºããªããããä½ã®ã¢ã¯ã·ã§ã³ãèµ·ããã¾ããã@c
ããã¯ã¨ã©ã¼ã§ã¯ãªãããã° ãã¡ã¤ã«ã«ã¨ã©ã¼ ã¡ãã»ã¼ã¸ã¯æ®ãã¾ããã
@@ -1817,7 +1874,7 @@ LilyPond å
¥åãã¡ã¤ã«ã«å¯¾ããç¹å¥ãªãµãã¼ããæã¤@c
@rinternals{Tunable context properties} ã @rinternals{Contexts}
ãåç
§ãã¦ãã ããã
-@code{instrumentName} ããããã£ã¯ @code{Staff} ã³ã³ããã¹ãã®ä¸ã«@c
+@code{clefGlyph} ããããã£ã¯ @code{Staff} ã³ã³ããã¹ãã®ä¸ã«@c
ã»ãããããå ´åã«ã®ã¿å¹æãæã¡ã¾ãããããã¤ãã®ããããã£ã¯è¤æ°ã®@c
ã³ã³ããã¹ãã®ä¸ã«ã»ãããããã¨ãã§ãã¾ãã@c
ä¾ãã°ããããã㣠@code{extraNatural} ã¯ãã¹ã¦ã®èã«å¯¾ãã¦ããã©ã«ãã§
@@ -1856,7 +1913,7 @@ LilyPond å
¥åãã¡ã¤ã«ã«å¯¾ããç¹å¥ãªãµãã¼ããæã¤@c
@end lilypond
ä»ã®ä¾ã¨ãã¦ã¯ã@code{clefTransposition} ã @code{Score} ã³ã³ããã¹ãã«@c
-ã»ãããããå ´åãç´ã¡ã«ãã¹ã¦ã®èã§ã®ãªã¯ã¿ã¼ãã®å¤ãå¤æ´ãããã¹ã¦ã®èã«@c
+ã»ãããããå ´åãç´ã¡ã«ãã¹ã¦ã®èã§ã®ãªã¯ã¿ã¼ã表示ãå¤æ´ãããã¹ã¦ã®èã«@c
é©ç¨ãããæ°ããããã©ã«ãå¤ãã»ãããã¾ãã
éã®ãã¨ãè¡ãã³ãã³ã @code{\unset} ã¯ã³ã³ããã¹ãããããããã£ã@c
@@ -2295,7 +2352,7 @@ melody = \relative @{
ãã§ãç¨ã®ã»ã¯ã·ã§ã³ã @code{celloMusic} ã¨å¼ã¶ãã¨ã«ãã¾ãã@c
ãªãã¼ã ããã¨ãã«ã@code{text} ã @code{sopranoLyrics} ã¨ããã¼ã ãã¾ãããã@c
ãããã®ã¤ã³ã¹ã¿ã³ã¹ããªãã¼ã ãããã¨ãå¿ããªãã§ãã ãã
-â- åæå®ç¾© (@code{melody = \relative c' @{ } é¨å) ã¨ãã®ååã@c
+â- åæå®ç¾© (@code{melody = \relative @{ } é¨å) ã¨ãã®ååã@c
使ããã¦ããã¨ãã (@code{\score ã»ã¯ã·ã§ã³ã®ä¸}) ã®ä¸¡æ¹ã§ãã
ãªãã¼ã ããéã«ããã§ã ãã¼ãã®èãå¤æ´ãã¾ããã
@@ -2478,8 +2535,9 @@ lower = \relative {
\score {
<< % combine ChoirStaff and PianoStaff in parallel
\new ChoirStaff <<
- \new Staff = "sopranos" <<
- \set Staff.instrumentName = #"Soprano"
+ \new Staff = "sopranos"
+ \with { instrumentName = #"Soprano" }
+ <<
\new Voice = "sopranos" {
\global
\sopranoMusic
@@ -2488,24 +2546,31 @@ lower = \relative {
\new Lyrics \lyricsto "sopranos" {
\sopranoWords
}
- \new Staff = "altos" <<
- \set Staff.instrumentName = #"Alto"
+ \new Staff = "altos"
+ \with { instrumentName = #"Alto" }
+ <<
\new Voice = "altos" {
\global
\altoMusic
}
>>
- \new Lyrics \lyricsto "altos" { \altoWords }
- \new Staff = "tenors" <<
- \set Staff.instrumentName = #"Tenor"
+ \new Lyrics \lyricsto "altos" {
+ \altoWords
+ }
+ \new Staff = "tenors"
+ \with { instrumentName = #"Tenor" }
+ <<
\new Voice = "tenors" {
\global
\tenorMusic
}
>>
- \new Lyrics \lyricsto "tenors" { \tenorWords }
- \new Staff = "basses" <<
- \set Staff.instrumentName = #"Bass"
+ \new Lyrics \lyricsto "tenors" {
+ \tenorWords
+ }
+ \new Staff = "basses"
+ \with { instrumentName = #"Bass" }
+ <<
\new Voice = "basses" {
\global
\bassMusic
@@ -2515,8 +2580,8 @@ lower = \relative {
\bassWords
}
>> % end ChoirStaff
- \new PianoStaff <<
- \set PianoStaff.instrumentName = #"Piano"
+ \new PianoStaff \with { instrumentName = #"Piano" }
+ <<
\new Staff = "upper" \upper
\new Staff = "lower" \lower
>>
@@ -2524,8 +2589,18 @@ lower = \relative {
}
@end lilypond
-ãã®ã¬ã¤ã¢ã¦ãããã®ã¾ã¾æä¾ãããã³ãã¬ã¼ãã¯ããã¾ããã@c
-æãè¿ãã®ã¯ @ref{SATB vocal score and automatic piano reduction}
+@warning{ãã®ã¬ã¤ã¢ã¦ã㯠LilyPond ã«çµã¿è¾¼ã¾ãã¦ãããã³ãã¬ã¼ãã@c
+ç¨ãããã¨ã§ç°¡åã«å®ç¾ã§ãã¾ã: @code{satb.ly} ã@c
+@ref{Built-in templates} ãåç
§ãã¦ãã ããã@c
+ç°¡åã«å©ç¨ã§ããã¨ããå©ç¹ã¯ããã¾ããã@c
+ãã®ãã³ãã¬ã¼ããç¨ããã¨ãããã¨ã¯ãå¿
è¦ãªã³ã³ããã¹ãæ§é ã@c
+èªåã§æä¾ãã代ããã«ããããé ãã¦ãã¾ãã¨ãããã¨ã§ãã@c
+ã§ãããå¦ç¿ã®ããã«ããããä¸ããä½ãæ¹æ³ãè¦ã¦ã¿ã¾ãããã@c
+çµã¿è¾¼ã¿ã®ãã³ãã¬ã¼ããå®å
¨ã«ã¯æã¿ã©ããã§ãªãå ´åã@c
+ãã®æé ãè¡ãå¿
è¦ãããããããã¾ããã}
+
+ã³ãã¼ãã¦ç·¨éã§ãããã³ãã¬ã¼ãã®ä¸ã§ãæãè¿ããã®ã¯
+@ref{SATB vocal score and automatic piano reduction}
ã§ãããã¬ã¤ã¢ã¦ããå¤æ´ãã¦ããã¼ã«ã« ãã¼ãããèªåçã«çæããããã®ã§ã¯@c
ãªããã¢ãä¼´å¥èãä»ãå ããå¿
è¦ãããã¾ãã@c
ãã¼ã«ã« ãã¼ãã®ããã®é³æ¥½ã¨æè©ãä¿æãã¦ããå¤æ°ã¯ãã®ã¾ã¾ä½¿ãã¾ããã@c
@@ -2546,8 +2621,9 @@ lower = \relative {
@example
\new ChoirStaff <<
- \new Staff = "sopranos" <<
- \set Staff.instrumentName = #"Soprano"
+ \new Staff = "sopranos"
+ \with @{ instrumentName = #"Soprano" @}
+ <<
\new Voice = "sopranos" @{
\global
\sopranoMusic
@@ -2556,8 +2632,9 @@ lower = \relative {
\new Lyrics \lyricsto "sopranos" @{
\sopranoWords
@}
- \new Staff = "altos" <<
- \set Staff.instrumentName = #"Alto"
+ \new Staff = "altos"
+ \with @{ instrumentName = #"Alto" @}
+ <<
\new Voice = "altos" @{
\global
\altoMusic
@@ -2566,8 +2643,9 @@ lower = \relative {
\new Lyrics \lyricsto "altos" @{
\altoWords
@}
- \new Staff = "tenors" <<
- \set Staff.instrumentName = #"Tenor"
+ \new Staff = "tenors"
+ \with @{ instrumentName = #"Tenor" @}
+ <<
\new Voice = "tenors" @{
\global
\tenorMusic
@@ -2576,8 +2654,9 @@ lower = \relative {
\new Lyrics \lyricsto "tenors" @{
\tenorWords
@}
- \new Staff = "basses" <<
- \set Staff.instrumentName = #"Bass"
+ \new Staff = "basses"
+ \with @{ instrumentName = #"Bass" @}
+ <<
\new Voice = "basses" @{
\global
\bassMusic
@@ -2594,8 +2673,8 @@ lower = \relative {
å¼ãæãã¦ããã ãã§ã:
@example
-\new PianoStaff <<
- \set PianoStaff.instrumentName = #"Piano "
+\new PianoStaff \with @{ instrumentName = #"Piano " @}
+<<
\new Staff = "upper" \upper
\new Staff = "lower" \lower
>>
@@ -2649,8 +2728,8 @@ lower = \relative {
@}
>> % end ChoirStaff
- \new PianoStaff <<
- \set PianoStaff.instrumentName = #"Piano"
+ \new PianoStaff \with @{ instrumentName = #"Piano " @}
+ <<
\new Staff = "upper" \upper
\new Staff = "lower" \lower
>>
@@ -2702,8 +2781,9 @@ lower = \relative {
\score {
<< % ChoirStaff 㨠PianoStaff ã並è¡ã«çµã¿åããã¾ã
\new ChoirStaff <<
- \new Staff = "sopranos" <<
- \set Staff.instrumentName = #"Soprano"
+ \new Staff = "sopranos"
+ \with { instrumentName = #"Soprano" }
+ <<
\new Voice = "sopranos" {
\global
\sopranoMusic
@@ -2712,8 +2792,9 @@ lower = \relative {
\new Lyrics \lyricsto "sopranos" {
\sopranoWords
}
- \new Staff = "altos" <<
- \set Staff.instrumentName = #"Alto"
+ \new Staff = "altos"
+ \with { instrumentName = #"Alto" }
+ <<
\new Voice = "altos" {
\global
\altoMusic
@@ -2722,8 +2803,9 @@ lower = \relative {
\new Lyrics \lyricsto "altos" {
\altoWords
}
- \new Staff = "tenors" <<
- \set Staff.instrumentName = #"Tenor"
+ \new Staff = "tenors"
+ \with { instrumentName = #"Tenor" }
+ <<
\new Voice = "tenors" {
\global
\tenorMusic
@@ -2732,8 +2814,9 @@ lower = \relative {
\new Lyrics \lyricsto "tenors" {
\tenorWords
}
- \new Staff = "basses" <<
- \set Staff.instrumentName = #"Bass"
+ \new Staff = "basses"
+ \with { instrumentName = #"Bass" }
+ <<
\new Voice = "basses" {
\global
\bassMusic
@@ -2744,8 +2827,9 @@ lower = \relative {
}
>> % ChoirStaff ã®çµäº
- \new PianoStaff <<
- \set PianoStaff.instrumentName = #"Piano "
+ \new PianoStaff
+ \with { instrumentName = #"Piano " }
+ <<
\new Staff = "upper" \upper
\new Staff = "lower" \lower
>>
@@ -2865,12 +2949,12 @@ PedalOrganMusic = @{ s1 @}
@end example
2 çªç®ã®éµç¤ãã¼ãã¨ããã« ãªã«ã¬ã³ã®è表㯠1 ã¤ã ãããé³æ¥½è¡¨è¨ã@c
-ä¿æããªãããããããã«å¯¾ãã¦åæé²è¡æ§é @code{<< .. >>} ã使ãå¿
è¦ã¯@c
+ä¿æããªãããããããã«å¯¾ãã¦åæé²è¡æ§é @code{<< @dots{} >>} ã使ãå¿
è¦ã¯@c
å¿
ãããããã¾ããã@c
ããããªããããããã¦ã害ã¯ããã¾ãããã@code{\new Staff} ã®å¾ã«å¸¸ã«@c
å±±æ¬å¼§ãç½®ãã¨ããã®ã¯è¤æ°ã®ãã¤ã¹ãããå ´åã§ã¯æ¨å¥¨ãããè¯ãç¿æ
£ã§ãã@c
Voice ã¯ããã¨ã¯å¯¾ç
§çã«ãããªãã®é³æ¥½ãé£ç¶ãã¦æ¼å¥ãã¹ãããã¤ãã®å¤æ°ã«@c
-åãã¦ã³ã¼ãåããå ´åã« Voice ã®å¾ã«æ³¢æ¬å¼§ @code{@{ .. @}} ã常ã«ç½®ãã¹ãã§ãã
+åãã¦ã³ã¼ãåããå ´åã« Voice ã®å¾ã«æ³¢æ¬å¼§ @code{@{ @dots{} @}} ã常ã«ç½®ãã¹ãã§ãã
ãã®æ§é ãã¹ã³ã¢ ãããã¯ã«ä»ãå ãã¦ãã¤ã³ãã³ãã調æ´ãã¾ãããã@c
ããã«ãé©åãªé³é¨è¨å·ãä»ãå ãã@code{\voiceOne} 㨠@code{\voiceTwo} ã@c
@@ -3092,11 +3176,11 @@ violin = \new Staff {
ããã«ããããã®å¤æ° (å¤æ°ããã¯ãã(ã¦ã¼ã¶å®ç¾©) ã³ãã³ããªã©ã¨å¼ã°ãã¾ã)
ã調æ´ã®ããã«ä½¿ããã¨ãã§ãã¾ã:
-@c TODO Avoid padtext - not needed with skylining
@lilypond[quote,verbatim,ragged-right]
dolce = \markup { \italic \bold dolce }
-padText = { \once \override TextScript.padding = #5.0 }
+centreText = { \once \override TextScript.self-alignment-X = #CENTER }
+
fthenp =_\markup {
\dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p
}
@@ -3104,9 +3188,9 @@ fthenp =_\markup {
violin = \relative {
\repeat volta 2 {
c''4._\dolce b8 a8 g a b |
- \padText
- c4.^"hi there!" d8 e' f g d |
- c,4.\fthenp b8 c4 c-. |
+ \centreText
+ c4.^"hi there!" d8 e f g d |
+ c4.\fthenp b8 c4 c-. |
}
}
@@ -3114,7 +3198,6 @@ violin = \relative {
{
\violin
}
- \layout { ragged-right = ##t }
}
@end lilypond
@@ -3128,9 +3211,9 @@ violin = \relative {
violin = \relative @{
\repeat volta 2 @{
c''4._\markup @{ \italic \bold dolce @} b8 a8 g a b |
- \once \override TextScript.padding = #5.0
- c4.^"hi there!" d8 e' f g d |
- c,4.\markup @{
+ \once \override TextScript.self-alignment-X = #CENTER
+ c4.^"hi there!" d8 e f g d |
+ c4._\markup @{
\dynamic f \italic \small @{ 2nd @} \hspace #0.1 \dynamic p
@}
b8 c4 c-. |
@@ -3138,12 +3221,9 @@ violin = \relative @{
@}
@end example
-@c TODO Replace the following with a better example -td
-@c Skylining handles this correctly without padText
-
ããã¾ã§ã«è¦ã¦ããã®ã¯éçãªç½®ãæãã§ã
--- LilyPond 㯠@code{\padText} ãè¦ã¤ããã¨ããããå®ç¾©ããå
容
-(ã¤ã¾ãã@code{padText=} ã®å³å´ã«ãããã®) ã«ç½®ãæãã¾ãã
+-- LilyPond 㯠@code{\centreText} ãè¦ã¤ããã¨ããããå®ç¾©ããå
容
+(ã¤ã¾ãã@code{centreText=} ã®å³å´ã«ãããã®) ã«ç½®ãæãã¾ãã
LilyPond ã¯ééçãªç½®ãæããå¦çã§ãã¾ã (ããããé¢æ°ã¨è¦ãªããã¨ãã§ãã¾ã)ã
@@ -3157,11 +3237,11 @@ padText =
#})
\relative {
- c'''4^"piu mosso" b a b |
+ c''4^"piu mosso" b a b
\padText #1.8
- c4^"piu mosso" d e f |
+ c4^"piu mosso" b a b
\padText #2.6
- c4^"piu mosso" fis a g |
+ c4^"piu mosso" b a b
}
@end lilypond
@@ -3248,22 +3328,17 @@ R2*3
@end example
ãã®é¨åãèå»ããã¨ããè¤å°ç¯ä¼ç¬¦ãå§ç¸®ããå¿
è¦ãããã¾ãã@c
-ããã¯ä»¥ä¸ã®ã©ã³-ã¿ã¤ã å¤æ°ãè¨å®ãããã¨ã«ãã£ã¦è¡ãã¾ã:
+ãããè¡ãé³æ¥½é¢æ°ãåå¨ãã¾ãã
@example
-\set Score.skipBars = ##t
+\compressMMRests @{ ... @}
@end example
-@noindent
-ãã®ã³ãã³ã㯠@code{Score} ã³ã³ããã¹ãã®ä¸ã«ãã@c
-ãããã㣠@code{skipBars} ãç (@code{##t}) ã«ã»ãããã¾ãã@c
-ãã®ä¼ç¬¦ã¨ãªãã·ã§ã³ãä¸è¨ã®é³æ¥½ã®å
é ã«è¿½å ãããã¨ã«ãã£ã¦ã@c
-以ä¸ã®ãããªçµæã«ãªãã¾ã:
+ããã @code{hornNotes} ã«é©ç¨ããã¨ã以ä¸ã®ãããªçµæã«ãªãã¾ã:
@lilypond[quote,ragged-right]
-\transpose f c' \relative {
+\compressMMRests \transpose f c' \relative {
\time 2/4
- \set Score.skipBars = ##t
R2*3 |
r4 f8 a | cis4 f | e4 d |
}
@@ -3303,3 +3378,12 @@ R2*3
>>
@end lilypond
+@seealso
+å¦ç¿ããã¥ã¢ã«:
+@ref{Organizing pieces with variables}.
+
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ruser{Transpose},
+@ruser{Writing parts},
+@ruser{Full measure rests},
+@ruser{Including LilyPond files}.
diff --git a/Documentation/ja/learning/templates.itely b/Documentation/ja/learning/templates.itely
index af5077d0b0..31b7f0b26a 100644
--- a/Documentation/ja/learning/templates.itely
+++ b/Documentation/ja/learning/templates.itely
@@ -1,17 +1,17 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: 9bb7fa99aa8bc7c14a45a42224545c726bb6c592
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.16.0"
+@c \version "2.19.25"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -24,6 +24,7 @@
ãã¨ã¯ç¾ããèå»ããã楽èãã楽ãã¿ãã ããï¼
@menu
+* çµã¿è¾¼ã¾ãã¦ãããã³ãã¬ã¼ã::
* åä¸èãã³ãã¬ã¼ã::
* ãã¢ã ãã³ãã¬ã¼ã::
* 弦楽åéå¥ãã³ãã¬ã¼ã::
@@ -34,6 +35,303 @@
@end menu
+@node çµã¿è¾¼ã¾ãã¦ãããã³ãã¬ã¼ã
+@appendixsec çµã¿è¾¼ã¾ãã¦ãããã³ãã¬ã¼ã
+@translationof Built-in templates
+
+ããã¤ãã®ãåå±é³æ¥½ã«é©ãããã³ãã¬ã¼ãã LilyPond ã«çµã¿è¾¼ã¾ãã¦ãã¾ãã@c
+ããã㯠2 段ã4 段ã8 段ã®åç´ãªåå±èãä½ãã®ã«ä½¿ããã¨ãã§ãã@c
+ãã¢ãä¼´å¥ã®æç¡ãæå®ã§ãã¾ããä»ã®ãã³ãã¬ã¼ãã¨ç°ãªãããããã¯@c
+@q{çµã¿è¾¼ã¿}ã®ãã³ãã¬ã¼ãã§ãããããã³ãã¼ãã¦ç·¨éããã¨ããæé ãè¸ã@c
+å¿
è¦ãããã¾ããã代ããã« @code{@bs{}include} ãå
¥åããã ãã§ä½¿ç¨ã§ãã¾ãã
+
+@warning {å¤ãã®ã¤ã³ã¯ã«ã¼ããã¡ã¤ã«ã¨ã¯ç°ãªããçµã¿è¾¼ã¿ã®ãã³ãã¬ã¼ãã¯@c
+å
¥åãã¡ã¤ã«ã®@emph{æå¾ã«} @code{@bs{}include} ããå¿
è¦ãããã¾ãã}
+
+å¿
è¦ãªé³æ¥½è¡¨è¨ã¯ç¹å®ã®å¤æ°ã«ä»£å
¥ãããã¨ã§å
¥åãã¾ãããããã®ä»£å
¥æã¯
+@code{@bs{}include} ã®åã«å
¥åããã¦ããªããã°ãªãã¾ããã
+
+@menu
+* SATB ãã³ãã¬ã¼ã::
+* SSAATTBB ãã³ãã¬ã¼ã::
+@end menu
+
+@node SATB ãã³ãã¬ã¼ã
+@appendixsubsec SATB ãã³ãã¬ã¼ã
+@translationof SATB template
+
+1 ã¤ã®è表ã«ãã¤ã¹ã 1 ã¤å«ãã 2 ã¤å«ããã¯ã@c
+ãããã @code{TwoVoicesPerStaff} ã @code{##f} ã @code{##t} ã«ãããã¨ã§@c
+è¨å®ã§ãã¾ãã
+
+ãããåãã¼ãã«æè©ãä»ã 4 ãã¼ã SATB èã¨ãã¢ãä¼´å¥èãæã¤@c
+å®å
¨ãªå
¥åãã¡ã¤ã«ã§ã:
+
+@lilypond[verbatim, quote]
+ SopranoMusic = \relative { a'4\f a8 a a4 a }
+ SopranoLyrics = \lyricmode { Sop -- ra -- no ly -- rics }
+ AltoMusic = \relative { d'4\f d d d }
+ AltoLyrics = \lyricmode { Al -- to ly -- rics }
+ TenorMusic = \relative { a4\p a a a }
+ TenorLyrics = \lyricmode { Te -- nor ly -- rics }
+ BassMusic = \relative { c2\p c4 c }
+ BassLyrics = \lyricmode { Bass ly -- rics }
+ PianoRHMusic = \relative { c' e g c }
+ PianoDynamics = { s2\mp s4 s4 }
+ PianoLHMusic = \relative { c e g c }
+ \include "satb.ly"
+@end lilypond
+
+1 ã¤ã®è表ã«ãã¤ã¹ã 2 ã¤ã«ããå ´åãåãå
¥åã§è¯ããåã«@c
+@code{TwoVoicesPerStaff} ã @code{##t} ã«ã»ããããã ãã§ãã@c
+åæ§ã«ãåãã¼ãã«æè©ãä»ãã¾ãã
+
+
+@lilypond[verbatim, quote]
+ SopranoMusic = \relative { a'4\f a8 a a4 a }
+ SopranoLyrics = \lyricmode { Sop -- ra -- no ly -- rics }
+ AltoMusic = \relative { d'4\f d d d }
+ AltoLyrics = \lyricmode { Al -- to ly -- rics }
+ TenorMusic = \relative { a4\p a a a }
+ TenorLyrics = \lyricmode { Te -- nor ly -- rics }
+ BassMusic = \relative { c2\p c4 c }
+ BassLyrics = \lyricmode { Bass ly -- rics }
+ PianoRHMusic = \relative { c' e g c }
+ PianoDynamics = { s2\mp s4 s4 }
+ PianoLHMusic = \relative { c e g c }
+ TwoVoicesPerStaff = ##t
+ \include "satb.ly"
+@end lilypond
+
+@code{TwoVoicesPerStaff} ã @code{##f} ã«ã»ããããã¦ãã@c
+ï¼ãããã¯ããã©ã«ãã®ï¼æãå¤æ°å®£è¨ãçç¥ãããã¨ã§ã声é¨ã®æ°ãæ¸ãã@c
+ãã¨ãã§ãã¾ããä¾ãã°ãã½ãã©ãã¨ãã¹ã®ãã¥ã¨ããã¯ãã®ããã«å
¥åãã¾ã:
+
+@lilypond[verbatim,quote]
+ SopranoMusic = \relative { c'' c c c }
+ SopranoLyrics = \lyricmode { High voice ly -- rics }
+ BassMusic = \relative { a a a a }
+ BassLyrics = \lyricmode { Low voice ly -- rics }
+ \include "satb.ly"
+@end lilypond
+
+2 çªã®æè©ã代ããã®æè©ãåãã¼ãã«è¿½å ãããã¨ãã§ãã¾ã:
+
+@lilypond[verbatim, quote]
+ SopranoMusic = \relative { a'4 a a a }
+ SopranoLyricsOne = \lyricmode {
+ \set stanza = "1."
+ Words to verse one
+ }
+ SopranoLyricsTwo = \lyricmode {
+ \set stanza = "2."
+ Words to verse two
+ }
+ \include "satb.ly"
+@end lilypond
+
+æè©ã¨ãªãºã ãå
¨ã¦ã®ãã¼ãã§åãã§ããå ´åã2 ã¤ã®è表ãç¨ããã¨è¯ãã§ãããã@c
+ãã®æãæè©ã¯ 9 çªã¾ã§å
¥åã§ãã¾ãããããä¼´å¥ç¡ãã§ã3 çªã¾ã§å
¥åããä¾ã§ã:
+
+@lilypond[verbatim, quote]
+ SopranoMusic = \relative { a' a a a }
+ AltoMusic = \relative { f' f f f }
+ VerseOne = \lyricmode {
+ \set stanza = "1."
+ Words to verse one
+ }
+ VerseTwo = \lyricmode {
+ \set stanza = "2."
+ Words to verse two
+ }
+ VerseThree = \lyricmode {
+ \set stanza = "3."
+ Words to verse three
+ }
+ TenorMusic = \relative { a a a a }
+ BassMusic = \relative { f f f f }
+ TwoVoicesPerStaff = ##t
+ \include "satb.ly"
+@end lilypond
+
+å¤ãä¸ãããã¨ãã§ããå¤æ°ãä»ã«ãããã¾ãã@c
+調å·ã¨æåè¨å·ã¯ãã®ããã«å¤æ´ãã¾ã:
+
+@lilypond[verbatim, quote]
+ Key = \key a \major
+ Time = {
+ \time 5/4
+ \tempo "Allegro" 4 = 144
+ }
+ SopranoMusic = \relative { gis' gis gis gis gis }
+ AltoMusic = \relative { cis' cis cis cis cis }
+ VerseOne = \lyricmode { Words to this du -- et }
+ TwoVoicesPerStaff = ##t
+ \include "satb.ly"
+@end lilypond
+
+楽å¨åã¨çã楽å¨åãå¤æ´ãããã¨ãã§ãã¾ã:
+
+@lilypond[verbatim,quote]
+ SopranoMusic = \relative { c'' c c c }
+ SopranoLyrics = \lyricmode { High voice ly -- rics }
+ SopranoInstrumentName = "Soprano 1"
+ SopranoShortInstrumentName = "S1"
+ AltoMusic = \relative { a' a a a }
+ AltoLyrics = \lyricmode { Low voice ly -- rics }
+ AltoInstrumentName = "Soprano 2"
+ AltoShortInstrumentName = "S2"
+ \include "satb.ly"
+@end lilypond
+
+ãã®ä¾ã§ã¯ããã®ããã«ãããã @code{ssaattbb.ly} ã®ãã³ãã¬ã¼ããç¨ããæ¹ã@c
+ç°¡åã§ãããã @ref{SSAATTBB ãã³ãã¬ã¼ã} ãåç
§ãã¦ãã ããã
+
+ãã¹ã«ã³ãã¯å¤æ° @code{DescantMusic} ãå®ç¾©ãããã¨ã§è¿½å ã§ãã@c
+ãã¹ã«ã³ãã®æè©ã¯ @code{DescantLyrics} ãå®ç¾©ãããã¨ã§è¿½å ã§ãã¾ãã@c
+åãããã«ãã½ããã¼ã㯠@code{SoloMusic} 㨠@code{SoloLyrics} ã@c
+å®ç¾©ãããã¨ã§ãã°ã«ã¼ãåãããåå±èã®ä¸ã«è¿½å ãããã¨ãã§ãã¾ãã
+
+@code{\header} ãããã¯ã @code{\paper} ãããã¯ã¯é常ã®ããã«è¿½å ã§ãã¾ãã
+@code{\layout} ãããã¯ãé常ã®ããã«ãããã¬ãã«ã«è¿½å ã§ããå
容ã¯@c
+ãã³ãã¬ã¼ãã«ããã©ã«ãã§å®ç¾©ããã¦ããè¨å®ã¨çµã¿åããããã¾ã@c
+ï¼ä¸æ¸ãã¯è¡ãã¾ããï¼ããã®ä»£ããããã³ãã¬ã¼ãã®å
¨ã¦ã®ããã©ã«ãè¨å®ã¯
+@emph{å
¨ã¦ã®}å¿
è¦ãªè¨å®ãå«ãã @code{Layout} å¤æ°ãå®ç¾©ãããã¨ã§ç ´æ£ã§ãã¾ãã
+
+@example
+Layout = \layout @{ ... @}
+@end example
+
+å¤æ´ãããã¨ã®ã§ããå
¨ã¦ã®å¤æ°ã®ä¸è¦§ã¯ @file{ly/satb.ly} ãã@c
+è¦ããã¨ãã§ãã¾ãã @ref{ãã®ä»ã®æ
å ±æº} ãåç
§ãã¦ãã ããã
+
+
+@seealso
+å¦ç¿ããã¥ã¢ã«:
+@ref{å¤æ°ãç¨ãã¦æ¥½æ²ãç·¨æãã},
+@ref{åå±ãã³ãã¬ã¼ã},
+@ref{ãã³ãã¬ã¼ããæ¡å¼µãã},
+@ref{ãã®ä»ã®æ
å ±æº}
+
+@knownissues
+@code{TwoVoicesPerStaff} ã®è¨å®ã¯æ¥½èå
¨ä½ã«é©ç¨ããã¾ããéä¸ã§ä»ã®å¤ã@c
+è¨å®ãããã¨ã¯ã§ãã¾ããã
+
+ããã«è¤é㪠SATB åå±èã¯ãã®åç´ãªãã³ãã¬ã¼ãã§ã¯ä½ããã¨ãã§ãã¾ããã
+
+
+@node SSAATTBB ãã³ãã¬ã¼ã
+@appendixsubsec SSAATTBB ãã³ãã¬ã¼ã
+@translationof SSAATTBB template
+
+@code{VerseXxx} ãé¤ãå
¨ã¦ã® SATB ãã³ãã¬ã¼ãã«å®ç¾©ãããå¤æ°ã¯ã
+SSAATTBB ãã³ãã¬ã¼ãã§ã使ç¨ã§ãã¾ãã
+@ref{SATB template} ãåç
§ãã¦ãã ããã@c
+ããã«ã4 ãã¼ããã¹ã¦ã«ã¤ãã¦ã1 ã¤ç®ã®ãã¤ã¹ã¨ 2 ã¤ç®ã®ãã¤ã¹ã@c
+æå®ãããã¨ãã§ãã¾ããé³ç¬¦ã¯ @code{SopranoOneMusic} 㨠@code{SopranoTwoMusic}
+ãªã©ã®ããã«ãæè©ã¯ @code{SopranoOneLyrics} 㨠@code{SopranoTwoLyrics}
+ãªã©ã®ããã«å
¥åãã¾ããå
¨ã¦ã®ãã¤ã¹ã«ã¤ãã¦ã
+@code{SopranoOneLyricsOne} ãªã©ã®ããã«ãããã¨ã§ã@c
+4 çªã¾ã§ã®æè©ãå
¥åã§ãã¾ãã
+
+@code{TwoVoicesPerStaff} ã @code{##t} ã«ã»ããããã¨ã@emph{å
¨ã¦ã®}ãã¤ã¹ã@c
+ãã£ã´ã£ã¼ã¸ ãã¤ã¹ã¨ã㦠1 ã¤ã®èã«é
ç½®ããã¾ãã
+@code{TwoVoicesPerStaff} ãããã©ã«ãã®ã¾ã¾ãã¾ã㯠@code{##f} ã«ã»ããããã@c
+å ´åãåãã¤ã¹ã¯ @code{SopranoTwoVoicesPerStaff} ã
+@code{MenTwoVoicesPerStaff} ãªã©ã®è¨å®ã«åºã¥ãã¦ã1 ã¤ã 2 ã¤ã®èã«é
ç½®ããã¾ãã
+
+ä¾ã¨ãã¦ãã½ãã©ãã¨ã¢ã«ãã®å
¨ã¦ã®ãã¤ã¹ãã¦ãã¾ã³ã§å§ã¾ãã@c
+ã½ãã©ãã¨ã¢ã«ãã® 2 ã¤ã®ãã¼ãã«åãããæçµçã« 4 ãã¼ãã¨ãªããã®ãèãã¦@c
+ã¿ã¾ãããããã®ããã«ãªãã¾ã:
+
+@lilypond[verbatim,quote]
+Time = { s1 \break s1 \break }
+WomenMusic = \relative { a'4 a a a }
+WomenLyrics = \lyricmode { Wo -- men ly -- rics }
+SopranoMusic = \relative { s1 | c''4 c c c8 c }
+SopranoLyrics = \lyricmode{ So -- pra -- no ly -- rics }
+AltoMusic = \relative { s1 | g'4 g g g }
+AltoLyrics = \lyricmode { Al -- to ly -- rics }
+SopranoOneMusic = \relative { s1 | s1 |e''4 e e e }
+SopranoOneLyrics = \lyricmode { Sop One ly -- rics }
+SopranoTwoMusic = \relative { s1 | s1 | c''4 c c c }
+SopranoTwoLyrics = \lyricmode { Sop Two ly -- rics }
+AltoOneMusic = \relative { s1 | s1 | g'4 g g g8 g }
+AltoOneLyrics = \lyricmode { Al -- to One ly -- rics }
+AltoTwoMusic = \relative { s1 | s1 | e'4 e e e8 e }
+AltoTwoLyrics = \lyricmode { Al -- to Two ly -- rics }
+\layout { ragged-right = ##t }
+\include "ssaattbb.ly"
+@end lilypond
+
+ç·å£°ãåãããã«è¿½å ãããã¨ãã§ãã¾ãã
+
+ãã£ã´ã£ã¼ã¸ã®ã½ãã©ã ãã¤ã¹ãåãèãå
±æããããã«ã¬ã¤ã¢ã¦ãã@c
+å¤æ´ããã«ã¯ãåç´ã« @code{SopranoTwoVoicesPerStaff} ã @code{##t} ã«@c
+ã»ããããã ãã§è¯ããä»ã®å¤æ°ãå¤æ´ããå¿
è¦ã¯ããã¾ããããã®ããã«ãªãã¾ã:
+
+@lilypond[verbatim,quote]
+SopranoTwoVoicesPerStaff = ##t
+Time = { s1 \break s1 \break }
+WomenMusic = \relative { a'4 a a a }
+WomenLyrics = \lyricmode { Wo -- men ly -- rics }
+SopranoMusic = \relative { s1 | c''4 c c c8 c }
+SopranoLyrics = \lyricmode{ So -- pra -- no ly -- rics }
+AltoMusic = \relative { s1 | g'4 g g g }
+AltoLyrics = \lyricmode { Al -- to ly -- rics }
+SopranoOneMusic = \relative { s1 | s1 |e''4 e e e }
+SopranoOneLyrics = \lyricmode { Sop One ly -- rics }
+SopranoTwoMusic = \relative { s1 | s1 | c''4 c c c }
+SopranoTwoLyrics = \lyricmode { Sop Two ly -- rics }
+AltoOneMusic = \relative { s1 | s1 | g'4 g g g8 g }
+AltoOneLyrics = \lyricmode { Al -- to One ly -- rics }
+AltoTwoMusic = \relative { s1 | s1 | e'4 e e e8 e }
+AltoTwoLyrics = \lyricmode { Al -- to Two ly -- rics }
+\layout { ragged-right = ##t }
+\include "ssaattbb.ly"
+@end lilypond
+
+ãããã¯ãå
¨ã¦ã®çµã«ãªããã¤ã¹ã 1 ã¤ã®èãå
±æããããã«ããã«ã¯ã
+@code{TwoVoicesPerStaff} ã @code{##t} ã«ã»ãããã¾ã:
+
+@lilypond[verbatim,quote]
+TwoVoicesPerStaff = ##t
+Time = { s1 \break s1 \break }
+WomenMusic = \relative { a'4 a a a }
+WomenLyrics = \lyricmode { Wo -- men ly -- rics }
+SopranoMusic = \relative { s1 | c''4 c c c8 c }
+SopranoLyrics = \lyricmode{ So -- pra -- no ly -- rics }
+AltoMusic = \relative { s1 | g'4 g g g }
+AltoLyrics = \lyricmode { Al -- to ly -- rics }
+SopranoOneMusic = \relative { s1 | s1 |e''4 e e e }
+SopranoOneLyrics = \lyricmode { Sop One ly -- rics }
+SopranoTwoMusic = \relative { s1 | s1 | c''4 c c c }
+SopranoTwoLyrics = \lyricmode { Sop Two ly -- rics }
+AltoOneMusic = \relative { s1 | s1 | g'4 g g g8 g }
+AltoOneLyrics = \lyricmode { Al -- to One ly -- rics }
+AltoTwoMusic = \relative { s1 | s1 | e'4 e e e8 e }
+AltoTwoLyrics = \lyricmode { Al -- to Two ly -- rics }
+\layout { ragged-right = ##t }
+\include "ssaattbb.ly"
+@end lilypond
+
+å¤æ´ãããã¨ã®ã§ããå
¨ã¦ã®å¤æ°ã®ä¸è¦§ã¯ @file{ly/ssaattbb.ly} ãã@c
+è¦ããã¨ãã§ãã¾ãã @ref{ãã®ä»ã®æ
å ±æº} ãåç
§ãã¦ãã ããã
+
+@seealso
+å¦ç¿ããã¥ã¢ã«:
+@ref{å¤æ°ãç¨ãã¦æ¥½æ²ãç·¨æãã},
+@ref{åå±ãã³ãã¬ã¼ã},
+@ref{ãã³ãã¬ã¼ããæ¡å¼µãã},
+@ref{ãã®ä»ã®æ
å ±æº}
+
+@knownissues
+@code{TwoVoicesPerStaff} ãªã©ã®è¨å®ã¯æ¥½èå
¨ä½ã«é©ç¨ããã¾ããéä¸ã§ä»ã®å¤ã@c
+è¨å®ãããã¨ã¯ã§ãã¾ããã
+
+ããã«è¤é㪠8 ãã¼ãåå±èã¯ãã®åç´ãªãã³ãã¬ã¼ãã§ã¯ä½ããã¨ãã§ãã¾ããã
+
+
@node åä¸èãã³ãã¬ã¼ã
@appendixsec åä¸èãã³ãã¬ã¼ã
@translationof Single staff templates
@@ -49,14 +347,14 @@
@appendixsubsec é³ç¬¦ã®ã¿
@translationof Notes only
-@lilypondfile[verbatim,quote,ragged-right,texidoc,addversion]
+@lilypondfile[verbatim,quote,ragged-right,texidoc]
{single-staff-template-with-only-notes.ly}
@node é³ç¬¦ã¨æè©
@appendixsubsec é³ç¬¦ã¨æè©
@translationof Notes and lyrics
-@lilypondfile[verbatim,quote,ragged-right,texidoc,addversion]
+@lilypondfile[verbatim,quote,ragged-right,texidoc]
{single-staff-template-with-notes-and-lyrics.ly}
@node é³ç¬¦ã¨ã³ã¼ã
@@ -134,6 +432,11 @@
@appendixsec åå±ãã³ãã¬ã¼ã
@translationof Vocal ensembles templates
+以ä¸ã®ãã³ãã¬ã¼ãã¯å
¥åãã¡ã¤ã«ã«ã³ãã¼ããã¦ããã§ç·¨éãããã¹ãã§ãã@c
+æ¯è¼çåç´ãª SATB èã®å ´åãåç´ã« @code{\include} ãæ¿å
¥ããã ãã§å©ç¨ã§ãã@c
+çµã¿è¾¼ã¿ã®ãã³ãã¬ã¼ãã使ãæ¹ã好ã¾ããããããã¾ããã@c
+@ref{çµã¿è¾¼ã¾ãã¦ãããã³ãã¬ã¼ã} ãåç
§ãã¦ãã ããã
+
@menu
* SATB ãã¼ã«ã«è::
* SATB ãã¼ã«ã«èã¨èªåãã¢ãè::
@@ -215,18 +518,20 @@
@translationof Ancient notation templates
@menu
-* Transcription of mensural music::
-* Gregorian transcription template::
+* è¨éè¨èæ³ã®ãã³ãã¬ã¼ã::
+* ã°ã¬ã´ãªã¢èæã®ãã³ãã¬ã¼ã::
@end menu
-@node Transcription of mensural music
-@appendixsubsec Transcription of mensural music
+@node è¨éè¨èæ³ã®ãã³ãã¬ã¼ã
+@appendixsubsec è¨éè¨èæ³ã®ãã³ãã¬ã¼ã
+@translationof Transcription of mensural music
@lilypondfile[verbatim,quote,ragged-right,texidoc]
{incipit.ly}
-@node Gregorian transcription template
-@appendixsubsec Gregorian transcription template
+@node ã°ã¬ã´ãªã¢èæã®ãã³ãã¬ã¼ã
+@appendixsubsec ã°ã¬ã´ãªã¢èæã®ãã³ãã¬ã¼ã
+@translationof Gregorian transcription template
@lilypondfile[verbatim,quote,ragged-right,texidoc]
{ancient-notation-template----modern-transcription-of-gregorian-music.ly}
@@ -267,7 +572,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
@ The `line-width' is for \header.
@li lypond[quote,verbatim,ragged-right,line-width]
-\version "2.16.0"
+\version "2.19.25"
\header {
dedication = "dedication"
title = "Title"
diff --git a/Documentation/ja/learning/tutorial.itely b/Documentation/ja/learning/tutorial.itely
index 8e48c14456..57595d4037 100644
--- a/Documentation/ja/learning/tutorial.itely
+++ b/Documentation/ja/learning/tutorial.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: 76ee88f5adfc7bcd8eff487543e3605e43a93d80
+ Translation of GIT committish: 9bb7fa99aa8bc7c14a45a42224545c726bb6c592
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
diff --git a/Documentation/ja/learning/tweaks.itely b/Documentation/ja/learning/tweaks.itely
index f3ecdf55d1..f3ef8e9ecc 100644
--- a/Documentation/ja/learning/tweaks.itely
+++ b/Documentation/ja/learning/tweaks.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: 9bb7fa99aa8bc7c14a45a42224545c726bb6c592
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.22"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -27,6 +27,7 @@ LilyPond ã¯æ¬å½ã«ãã¾ãã¾ãªè¨å®ãå¯è½ã§ãã@c
* å
é¨ãªãã¡ã¬ã³ã¹ ããã¥ã¢ã«::
* ãªãã¸ã§ã¯ãã®è¦ãç®::
* ãªãã¸ã§ã¯ãã®é
ç½®::
+* åç´æ¹åã®ã¹ãã¼ã¹::
* ãªãã¸ã§ã¯ãã®è¡çª::
* æ´ãªã調æ´::
@end menu
@@ -115,6 +116,19 @@ LilyPond ã @code{\new Staff} ã®ãããªã³ãã³ãã«ééããå ´åã@
ãããã®ãªãã¸ã§ã¯ãã®ããã«å½¢ã伸é·ããããªãã¸ã§ã¯ãã¯
@q{ã¹ãã (Spanners)} ã¨å¼ã°ãã¾ãã
+ã¹ããã¯çæãããå¾ã«èª¿æ´ãè¡ããã¨ãã§ãã¾ããã楽èå
¨ä½ã«ããã£ã¦ç¶ã
+@code{StaffSymbol} ã @code{LedgerLineSpanner} ãåæ§ã§ãããã ãã
+@code{\stopStaff} ã³ãã³ãã«ãã£ã¦çµäºãã@code{\startStaff} ã³ãã³ãã§æ°ãã«@c
+çæãããå ´åãé¤ãã¾ãã
+
+ã¾ãã@q{æ½è±¡ (abstract)} ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ãã¨ãããã®ãåå¨ãã¾ãã@c
+ããã¯ãªãã¸ã§ã¯ãèªèº«ã¯åºåã«ä½ãæ¸ãåºãã¾ããããä»ã®ã°ã©ãã£ã«ã«
+ãªãã¸ã§ã¯ããåéããé
ç½®ã管çãããå½¹å²ãæ
ãã¾ãã
+@code{DynamicLineSpanner}, @code{BreakAlignment},
+@code{NoteColumn}, @code{VerticalAxisGroup},
+@code{NonMusicalPaperColumn} ãªã©ãä¾ã§ããå¾ã§ãããããã©ã®ããã«@c
+使ãããããè¦ã¦ããã¾ãããã
+
@q{ã¤ã³ã¿ãã§ã¤ã¹} ã¨ã¯ä½ãªã®ãã¨ãã説æãæ®ã£ã¦ãã¾ãã@c
å¤ãã®ãªãã¸ã§ã¯ã -- ãã¨ãããããé常ã«ç°ãªã£ã¦ããã¨ãã¦ã --
ã¯åãæ¹æ³ã§å¦çãããå¿
è¦ãããå
±éç¹å¾´ãå
±æãã¾ãã@c
@@ -178,24 +192,29 @@ LilyPond ã @code{\new Staff} ã®ãããªã³ãã³ãã«ééããå ´åã@
ãã®ãããååãããªãã¸ã§ã¯ããããããã£ã®ã¿ã¤ããèå¥ã§ããããã«@c
ãªãã¨å½¹ã«ç«ã¡ã¾ãã
+@seealso
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ruser{ããããã£ãå¤æ´ãã}
+
@node 調æ´æ段
@subsection 調æ´æ段
@translationof Tweaking methods
-@cindex tweaking methods (調æ§æ段)
+@cindex tweaking methods (調æ´æ段)
@menu
-* \override ã³ãã³ã::
-* \revert ã³ãã³ã::
-* \once æ¥é è¾::
-* \overrideProperty ã³ãã³ã::
-* \tweak ã³ãã³ã::
+* override ã³ãã³ã::
+* revert ã³ãã³ã::
+* once æ¥é è¾::
+* overrideProperty ã³ãã³ã::
+* tweak ã³ãã³ã::
+* single æ¥é è¾::
@end menu
-@node \override ã³ãã³ã
-@unnumberedsubsubsec @code{\override} ã³ãã³ã
-@translationof The \override command
+@node override ã³ãã³ã
+@unnumberedsubsubsec @code{@bs{}override} ã³ãã³ã
+@translationof The override command
@cindex override command (override ã³ãã³ã)
@cindex override syntax (override æ§æ)
@@ -268,9 +287,9 @@ Scheme ã¢ã¼ãã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @rextend{LilyPond Scheme synta
@end lilypond
-@node \revert ã³ãã³ã
-@unnumberedsubsubsec @code{\revert} ã³ãã³ã
-@translationof The \revert command
+@node revert ã³ãã³ã
+@unnumberedsubsubsec @code{@bs{}revert} ã³ãã³ã
+@translationof The revert command
@cindex revert command (revert ã³ãã³ã)
@@ -309,15 +328,15 @@ Scheme ã¢ã¼ãã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @rextend{LilyPond Scheme synta
@end lilypond
-@node \once æ¥é è¾
-@unnumberedsubsubsec The @code{\once} prefix
-@translationof The \once prefix
+@node once æ¥é è¾
+@unnumberedsubsubsec @code{@bs{}once} æ¥é è¾
+@translationof The once prefix
@funindex \once
-@code{\override} ã³ãã³ã㨠@code{\set} ã³ãã³ãã«ã¯ä¸¡æ¹ã¨ã@c
+@code{\override}, @code{\revert}, @code{\set}, @code{\unset} ã³ãã³ãã«ã¯@c
æ¥é è¾ @code{\once} ãä»ãå¯è½æ§ãããã¾ãã@c
-ããã¯ãã®å¾ã«ç¶ã @code{\override} ã @code{\set} ã³ãã³ãã@c
+ããã¯ãã®ãããªã³ãã³ãã@c
ãã®å ´ä¸åéãæå¹ã«ãããã®å¾ã«ãã®ããããã£ã®å¤ãããã©ã«ãå¤ã«æ»ãã¾ãã@c
ä¸ã¨åãä¾ã使ã£ã¦ã以ä¸ã®ããã« 1 ã¤ã ãã®é³ç¬¦ã®è²ãå¤æ´ãããã¨ãã§ãã¾ã:
@@ -331,32 +350,30 @@ Scheme ã¢ã¼ãã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @rextend{LilyPond Scheme synta
e4 f |
\once \override NoteHead.color = #green
g4 a
- \revert NoteHead.color
+ \once \revert NoteHead.color
b c |
+ \revert NoteHead.color
+ f2 c |
}
@end lilypond
@code{\once} æ¥é è¾ããã¾ãã¾ãªå®ç¾©æ¸ã¿ã³ãã³ãã®åã«ç½®ããã¨ã§ã@c
ã³ãã³ãã®å¹æã次ã®é³æ¥½ã¿ã¤ãã³ã°ã«éå®ãããã¨ãã§ãã¾ã:
-@lilypond[quote,verbatim,relative=1]
-c4 d
-\once \stemDown
-e4 f |
-g4 a
-\once \hideNotes
-b c |
+@lilypond[quote,verbatim]
+\relative {
+ c'4( d)
+ \once \slurDashed
+ e4( f) |
+ g4( a)
+ \once \hideNotes
+ b( c) |
+}
@end lilypond
-ããããªããã@code{\...Neutral}, @code{\...Off}, ããã« @code{\un...}
-ã®å½¢å¼ã®å®ç¾©æ¸ã¿ã³ãã³ãã®åã« @code{\once} ãç½®ãã¦ãå¹æã¯ããã¾ããã@c
-ãªããªãããããã®ã³ãã³ãã¯å
é¨çã« @code{\override} ã§ã¯ãªãã@code{\revert}
-ãç¨ããããã§ãã
-
-
-@node \overrideProperty ã³ãã³ã
-@unnumberedsubsubsec @code{\overrideProperty} ã³ãã³ã
-@translationof The \overrideProperty command
+@node overrideProperty ã³ãã³ã
+@unnumberedsubsubsec @code{@bs{}overrideProperty} ã³ãã³ã
+@translationof The overrideProperty command
@cindex overrideProperty command (overrideProperty ã³ãã³ã)
@@ -368,9 +385,9 @@ b c |
詳細㯠@rextend{Difficult tweaks} ãåç
§ãã¦ãã ããã
@c Maybe explain in a later iteration -td
-@node \tweak ã³ãã³ã
-@unnumberedsubsubsec @code{\tweak} ã³ãã³ã
-@translationof The \tweak command
+@node tweak ã³ãã³ã
+@unnumberedsubsubsec @code{@bs{}tweak} ã³ãã³ã
+@translationof The tweak command
@cindex tweak command (tweak ã³ãã³ã)
@@ -477,7 +494,7 @@ a'4^"Black"
ãã®é·ãå½¢å¼ã® @code{\tweak} ã³ãã³ãã¯ä»¥ä¸ã®ããã«è¨è¿°ãããã¨ãã§ãã¾ã:
@example
-\tweak @var{layout-object}.@var{layout-property} @var{value}
+\tweak @var{LayoutObject}.@var{layout-property} #@var{value}
@end example
@cindex tuplets, nested (ãã¹ããããé£ç¬¦)
@@ -544,6 +561,58 @@ a'4^"Black"
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ruser{The tweak command}
+@node single æ¥é è¾
+@unnumberedsubsubsec @code{@bs{}single} æ¥é è¾
+@translationof The single prefix
+
+@funindex \single
+@cindex tweak, generated from override (override ããçæããã tweak)
+
+ç¹å®ã®ç¬¦é ã赤è²ã«ãã¦ãµã¤ãºã大ãããããã¨ã«ãã£ã¦ã強調ãè¡ãããã¨@c
+ãã¾ããããã¾ãããããç°¡åã«ããããã«ãã®ãããªé¢æ°ãå®ç¾©ããã¨ãã¾ããã:
+
+@lilypond[quote,verbatim]
+emphNoteHead = {
+ \override NoteHead.color = #red
+ \override NoteHead.font-size = 2
+}
+\relative {
+ c''4 a \once \emphNoteHead f d |
+}
+@end lilypond
+
+@code{\once} æ¥é è¾ã¯åé³ãåé³å
¨ä½ã«ã¯åä½ãã¾ãããåé³@emph{å
}ã®@c
+ä¸ã¤ã®é³ç¬¦ã«å¯¾ãã¦ã¯ä½¿ããã¨ãã§ãã¾ããããã£ãã@code{\tweak} ã¯@c
+ãã®ãããªå ´é¢ã§ä½¿ãã¨ãããã¨ãå¦ã³ã¾ããã
+@ref{tweak ã³ãã³ã,,@code{@bs{}tweak} ã³ãã³ã} ãåç
§ãã¦ãã ããã@c
+ãããã@code{\tweak} ã¯é¢æ°ã¨ä¸ç·ã«ä½¿ããã¨ãã§ãã¾ãããããã§
+@code{\single} ã®ç»å ´ã§ã:
+
+@lilypond[quote,verbatim]
+emphNoteHead = {
+ \override NoteHead.color = #red
+ \override NoteHead.font-size = 2
+}
+\relative {
+ <c'' a \single \emphNoteHead f d>4
+}
+@end lilypond
+
+è¦ç´ããã¨ã@code{\single} 㯠@code{\override} ã @code{\tweak} ã«å¤æãã¾ãã@c
+ãã£ã¦ã(åé³å
ã®é³ç¬¦ã®ããã«) åãã¿ã¤ãã³ã°ã«ããã¤ãã®ãªãã¸ã§ã¯ãã@c
+åå¨ããå ´åã@code{\once} ã¯ãã®å
¨ã¦ã«å½±é¿ãä¸ããã®ã«å¯¾ãã
+@code{\single} ã¯ãã®å
ã® 1 ã¤ã« -- ããå¾ã«ç¶ãé³æ¥½è¡¨è¨ã®ã¿ã« -- ä½ç¨ãã¾ãã
+
+@code{\single} ããã®ããã«ä½¿ç¨ãããã¨ã§ã@code{\override} ã®ã¿ããæã@c
+ç°¡ç¥åã®ããã«å®ç¾©ãããé¢æ°ããåé³å
ã®åé³ç¬¦ã«å¯¾ãã¦é©ç¨ãããã¨ãã§ãã¾ãã@c
+ãããã@code{\single} 㯠@code{\revert}, @code{\set}, @code{\unset} ã
+@code{\tweak} ã«å¤æãããã¨ã¯ã§ãã¾ããã
+
+@seealso
+å¦ç¿ããã¥ã¢ã«:
+@ref{tweak ã³ãã³ã,,@code{@bs{}tweak} ã³ãã³ã},
+@ref{ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã}
+
@node å
é¨ãªãã¡ã¬ã³ã¹ ããã¥ã¢ã«
@section å
é¨ãªãã¡ã¬ã³ã¹ ããã¥ã¢ã«
@@ -691,12 +760,13 @@ thickness (number)
@cindex Slur example of overriding (Slur ããªã¼ãã©ã¤ãããä¾)
@cindex thickness property, example (thickness ããããã£ã®ä¾)
+@c KEEP LY
@lilypond[quote,verbatim]
{
\key es \major
\time 6/8
\relative {
- % Increase thickness of all following slurs from 1.2 to 5.0
+ % ãã以éã«ããå
¨ã¦ã®ã¹ã©ã¼ã®å¤ªãã 1.2 ãã 5.0 ã«ãã¾ã
\override Slur.thickness = #5.0
r4 bes'8 bes[( g]) g |
g8[( es]) es d[( f]) as |
@@ -1582,7 +1652,7 @@ RGB å¤ãå
é¨ã«ã©ã¼ã«å¤æãã @code{rgb-color} é¢æ°ã§ãã@c
@cindex TimeSignature, example of overriding (TimeSignature ããªã¼ãã©ã¤ãããä¾)
@c KEEP LY
-@lilypond[quote,fragment,ragged-right,verbatim]
+@lilypond[quote,ragged-right,verbatim]
\new Staff ="main" {
\relative {
r4 g'8 g c4 c8 d |
@@ -1607,6 +1677,7 @@ RGB å¤ãå
é¨ã«ã©ã¼ã«å¤æãã @code{rgb-color} é¢æ°ã§ãã@c
ç縮形 @code{\hide} 㨠@code{\omit} ã使ããã¨ãã§ããçµæã¨ãã¦@c
以ä¸ã®ããã«ãªãã¾ã:
+@c KEEP LY
@lilypond[quote,ragged-right,verbatim]
\new Staff ="main" {
\relative {
@@ -1745,6 +1816,7 @@ LilyPond ã§ã¯è·é¢ã¨é·ãã¯ä¸è¬ã«èã¹ãã¼ã¹ -- èã®ä¸ã®é£ã
@cindex staff-space property, example (staff-space ããããã£ã®ä¾)
@cindex stencil property, example (stencil ããããã£ã®ä¾)
+@c KEEP LY
@lilypond[quote,ragged-right,verbatim]
\new Staff ="main" {
\relative {
@@ -1915,29 +1987,31 @@ c''2^"Text4" |
@cindex center (ä¸å¤®)
@cindex neutral (ãã¥ã¼ãã©ã«)
-以ä¸ã®ä¾ã¯ãå°ç¯ 1 ã§ç¬¦å¹¹ã®ããã©ã«ãã®æ¯ãèãã示ãã¦ãã¾ãã@c
-é«ãä½ç½®ã«ããé³ç¬¦ã®ç¬¦å¹¹ã¯ä¸åãã§ãä½ãä½ç½®ã«ããé³ç¬¦ã®ç¬¦å¹¹ã¯ä¸åãã§ãã@c
-ç¶ã㦠4 ã¤ã®é³ç¬¦ã®ç¬¦å¹¹ããã¹ã¦å¼·å¶çã«ä¸åãã«ãã4 ã¤ã®é³ç¬¦ã®ç¬¦å¹¹ã@c
-ãã¹ã¦å¼·å¶çã«ä¸åãã«ããæå¾ã« 4 ã¤ã®é³ç¬¦ã®ç¬¦å¹¹ãããã©ã«ãã«æ»ãã¾ãã
+以ä¸ã®ä¾ã¯ãæåã®å°ç¯ã§ã¹ã©ã¼ã®ããã©ã«ãã®æ¯ãèãã示ãã¦ãã¾ãã@c
+é«ãä½ç½®ã«ããé³ç¬¦ã®ã¹ã©ã¼ã¯é³ç¬¦ã®ä¸ã«ããã@c
+ä½ãä½ç½®ã«ããé³ç¬¦ã®ã¹ã¿ã¼ã¯é³ç¬¦ã®ä¸ã«ããã¾ãã@c
+次ã®å°ç¯ã§ã¯ä¸¡æ¹ã®ã¹ã©ã¼ããã¹ã¦å¼·å¶çã«ä¸åãã«ãã
+ããã«æ¬¡ã®å°ç¯ã§ã¯ä¸¡æ¹ã®ã¹ã©ã¼ããã¹ã¦å¼·å¶çã«ä¸åãã«ãã
+æå¾ã®å°ç¯ã§ã¯ã¹ã©ã¼ã®åããããã©ã«ãã«æ»ãã¾ãã
-@cindex Stem, example of overriding (Stem ããªã¼ãã©ã¤ãããä¾)
+@cindex Slur, example of overriding (Slur ããªã¼ãã©ã¤ãããä¾)
@cindex direction property, example (direction ããããã£ã®ä¾)
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
-a4 g c a |
-\override Stem.direction = #DOWN
-a4 g c a |
-\override Stem.direction = #UP
-a4 g c a |
-\revert Stem.direction
-a4 g c a |
+@lilypond[quote,fragment,verbatim]
+a'4( g') c''( a') |
+\override Slur.direction = #DOWN
+a'4( g') c''( a') |
+\override Slur.direction = #UP
+a'4( g') c''( a') |
+\revert Slur.direction
+a'4( g') c''( a') |
@end lilypond
ããã§å®æ° @code{DOWN} 㨠@code{UP} ã使ã£ã¦ãã¾ãã@c
ãããã¯ããããå¤ @w{@code{-1}} 㨠@code{+1} ãæã¡ãå®æ°ã®ä»£ããã«@c
ãããã®æ°å¤ã使ããã¨ãã§ãã¾ã¯ãã@c
ããã«å¤ @code{0} ã使ãå ´åãããã¾ãã@c
-ãã®å¤ã¯ç¬¦å¹¹ã§ã¯ @code{UP} ãæå³ãããã®ã¨ãã¦æ±ããã¾ããã@c
+ãã®å¤ã¯ã¹ã©ã¼ã§ã¯ @code{UP} ãæå³ãããã®ã¨ãã¦æ±ããã¾ããã@c
ããã¤ãã®ãªãã¸ã§ã¯ãã§ã¯ @q{center} ã¨ããæå³ã«ãªãã¾ãã@c
å¤ @code{0} ãæã¤å®æ°ã« @code{CENTER} ãããã¾ãã
@@ -1990,12 +2064,20 @@ a4 g c a |
@end multitable
ãããã®ã³ãã³ãã§ä¸ç«/é常ã®ä½ç½®ã«æ»ãã³ãã³ã㯠@code{\revert} ã@c
-ç¨ãããã¨ã§å®è£
ããã¦ãã¦ãåã« @code{\once} ãä»ã㦠@strong{ããªã}
+ç¨ãããã¨ã§å®è£
ããã¦ãã¦ããããã¯åã« @code{\once} ãä»ã㦠@strong{ããªã}
ããããã¾ããã@c
@code{\override} ãç¨ãã¦å®è£
ããã¦ããã³ãã³ãã®å¹æãåä¸ã®ã¿ã¤ãã³ã°@c
ã«éå®ãããã®ã§ããã°ãæ示çãªãªã¼ãã©ã¤ãã®å ´åã¨åæ§ã«ã@c
ã³ãã³ãã®åã« @code{\once} ãé
ç½®ãã¾ãã
+ãããã¯ãåã« 1 ã¤ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ããä¸åããä¸åãã«ããããªãã@c
+æ¹åæ示åã® @code{^} ã @code{_} ã使ããã¨ãã§ãã¾ã:
+
+@lilypond[quote,fragment,verbatim]
+a'4( g') c''( a') |
+a'4^( g') c''_( a') |
+@end lilypond
+
@node éæ
@unnumberedsubsubsec éæ
@translationof Fingering
@@ -2164,7 +2246,7 @@ LilyPond ã¯ãããã®å¶ç´ãåãåãã
@menu
* outside-staff-priority ããããã£::
-* \textLengthOn ã³ãã³ã::
+* textLengthOn ã³ãã³ã::
* å¼·å¼±è¨å·ã®é
ç½®::
* ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ãã®ãµã¤ãº::
@end menu
@@ -2186,7 +2268,7 @@ LilyPond ã¯ãããã®å¶ç´ãåãåãã
以ä¸ã®è¡¨ã¯ããã¤ãã®ä¸è¬çãªèå¤é¨ãªãã¸ã§ã¯ãã®ããã©ã«ãã®
@code{outside-staff-priority} å¤ã示ãã¦ãã¾ãã
-@multitable @columnfractions .3 .3 .3
+@multitable @columnfractions .3 .15 .45
@headitem ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ã
@tab åªå
度
@tab 以ä¸ã®ãªãã¸ã§ã¯ãã®é
ç½®ãå¶å¾¡ãã:
@@ -2196,15 +2278,33 @@ LilyPond ã¯ãããã®å¶ç´ãåãåãã
@item @code{MetronomeMark}
@tab @code{1000}
@tab ã¡ãããã¼ã è¨å·
+@item @code{SostenutoPedalLineSpanner}
+ @tab @code{1000}
+ @tab ããã«è¨å·
+@item @code{SustainPedalLineSpanner}
+ @tab @code{1000}
+ @tab
+@item @code{UnaCordaPedalLineSpanner}
+ @tab @code{1000}
+ @tab
+@item @code{MeasureCounter}
+ @tab @code{750}
+ @tab å°ç¯çªå·
@item @code{VoltaBracketSpanner}
@tab @code{600}
@tab Volta (çªå·ä»ãã®ãªãã¼ã) ã®å²ã¿
+@item @code{InstrumentSwitch}
+ @tab @code{500}
+ @tab 楽å¨ãå¤æ´ããããã¹ã
@item @code{TextScript}
@tab @code{450}
@tab ãã¼ã¯ã¢ãã ããã¹ã
@item @code{MultiMeasureRestText}
@tab @code{450}
- @tab å
¨ä¼ç¬¦ä¸ã®ããã¹ã
+ @tab è¤æ°å°ç¯ã«ãããä¼ç¬¦ä¸ã®ããã¹ã
+@item @code{CombineTextScript}
+ @tab @code{450}
+ @tab ãã¼ãçµåã®ããã¹ã
@item @code{OttavaBracket}
@tab @code{400}
@tab ãªãã¿ã¼ã (ãªã¯ã¿ã¼ããä¸ä¸ãããè¨å·) ã®å²ã¿
@@ -2220,6 +2320,9 @@ LilyPond ã¯ãããã®å¶ç´ãåãåãã
@item @code{TrillSpanner}
@tab @code{50}
@tab ããªã«è¨å·
+@item @code{AccidentalSuggestion}
+ @tab @code{0}
+ @tab 注éçãªè¨æè¨å· (é³ç¬¦ã®ä¸ã«ä»ãè¨æè¨å·ãã ã¸ã«ã»ãã£ã¯ã¿)
@end multitable
ãããã®ãã¡ã®ããã¤ãã®ããã©ã«ãã§ã®é
ç½®ã示ãã¦ããä¾ãæãã¾ãã
@@ -2377,9 +2480,9 @@ c''2^"Text4" |
é³ç¬¦ãæ°´å¹³æ¹åã«åºããå¿
è¦ãããã¾ãã@c
ãã㯠@code{\textLengthOn} ã³ãã³ããç¨ãããã¨ã§éæã§ãã¾ãã
-@node \textLengthOn ã³ãã³ã
-@unnumberedsubsubsec @code{\textLengthOn} ã³ãã³ã
-@translationof The \textLengthOn command
+@node textLengthOn ã³ãã³ã
+@unnumberedsubsubsec @code{@bs{}textLengthOn} ã³ãã³ã
+@translationof The textLengthOn command
@cindex notes, spreading out with text (ããã¹ãã«åããã¦é³ç¬¦ã®ééãåºãã)
@@ -2402,7 +2505,9 @@ c''2^"Text4" |
ããã©ã«ãã®åä½ã«æ»ãããã®ã³ãã³ã㯠@code{\textLengthOff} ã§ãã@c
å¹æãä¸ããã®ãåä¸ã®é³æ¥½ã¿ã¤ãã³ã°ã§ããã°ã@code{\textLengthOn}
-ã« @code{\once} ãä»ããæ¹æ³ãããã¾ãã
+ã« @code{\once} ãä»ããæ¹æ³ãããã¾ãã@c
+ãªãã¼ãµã«ãã¼ã¯ããã³ãè¨å·ã®æ°´å¹³æ¹åã®ã¹ãã¼ã¹ã調æ´ããã«ã¯ã
+@code{\markLengthOn} 㨠@code{\markLengthOff} ã使ãã¾ãã
@cindex markup text, allowing collisions (ãã¼ã¯ã¢ãã ããã¹ãã®è¡çªã許å¯ãã)
@@ -2472,9 +2577,9 @@ c''2^"Text4" |
ãããã以ä¸ã®ããªãä¸èªç¶ãªä¾ã示ãããã«ã@c
ããã¯æé©ãªé
ç½®ã§ã¯ãªãããããã¾ãã:
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,ragged-right,verbatim,fragment]
\dynamicUp
-a4\f b\mf c\mp b\p
+\relative { a'4\f b\mf a\mp b\p }
@end lilypond
@noindent
@@ -2512,16 +2617,15 @@ a4\f b\mf c\mp b\p
ããã©ã«ãã§ã¯ãèå¤é¨ãªãã¸ã§ã¯ãã«ã¯ 0 ã®å¹
ãä¸ãããã¦ããããã@c
æ°´å¹³æ¹åã§éãªãå¯è½æ§ãããã¾ãã@c
ãã㯠@code{extra-spacing-width} ã« @code{'(+inf.0 . -inf.0)} ã@c
-ã»ãããããã¨ã«ãã£ã¦ã左端ã®åºããã«ãã©ã¹ç¡é大ãå³ç«¯ã®åºããã«@c
-ãã¤ãã¹ç¡é大ãä»ãå ããã¨ããããªãã¯ã«ãã£ã¦éæããã¦ãã¾ãã@c
-ãã®ãããèå¤é¨ãªãã¸ã§ã¯ããæ°´å¹³æ¹åã§éãªããªããã¨ãä¿è¨¼ããã«ã¯ã@c
-@code{extra-spacing-width} ã®å¤ã @code{'(0 . 0)} ã«@c
-ãªã¼ãã©ã¤ãããå¿
è¦ãããã¾ãã@c
-ããã«ãããæ¬å½ã®å¹
ãæããã«ãªãã¾ãã@c
-以ä¸ã¯å¼·å¼±è¨å·ããã¹ãã«å¯¾ãã¦ãããè¡ãã³ãã³ãã§ã:
+ã»ãããããã¨ã«ãã£ã¦ã左端ã®åºããããã©ã¹ç¡é大ã«ãå³ç«¯ã®åºããã@c
+ãã¤ãã¹ç¡é大ã«ããã¨ããããªãã¯ã«ãã£ã¦éæããã¦ãã¾ãã@c
+èå¤é¨ãªãã¸ã§ã¯ããæ°´å¹³æ¹åã§éãªããªããã¨ãä¿è¨¼ããã«ã¯ã@c
+@code{extra-spacing-width} ã®å¤ããªã¼ãã©ã¤ãããä½åãªã¹ãã¼ã¹ãå°ãã ã@c
+ä½ãå¿
è¦ãããã¾ããåä½ã¯ 2 ã¤ã®èç·ã®ééãªã®ã§ã左端ã 0.5 åä½å·¦ã«ã@c
+å³ç«¯ã 0.5 åä½å³ã«åãããã¨ã§å®ç¾ã§ãã¾ã:
@example
-\override DynamicText.extra-spacing-width = #'(0 . 0)
+\override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
@end example
@noindent
@@ -2530,31 +2634,11 @@ a4\f b\mf c\mp b\p
@cindex DynamicText, example of overriding (DynamicText ããªã¼ãã©ã¤ãããä¾)
@cindex extra-spacing-width property, example (extra-spacing-width ããããã£ã®ä¾)
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
-\dynamicUp
-\override DynamicText.extra-spacing-width = #'(0 . 0)
-a4\f b\mf c\mp b\p |
-@end lilypond
-
-@noindent
-確ãã«å¼·å¼±è¨å·ã®åé
ç½®ãã¹ãããããã¦ãã¾ãã@c
-ãããã2 ã¤ã®åé¡ãæ®ã£ã¦ãã¾ãã@c
-å¼·å¼±è¨å·ãäºãã«ããå°ãé¢ãã¹ãã§ããããããã¯èãã@c
-åãè·é¢ã«ããã»ããæã¾ããã§ãã@c
-æåã®åé¡ã¯ç°¡åã«è§£æ±ºã§ãã¾ãã@c
-@code{extra-spacing-width} ã 0 ã«ãã代ããã«ã@c
-ããå°ã大ããªå¤ãä¸ããã®ã§ãã@c
-åä½ã¯ 2 æ¬ã®èç·ã®ééãªã®ã§ã左端ã 1 åä½ã®ååã ãå·¦ã«ç§»åããã@c
-å³ç«¯ã 1 åä½ã®ååã ãå³ã«ç§»åãããã¨è§£æ±ºã«ãªãã¾ã:
-
-@cindex DynamicText, example of overriding (DynamicText ããªã¼ãã©ã¤ãããä¾)
-@cindex extra-spacing-width property, example (extra-spacing-width ããããã£ã®ä¾)
-
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,ragged-right,verbatim,fragment]
\dynamicUp
% Extend width by 1 staff space
\override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
-a4\f b\mf c\mp b\p
+\relative { a'4\f b\mf a\mp b\p }
@end lilypond
@noindent
@@ -2562,8 +2646,201 @@ a4\f b\mf c\mp b\p
ããããå¼·å¼±è¨å·ãé³ç¬¦ã«åããã¦ä¸ä¸ãããããã@c
åããã¼ã¹ã©ã¤ã³ã§æã£ã¦ããæ¹ãæã¾ããã§ãããã@c
ãããè¡ãããã®ããããã£ã¯ @code{staff-padding} ã§ããã@c
-å¾ã«ç¶ãã»ã¯ã·ã§ã³ã§ã«ãã¼ããã¦ãã¾ãã
+è¡çªã«é¢ããã»ã¯ã·ã§ã³ã§ã«ãã¼ããã¦ãã¾ã
+(@ref{ãªãã¸ã§ã¯ãã®è¡çª} ãåç
§ãã¦ãã ãã)ã
+
+
+@node åç´æ¹åã®ã¹ãã¼ã¹
+@section åç´æ¹åã®ã¹ãã¼ã¹
+@translationof Vertical spacing
+
+åºæ¬çã«ãLilyPond ã®ãªãã¸ã§ã¯ãã«ãããåç´æ¹åã®ã¹ãã¼ã·ã³ã°ã¯é常ã«@c
+è¯ãã§ãã2 声ã¨ãã¢ãä¼´å¥ãããªãåç´ãªæ²ã§ã©ã®ããã«ãªãããè¦ã¦ã¿ã¾ããã:
+
+@lilypond[quote,fragment,ragged-right]
+<<
+ \new ChoirStaff
+ <<
+ \new Staff {
+ \new Voice = "music" {
+ b'2 c' c' c'
+ }
+ }
+ \new Lyrics
+ \lyricsto "music" {
+ Here are some lyrics
+ }
+ \new Staff {
+ \clef bass e'2 f e c
+ }
+ >>
+ \new PianoStaff
+ <<
+ \new Staff {
+ g''2 c'' c'' a''
+ }
+ \new Staff {
+ \clef bass e2 f c e
+ }
+ >>
+>>
+@end lilypond
+åç´æ¹åã®ã¹ãã¼ã¹ã«ã¤ãã¦ãä½ãããããªæã¯ããã¾ãããããããããªãã@c
+åºç社ã¨å
±ã«ä½æ¥ãã¦ãã¦ãèã¨æè©ã®åç´æ¹åã®ã¹ãã¼ã¹ã«ã¤ãã¦ããè¦æ±ã@c
+ããå ´åãæ³åãã¦ãã ãã: æè©ãé³ç¬¦ããé¢ãã¦é
ç½®ãããããã«ã@c
+ãã¢ãä¼´å¥ãæã®ãã¼ãããé¢ãã¦é
ç½®ãããããã«ããã¢ãä¼´å¥ã® 2 ã¤ã®èã@c
+è¿ã¥ãã¦é
ç½®ãããããã«è¦æ±ãããã¨ãã¾ããã¾ãæè©ããåãçµã¿å§ãã¾ãããã
+
+æè©ã¯ã·ã¹ãã (訳注: 1 è¡åã®èã®ã¾ã¨ã¾ã) å
ã«é
ç½®ããã¦ãã¾ãã@c
+ãã®ãããæè©ã®ã¹ãã¼ã¹ã調æ´ããã³ãã³ãã¯@c
+@ruser{ã·ã¹ãã å
é¨ã®å¯å¤ãªåç´æ¹åã®ã¹ãã¼ã¹} ã«ããã¾ãã@c
+ããã«ããã¨ãæè©ã¯ @code{non-staff lines} (èã§ã¯ãªãè¡) ã§ããããã@c
+ãã®ã¹ãã¼ã¹ãå¤æ´ããã³ãã³ã㯠@code{nonstaff} ããããã£ã¨é¢é£ãã@c
+ã¨ãããã¨ãåããã¾ããæè©ã¨é¢é£ãã¦ãã (ä¸ã®æ®µã®) èã¨ã®ã¹ãã¼ã¹ã@c
+åºããã«ã¯ @code{relatedstaff} ããããã£ãä¸ã®æ®µã¨ã®ã¹ãã¼ã¹ãåºããã«ã¯
+@code{unrelatedstaff} ããããã£ã使ãã¾ãã@c
+æã®ãã¼ã㯠@code{VerticalAxisGroup} ã®ä¸é¨ã§ããããããã®ããããã£ã@c
+調æ´ããå¿
è¦ãããã¾ãã試ãã¦ã¿ã¦ãå¹æããããè¦ã¦ã¿ã¾ããã:
+
+@lilypond[quote,fragment,ragged-right,verbatim]
+<<
+ \new ChoirStaff
+ <<
+ \new Staff {
+ \new Voice = "music" {
+ b'2 c' c' c'
+ }
+ }
+ \new Lyrics \with {
+ \override VerticalAxisGroup.
+ nonstaff-relatedstaff-spacing.padding = #5
+ \override VerticalAxisGroup.
+ nonstaff-unrelatedstaff-spacing.padding = #5
+ }
+ \lyricsto "music" {
+ Here are some lyrics
+ }
+ \new Staff {
+ \clef bass e'2 f e c
+ }
+ >>
+ \new PianoStaff
+ <<
+ \new Staff {
+ g''2 c'' c'' a''
+ }
+ \new Staff {
+ \clef bass e2 f c e
+ }
+ >>
+>>
+@end lilypond
+
+確ãã«åæ ããã¾ããããããããéãããããã¾ããã@code{padding}
+ããããã£ã 5 ã«è¨å®ããã¨ãLilyPond 㯠5 èã¹ãã¼ã¹ããªãã¸ã§ã¯ãéã®@c
+è·é¢ã«è¿½å ãã¾ããããã¯ä»åã¯å¤§ããããã®ã§ã2 ã使ç¨ãã¾ãããã
+
+次ã«ããã¢ãä¼´å¥ãæã®ãã¼ãããé¢ãã¾ããããæ㯠@code{ChoirStaff}
+ã§ããããããã®èã®ã°ã«ã¼ãã¨ä¸ã«ãããã¢ãèã¨ã®ã¹ãã¼ã¹ãå¢ããå¿
è¦ã@c
+ããã¾ãã@code{StaffGrouper} ã® @code{staffgroup-staff-spacing} ã«ãã
+@code{basic-distance} ãå¤æ´ãããã¨ã§è¡ãã¾ãã
+
+@lilypond[quote,fragment,ragged-right,verbatim]
+<<
+ \new ChoirStaff \with {
+ \override StaffGrouper.
+ staffgroup-staff-spacing.basic-distance = #15
+ }
+ <<
+ \new Staff {
+ \new Voice = "music" {
+ b'2 c' c' c'
+ }
+ }
+ \new Lyrics \with {
+ \override VerticalAxisGroup.
+ nonstaff-relatedstaff-spacing.padding = #2
+ \override VerticalAxisGroup.
+ nonstaff-unrelatedstaff-spacing.padding = #2
+ }
+ \lyricsto "music" {
+ Here are some lyrics
+ }
+ \new Staff {
+ \clef bass e'2 f e c
+ }
+ >>
+ \new PianoStaff
+ <<
+ \new Staff {
+ g''2 c'' c'' a''
+ }
+ \new Staff {
+ \clef bass e2 f c e
+ }
+ >>
+>>
+@end lilypond
+
+å®ç§ã§ãããã¦ããã¢ãèããäºãã«è¿ã¥ããæå¾ã®è¦æ±ã«å¿ãã¾ãããã@c
+ãã®ããã«ã¯ãã¾ã @code{StaffGrouper} ã®ããããã£ãå¤æ´ãã¾ãããä»åã¯@c
+@code{basic-distance} 㨠@code{padding} ã®ä¸¡æ¹ã®å¤ãæ¸ããã¾ãã@c
+ãã®ããã«ãã¦è¡ãã¾ãã
+
+@lilypond[quote,fragment,ragged-right,verbatim]
+<<
+ \new ChoirStaff \with {
+ \override StaffGrouper.
+ staffgroup-staff-spacing.basic-distance = #15
+ }
+ <<
+ \new Staff {
+ \new Voice = "music" {
+ b'2 c' c' c'
+ }
+ }
+ \new Lyrics \with {
+ \override VerticalAxisGroup.
+ nonstaff-relatedstaff-spacing.padding = #2
+ \override VerticalAxisGroup.
+ nonstaff-unrelatedstaff-spacing.padding = #2
+ }
+ \lyricsto "music" {
+ Here are some lyrics
+ }
+ \new Staff {
+ \clef bass e'2 f e c
+ }
+ >>
+ \new PianoStaff \with {
+ \override StaffGrouper.staff-staff-spacing = #'(
+ (basic-distance . 0)
+ (padding . 0))
+ }
+ <<
+ \new Staff {
+ g''2 c'' c'' a''
+ }
+ \new Staff {
+ \clef bass e2 f c e
+ }
+ >>
+>>
+@end lilypond
+
+é常ã«è¿ããªãã¾ãããããããããåºç社ã®æããã®ã§ããã@c
+å¿
è¦ã§ããã°ã@code{padding} 㨠@code{basic-distance} ãå¤æ´ãããã¨ã§@c
+ééãåºãããã¨ãã§ãã¾ãã
+
+åç´æ¹åã®ã¹ãã¼ã¹ãå¤æ´ããæ¹æ³ã¯ããããããã¾ããè¦ãã¦ããã¹ã@c
+ãã¼ãã¤ã³ãã¯ããã§ã: @code{StaffGroup} ã«ãããªãã¸ã§ã¯ã
+(ä¾ãã° @code{GrandStaff} ã @code{PianoStaff} ã®ã°ã«ã¼ã) ã®ã¹ãã¼ã¹ã¯ã
+@code{StaffGrouper} ã®å¤æ°ã«ãã£ã¦æä½ããããã¨ã@c
+ã°ã«ã¼ãåããã¦ããªãè (ä¾ãã° @code{Lyrics} ã @code{Staff})
+ã®ã¹ãã¼ã¹ã¯ã@code{VerticalAxisGroup} ã®å¤æ°ã«ãã£ã¦æä½ããããã¨ã§ãã@c
+詳ããã¯ã@ruser{Flexible vertical spacing paper variables} ã¨
+@ruser{Flexible vertical spacing within systems} ãåç
§ãã¦ãã ããã
@node ãªãã¸ã§ã¯ãã®è¡çª
@section ãªãã¸ã§ã¯ãã®è¡çª
@@ -2734,26 +3011,50 @@ LilyPond ãã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ããé
ç½®ããã¨ãã«ä½¿ç¨ã
ãã®ããããã£ã¯è¤æ°å°ç¯ã«äºãä¼ç¬¦ãã¿ã¤ãç°ãªããã¤ã¹ã®ä¸ã«ããé³ç¬¦ã¨ãã£ã@c
ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã®è¡çªã解決ããå ´åã«æç¨ã§ãã
+@item
+@code{horizontal-shift}
+
+@cindex horizontal-shift property (horizontal-shift ããããã£)
+@cindex note column (é³ç¬¦å)
+@cindex note collisions (é³ç¬¦ã®è¡çª)
+@cindex collisions, notes (é³ç¬¦ã®è¡çª)
+@cindex shift commands (ã·ãã ã³ãã³ã)
+@funindex \shiftOff
+@funindex \shiftOn
+@funindex \shiftOnn
+@funindex \shiftOnnn
+
+ãã¤ã¹ã®ä¸ã§ãåãã¿ã¤ãã³ã°ã«ããå
¨ã¦ã®é³ç¬¦ã¯ 1 ã¤ã®é³ç¬¦åã«ã°ã«ã¼ãåããã@c
+@code{NoteColumn} ãªãã¸ã§ã¯ãããã®é³ç¬¦ã®ã°ã«ã¼ãã®æ°´å¹³ä½ç½®ãã³ã³ããã¼ã«ãã@c
+ããã«ä½æããã¾ã (@ref{Explicitly instantiating voices} ã®
+@qq{Note columns} ãåç
§ãã¦ãã ãã)ã
+ãã 1 ã¤ã® Staff ã³ã³ããã¹ãã«ãã 2 ã¤ä»¥ä¸ã®é³ç¬¦åããåãã¿ã¤ãã³ã°ã§@c
+åºç¾ãåãåãã®ç¬¦å¹¹ãæã¤å ´å@emph{ã«éã}ããããã® @code{horizontal-shift}
+ããããã£ã®å¤ãé ä½ãä»ããããã«ä½¿ç¨ãããé«ãé ä½ã«ãããã®ãåªå
çã«@c
+符é ã®è¡çªãé¿ããããã«ç§»åãã¾ãããã®ããããã£ã¯ @code{\voiceXXX}
+ã³ãã³ãã«ãã£ã¦ã»ããããã@code{\override} ã³ãã³ãã§ç´æ¥ä¸æ¸ããããã¨ã@c
+ã§ãã¾ãããé常㯠@code{\shiftOn} ã³ãã³ãã«ãã£ã¦ä¸æ¸ããã¾ãã@c
+注æããªããã°ãªããªããã¨ã¯ããã®ããããã£ã¯ç§»åã® @emph{é ä½} ã@c
+決å®ããã ãã ãã§ããã移åã®å¤§ããã決å®ãããã®ã§ã¯ãªãã¨ãããã¨ã§ãã
+移åã®å¤§ããã¯ãé ä½ãã¨ã«ç¬¦é ã®å¹
ãåºã«ã㦠1 ã¤ãã¤å¤§ãããªã£ã¦ããã¾ãã@c
+1 ã¤åã®å¹
ã¯é常符é ã®å¹
ã®ååã§ãããããã§è¿ãå ´åã«ã¯ç¬¦é 1 ã¤åã®å¹
ã«@c
+ãªãã¾ãã
+
@item
@code{force-hshift}
@cindex force-hshift property (force-hshift ããããã£)
-åé³ã®ä¸ã§è¿æ¥ãã¦é
ç½®ãããé³ç¬¦ãç°ãªããã¤ã¹ã®ä¸ã«ãã£ã¦åæã«èµ·ããé³ç¬¦ã¯ã@c
-符é ã®è¡çªãé¿ããããã«ã2 㤠(å ´åã«ãã£ã¦ã¯ãã以ä¸) ã®åã«@c
-é
ç½®ããã¾ãã@c
-ãã®åã¯é³ç¬¦åã¨å¼ã°ãããã®åã«é³ç¬¦ãã¬ã¤ã¢ã¦ãããããã« @code{NoteColumn}
-ã¨å¼ã°ãããªãã¸ã§ã¯ããä½æããã¾ãã
-
@code{force-hshift} ããããã£ã¯ @code{NoteColumn} ã®ããããã£ã§ã
(å®éã«ã¯ @code{note-column-interface} ã®ããããã£ã§ã)ã@c
-ãã®ããããã£ãå¤æ´ãããã¨ã§é³ç¬¦åããé³ç¬¦åç¹æã®åä½ --
-ããªãã¡ãæåã®ãã¤ã¹ã®ä¸ã«ããé³ç¬¦ã®ç¬¦é ã®å¹
-- ã«å¾ã£ã¦ã@c
-移åããããã¨ãã§ãã¾ãã@c
+ãã®ããããã£ãå¤æ´ãããã¨ã§ãé³ç¬¦åãéãªã£ã¦ãã¾ãå ´åã«ããã¦@c
+é³ç¬¦åã移åããããã¨ãã§ãã¾ããéãªããªãé³ç¬¦åã«ã¯å¹æãç¡ãã¨ãããã¨ã«@c
+注æãã¦ãã ããã移åã®éã¯é³ç¬¦åç¹æã®åä½ãããªãã¡æåã®ãã¤ã¹ã®@c
+ä¸ã«ããé³ç¬¦ã®ç¬¦é ã®å¹
ã§æå®ããã¾ãã
ãã®ããããã£ã¯ãé常ã®
@code{\shiftOn} ã³ãã³ã
(@ref{ãã¤ã¹ãæ示çã«ã¤ã³ã¹ã¿ã³ã¹åãã} ãåç
§ãã¦ãã ãã)
-ãé³ç¬¦ã®è¡çªã解決ã§ããªããããªè¤éãªç¶æ³ã§ä½¿ç¨ãããã¹ãã§ãã@c
+ãé³ç¬¦ã®è¡çªãååã«è§£æ±ºã§ããªããããªè¤éãªç¶æ³ã§ä½¿ç¨ãããã¹ãã§ãã@c
ãã®ç®çã®ããã«ã¯ã@code{extra-offset} ããããã£ãç¨ããããã
@code{force-hshift} ããããã£ãç¨ããæ¹ã好ã¾ããã§ãã@c
ãªããªããèã¹ãã¼ã¹ãåä½ã¨ããè·é¢ãç®åºããå¿
è¦ãç¡ãã@c
@@ -2957,8 +3258,8 @@ sesquisharp = \markup { \sesquisharp }
@cindex objects, aligning on a baseline (ãªãã¸ã§ã¯ãããã¼ã¹ã©ã¤ã³ã«æãã)
@code{staff-padding} ã使ããã¨ã§ãå¼·å¼±è¨å·ãªã©ã®ãªãã¸ã§ã¯ããã@c
-ããããåãä»ããããé³ç¬¦ã®ä½ç½®ã«ä¾åããé«ãã§ã¯ãªãã@c
-èä¸ã®ããåºå®ããé«ãã®ãã¼ã¹ã©ã¤ã³ã«æãããã¨ãã§ãã¾ãã@c
+ä»ã®ãªãã¸ã§ã¯ããèããé¢ãããå¼·å¶ããªãéãã@c
+èããä¸å®ã®è·é¢ã«ãããã¼ã¹ã©ã¤ã³ã«æãããã¨ãã§ãã¾ãã@c
ãã®ããããã£ã¯ @code{DynamicText} ã®ããããã£ã§ã¯ãªãã@c
@code{DynamicSpanner} ã®ããããã£ã§ãã@c
ãã®çç±ã¯ããã®ãã¼ã¹ã©ã¤ã³ã¯å»¶é·ã¹ãããå«ã @strong{ãã¹ã¦} ã®å¼·å¼±è¨å·ã«@c
@@ -2971,14 +3272,9 @@ sesquisharp = \markup { \sesquisharp }
@cindex DynamicLineSpanner, example of overriding (DynamicLineSpanner ããªã¼ãã©ã¤ãããä¾)
@cindex staff-padding property, example (staff-padding ããããã£ã®ä¾)
-@c KEEP LY
@lilypond[quote,fragment,ragged-right,verbatim]
-\dynamicUp
-% å¹
ã 1 åä½åºãã¾ã
-\override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
-% å¼·å¼±è¨å·ãèãã 2 åä½ä¸ã®ãã¼ã¹ ã©ã¤ã³ã«æãã¾ã
-\override DynamicLineSpanner.staff-padding = #2
-\relative { a'4\f b\mf c\mp b\p }
+\override DynamicLineSpanner.staff-padding = #3
+\relative { a'4\f b\mf a\p b\mp }
@end lilypond
@@ -2988,8 +3284,8 @@ sesquisharp = \markup { \sesquisharp }
以ä¸ã®ä¾ã¯ãã®ããããã£ããéææ³è¨å·ãªãã¸ã§ã¯ãã®å³ç«¯ã親ã®é³ç¬¦ã®@c
åç
§ãã¤ã³ãã«æãããã¨ã«ãã£ã¦ã@c
-弦楽å¨ã®éææ³è¨å·ãªãã¸ã§ã¯ãã¨é³ç¬¦ã®ç¬¦å¹¹ã¨ã®ãã®ããããã£ãè¡çªã@c
-解決ãã¦ããæ§åã示ãã¦ãã¾ã:
+弦楽å¨ã®éææ³è¨å·ãªãã¸ã§ã¯ãã¨é³ç¬¦ã®ç¬¦å¹¹ã¨ã®ç¸å¯¾ä½ç½®ã調æ´ãã¦ãã@c
+æ§åã示ãã¦ãã¾ã:
@cindex StringNumber, example of overriding (StringNumber ããªã¼ãã©ã¤ãããä¾)
@cindex self-alignment-X property, example (self-alignment-X ããããã£ã®ä¾)
@@ -3022,7 +3318,7 @@ LilyPond ãããã¨è¡çªãããããããªãé³ç¬¦ãçªãæ¢ããã®
ããã§ã®æè¯ã®è§£æ±ºçã¯ãè¤æ°å°ç¯ã«äºãä¼ç¬¦ãä¸ã¸ç§»åããããã¨ã§ãã@c
ãªããªãããã®ä¼ç¬¦ã¯ãã¤ã¹ 2 ã®ä¸ã«ããããã§ãã@c
-@code{\voiceTwo} (ããªãã¡ã@code{<<@{...@} \\ @{...@}>>} æ§é ã®
+@code{\voiceTwo} (ããªãã¡ã@code{<<@{@dots{}@} \\ @{@dots{}@}>>} æ§é ã®
2 çªç®ã®ãã¤ã¹) ã®ããã©ã«ãç¶æ
ã§ã¯ã@c
@code{MultiMeasureRest} ã® @code{staff-position} 㯠@code{-4} ã«@c
ã»ããããã¦ãã¾ãã@c
@@ -3063,11 +3359,10 @@ LilyPond ãããã¨è¡çªãããããããªãé³ç¬¦ãçªãæ¢ããã®
@cindex Fingering, example of overriding (Fingering ããªã¼ãã©ã¤ãããä¾)
@cindex extra-offset property, example (extra-offset ããããã£ã®ä¾)
-@lilypond[quote,fragment,relative=1,verbatim]
-\stemUp
-f4-5
+@lilypond[quote,fragment,verbatim]
+f'4-5
\once \override Fingering.extra-offset = #'(-0.3 . -1.8)
-f4-5
+f'4-5
@end lilypond
@@ -3117,19 +3412,27 @@ a'8 \( ( a''16 ) a'' \)
ãã 1 ã¤ä¾ã示ãã¾ãã@c
é£æ¡ãã¿ã¤ã¨è¡çªãã¦ãã¾ã:
-@lilypond[quote,verbatim,fragment,ragged-right]
+@lilypond[quote,verbatim,ragged-right]
{
\time 4/2
<<
- { c'1 ~ 2. e'8 f' }
+ \relative { c'1~ 2. e8 f }
\\
- { e''8 e'' e'' e'' e'' e'' e'' e'' f''2 g'' }
+ \relative {
+ e''8 e e e
+ e e e e
+ f2 g
+ }
>>
<<
- { c'1 ~ 2. e'8 f' }
+ \relative { c'1~ 2. e8 f }
\\
- { e''8 e'' e'' e'' e'' e'' e'' e'' f''2 g'' }
- >>
+ \relative {
+ e''8 e e e
+ e e e e
+ f2 g
+ }
+ >>
}
@end lilypond
@@ -3140,29 +3443,39 @@ a'8 \( ( a''16 ) a'' \)
@cindex Beam, example of overriding (Beam ããªã¼ãã©ã¤ãããä¾)
@cindex positions property, example (positions ããããã£ã®ä¾)
-@lilypond[quote,verbatim,fragment,ragged-right]
+@lilypond[quote,verbatim,ragged-right]
{
\time 4/2
<<
- { c'1 ~ 2. e'8 f' }
+ \relative { c'1~ 2. e8 f }
\\
- {
+ \relative {
\override Beam.positions = #'(-1 . -1)
- e''8 e'' e'' e'' e'' e'' e'' e'' f''2 g''
+ e''8 e e e
+ e e e e
+ f2 g
}
>>
<<
- { c'1 ~ 2. e'8 f' }
+ \relative { c'1~ 2. e8 f }
\\
- { e''8 e'' e'' e'' e'' e'' e'' e'' f''2 g'' }
+ \relative {
+ e''8 e e e
+ e e e e
+ f2 g
+ \revert Beam.positions
+ }
>>
}
@end lilypond
@noindent
-ãªã¼ãã©ã¤ãã®å¹æã¯ç¶ç¶ãã¦ç¬¬ 2 å°ç¯ã®ãã¤ã¹ 1 ã® 8 åé³ç¬¦ã«ã@c
+ãªã¼ãã©ã¤ãã®å¹æã¯ç¶ç¶ãã¦ç¬¬ 2 å°ç¯ã®ãã¤ã¹ 2 ã® 8 åé³ç¬¦ã«ã@c
é©ç¨ããã¦ãã¾ããã@c
-ãã¤ã¹ 2 ã®é£æ¡ã«ã¯ã¾ã£ããé©ç¨ããã¦ããªãã¨ãããã¨ã«æ³¨æãã¦ãã ããã
+ãã¤ã¹ 1 ã®é£æ¡ã«ã¯ããã®å¾ã®ç¬¬ 2 å°ç¯ã«ããã¦ã@c
+ã¾ã£ããé©ç¨ããã¦ããªãã¨ãããã¨ã«æ³¨æãã¦ãã ããã@c
+ä¾ã«ç¤ºããããã«ããªã¼ãã©ã¤ããããé©ç¨ãããã¹ãã§ãªãã¨ããã§ã¯@c
+ãªã¼ãã©ã¤ãããªãã¼ãããã¹ãã§ãã
@node force-hshift ããããã£
@unnumberedsubsubsec @code{force-hshift} ããããã£
@@ -3189,17 +3502,18 @@ a'8 \( ( a''16 ) a'' \)
@noindent
æåã®åé³ã®å
声ã®é³ (ã¤ã¾ãã4 çªç®ã®ãã¤ã¹ã«ãã A-ãã©ãã) ãä¸ã®é³ç¬¦ã®@c
-é³ç¬¦åãããããå¿
è¦ã¯ããã¾ããã@c
-ãããä¿®æ£ããã«ã¯ãä¸ã®é³ç¬¦ã® @code{force-hshift} --
-ãã㯠@code{NoteColumn} ã®ããããã£ã§ã -- ã 0 ã«ã»ãããã¾ãã@c
+é³ç¬¦åãããããå¿
è¦ã¯ããã¾ããããã®ããã« @code{\shiftOff} ãç¨ãã¾ãã@c
2 çªç®ã®åé³ã§ã¯ãF ã A-ãã©ããã«æãã¦ã符幹ã®è¡çªãé¿ããããã«@c
æä¸æ®µã®é³ç¬¦ãå°ãå³ã«ç§»åãããã¹ãã§ãããã@c
ããããã«ã¯ãD-ãã©ããã® @code{NoteColumn} ã® @code{force-hshift}
-ãè¨å®ãã¦èã¹ãã¼ã¹ã®ååã ãå³ã«ãããã¾ãã
-2 çªç®ã®åé³ã®ä¸ã®æ¹ã®é³ç¬¦ã¯ãä¸ã®æ¹ã®é³ç¬¦ã®ããå³ã«ç½®ãã®ãæè¯ã§ãã@c
-ããããã«ã¯ããã®é³ç¬¦ã® @code{force-hshift} ã 0.5 ã«ã»ãããã¾ã --
-ã¤ã¾ããä¸ã®æ¹ã®é³ç¬¦ã®é³ç¬¦åãã符é ã®å¹
ã®ååã ãå³ã«ãããã¾ãã
+ãè¨å®ãã¦èã¹ãã¼ã¹ã®ååã ãå³ã«ããããF ã® @code{force-hshift}
+ãã¼ãã«ãã¾ãã@c
+注æãã¹ããã¨ã¯ãããå¾ã®ã¿ã¤ãã³ã°ãè¶ãã¦è¨å®ãä¼æãã¦ãã¾ããªãããã«ã
+@code{\once} ã使ã£ã¦ããã¨ãããã¨ã§ãã
+ãã®å°ããä¾ã«ããã¦ã¯ããã¤ã¹ 4 ã® @code{\once} 㨠2 åç®ã®
+@code{\override} (訳注: @code{\shiftOff} ã®ãã¨) ã¯çç¥ã§ãã¾ããã@c
+ããã¯è¯ãæ¹æ³ã§ã¯ããã¾ããã
ããã§ãæçµçµæãæãã¾ã:
@@ -3212,17 +3526,10 @@ a'8 \( ( a''16 ) a'' \)
<<
{ c''2 aes4. bes8 }
\\
- {
- <ees, c>2
- \once \override NoteColumn.force-hshift = #0.5
- des2
- }
+ { <ees, c>2 \once \override NoteColumn.force-hshift = 0.5 des }
\\
\\
- {
- \override NoteColumn.force-hshift = #0
- aes'2 f4 fes
- }
+ { \once \shiftOff aes'2 \once \shiftOff f4 fes }
>> |
<c ees aes c>1 |
}
@@ -3261,7 +3568,7 @@ rhMusic = \relative {
\time 6/4
\mergeDifferentlyHeadedOn
\mergeDifferentlyDottedOn
- bes2.^\markup { \bold "Moderato" } r8
+ bes2.\tempo "Moderato" r8
<<
{ c,8 d fis bes a }
\new Voice {
@@ -3525,8 +3832,8 @@ lhMusic = \relative {
@end lilypond
第 3 å°ç¯ -- Moderato ã»ã¯ã·ã§ã³ã®éå§é¨å -- ã«åãæããã¾ãã@c
-ãã¥ã¼ããªã¢ã«ã§ @code{\markup} ã³ãã³ãã使ã£ã¦ãã¼ã«ãä½ã®ããã¹ãã@c
-ä»ãå ããæ¹æ³ã示ãã¾ããã®ã§ã@q{Moderato} ããã¼ã«ãä½ã§ä»ãå ãããã¨ã¯@c
+ãã¥ã¼ããªã¢ã«ã§ @code{\tempo} ã³ãã³ãã使ã£ã¦ãã³ã表示ã@c
+ä»ãå ããæ¹æ³ã示ãã¾ããã®ã§ã@q{Moderato} ãä»ãå ãããã¨ã¯@c
容æã§ãã@c
ããããç°ãªããã¤ã¹ã®ä¸ã«ããé³ç¬¦ããã¼ã¸ããã«ã¯ã©ãããã®ã§ããããï¼@c
ããã§ãå©ããæ±ãã¦è¨èæ³ãªãã¡ã¬ã³ã¹ã«ç§»è¡ããå¿
è¦ãããã¾ãã@c
@@ -3563,7 +3870,7 @@ rhMusic = \relative {
bes1~ |
\bar "||"
\time 6/4
- bes2.^\markup { \bold "Moderato" } r8
+ bes2.\tempo "Moderato" r8
\mergeDifferentlyHeadedOn
\mergeDifferentlyDottedOn
% 4 ã¤ã®ãã¤ã¹ã®å¤å£°ã»ã¯ã·ã§ã³ã®éå§
@@ -3642,7 +3949,7 @@ rhMusic = \relative {
bes1~ |
\bar "||"
\time 6/4
- bes2.^\markup { \bold "Moderato" } r8
+ bes2.\tempo "Moderato" r8
\mergeDifferentlyHeadedOn
\mergeDifferentlyDottedOn
% 4 ã¤ã®ãã¤ã¹ã®å¤å£°ã»ã¯ã·ã§ã³ã®éå§
@@ -3715,7 +4022,7 @@ rhMusic = \relative {
bes1~ |
\bar "||"
\time 6/4
- bes2.^\markup { \bold "Moderato" } r8
+ bes2.\tempo "Moderato" r8
\mergeDifferentlyHeadedOn
\mergeDifferentlyDottedOn
% 4 ã¤ã®ãã¤ã¹ã®å¤å£°ã»ã¯ã·ã§ã³ã®éå§
@@ -3779,7 +4086,7 @@ lhMusic = \relative {
@menu
* 調æ´ã®ãã®ä»ã®ä½¿ç¨æ¹æ³::
-* 調æ´ã®ããã«å¤æ°ã使ç¨ãã::
+* ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã::
* ã¹ã¿ã¤ã« ã·ã¼ã::
* ãã®ä»ã®æ
å ±æº::
* Scheme ãç¨ããé«åº¦ãªèª¿æ´::
@@ -3794,14 +4101,8 @@ lhMusic = \relative {
* MIDI ã§ãã§ã«ãã¼ã¿ãã·ãã¥ã¬ã¼ããã::
@end menu
-@cindex transparent property, use of (transparent ããããã£ã®ä½¿ç¨æ¹æ³)
-@cindex objects, making invisible (ãªãã¸ã§ã¯ããä¸å¯è¦ã«ãã)
@cindex removing objects (ãªãã¸ã§ã¯ããåé¤ãã)
@cindex objects, removing (ãªãã¸ã§ã¯ããåé¤ãã)
-@cindex hiding objects (ãªãã¸ã§ã¯ããé ã)
-@cindex objects, hiding (ãªãã¸ã§ã¯ããé ã)
-@cindex invisible objects (ä¸å¯è¦ã®ãªãã¸ã§ã¯ã)
-@cindex objects, invisible (ä¸å¯è¦ã®ãªãã¸ã§ã¯ã)
@node ç°ãªããã¤ã¹ã®ä¸ã«ããé³ç¬¦ãã¿ã¤ã§çµã¶
@@ -3811,7 +4112,7 @@ lhMusic = \relative {
@cindex tying notes across voices (ç°ãªããã¤ã¹ã®ä¸ã«ããé³ç¬¦ãã¿ã¤ã§çµã¶)
以ä¸ã®ä¾ã¯ç°ãªããã¤ã¹ã®ä¸ã«ããé³ç¬¦ãã¿ã¤ã§çµã¶æ¹æ³ã示ãã¦ãã¾ãã@c
-é常ãã¿ã¤ã§çµã¹ãã®ã¯åããã¤ã¹ã®ä¸ã«ãã 2 ã¤é³ç¬¦ã ãã§ãã@c
+é常ãã¿ã¤ã§çµã¹ãã®ã¯åããã¤ã¹ã®ä¸ã«ããé³ç¬¦ã ãã§ãã@c
2 ã¤ã®ãã¤ã¹ã使ãããã®ãã¡ã® 1 ã¤ã«ã¿ã¤ã§çµãã é³ç¬¦ãç½®ãã¾ã:
@lilypond[quote]
@@ -3819,67 +4120,31 @@ lhMusic = \relative {
@end lilypond
@noindent
-ããã¦ããã®ãã¤ã¹ã®æåã®ä¸åã符幹ãæ¶ãã¾ãã@c
+ããã¦ããã®ãã¤ã¹ã®æåã®ä¸åã符幹ã¨ç¬¦å°¾ãæ¶ãã¾ãã@c
ããã§ãã¿ã¤ã¯ãã¤ã¹ãã¾ããã£ã¦ããããã«è¦ãã¾ã:
+@funindex \omit
@cindex Stem, example of overriding (Stem ããªã¼ãã©ã¤ãããä¾)
-@cindex transparent property, example (transparent ããããã£ã®ä¾)
+@cindex Flag, example of overriding (Flag ããªã¼ãã©ã¤ãããä¾)
+@cindex @code{\omit}, example (@code{\omit} ã®ä¾)
+@cindex example of @code{\omit} (@code{\omit} ã®ä¾)
-@lilypond[quote,fragment,relative=2,verbatim]
-<<
- {
- \tweak Stem.transparent ##t
- b8~ 8\noBeam
- }
-\\
- { b8[ g] }
->>
-@end lilypond
-
-符幹ã¯è¡¨ç¤ºãããªããªã£ãã ããªã®ã§ãã¿ã¤ã®é·ããååã§ã¯ããã¾ããã@c
-符幹㮠@code{length} ã @code{8} ã«ã»ãããããã¨ã§ç¬¦å¹¹ã伸ã°ããã¨ãã§ãã¾ã:
-
-@lilypond[quote,fragment,relative=2,verbatim]
-<<
- {
- \tweak Stem.transparent ##t
- \tweak Stem.length #8
- b8~ 8\noBeam
- }
-\\
- { b8[ g] }
->>
-@end lilypond
-
-@funindex \single
-@cindex tweak, generated from override
-ä»åº¦ã¯ãã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ãã®éææ§ã @emph{ãªã¼ãã©ã¤ã} ãã@c
-ãã¨ã§å®ç¾ãã¾ãã@c
-ããã¾ã§ã«èª¬æããç縮形 @code{\hide} ã使ãã¾ãã@c
-調æ´ã¨ç°ãªãããªã¼ãã©ã¤ãã¯åä¸ã®é³æ¥½è¡¨è¨ããçæãããããããã£ã«ã ã@c
-å¹æãæã¡ã¾ãã@c
-@code{\single} ãç¨ãã¦ãªã¼ãã©ã¤ãã調æ´ã«å¤æãããã¨ãã§ãã®ã§ã@c
-ä¸è¨ã®ä¾ã以ä¸ã®ããã«æ¸ãæãããã¨ãã§ãã¾ã:
-
-@lilypond[quote,fragment,relative=2,verbatim]
+@lilypond[quote,verbatim]
<<
{
- \single \hide Stem
- \single \hide Flag
- \tweak Stem.length #8
- b8~ 8\noBeam
+ \once \omit Stem
+ \once \omit Flag
+ b'8~ 8\noBeam
}
\\
- { b8[ g] }
+ { b'8[ g'] }
>>
@end lilypond
-ä»åã®ã±ã¼ã¹ã§ã¯ã@code{\once \hide} ã¨ã®éãã¯ã¯ã£ãããã¾ããã@c
-åãé³æ¥½ã¿ã¤ãã³ã°ã«è¤æ°ã®ãªãã¸ã§ã¯ããåå¨ããå ´å
-(åé³ã®ä¸ã«ãã符é ã®ããã«)ããã®éãã¯éè¦ã«ãªãã¾ãã@c
-ãã®ãããªå ´åã@code{\once} ã¯ãã¹ã¦ã®ãªãã¸ã§ã¯ãã«å½±é¿ãä¸ãã@c
-ã®ã«å¯¾ãã¦ã@code{\single} ã¯ç´å¾ã«ããé³æ¥½è¡¨è¨ã«ãã£ã¦çæããã@c
-ãã 1 ã¤ã®ãªãã¸ã§ã¯ãã ãã«å½±é¿ãä¸ãã¾ãã
+@seealso
+Learning Manual:
+@ref{once æ¥é è¾,,@code{@bs{}once} æ¥é è¾},
+@ref{stencil ããããã£}.
@node MIDI ã§ãã§ã«ãã¼ã¿ãã·ãã¥ã¬ã¼ããã
@@ -3964,13 +4229,14 @@ lhMusic = \relative {
@rglos{system}
-@node 調æ´ã®ããã«å¤æ°ã使ç¨ãã
-@subsection 調æ´ã®ããã«å¤æ°ã使ç¨ãã
-@translationof Using variables for tweaks
+@node ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã
+@subsection ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã
+@translationof Using variables for layout adjustments
-@cindex variables, using for tweaks (調æ´ã®ããã«å¤æ°ã使ç¨ãã)
-@cindex using variables for tweaks (調æ´ã®ããã«å¤æ°ã使ç¨ãã)
-@cindex tweaks, using variables for (調æ´ã®ããã«å¤æ°ã使ç¨ãã)
+@cindex variables, using for overrides (ãªã¼ãã©ã¤ãã®ããã«å¤æ°ã使ç¨ãã)
+@cindex overrides, using variables for (ãªã¼ãã©ã¤ãã®ããã«å¤æ°ã使ç¨ãã)
+@cindex adjustments, using variables for (調æ´ã®ããã«å¤æ°ã使ç¨ãã)
+@cindex layout adjustments, using variables for (ã¬ã¤ã¢ã¦ãã®èª¿æ´ã®ããã«å¤æ°ã使ç¨ãã)
ãªã¼ãã©ã¤ã ã³ãã³ãã¯ãã°ãã°é·ããå
¥åããã®ã大å¤ãªãã®ã«ãªãã¾ãã@c
ããã¦ããããã¯å®å
¨ã«æ£ããè¨è¿°ãããªããã°ãªãã¾ããã@c
@@ -4082,12 +4348,9 @@ LilyPond ãä½ãåºãåºåã«ã¯ãã¾ãã¾ãªå¤æ´ãå ãããã¨ã
@lilypond[quote,verbatim,ragged-right]
mpdolce =
-#(make-dynamic-script
- #{ \markup { \hspace #0
- \translate #'(5 . 0)
- \line { \dynamic "mp"
- \text \italic "dolce" } }
- #})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #{ \markup { \dynamic mp \normal-text \italic \bold dolce } #})
inst =
#(define-music-function
@@ -4116,12 +4379,9 @@ inst =
@example
%%% ããã "definitions.ily" ã¨ãããã¡ã¤ã«åã§ä¿åãã¦ãã ãã
mpdolce =
-#(make-dynamic-script
- #@{ \markup @{ \hspace #0
- \translate #'(5 . 0)
- \line @{ \dynamic "mp"
- \text \italic "dolce" @} @}
- #@})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #@{ \markup @{ \dynamic mp \normal-text \italic \bold dolce @} #@})
inst =
#(define-music-function
@@ -4155,12 +4415,9 @@ inst =
@lilypond[quote,ragged-right]
mpdolce =
-#(make-dynamic-script
- #{ \markup { \hspace #0
- \translate #'(5 . 0)
- \line { \dynamic "mp"
- \text \italic "dolce" } }
- #})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #{ \markup { \dynamic mp \normal-text \italic \bold dolce } #})
inst =
#(define-music-function
@@ -4192,12 +4449,9 @@ inst =
@example
%%% definitions.ily
mpdolce =
-#(make-dynamic-script
- #@{ \markup @{ \hspace #0
- \translate #'(5 . 0)
- \line @{ \dynamic "mp"
- \text \italic "dolce" @} @}
- #@})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #@{ \markup @{ \dynamic mp \normal-text \italic \bold dolce @} #@})
inst =
#(define-music-function
@@ -4225,12 +4479,9 @@ inst =
@lilypond[quote,ragged-right]
mpdolce =
-#(make-dynamic-script
- #{ \markup { \hspace #0
- \translate #'(5 . 0)
- \line { \dynamic "mp"
- \text \italic "dolce" } }
- #})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #{ \markup { \dynamic mp \normal-text \italic \bold dolce } #})
inst =
#(define-music-function
@@ -4277,12 +4528,9 @@ inst =
@example
%%% web-publish.ily
mpdolce =
-#(make-dynamic-script
- #@{ \markup @{ \hspace #0
- \translate #'(5 . 0)
- \line @{ \dynamic "mp"
- \text \italic "dolce" @} @}
- #@})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #@{ \markup @{ \dynamic mp \normal-text \italic \bold dolce @} #@})
inst =
#(define-music-function
@@ -4311,12 +4559,9 @@ inst =
@lilypond[quote,ragged-right]
mpdolce =
-#(make-dynamic-script
- #{ \markup { \hspace #0
- \translate #'(5 . 0)
- \line { \dynamic "mp"
- \text \italic "dolce" } }
- #})
+ \tweak self-alignment-X #-0.6
+ #(make-dynamic-script
+ #{ \markup { \dynamic mp \normal-text \italic \bold dolce } #})
inst =
#(define-music-function
@@ -4451,7 +4696,7 @@ LilyPond ã¢ããªã±ã¼ã·ã§ã³ä¸ã§ã³ã³ããã¼ã« ã¯ãªãã¯ãã¦
ã¨ãã£ã¿ã¯ããªããæ®æ®µ @code{.ly} ãã¡ã¤ã«ãç·¨éããããã«ä½¿ã£ã¦ãããã®ã§@c
çµæ§ã§ãã@c
ãã®ãã¡ã¤ã«ã¯æ¨æºã® LilyPond å®ç¾©æ¸ã¿ã³ãã³ã
--- @code{\stemUp} ã @code{\slurDotted} ãªã©
+-- @code{\tieUp} ã @code{\slurDotted} ãªã©
-- ã®ãã¹ã¦ã®å®ç¾©ãä¿æãã¦ãã¾ãã@c
1 ã¤ã¾ãã¯è¤æ°ã® @code{\override} ã³ãã³ããä¿æãã¦ãã@c
å¤æ°ã®å®ç¾©ä»¥å¤ã®ãã®ã¯ãªãã¨ãããã¨ããããã§ãããã@c
@@ -4569,5 +4814,3 @@ Scheme ããã·ã¼ã¸ã£ãã»ãããããã¨ãã§ãã¾ãã@c
@rextend{Callback functions} ã«ããããã®ããã°ã©ã å¯è½ãªã¤ã³ã¿ãã§ã¤ã¹ã®@c
使ãæ¹ã示ãã¦ããä¾ããã£ã¨ããã¾ãã
-
-
diff --git a/Documentation/ja/notation.tely b/Documentation/ja/notation.tely
index 2194222b0d..ea41bf5332 100644
--- a/Documentation/ja/notation.tely
+++ b/Documentation/ja/notation.tely
@@ -1,6 +1,7 @@
\input texinfo-ja @c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
+
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@@ -19,9 +20,14 @@
æ±ã£ã¦ããé¡æã«æ
£ã親ããã§ãããã¨ãåæã¨ãã¦ãã¾ãã
@end macro
-@c `Notation Reference' was born 1999-10-11 with git commit 940dda0...
+@c `Notation Reference' was born 1998-08-14 with this commit:
+@c release: 1.0.2
+@c author: Han-Wen Nienhuys
+@c commit: a3a44f9f3c581b6824b3a65f9039656693e09bbf
+@c file: Documentation/tex/refman.yo
+
@macro copyrightDeclare
-Copyright @copyright{} 1999--2015 by èä½è
ä¸å
+Copyright @copyright{} 1998--2015 by èä½è
ä¸å
@end macro
diff --git a/Documentation/ja/notation/changing-defaults.itely b/Documentation/ja/notation/changing-defaults.itely
index ad5d5affcb..917fcdf560 100644
--- a/Documentation/ja/notation/changing-defaults.itely
+++ b/Documentation/ja/notation/changing-defaults.itely
@@ -10,7 +10,7 @@
@c \version "2.19.22"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@node ããã©ã«ããå¤æ´ãã
@@ -203,8 +203,8 @@ Score ã³ã³ããã¹ãã¯ã@code{\score @{@dots{}@}} ã @code{\layout @{@dot
@strong{@emph{MensuralStaff}}
-@code{Staff} ã¨åãã§ãã@c
-å®éå½¢å¼ã®æ¥½æ²ãèå»ããããã«ãã¶ã¤ã³ããã¦ããç¹ãç°ãªãã¾ãã
+@code{Staff} ã¨åãã§ããã@c
+è¨éå½¢å¼ã®æ¥½æ²ãèå»ããããã«ãã¶ã¤ã³ããã¦ããç¹ãç°ãªãã¾ãã
@node ä¸ä½ã³ã³ããã¹ã - ãã¤ã¹
@unnumberedsubsubsec ä¸ä½ã³ã³ããã¹ã - ãã¤ã¹
@@ -2579,6 +2579,7 @@ property (modified with @code{\set}) was created.
* å
¥åã¢ã¼ã::
* åãã¨é
ç½®::
* è·é¢ã¨è·é¢ã®åä½::
+* 寸æ³::
* èè¨å·ããããã£::
* ã¹ãã::
* ãªãã¸ã§ã¯ãã®å¯è¦æ§::
@@ -2883,6 +2884,36 @@ Scheme é¢æ° @code{magstep} ã使ç¨ãããã¨ãã§ãã¾ãã@c
@ref{èãµã¤ãºãè¨å®ãã}
+@c 2017-9-22 ãã®ãã¼ãã®ã¿å
ã«ç¿»è¨³
+@c 第1ç« ã®xrefãæ£ããåä½ãããããã
+@node 寸æ³
+@subsection 寸æ³
+@translationof Dimensions
+
+@cindex dimensions (寸æ³)
+@cindex bounding box (ãã¦ã³ãã£ã³ã° ããã¯ã¹)
+
+ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ãã®å¯¸æ³ (大ãã) ã¯ããªãã¸ã§ã¯ãã®@c
+ãã¦ã³ãã£ã³ã° ããã¯ã¹ã®å·¦å³ç«¯ã®ä½ç½®ãä¸ä¸ç«¯ã®ä½ç½®ãæå®ãã¾ãã@c
+ãããã¯ãªãã¸ã§ã¯ãã®åç
§ãã¤ã³ãããã®è·é¢ã§æå®ããåä½ã¯èã¹ãã¼ã¹ã§ãã@c
+ãããã®ä½ç½®ã¯é常 2 ã¤ã® Scheme ãã¢ã§è¡¨ç¾ãã¾ãã@c
+ä¾ãã°ãããã¹ã ãã¼ã¯ã¢ãã ã³ãã³ã @code{\with-dimensions} ã¯
+3 ã¤ã®å¼æ°ãåããæåã® 2 ã¤ãå·¦å³ç«¯ã®ä½ç½®ã¨ä¸ä¸ç«¯ã®ä½ç½®ã示ã
+Scheme ãã¢ã§ã:
+
+@example
+\with-dimensions #'(-5 . 10) #'(-3 . 15) @var{arg}
+@end example
+
+ãã㯠@var{arg} ã®ãã¦ã³ãã£ã³ã° ããã¯ã¹ã®@c
+左端ã -5, å³ç«¯ã 10, ä¸ç«¯ã -3, ä¸ç«¯ã 15 ã«æå®ãã¦ãã¾ãã@c
+å
¨ã¦ãªãã¸ã§ã¯ãã®åç
§ãã¤ã³ããããèã¹ãã¼ã¹ã®åä½ã§è¨æ¸¬ããã¦ãã¾ãã
+
+@seealso
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ref{è·é¢ã¨è·é¢ã®åä½}
+
+
@node èè¨å·ããããã£
@subsection èè¨å·ããããã£
@translationof Staff symbol properties
diff --git a/Documentation/ja/notation/editorial.itely b/Documentation/ja/notation/editorial.itely
index 12341e03e5..666a298bb4 100644
--- a/Documentation/ja/notation/editorial.itely
+++ b/Documentation/ja/notation/editorial.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -56,62 +56,212 @@
@funindex fontSize
@funindex font-size
+@funindex magnification->font-size
@funindex magstep
-@funindex \huge
-@funindex \large
+@funindex magnifyMusic
+@funindex teeny
+@funindex tiny
+@funindex small
+@funindex normalsize
+@funindex large
+@funindex huge
+@funindex \magnifyMusic
+@funindex \teeny
+@funindex \tiny
@funindex \normalsize
@funindex \small
-@funindex \tiny
-@funindex \teeny
-@funindex huge
-@funindex large
-@funindex normalsize
-@funindex small
-@funindex tiny
-@funindex teeny
+@funindex \large
+@funindex \huge
+
+@warning{@*
+ããã¹ãã®ãã©ã³ã ãµã¤ãºã«é¢ãã¦ã¯ã@c
+@ref{ãã©ã³ãã¨ãã©ã³ã ãµã¤ãºãé¸æãã}ãåç
§ãã¦ãã ããã@*
+èã®ãµã¤ãºã«é¢ãã¦ã¯ã@ref{èãµã¤ãºãè¨å®ãã}ãåç
§ãã¦ãã ããã@*
+åå³é³ç¬¦ã«é¢ãã¦ã¯ã@ref{åå³é³ç¬¦ããã©ã¼ããããã}ãåç
§ãã¦ãã ããã@*
+ãªãã·ã¢èã«é¢ãã¦ã¯ã@ref{ãªãã·ã¢è}ãåç
§ãã¦ãã ããã}
+
+èã®ãµã¤ãºãå¤ããã«è¨èã®ãµã¤ãºãå¤æ´ããã«ã¯ã@code{\magnifyMusic}
+ã³ãã³ãã«æ¡å¤§ç¸®å°ã®å²åãæå®ãã¾ã:
+
+@c Grieg Piano Concerto (mvt.1 cadenza)
+@lilypond[verbatim,quote]
+\new Staff <<
+ \new Voice \relative {
+ \voiceOne
+ <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
+ }
+ \new Voice \relative {
+ \voiceTwo
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ r32 c'' a c a c a c r c a c a c a c
+ r c a c a c a c a c a c a c a c
+ }
+ }
+>>
+@end lilypond
+
+ä¸ã®ä¾ã«ãã @code{\override} ã¯ãä¸å
·åã®ä¸æçãªåé¿æªç½®ã§ãã@c
+ãã®ã»ã¯ã·ã§ã³ã®æå¾ã«ãã@qq{æ¢ç¥ã®åé¡ã¨è¦å}ãåç
§ãã¦ãã ããã
+
+é常ã®ãµã¤ãºã®é³ç¬¦ãå°ããé³ç¬¦ã¨ãã¼ã¸ãããéã«ã¯ã符幹ãè¨æè¨å·ãæ£ãã@c
+æãããã«ãå°ããé³ç¬¦ã®ãµã¤ãºã@c
+(@w{@samp{\once@tie{}\normalsize}} ã«ãã£ã¦) ãªã»ããããå¿
è¦ãããã¾ã:
+
+@c Chopin Prelude op.28 no.8
+@lilypond[verbatim,quote]
+\new Staff <<
+ \key fis \minor
+ \mergeDifferentlyDottedOn
+ \new Voice \relative {
+ \voiceOne
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ \once \normalsize cis'32( cis' gis b a fis \once \normalsize d d'
+ \once \normalsize cis, cis' gis b a gis \once \normalsize fis fis'
+ \once \normalsize fis, fis' ais, cis b gis \once \normalsize eis eis'
+ \once \normalsize a, a' bis, d cis b \once \normalsize gis gis')
+ }
+ }
+ \new Voice \relative {
+ \voiceTwo
+ cis'8. d16 cis8. fis16 fis8. eis16 a8. gis16
+ }
+>>
+@end lilypond
+
+@code{\magnifyMusic} ã³ãã³ãã¯åå³é³ç¬¦ãè£
飾é³ç¬¦ããªãã·ã¢èãä½ãããã®@c
+ãã®ã¨ãã¦ã¯æ³å®ããã¦ãã¾ãã -- ãããã«ã¯ãããé©åãªä½ææ¹æ³ãããã¾ãã@c
+代ããã«ããã®ã³ãã³ãã¯ä»¥ä¸ã®ãããªå ´åã«é©ãã¦ãã¾ã:
+åä¸ã®èã«ãããåä¸ã®æ¥½å¨ã«ã¤ãã¦ãè¨èãµã¤ãºãå¤åãã@c
+ãããè£
飾é³ç¬¦ãç¨ããã®ã¯é©åã§ã¯ãªãå ´å -- ä¾ãã°ã«ãã³ãã¡ã®ãããª@c
+ããã»ã¼ã¸ãä¸ã®ä¾ã«ãããããªå ´åã§ãã
+@code{\magnifyMusic} ã®å¤ã 0.63 ã«ã»ãããããã¨ã§ã@code{CueVoice} ã¨åã@c
+大ããã«ãªãã¾ãã
+
+@warning{@code{@bs{}magnifyMusic} ã³ãã³ãã¯èã®ãµã¤ãºãå¤æ´ããæã«ã@c
+使ãã¹ãã§ã¯@i{ããã¾ããã}@ref{èãµã¤ãºãè¨å®ãã}ãåç
§ãã¦ãã ããã}
+
+
+@subsubsubheading åã
ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã®ãµã¤ãºãå¤æ´ãã
+
+åã
ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ã㯠@code{\tweak} ã @code{\override} ã³ãã³ãã@c
+使ã£ã¦ã@code{font-size} ããããã£ã調æ´ãããã¨ã§ãµã¤ãºãå¤æ´ã§ãã¾ã:
+
+@c KEEP LY
+@lilypond[quote,verbatim]
+\relative {
+ % 符é ã®ãµã¤ãºãå¤æ´ãã¾ã
+ <f' \tweak font-size -4 b e>-5
+ % éæè¨å·ã®ãµã¤ãºãå¤æ´ãã¾ã
+ bes-\tweak font-size 0 -3
+ % è¨æè¨å·ã®ãµã¤ãºãå¤æ´ãã¾ã
+ \once \override Accidental.font-size = -4 bes!-^
+ % ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã®ãµã¤ãºãå¤æ´ãã¾ã
+ \once \override Script.font-size = 4 bes!-^
+}
+@end lilypond
+
+ããããã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã® @code{font-size} ã®ããã©ã«ãå¤ã¯ã@c
+å
é¨ãªãã¡ã¬ã³ã¹ã«ãªã¹ãã¢ããããã¦ãã¾ãã@code{font-size} ããããã£ã¯@c
+@code{font-interface} ããµãã¼ããã¦ããã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã«ã®ã¿@c
+è¨å®ã§ãã¾ãã@code{font-size} ããªãã¸ã§ã¯ãã® @q{Standard@tie{}settings} ã«@c
+åå¨ãã¦ããªãå ´åã¯ãããã©ã«ãå¤ã¯ 0 ã§ãã@c
+@rinternals{All layout objects} ãåç
§ãã¦ãã ããã
-è¨èè¦ç´ ã®ãã©ã³ã ãµã¤ãºãå¤æ´ãããã¨ãã§ãã¾ãã@c
-ããã¯é£æ¡ãã¹ã©ã¼ãªã©ã®å¯å¤ã·ã³ãã«ã®ãµã¤ãºã¯å¤æ´ãã¾ããã
-
-@warning{ããã¹ãã®ãã©ã³ã ãµã¤ãºãå¤æ´ããæ¹æ³ã«ã¤ãã¦ã¯
-@ref{Selecting font and font size} ãåç
§ãã¦ãã ããã}
-
-@lilypond[verbatim,quote,relative=2]
-\huge
-c4.-> d8---3
-\large
-c4.-> d8---3
-\normalsize
-c4.-> d8---3
-\small
-c4.-> d8---3
-\tiny
-c4.-> d8---3
-\teeny
-c4.-> d8---3
+
+@subsubsubheading @code{fontSize} ããããã£ãç解ãã
+
+@code{fontSize} ã³ã³ããã¹ã ããããã£ã¯ãã³ã³ããã¹ãã«å±ãã@c
+ã°ãªã ãã¼ã¹ã® (訳注: ãã©ã³ãã®æåã¨ãã¦å®ç¾©ããã¦ããã詳ããã¯å¾è¿°)
+è¨èè¦ç´ å
¨ã¦ã®ç¸å¯¾ãµã¤ãºã調æ´ãã¾ã:
+
+@lilypond[verbatim,quote]
+\relative {
+ \time 3/4
+ d''4---5 c8( b a g) |
+ \set fontSize = -6
+ e'4-- c!8-4( b a g) |
+ \set fontSize = 0
+ fis4---3 e8( d) fis4 |
+ g2.
+}
@end lilypond
-å
é¨çã«ã¯ããã㯠@code{fontSize} ããããã£ãè¨å®ãã¾ãã@c
-ãã®è¨å®ã«ãã @code{font-size} ããããã£ã@c
-ãã¹ã¦ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã«ã»ããããã¾ãã@c
-@code{font-size} ã®å¤ã¯ãã«ã¬ã³ãã®èã®é«ãã§ã®æ¨æºãã©ã³ã ãµã¤ãºããã®@c
-ç¸å¯¾å¤ã表ãã¦ããæ°åã§ãã@c
-1 段éä¸ããæ¯ã«ãã©ã³ã ãµã¤ãºã¯ç´ 12% å¢å ãã¾ãã@c
-6 段éã§ã¡ããã© 2 åã«ãªãã¾ãã@c
-Scheme é¢æ° @code{magstep} 㯠@code{font-size} æ°ãã¹ã±ã¼ãªã³ã° ãã¡ã¯ã¿ã«@c
-å¤æãã¾ãã@c
-@code{font-size} ããããã£ãç´æ¥è¨å®ãããã¨ãå¯è½ã§ãã@c
-ããããå ´åãç¹å®ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã ããå½±é¿ãåãã¾ãã
-
-@lilypond[verbatim,quote,relative=2]
-\set fontSize = #3
-c4.-> d8---3
-\override NoteHead.font-size = #-4
-c4.-> d8---3
-\override Script.font-size = #2
-c4.-> d8---3
-\override Stem.font-size = #-5
-c4.-> d8---3
+@code{fontSize} ã®å¤ã¯ãç¾å¨ã®èã®é«ãã«å¿ããé常ã®ãµã¤ãºããã®@c
+ç¸å¯¾å¤ã示ãã¦ãã¾ããããã©ã«ãã® @code{fontSize} 㯠0 ã§ãã@c
+@code{fontSize} ã« 6 ãå ãããã¨ã§å¤§ããã 2 åã«ãªãã@c
+6 ãæ¸ãããã¨ã§ååã«ãªãã¾ãã1 ãç´ 12% ã®å¢æ¸ã«ãªãã¾ãã
+
+@code{font-size} ããããã£ã®å¯¾æ°çãªåä½ã¯å¸¸ã«ç´è¦³çã¨ã¯éãã¾ããã@c
+Scheme é¢æ° @code{magnification->font-size} ã¯ããã«å¯¾å¿ãã便å©ãªé¢æ°ã§ãã@c
+ä¾ãã°ãè¨èã®å¤§ãããããã©ã«ãã® 75% ã«ãããå ´åã¯ã以ä¸ã®ããã«ãã¾ã:
+
+@example
+\set fontSize = #(magnification->font-size 0.75)
+@end example
+
+Scheme é¢æ° @code{magstep} ã¯éã®ãã¨ããã¾ã: @code{font-size} ã®å¤ã@c
+æ¡å¤§ç¸®å°çã«å¤æãã¾ãã
+
+@code{fontSize} ããããã£ã¯ã°ãªãã¨ãã¦æããã¦ããè¨èè¦ç´ ã®ã¿ã«ä½ç¨ãã¾ã
+-- ä¾ãã°ã符é ãè¨æè¨å·ãæåãªã©ã§ããèã®ãµã¤ãºãã®ãã®ãã@c
+符幹ãé£æ¡ã®ãµã¤ãºãæ°´å¹³æ¹åã®ã¹ãã¼ã¹ãªã©ã¯å¤åãã¾ããã@c
+(èã®ãµã¤ãºãå¤æ´ããã«) 符幹ãé£æ¡ã®ãµã¤ãºããæ°´å¹³æ¹åã®ã¹ãã¼ã¹ã@c
+å¤æ´ããã«ã¯ãä¸è¨ã® @code{\magnifyMusic} ã使ç¨ãã¦ãã ããã@c
+èã®ãµã¤ãºãå«ãã¦ãå
¨ã¦ã®ãµã¤ãºãå¤æ´ããå ´åã¯ã@c
+@ref{èãµã¤ãºãè¨å®ãã}ãåç
§ãã¦ãã ããã
+
+@code{fontSize} @i{ã³ã³ããã¹ã ããããã£} ãè¨å®ãããã¨ã@c
+åã
ã®ã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã®ã°ãªããåºåãããåã«ã@c
+@code{fontSize} ã®å¤ã¨ã@c
+@code{font-size} @i{ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ã ããããã£}ã®å¤ã@c
+足ãåãããã¾ããããã¯ã@code{fontSize} ãæ¢ã«è¨å®ããã¦ãã¦ã@c
+åã
ã® @code{font-size} ããããã£ãæ´ã«è¨å®ããå ´åã«æ··ä¹±ããããããã¾ãã:
+
+@c KEEP LY
+@lilypond[verbatim,quote,fragment]
+% NoteHead ã®ããã©ã«ãã® font-size 㯠0 ã§ã
+% Fingering ã®ããã©ã«ãã® font-size 㯠-5 ã§ã
+c''4-3
+
+\set fontSize = -3
+% NoteHead ã®ãã©ã³ã ãµã¤ãºã®æçµçãªå¤ã¯ -3 ã«ãªãã¾ã
+% Fingering ã®ãã©ã³ã ãµã¤ãºã®æçµçãªå¤ã¯ -8 ã«ãªãã¾ã
+c''4-3
+
+\override Fingering.font-size = 0
+% Fingering ã®ãã©ã³ã ãµã¤ãºã®æçµçãªå¤ã¯ -3 ã«ãªãã¾ã
+c''4-3
+@end lilypond
+
+以ä¸ã®ãããªç縮è¨æ³ã³ãã³ããåå¨ãã¾ã:
+
+@multitable @columnfractions .2 .4 .4
+@item @b{ã³ãã³ã} @tab @b{åçãªã³ãã³ã} @tab @b{ç¸å¯¾ãµã¤ãº}
+@item @code{\teeny} @tab @code{\set fontSize = -3} @tab 71%
+@item @code{\tiny} @tab @code{\set fontSize = -2} @tab 79%
+@item @code{\small} @tab @code{\set fontSize = -1} @tab 89%
+@item @code{\normalsize} @tab @code{\set fontSize = 0} @tab 100%
+@item @code{\large} @tab @code{\set fontSize = 1} @tab 112%
+@item @code{\huge} @tab @code{\set fontSize = 2} @tab 126%
+@end multitable
+
+@lilypond[verbatim,quote]
+\relative c'' {
+ \teeny
+ c4.-> d8---3
+ \tiny
+ c4.-> d8---3
+ \small
+ c4.-> d8---3
+ \normalsize
+ c4.-> d8---3
+ \large
+ c4.-> d8---3
+ \huge
+ c4.-> d8---3
+}
@end lilypond
@cindex standard font size (notation) (æ¨æºãã©ã³ã ãµã¤ãº (è¨èæ³))
@@ -121,18 +271,14 @@ c4.-> d8---3
@funindex font-size
ãã©ã³ã ãµã¤ãºã®å¤æ´ã¯ãã²ãªå½¢ã®ãµã¤ãºãæã¿ã®ãµã¤ãºã«æãè¿ããªããã
-(ä¸å®ã®å²åã§) å¢æ¸ãããã¨ã«ãã£ã¦ãéæããã¾ã@c
-æ¨æºãã©ã³ã ãµã¤ãº (@w{@code{font-size = #0}} ã®ãã©ã³ã ãµã¤ãº) ã¯@c
+(ä¸å®ã®å²åã§) å¢æ¸ãããã¨ã«ãã£ã¦ãéæããã¾ãã@c
+æ¨æºãã©ã³ã ãµã¤ãº (@w{@code{font-size = 0}} ã®ãã©ã³ã ãµã¤ãº) ã¯@c
æ¨æºã®èã®é«ãã«åºã¥ãã¾ãã@c
20pt ã®èã§ã¯ã11pt ã®ãã©ã³ããé¸æããã¾ãã
-@code{font-size} ããããã£ã¯ãã©ã³ãã使ç¨ããã¬ã¤ã¢ã¦ã ãªãã¸ã§ã¯ãã ãã«@c
-ã»ãããããã¨ãã§ãã¾ã@c
-ãã®ãããªãªãã¸ã§ã¯ã㯠@code{font-interface} ã¬ã¤ã¢ã¦ã ã¤ã³ã¿ãã§ã¤ã¹ã@c
-ãµãã¼ããã¾ãã
-
@predefined
+@code{\magnifyMusic},
@code{\teeny},
@code{\tiny},
@code{\small},
@@ -142,12 +288,43 @@ c4.-> d8---3
@endpredefined
@seealso
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ref{Selecting font and font size},
+@ref{Setting the staff size},
+@ref{Formatting cue notes},
+@ref{Ossia staves}
+
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{ly/music-functions-init.ly},
+@file{ly/property-init.ly}
+
ã³ã¼ãæçé:
@rlsr{Editorial annotations}
å
é¨ãªãã¡ã¬ã³ã¹:
@rinternals{font-interface}
+@c The two issues mentioned below:
+@c http://code.google.com/p/lilypond/issues/detail?id=3987
+@c http://code.google.com/p/lilypond/issues/detail?id=3990
+@knownissues
+@code{\magnifyMusic} ã使ç¨ããéã«ãæ°´å¹³æ¹åã®ã¹ãã¼ã¹ãä¸é©åã«ãªã
+2 ã¤ã®ä¸å
·åãããã¾ããããã解決ããæ¹æ³ã 1 ã¤ã ãããã¾ããã@c
+å
¨ã¦ã®å ´åã«ãã¾ãããã¨ã¯éãã¾ããã次ã®ä¾ã§ã@var{mag} å¤æ°ã@c
+好ããªå¤ã«ç½®ãæãã¦ãã ããã@c
+@code{\newSpacingSection} ã³ãã³ãã®çæ¹ã両æ¹ããããã¯
+@code{\override} ã @code{\revert} ã³ãã³ããåãé¤ãã¦ã¿ããã¨ãã§ãã¾ã:
+
+
+@example
+\magnifyMusic @var{mag} @{
+ \newSpacingSection
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 @var{mag})
+ [@var{music}]
+ \newSpacingSection
+ \revert Score.SpacingSpanner.spacing-increment
+@}
+@end example
@node éæã®æ示
@unnumberedsubsubsec éæã®æ示
@@ -160,17 +337,11 @@ c4.-> d8---3
éæã®æ示㯠@var{é³ç¬¦}-@var{æ°å} ãç¨ãããã¨ã§æ¿å
¥ãããã¨ãã§ãã¾ã:
-@lilypond[verbatim,quote,relative=2]
-c4-1 d-2 f-4 e-3
-@end lilypond
-
-æã®å¤æ´ã®ããã«ãã¼ã¯ã¢ãã ããã¹ããæååã使ç¨ããããã¨ãããã¾ãã
-
@lilypond[verbatim,quote]
\relative { c''4-1 d-2 f-4 e-3 }
@end lilypond
-æã®å
¥ãæ¿ãã®ããã«ãã¼ã¯ã¢ãã ããã¹ãã使ããã¨ãã§ãã¾ãã
+æã®å
¥ãæ¿ãã®ããã«ãã¼ã¯ã¢ãã ããã¹ããæååã使ããã¨ãã§ãã¾ãã
@lilypond[verbatim,quote]
\relative {
@@ -237,18 +408,17 @@ c4-1 d-2 f-4 e-3
@unnumberedsubsubsec é ãããé³ç¬¦
@translationof Hidden notes
-@cindex hidden notes
-@cindex invisible notes
-@cindex transparent notes
-@cindex notes, hidden
-@cindex notes, invisible
-@cindex notes, transparent
+@cindex hidden notes (é ãããé³ç¬¦)
+@cindex invisible notes (ä¸å¯è¦ã®é³ç¬¦)
+@cindex transparent notes (éæãªé³ç¬¦)
+@cindex notes, hidden (é ãããé³ç¬¦)
+@cindex notes, invisible (ä¸å¯è¦ã®é³ç¬¦)
+@cindex notes, transparent (éæãªé³ç¬¦)
@funindex \hideNotes
@funindex \unHideNotes
-@c æªè¨³
-é ããã (ã¾ãã¯ä¸å¯è¦ãéæã®) é³ç¬¦ã¯ãpreparing theory ãä½æ²ã®æ¼ç¿ã®éã«@c
+é ããã (ã¾ãã¯ä¸å¯è¦ãéæã®) é³ç¬¦ã¯ãé³æ¥½çè«ãä½æ²ã®æ¼ç¿ã®éã«@c
æç¨ã§ãã
@lilypond[verbatim,quote]
@@ -346,12 +516,13 @@ X11 ã®ããã«å®ç¾©ãããè²ã®å
¨ç¯å²ã«ã¢ã¯ã»ã¹ãããã¨ãã§
@c KEEP LY
@lilypond[verbatim,quote]
-\relative c'' {
- \override Staff.StaffSymbol.color = #(x11-color 'SlateBlue2)
- \set Staff.instrumentName = \markup {
- \with-color #(x11-color 'navy) "Clarinet"
+\new Staff \with {
+ instrumentName = \markup {
+ \with-color #(x11-color 'red) "Clarinet"
+ }
}
-
+ \relative c'' {
+ \override Staff.StaffSymbol.color = #(x11-color 'SlateBlue2)
gis8 a
\override Beam.color = #(x11-color "medium turquoise")
gis a
@@ -375,12 +546,13 @@ Scheme é¢æ° @code{rgb-color} ãç¨ãããã¨ã«ãã£ã¦ã@c
å³å¯ãª RGB ã«ã©ã¼ãæå®ãããã¨ãã§ãã¾ãã
@lilypond[verbatim,quote]
+\new Staff \with {
+ instrumentName = \markup {
+ \with-color #(x11-color 'red) "Clarinet"
+ }
+ }
\relative c'' {
\override Staff.StaffSymbol.color = #(x11-color 'SlateBlue2)
- \set Staff.instrumentName = \markup {
- \with-color #(x11-color 'navy) "Clarinet"
- }
-
\override Stem.color = #(rgb-color 0 0 0)
gis8 a
\override Stem.color = #(rgb-color 1 1 1)
@@ -415,8 +587,9 @@ X11 ã«ã©ã¼ã¯å¿
ãããåæ§ã®ååãæã¤ãã¼ãã« ã«ã©ã¼ã¨@c
Web åãã§ã¯ããã¼ãã« ã«ã©ã¼ã使ç¨ãããã¨ãæ¨å¥¨ãã¾ã
(ã¤ã¾ãã@code{blue}, @code{green}, @code{red})ã
-åé³ã®ä¸ã«ããé³ç¬¦ã«ã¯ @code{\override} ã§è²ãä»ãããã¨ã¯ã§ãã¾ããã@c
-@code{\override} ã®ä»£ããã« @code{\tweak} ã使ç¨ãã¦ãã ãã
+åé³ã®ä¸ã«ããé³ç¬¦ã«å¥ã
ã«è²ãä»ããã®ã« @code{\override} ã使ããã¨ã¯@c
+ã§ãã¾ããã代ããã«ããããã®é³ç¬¦ã®åã« @code{\tweak} ããããã¨åçãª@c
+@code{\single\override} ã使ç¨ãã¦ãã ãã
-- @ref{The tweak command} ãåç
§ãã¦ãã ããã
@@ -424,9 +597,8 @@ Web åãã§ã¯ããã¼ãã« ã«ã©ã¼ã使ç¨ãããã¨ãæ¨å¥¨ãã¾ã
@unnumberedsubsubsec æ¬å¼§
@translationof Parentheses
-@c ä¿ç: ghost notes
-@cindex ghost notes (ã´ã¼ã¹ãé³ç¬¦)
-@cindex notes, ghost (ã´ã¼ã¹ãé³ç¬¦)
+@cindex ghost notes (ã´ã¼ã¹ã ãã¼ã)
+@cindex notes, ghost (ã´ã¼ã¹ã ãã¼ã)
@cindex notes, parenthesized (æ¬å¼§ã§å²ã¾ããé³ç¬¦)
@cindex parentheses (æ¬å¼§)
@cindex brackets (å²ã¿)
@@ -509,6 +681,9 @@ Web åãã§ã¯ããã¼ãã« ã«ã©ã¼ã使ç¨ãããã¨ãæ¨å¥¨ãã¾ã
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{default-direction-of-stems-on-the-center-line-of-the-staff.ly}
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{automatically-changing-the-stem-direction-of-the-middle-note-based-on-the-melody.ly}
+
@seealso
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Direction and placement}
@@ -574,16 +749,12 @@ Web åãã§ã¯ããã¼ãã« ã«ã©ã¼ã使ç¨ãããã¨ãæ¨å¥¨ãã¾ã
å¾è
ã¯ããã¦ãåé³ã®ä¸ã§ @code{\tweak} ã®ããã«ä½¿ç¨ããã@c
åã
ã®é³ç¬¦ã«ããã¹ããä»å ãã¾ãã
-é常ããã«ã¼ã³ ãã«ãã®ããã¹ãã¯é³ç¬¦ã®ééã«å½±é¿ãä¸ãã¾ããã@c
-å½±é¿ãä¸ããªãããå¤æ´ãããã¨ãã§ãã¾ã:
-
-Balloon text normally influences note spacing, but this can be
-altered:
+ãã«ã¼ã³ ãã«ãã®ããã¹ãã¯é³ç¬¦ã®ééã«å½±é¿ãä¸ãã¾ãããã@c
+å½±é¿ãä¸ããããã«å¤æ´ãããã¨ãã§ãã¾ã:
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote]
\new Voice \with { \consists "Balloon_engraver" }
-{
- \balloonLengthOff
+\relative c'' {
\balloonGrobText #'Stem #'(3 . 4) \markup { "I'm a Stem" }
a8
\balloonGrobText #'Rest #'(-4 . -4) \markup { "I'm a rest" }
@@ -681,10 +852,10 @@ altered:
@translationof Analysis brackets
@cindex brackets (å²ã¿ãè§æ¬å¼§)
-@cindex bracket, phrasing (ãã¬ã¼ã¸ã³ã°ã®å²ã¿)
-@cindex phrasing bracket (ãã¬ã¼ã¸ã³ã°ã®å²ã¿)
+@cindex bracket, phrasing (ãã¬ã¼ãºã®å²ã¿)
+@cindex phrasing bracket (ãã¬ã¼ãºã®å²ã¿)
@cindex musicological analysis (é³æ¥½å¦çåæ)
-@cindex analysis, musicologica (é³æ¥½å¦çåæ)l
+@cindex analysis, musicological (é³æ¥½å¦çåæ)
@cindex note grouping bracket (é³ç¬¦ã°ã«ã¼ãåå²ã¿)
@cindex horizontal bracket (æ°´å¹³ã®å²ã¿)
@cindex bracket, horizontal (æ°´å¹³ã®å²ã¿)
@@ -709,7 +880,7 @@ altered:
}
@end lilypond
-Analysis brackets may be nested.
+åæã®å²ã¿ã¯ãã¹ããããã¨ãã§ãã¾ãã
@lilypond[verbatim,quote]
\layout {
@@ -726,12 +897,19 @@ Analysis brackets may be nested.
}
@end lilypond
-@seealso
-ã³ã¼ãæçé:
-@rlsr{Editorial annotations}
+@snippets
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{analysis-brackets-above-the-staff.ly}
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{analysis-brackets-with-labels.ly}
+
+@seealso
å
é¨ãªãã¡ã¬ã³ã¹:
@rinternals{Horizontal_bracket_engraver},
@rinternals{HorizontalBracket},
@rinternals{horizontal-bracket-interface},
+@rinternals{HorizontalBracketText},
+@rinternals{horizontal-bracket-text-interface},
@rinternals{Staff}
diff --git a/Documentation/ja/notation/expressive.itely b/Documentation/ja/notation/expressive.itely
index 02f8b4e6ff..512dedaac7 100644
--- a/Documentation/ja/notation/expressive.itely
+++ b/Documentation/ja/notation/expressive.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -54,7 +54,7 @@
@cindex ornamentation (è£
飾)
@cindex scripts (ã¹ã¯ãªãã)
@cindex ornaments (è£
飾)
-@cindex espressivo (表ç¾çãª)
+@cindex espressivo (ã¨ã¹ãã¬ãã·ã¼ã´ã©)
@cindex fermata (ãã§ã«ãã¼ã¿)
@cindex upbow (ã¢ãããã¼ãä¸å¼)
@cindex downbow (ãã¦ã³ãã¼ãä¸å¼)
@@ -63,8 +63,7 @@
@cindex pedal marks, organ (ãªã«ã¬ã³ ããã«è¨å·)
@cindex turn (ã¿ã¼ã³)
@cindex open (ãªã¼ãã³)
-@c æªè¨³
-@cindex stopped
+@cindex stopped (ã¹ãããããã¥ã¼ã)
@c ãã©ã¸ã§ã¬ãã: å
åã®ç¸¦ç¬
@cindex flageolet (ãã©ã¸ã§ã¬ãã)
@cindex reverseturn (éã¿ã¼ã³)
@@ -75,11 +74,12 @@
@cindex prallmordent (ãã©ã«ã¢ã«ãã³ã)
@cindex prall, up (ã¢ãã ãã©ã«)
@cindex prall, down (ãã¦ã³ ãã©ã«)
-@cindex thumb marking
+@cindex mordent, up (ã¢ãã ã¢ã«ãã³ã)
+@cindex mordent, down (ãã¦ã³ ã¢ã«ãã³ã)
+@cindex thumb marking (親æè¨å·)
@cindex segno (ã»ã¼ãã§)
@cindex coda (ã³ã¼ã)
-@c æªè¨³
-@cindex varcoda
+@cindex varcoda (å¤æ ¼ã³ã¼ã)
@funindex \accent
@funindex \marcato
@@ -163,13 +163,15 @@
ããã« @notation{portato}ã@c
ãããã®åºåã¯ä»¥ä¸ã®ããã«è¡¨ç¤ºããã¾ã:
-@lilypond[verbatim,quote,relative=2]
-c4-^ c-+ c-- c-!
-c4-> c-. c2-_
+@lilypond[verbatim,quote]
+\relative {
+ c''4-^ c-+ c-- c-!
+ c4-> c-. c2-_
+}
@end lilypond
ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã®ããã©ã«ãã®é
ç½®è¦åã¯@c
-ãã¡ã¤ã« @file{scm/@/script@/.scm} ã§å®ç¾©ããã¦ãã¾ãã@c
+ãã¡ã¤ã« @file{scm/script.scm} ã§å®ç¾©ããã¦ãã¾ãã@c
ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã¨è£
飾ã¯æåã§èã®ä¸ã¾ãã¯ä¸ã«é
ç½®ããããã¨ãããã¾ã
-- @ref{Direction and placement} ãåç
§ãã¦ãã ããã
@@ -213,13 +215,17 @@ R1\fermataMarkup
@rglos{staccato},
@rglos{portato}
+å¦ç¿ããã¥ã¢ã«:
+@rlearning{Placement of objects}
+
è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ref{Text scripts},
@ref{Direction and placement},
@ref{List of articulations},
@ref{ããªã«}
ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
-@file{scm/@/script@/.scm}
+@file{scm/script.scm}
ã³ã¼ãæçé:
@rlsrnamed{Expressive marks,çºæ³è¨å·}
@@ -276,7 +282,6 @@ R1\fermataMarkup
}
@end lilypond
-@c ä¿ç
@cindex hairpin (ãã¢ãã³)
@cindex crescendo (ã¯ã¬ãã·ã§ã³ã)
@cindex decrescendo (ãã¯ã¬ãã·ã§ã³ã)
@@ -316,7 +321,8 @@ R1\fermataMarkup
éå§ã«ãã£ã¦ãã¢ãã³ãçµäºããå ´åã@c
ãã®ãã¢ãã³ã¯æ¬¡ã® @code{\<} ã¾ã㯠@code{\>} ãå²ãå½ã¦ããã@c
é³ç¬¦ã®ä¸å¤®ã§çµäºãã¾ãã@c
-次ã®ã¸ã¢ãã³ã¯ãé常éãã«é³ç¬¦ã®å·¦ç«¯ã§å§ã¾ã代ããã«ãå³ç«¯ããå§ã¾ãã¾ãã
+次ã®ã¸ã¢ãã³ã¯ãé常éãã«é³ç¬¦ã®å·¦ç«¯ã§å§ã¾ã代ããã«ãå³ç«¯ããå§ã¾ãã¾ãã@c
+1 æç®ã§çµãããã¢ãã³ã¯ãåã®å°ç¯ç·ã®ã¨ããã§çµäºãã¾ãã
@lilypond[verbatim,quote]
\relative {
@@ -324,7 +330,7 @@ R1\fermataMarkup
}
@end lilypond
-@code{\!} ã®ä»£ããã«çµ¶å¯¾å¼·å¼±è¨å·ã§çµäºãããã¢ããåãããã«èå»ããã¾ãã@c
+@code{\!} ã®ä»£ããã«çµ¶å¯¾å¼·å¼±è¨å·ã§çµäºãããã¢ãã³ãåãããã«èå»ããã¾ãã@c
ããããªããã絶対強弱è¨å·ã®å¹
ã«ãã£ã¦ãã¢ãã³ã®çµäºç¹ã¯å¤ããã¾ãã
@lilypond[verbatim,quote]
@@ -346,7 +352,7 @@ R1\fermataMarkup
}
@end lilypond
-@cindex espressivo articulation (表ç¾çãªã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³)
+@cindex espressivo articulation (ã¨ã¹ãã¬ãã·ã¼ã´ã© ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³)
@funindex \espressivo
@@ -458,18 +464,33 @@ R1\fermataMarkup
@snippets
+@cindex hairpins at bar lines (å°ç¯ç·ã§çµãããã¢ãã³)
+
@lilypondfile[verbatim,quote,texidoc,doctitle]
{setting-hairpin-behavior-at-bar-lines.ly}
@lilypondfile[verbatim,quote,texidoc,doctitle]
{setting-the-minimum-length-of-hairpins.ly}
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{moving-the-ends-of-hairpins.ly}
+
@cindex al niente (ã¢ã« ãã¨ã³ã)
@cindex niente, al (ã¢ã« ãã¨ã³ã)
@lilypondfile[verbatim,quote,texidoc,doctitle]
{printing-hairpins-using-al-niente-notation.ly}
+@cindex Ferneyhough hairpins (ãã¡ã¼ããã¦ã®ãã¢ãã³)
+@cindex hairpins, Ferneyhough (ãã¡ã¼ããã¦ã®ãã¢ãã³)
+@cindex flared hairpins (裾ã®åºããã¢ãã³)
+@cindex hairpins, flared (裾ã®åºããã¢ãã³)
+@cindex constante hairpins (åºãããªããã¢ãã³)
+@cindex hairpins, constante (åºãããªããã¢ãã³)
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{printing-hairpins-in-various-styles.ly}
+
@lilypondfile[verbatim,quote,texidoc,doctitle]
{vertically-aligned-dynamics-and-textscripts.ly}
@@ -492,7 +513,7 @@ R1\fermataMarkup
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Direction and placement},
@ref{æ°ããªå¼·å¼±è¨å·},
-@ref{What goes into the MIDI output?},
+@ref{Enhancing MIDI output},
@ref{Controlling MIDI dynamics}
ã³ã¼ãæçé:
@@ -624,10 +645,10 @@ moltoF = \tweak DynamicText.self-alignment-X #LEFT
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Formatting text},
@ref{Selecting font and font size},
-@ref{What goes into the MIDI output?},
+@ref{Enhancing MIDI output},
@ref{Controlling MIDI dynamics}
-LilyPond ã®æ¡å¼µ:
+æ¡å¼µ:
@rextend{Markup construction in Scheme}
ã³ã¼ãæçé:
@@ -638,7 +659,6 @@ LilyPond ã®æ¡å¼µ:
@subsection æ²ç·ã®çºæ³è¨å·
@translationof Expressive marks as curves
-@c æªè¨³
ãã®ã»ã¯ã·ã§ã³ã§ã¯æ²ç·ãæã¤ãã¾ãã¾ãªçºæ³è¨å·
-- é常ã®ã¹ã©ã¼ããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ããã¬ã¹è¨å·ãFall ããã« Doit --
ãä½æããæ¹æ³ã«ã¤ãã¦èª¬æãã¾ãã
@@ -684,20 +704,28 @@ LilyPond ã®æ¡å¼µ:
@cindex slur, phrasing (ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼)
@cindex slurs, multiple (å¤éã¹ã©ã¼)
@cindex slurs, simultaneous (åæé²è¡ã®ã¹ã©ã¼)
+@funindex \=
+
+åæé²è¡ããããããã¯éãªãã¹ã©ã¼ã¯ç¹å¥ãªæ³¨æãå¿
è¦ã¨ãã¾ãã@c
+é常ãå¤å´ã®ã¹ã©ã¼ã¯ãã¬ã¼ã¸ã³ã°ã表ãããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã¯é常ã®ã¹ã©ã¼ã¨@c
+éè¤ãã¾ãã@ref{ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼}ãåç
§ãã¦ãã ããã@c
+ä¸ã¤ã® @code{Voice} ã«é常ã®ã¹ã©ã¼ãè¤æ°å¿
è¦ãªå ´åãã¹ã©ã¼ã®åã«
+@code{\=} ã¨èå¥å (ã·ã³ãã«ãéè² ã®æ´æ°) ãå
¥åãããã¨ã«ãã£ã¦ã@c
+対å¿ããã¹ã©ã¼ã®å§ç¹ã¨çµç¹ã«ã©ãã«ãä»ããå¿
è¦ãããã¾ãã
-åæé²è¡ã¾ãã¯éãªãåãã¹ã©ã¼ã¯è¨±å¯ããã¾ããã@c
-ããããªããããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã¯ã¹ã©ã¼ã¨éãªãåããã¨ãã§ãã¾ãã@c
-ããã«ããã2 ã¤ã®ã¹ã©ã¼ãåæã«èå»ãããã¨ãã§ãã¾ãã@c
-詳細㯠@ref{ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼} ãåç
§ãã¦ãã ããã
+@lilypond[verbatim,quote]
+\fixed c' {
+ <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
+}
+@end lilypond
@cindex slur style (ã¹ã©ã¼ã®ã¹ã¿ã¤ã«)
-@cindex solid slur (å®ç·ã®ã¹ã©ã¼)
-@cindex dotted slur (ç¹ç·ã®ã¹ã©ã¼)
-@cindex dashed slur (ç ´ç·ã®ã¹ã©ã¼)
-@cindex sytle, slur (ã¹ã©ã¼ã®ã¹ã¿ã¤ã«)
@cindex slur, solid (å®ç·ã®ã¹ã©ã¼)
@cindex slur, dotted (ç¹ç·ã®ã¹ã©ã¼)
@cindex slur, dashed (ç ´ç·ã®ã¹ã©ã¼)
+@cindex solid slur (å®ç·ã®ã¹ã©ã¼)
+@cindex dotted slur (ç¹ç·ã®ã¹ã©ã¼)
+@cindex dashed slur (ç ´ç·ã®ã¹ã©ã¼)
@cindex style, slur (ã¹ã©ã¼ã®ã¹ã¿ã¤ã«)
@funindex \slurDashed
@funindex \slurDotted
@@ -839,7 +867,9 @@ LilyPond ã®æ¡å¼µ:
@cindex phrasing slurs, simultaneous (åæé²è¡ã®ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼)
@cindex phrasing slurs, multiple (å¤éãã¬ã¼ã¸ã³ã° ã¹ã©ã¼)
-åæé²è¡ãããã¯éãªãåããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã¯è¨±å¯ããã¾ããã
+åæé²è¡ãããã¯éãªãåããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã¯ã@c
+é常ã®ã¹ã©ã¼ã¨åæ§ã« @code{\=} ãç¨ãã¦å
¥åããå¿
è¦ãããã¾ãã@c
+@ref{ã¹ã©ã¼} ãåç
§ãã¦ãã ããã
@funindex \phrasingSlurDashed
@funindex \phrasingSlurDotted
@@ -951,6 +981,11 @@ LilyPond ã®æ¡å¼µ:
{ c''2. \breathe d''4 }
@end lilypond
+ãã¬ã¹è¨å·ã¯ä»ã®çºæ³è¨å·ã¨ç°ãªããåã®é³ç¬¦ã¨é¢é£ãããã®ã§ã¯ãªããç¬ç«ãã@c
+é³æ¥½ã¤ãã³ãã§ãããã®ãããåã®é³ç¬¦ã«ä»å ããçºæ³è¨å·ããæåé£æ¡ã示ã@c
+è§æ¬å¼§ãã¹ã©ã¼ããã¬ã¼ã¸ã³ã° ã¹ã©ã¼ã示ãæ¬å¼§ã¯ @code{\breathe} ã®åã«@c
+é
ç½®ãããªããã°ãªãã¾ããã
+
ãã¬ã¹è¨å·ã¯èªåé£æ¡ãçµãããã¾ãã@c
ãã®æ¯ãèãããªã¼ãã©ã¤ãããæ¹æ³ã¯ã@ref{æåé£æ¡} ãåç
§ãã¦ãã ããã
@@ -958,9 +993,8 @@ LilyPond ã®æ¡å¼µ:
\relative { c''8 \breathe d e f g2 }
@end lilypond
-@c ä¿ç
å¤ä»£è¨èæ³ã§ã®ãã¬ã¹è¨å·ã®é³æ¥½æ示å --
-divisiones (ãã£ãã¸ã§ã³: åºåã) ããµãã¼ãããã¦ãã¾ãã@c
+divisio (ãã£ãã¸ãªã¼: åºåãè¨å·) ããµãã¼ãããã¦ãã¾ãã@c
詳細㯠@ref{Divisiones} ãåç
§ãã¦ãã ããã
@@ -969,17 +1003,14 @@ divisiones (ãã£ãã¸ã§ã³: åºåã) ããµãã¼ãããã¦ãã¾ãã@
@lilypondfile[verbatim,quote,texidoc,doctitle]
{changing-the-breath-mark-symbol.ly}
-@c æªè¨³
-@cindex tick mark
+@cindex tick mark (ãã§ã㯠ãã¼ã¯)
@lilypondfile[verbatim,quote,texidoc,doctitle]
{using-a-tick-as-the-breath-mark-symbol.ly}
-@c æªè¨³
-@cindex caesura
-@cindex railroad tracks
+@cindex caesura (ã«ã¨ã¹ã¼ã©)
+@cindex railroad tracks (ç·è·¯è¨å·ãã«ã¨ã¹ã¼ã©)
-@c æªè¨³
@lilypondfile[verbatim,quote,texidoc,doctitle]
{inserting-a-caesura.ly}
@@ -1141,7 +1172,7 @@ Fall ããã㯠Doit ã®åãã¯ãã©ã¹ãããã¯ãã¤ãã¹ (ä¸ãã
@rinternals{Glissando}
@knownissues
-ç·ã®ä¸ã«ããã¹ããèå»ãã (@notation{ã°ãªããµã³ã} ãªã©) ãã¨ã¯@c
+ç·ã®ä¸ã«ããã¹ããèå»ãã (@notation{gliss.} ãªã©) ãã¨ã¯@c
ãµãã¼ãããã¦ãã¾ããã
@@ -1224,7 +1255,7 @@ Fall ããã㯠Doit ã®åãã¯ãã©ã¹ãããã¯ãã¤ãã¹ (ä¸ãã
@code{\arpeggioArrowDown},
@code{\arpeggioNormal},
@code{\arpeggioBracket},
-@code{\arpeggioParenthesis}
+@code{\arpeggioParenthesis},
@code{\arpeggioParenthesisDashed}
@endpredefined
@@ -1264,7 +1295,8 @@ Fall ããã㯠Doit ã®åãã¯ãã©ã¹ãããã¯ãã¤ãã¹ (ä¸ãã
ãã @code{PianoStaff} ã®ä¸ã®åæç¹ã§èãè·¨ãã¢ã«ãã¸ãªã¨è·¨ããªãã¢ã«ãã¸ãªã@c
æ··å¨ããããã¨ã¯ã§ãã¾ããã
-èãè·¨ãã¢ã«ãã¸ãªã«æ¬å¼§ã¹ã¿ã¤ã«ã®ã¢ã«ãã¸ãªãé©ç¨ãããã¨ã¯ã§ãã¾ããã
+èãè·¨ãã¢ã«ãã¸ãªã«æ¬å¼§ã¹ã¿ã¤ã«ã®ã¢ã«ãã¸ãªãé©ç¨ãããã¨ã¯åç´ãªæ¹æ³ã§ã¯@c
+ã§ãã¾ããã@ref{èãè·¨ã符幹}ãåç
§ãã¦ãã ããã
@node ããªã«
@@ -1348,7 +1380,6 @@ Fall ããã㯠Doit ã®åãã¯ãã©ã¹ãããã¯ãã¤ãã¹ (ä¸ãã
}
@end lilypond
-@c æªè¨³
@cindex pitched trill with forced accidental (ããããæã¤ããªã«ã«å¼·å¶çã«è¨æè¨å·ãä»ãã)
@cindex trill, pitched with forced accidental (ããããæã¤ããªã«ã«å¼·å¶çã«è¨æè¨å·ãä»ãã)
@cindex accidental, forced for pitched trill (ããããæã¤ããªã«ã«å¼·å¶çã«è¨æè¨å·ãä»ãã)
@@ -1357,22 +1388,21 @@ Fall ããã㯠Doit ã®åãã¯ãã©ã¹ãããã¯ãã¤ãã¹ (ä¸ãã
æåã§èå»ãæå®ããå¿
è¦ãããã¾ãã@c
æåã®å°ç¯ã§ã¯ãæåã®ããããæã¤ããªã«ã ãã«è¨æè¨å·ãèå»ããã¦ãã¾ãã
-@lilypond[verbatim,quote,relative=2]
-\pitchedTrill
-eis4\startTrillSpan fis
-eis4\stopTrillSpan
-
-\pitchedTrill
-eis4\startTrillSpan fis
-eis4\stopTrillSpan
-
-\pitchedTrill
-eis4\startTrillSpan fis
-eis4\stopTrillSpan
-
-\pitchedTrill
-eis4\startTrillSpan fis!
-eis4\stopTrillSpan
+@lilypond[verbatim,quote]
+\relative {
+ \pitchedTrill
+ eis''4\startTrillSpan fis
+ eis4\stopTrillSpan
+ \pitchedTrill
+ eis4\startTrillSpan cis
+ eis4\stopTrillSpan
+ \pitchedTrill
+ eis4\startTrillSpan fis
+ eis4\stopTrillSpan
+ \pitchedTrill
+ eis4\startTrillSpan fis!
+ eis4\stopTrillSpan
+}
@end lilypond
@predefined
diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely
index 46003a4226..eb823721d1 100644
--- a/Documentation/ja/notation/input.itely
+++ b/Documentation/ja/notation/input.itely
@@ -10,7 +10,7 @@
@c \version "2.19.22"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -26,7 +26,7 @@ LilyPond ã®ä¸è¬çãªå
¥åºåã®åé¡ã«ã¤ãã¦æ±ãã¾ãã
* ã¿ã¤ãã«ã¨ããã::
* å
¥åãã¡ã¤ã«ã«åãçµã::
* åºåãå¶å¾¡ãã::
-* MIDI åºå::
+* MIDI åºåãä½ãåºã::
* é³æ¥½æ
å ±ãæ½åºãã::
@end menu
@@ -2527,9 +2527,11 @@ Gonville ãã©ã³ã ãã¡ããªã¼ã§ã¯ã@c
製ä½è
ã® Web ãµã¤ããåç
§ãã¦ãã ããã
-@node MIDI åºå
-@section MIDI åºå
-@translationof MIDI output
+@c 2017/9/22 ãã¼ãåã¨ãã®ç¿»è¨³ã®ã¿å¤æ´
+@c 第1ç« ã®xrefãæ£ããåä½ãããããã
+@node MIDI åºåãä½ãåºã
+@section MIDI åºåãä½ãåºã
+@translationof Creating MIDI output
@cindex Sound (ãµã¦ã³ã)
@cindex MIDI
@@ -2561,7 +2563,7 @@ MIDI åºåã¯èæ¯ã« 1 ã¤ã®ãã£ã³ãã«ãå²ãå½ã¦ã@c
* MIDI ã§ã®ç¹°ãè¿ã::
* MIDI ã§ã®é³ã®å¼·å¼±ãå¶å¾¡ãã::
* MIDI ã§ã®æ楽å¨::
-* å¥æ³ã¹ã¯ãªãã::
+* MIDI åºåãããè¯ããã::
@end menu
@node MIDI ãã¡ã¤ã«ãä½ãåºã
@@ -3185,44 +3187,73 @@ MIDI æå°/æ大ããªã¥ã¼ã ããããã£ãè¨å®ããã¦ããªãå ´
ä¸è¬ã® MIDI æ¨æºã¯ãªã ã·ã§ãããå«ã¾ãªãããã@c
代ããã«ãµã¤ãã¹ãã£ãã¯ãç¨ãã¾ãã
+@c 2017-9-22 ãã®ãã¼ãã¨ãç¶ãå¥æ³ã¹ã¯ãªããã®ãã¼ãã®ã¿å
ã«ç¿»è¨³
+@c 第1ç« ã®xrefãæ£ããåä½ãããããã
+@c å
ã®å¥æ³ã¹ã¯ãªããã®ãã¼ãã¯ç§»åï¼å®è³ªåé¤ï¼ãã¾ããã
+@node MIDI åºåãããè¯ããã
+@subsection MIDI åºåãããè¯ããã
+@translationof Enhancing MIDI output
+
+@menu
+* å¥æ³ã¹ã¯ãªãã::
+@end menu
+
+ããã©ã«ãã® MIDI åºåã¯å¿
è¦æä½éã®ãã®ã§ããã@c
+MIDI ã®æ¥½å¨ãæå®ãããã@code{\midi} ãããã¯ã®ããããã£ãè¨å®ãããã@c
+å¥æ³ (@file{articulate}) ã¹ã¯ãªãããç¨ããããããã¨ã§@c
+ããè¯ããããã¨ãã§ãã¾ãã
+
+@cindex instrument names (楽å¨å)
+@cindex MIDI, instruments (MIDI ã§ã®æ¥½å¨)
+@cindex articulate script (å¥æ³ã¹ã¯ãªãã)
+@cindex articulate.ly
+@funindex Staff.midiInstrument
+
+
@node å¥æ³ã¹ã¯ãªãã
-@subsection å¥æ³ã¹ã¯ãªãã
+@unnumberedsubsubsec å¥æ³ã¹ã¯ãªãã
@translationof The Articulate script
-å¥æ³ã¹ã¯ãªãããç¨ãããã¨ã«ããããããªã¢ã«ãª MIDI åºåãå¾ããã¨ãã§ãã¾ãã@c
-å¥æ³ã¹ã¯ãªããã¯ãé³ç¬¦ãé©åãªæéæ¯çã®é³ç¬¦ã¨ã¹ãããã§ç½®ãæãããã¨ã«ããã@c
-ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ (ã¹ã©ã¼ãã¹ã¿ãã«ã¼ãç) ãèæ
®ã«å
¥ãããã¨ãã¾ãã@c
-ããã«ãããªã«ãã¿ã¼ã³ãå±éãããã¨ãã@c
-ããã«ã©ã¬ã³ã¿ã³ãã¨ã¢ããã§ã¬ã©ã³ããèæ
®ã«å
¥ãããã¨ãã¾ãã
-
-å¥æ³ã¹ã¯ãªããã使ãã«ã¯ã@c
-å
¥åãã¡ã¤ã«ã®å
é ã§ä»¥ä¸ãã¤ã³ã¯ã«ã¼ãããå¿
è¦ãããã¾ãã
+å¥æ³ã¹ã¯ãªããã使ãã«ã¯ãå
¥åãã¡ã¤ã«ã®æåã«ãã®ãããª
+@code{\include} ã³ãã³ãã追å ãã¾ã:
@example
\include "articulate.ly"
@end example
-ããã«ã@code{\score} ã»ã¯ã·ã§ã³ã§ä»¥ä¸ã®ããã«ãã¾ãã
+ãã®ã¹ã¯ãªããã¯ãã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ããã³ã表示ãåæ ãããããã«ã@c
+MIDI åºåã®é³ç¬¦ãæ£ãã@q{ã¿ã¤ã ã¹ã±ã¼ã«}ãã¾ãã@c
+ããããèå»ãããåºåã MIDI åºåã®çµæã¨å¯¾å¿ãã¦å¤åãã¦ãã¾ãã¾ãã
@example
-\unfoldRepeats \articulate <<
- all the rest of the score...
->>
+\score @{
+ \articulate <<
+ @var{@dots{} music @dots{}}
+ >>
+ \midi @{ @}
+@}
@end example
-ãã®æ¹æ³ã§å
¥åãã¡ã¤ã«ãå¤æ´ããã¨ã@c
-åºåããã楽èã®è¦ãç®ã¯èããå¤ãã£ã¦ãã¾ãã¾ããã@c
-æ¨æºã® @code{\midi} ãããã¯ã¯ããè¯ã MIDI ãã¡ã¤ã«ãä½ãåºãã¾ãã
+@code{\articulate} ã³ãã³ãã¯ãçç¥è¨å· (ããªã«ãã¿ã¼ã³ãªã©) ã解éã§ãã¾ãã@c
+対å¿ãã¦ããè¨å·ã®ä¸è¦§ã¯ãã¹ã¯ãªããå
ã«è¨è¼ãã¦ããã¾ãã@c
+@file{ly/articulate.ly} ãåç
§ãã¦ãã ããã
-å¥æ³ã¹ã¯ãªãããæ©è½ãããããã®å¿
é äºé
ã§ã¯ããã¾ãããã@c
-ä¸è¨ã®ä¾ã®ããã« @code{\unfoldRepeats} ã³ãã³ããæ¿å
¥ãããã¨ã«ããã@c
-@notation{ããªã«} ãªã©ã®ç縮è¨èã®æ¼å¥ãå¯è½ã«ãªãã¾ãã
+@seealso
+å¦ç¿ããã¥ã¢ã«:
+@rlearning{ãã®ä»ã®æ
å ±æº}
-@knownissues
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ref{楽èã¬ã¤ã¢ã¦ã}
-@c æªè¨³
-Articulate shortens chords ã¨ããã¤ãã®é³æ¥½ (ç¹ã«ãªã«ã¬ã³é³æ¥½) ã®æ¼å¥ã¯@c
-ãã¾ããããªããã¨ãããã¾ãã
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{ly/articulate.ly}
+
+@warning{å¥æ³ã¹ã¯ãªããã¯åé³ã®é·ããçããããã¨ãããã¾ãã@c
+ããã¯ãªã«ã¬ã³é³æ¥½ãªã©ã«ã¯é©ããªãããããã¾ããã@c
+ã¾ããã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ãå
¨ãä»ãã¦ããªãé³ç¬¦ãé·ããçããªãã¾ãã@c
+@code{\articulate} é¢æ°ã使ãå ´æãä¸é¨åã«éå®ãããã@c
+å¥æ³ã¹ã¯ãªããã«å®ç¾©ãããå¤æ°ãæ¸ãæãããã¨ã«ãã£ã¦ã@c
+é·ããçããªãæåãæãããã¨ãã§ãã¾ãã}
@node é³æ¥½æ
å ±ãæ½åºãã
diff --git a/Documentation/ja/notation/pitches.itely b/Documentation/ja/notation/pitches.itely
index b5e85815e1..c7dc86386b 100644
--- a/Documentation/ja/notation/pitches.itely
+++ b/Documentation/ja/notation/pitches.itely
@@ -1,14 +1,14 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
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.19.22"
+@c \version "2.19.53"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -84,14 +84,38 @@
@lilypond[verbatim,quote]
{
\clef treble
- c'4 c'' e' g
- d''4 d' d c
+ c'4 e' g' c''
+ c'4 g b c'
\clef bass
- c,4 c,, e, g
- d,,4 d, d c
+ c,4 e, g, c
+ c,4 g,, b,, c,
}
@end lilypond
+@funindex \fixed
+å
±éãã¦ä½åº¦ãç¨ãããããªã¯ã¿ã¼ãè¨å·ã¯ã@code{\fixed} ã®å¾ã«åºæºãããã@c
+å
¥åãããã®å¾ã®é³æ¥½ãå
¥åãããã¨ã§ 1 度ã ãã§æ¸ã¿ã¾ãã
+@code{\fixed} ã®ä¸ã«ãããããã¯ãåºæºãããããããªã¯ã¿ã¼ãä¸ãä¸ã«ããå ´å@c
+ã«ã®ã¿ @code{'} ã@tie{}@code{,} ã®è¨å·ãå¿
è¦ã§ãã
+
+@lilypond[verbatim,quote]
+{
+ \fixed c' {
+ \clef treble
+ c4 e g c'
+ c4 g, b, c
+ }
+ \clef bass
+ \fixed c, {
+ c4 e g c'
+ c4 g, b, c
+ }
+}
+@end lilypond
+
+@code{\fixed} ã®å¾ã«ç¶ãé³æ¥½è¡¨è¨å
ã®ãããã¯ãå¤å´ã«ãããããªã
+@code{\relative} ã®å½±é¿ãåãã¾ããã次ã§èª¬æãã¾ãã
+
@seealso
é³æ¥½ç¨èªé:
@rglos{Pitch names}
@@ -104,10 +128,6 @@
@unnumberedsubsubsec ç¸å¯¾ãªã¯ã¿ã¼ãå
¥å
@translationof Relative octave entry
-@c æ¬é
ç®ã®ã¿å
ã«ç¿»è¨³ 2015-12-31
-@c ããã¥ã¡ã³ãå
¨ä½çã«ç¸å¯¾ã¢ã¼ãã®éå§ãããæå®æ¹æ³ãå¤æ´ããã¦ããã
-@c å¾åã®ã¾ã¾ã®å
容ã ã¨æ··ä¹±ããããå¯è½æ§ãããããã
-
@cindex relative (ç¸å¯¾)
@cindex relative octave entry (ç¸å¯¾ãªã¯ã¿ã¼ãå
¥å)
@cindex octave entry, relative (ç¸å¯¾ãªã¯ã¿ã¼ãå
¥å)
@@ -151,7 +171,7 @@
@item
æåã®é³ç¬¦ã®ããã㯠@code{@var{startpitch}} ã¨ç¸å¯¾é¢ä¿ã§æ±ºå®ããã¾ãã@c
@var{startpitch} ã¯çµ¶å¯¾ãªã¯ã¿ã¼ã ã¢ã¼ãã§æå®ããã¾ãã@c
-ã©ã®é¸æè¢ããããããã§ããï¼
+以ä¸ã®ã©ããããããããã§ããï¼
@table @asis
@item @code{c} ã®ãªã¯ã¿ã¼ã
@@ -265,7 +285,7 @@
@end lilypond
ä¸ã§èª¬æããããã«ããããã®ãªã¯ã¿ã¼ãã¯é³ç¬¦åã®ã¿ã使ã£ã¦ç®åºããã@c
-ãããªãå¤æ´ã«ãå½±é¿ãåãã¾ããã@c
+ãããªãå¤æ´ (訳注: ã·ã£ã¼ãããã©ãã) ã«ãå½±é¿ãåãã¾ããã@c
ãã®ãããB ã®å¾ã® E ããã« ã·ã£ã¼ã㯠B ãããä¸ã«é
ç½®ããã@c
B ã®å¾ã® F ããã« ãã©ãã㯠B ãããä¸ã«é
ç½®ããã¾ãã@c
è¨ãæããã¨ãéå¢ 4 度ã¯éæ¸ 5 度ãããå°ãã
@@ -280,6 +300,24 @@ B ã®å¾ã® F ããã« ãã©ãã㯠B ãããä¸ã«é
ç½®ããã¾ãã@c
}
@end lilypond
+ç¶æ³ãè¤éã§ããã¨ãã«ã¯ãåã®é³ç¬¦ã«ãããããåºå®ããããããæå®ããã»ãã@c
+æçããããã¾ããããã㯠@code{\resetRelativeOctave} ã«ãã£ã¦è¡ããã¨ã@c
+ã§ãã¾ãã
+
+@lilypond[verbatim,quote]
+\relative {
+ <<
+ { c''2 d }
+ \\
+ { e,,2 f }
+ >>
+ \resetRelativeOctave c''
+ c2
+}
+@end lilypond
+
+@funindex \resetRelativeOctave
+
@seealso
é³æ¥½ç¨èªé:
@@ -316,11 +354,11 @@ B ã®å¾ã® F ããã« ãã©ãã㯠B ãããä¸ã«é
ç½®ããã¾ãã@c
@c duplicated in Key signature and Accidentals
@warning{LilyPond ãå§ããã°ããã®ã¦ã¼ã¶ã¯@c
ãã°ãã°è¨æè¨å·ã¨èª¿å·ã®ãã¨ã§æ··ä¹±ãã¾ãã@c
-LilyPond ã§ã¯ãé³ç¬¦åã¯æªå å·¥ã®å
¥åã§ã
--- 調å·ã¨é³é¨è¨å·ããã®æªå å·¥ã®å
¥åãã©ã®ããã«è¡¨ç¤ºãããã決å®ãã¾ãã@c
+LilyPond ã§ã¯ãé³ç¬¦åã¯ããããæå®ãã¾ã
+-- 調å·ã¨é³é¨è¨å·ããããã®ããããã©ã®ããã«è¡¨ç¤ºãããã決å®ãã¾ãã@c
@code{c} ã®ãããªå¤æ´ãå ãããã¦ããªãé³ç¬¦ã¯ã調å·ãé³é¨è¨å·ã¨ã¯ç¡é¢ä¿ã«ã@c
@q{C ããã¥ã©ã«} ãæå³ãã¾ãã@c
-æ´ãªãæ
å ±ã¯ã@rlearning{Accidentals and key signatures} ãåç
§ãã¦ãã ããã}
+æ´ãªãæ
å ±ã¯ã@rlearning{ãããã¨èª¿å·} ãåç
§ãã¦ãã ããã}
@cindex note names, Dutch (ãªã©ã³ãèªã§ã®é³ç¬¦å)
@cindex note names, default (ããã©ã«ãã®é³ç¬¦å)
@@ -348,9 +386,9 @@ LilyPond ã§ã¯ãé³ç¬¦åã¯æªå å·¥ã®å
¥åã§ã
\relative c'' { ais1 aes aisis aeses }
@end lilypond
-ããã¥ã©ã«ã¯è¨æè¨å·ã調å·ã®å¹æããã£ã³ã»ã«ãã¾ãã@c
-ããããªãããããã¥ã©ã«ã¯æ¥å°¾è¾ã¨ãã¦é³ç¬¦åæ§æã«ã¨ã³ã³ã¼ãããã¦ã¯ãã¾ããã@c
-ãã®ãããããã¥ã©ã«ã®ãããã¯åã«é³ç¬¦åã§å
¥åããã¾ã:
+ããã¥ã©ã«ã®ãããã¯åã«é³ç¬¦åãå
¥åãã¾ããæ¥å°¾è¾ã¯å¿
è¦ããã¾ããã@c
+ããã¥ã©ã«è¨å·ã¯ãåã®è¨æè¨å·ã調å·ã®å¹æããã£ã³ã»ã«ããã®ã«å¿
è¦ãªå ´åã«@c
+表示ããã¾ãã
@lilypond[verbatim,quote,fragment]
\relative c'' { a4 aes a2 }
@@ -424,7 +462,7 @@ LilyPond ã§ã¯ãé³ç¬¦åã¯æªå å·¥ã®å
¥åã§ã
@rglos{quarter tone}
å¦ç¿ããã¥ã¢ã«:
-@rlearning{Accidentals and key signatures}
+@rlearning{ãããã¨èª¿å·}
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Automatic accidentals},
@@ -472,7 +510,7 @@ LilyPond ã®è¨å·ã¯ãããªãæ¨æºã«ãæºæ ãã¾ããã
å©ç¨å¯è½ãªè¨èªãã¡ã¤ã«ã¨ããããå®ç¾©ãã¦ããé³ç¬¦åãæãã¾ã:
@quotation
-@multitable {@code{nederlands}} {do re mi fa sol la sib si}
+@multitable {@code{nederlands}} {do re/re mi fa sol la sib si}
@headitem è¨èª
@tab é³ç¬¦å
@item @code{nederlands}
@@ -485,7 +523,9 @@ LilyPond ã®è¨å·ã¯ãããªãæ¨æºã«ãæºæ ãã¾ããã
@tab c d e f g a bf b
@item @code{espanol} ã¾ã㯠@code{español}
@tab do re mi fa sol la sib si
-@item @code{italiano} ã¾ã㯠@code{français}
+@item @code{français}
+ @tab do ré/re mi fa sol la sib si
+@item @code{italiano}
@tab do re mi fa sol la sib si
@item @code{norsk}
@tab c d e f g a b h
@@ -503,33 +543,35 @@ LilyPond ã®è¨å·ã¯ãããªãæ¨æºã«ãæºæ ãã¾ããã
é³ç¬¦åã«å ãã¦ãè¨æè¨å·ã®æ¥å°¾è¾ãè¨èªã«ãã£ã¦ç°ãªãå ´åãããã¾ã:
@quotation
-@multitable {@code{nederlands}} {-s/-sharp} {-ess/-es} {-ss/-x/-sharpsharp} {-essess/-eses}
-@headitem è¨èª
- @tab ã·ã£ã¼ã @tab ãã©ãã @tab ããã« ã·ã£ã¼ã @tab ããã« ãã©ãã
+@multitable {@code{nederlands}} {-@code{s}/-@code{-sharp}} {-@code{f}/-@code{-flat}} {-@code{ss}/-@code{x}/-@code{-sharpsharp}} {-@code{ff}/-@code{-flatflat}}
+@headitem Language
+ @tab sharp @tab flat @tab double sharp @tab double flat
@item @code{nederlands}
- @tab -is @tab -es @tab -isis @tab -eses
+ @tab -@code{is} @tab -@code{es} @tab -@code{isis} @tab -@code{eses}
@item @code{catalan}
- @tab -d/-s @tab -b @tab -dd/-ss @tab -bb
+ @tab -@code{d}/-@code{s} @tab -@code{b} @tab -@code{dd}/-@code{ss} @tab -@code{bb}
@item @code{deutsch}
- @tab -is @tab -es @tab -isis @tab -eses
+ @tab -@code{is} @tab -@code{es} @tab -@code{isis} @tab -@code{eses}
@item @code{english}
- @tab -s/-sharp @tab -f/-flat @tab -ss/-x/-sharpsharp
- @tab -ff/-flatflat
+ @tab -@code{s}/-@code{-sharp} @tab -@code{f}/-@code{-flat} @tab -@code{ss}/-@code{x}/-@code{-sharpsharp}
+ @tab -@code{ff}/-@code{-flatflat}
@item @code{espanol} ã¾ã㯠@code{español}
- @tab -s @tab -b @tab -ss/-x @tab -bb
-@item @code{italiano} ã¾ã㯠@code{français}
- @tab -d @tab -b @tab -dd @tab -bb
+ @tab -@code{s} @tab -@code{b} @tab -@code{ss}/-@code{x} @tab -@code{bb}
+@item @code{français}
+ @tab -@code{d} @tab -@code{b} @tab -@code{dd}/-@code{x} @tab -@code{bb}
+@item @code{italiano}
+ @tab -@code{d} @tab -@code{b} @tab -@code{dd} @tab -@code{bb}
@item @code{norsk}
- @tab -iss/-is @tab -ess/-es @tab -ississ/-isis
- @tab -essess/-eses
+ @tab -@code{iss}/-@code{is} @tab -@code{ess}/-@code{es} @tab -@code{ississ}/-@code{isis}
+ @tab -@code{essess}/-@code{eses}
@item @code{portugues}
- @tab -s @tab -b @tab -ss @tab -bb
+ @tab -@code{s} @tab -@code{b} @tab -@code{ss} @tab -@code{bb}
@item @code{suomi}
- @tab -is @tab -es @tab -isis @tab -eses
+ @tab -@code{is} @tab -@code{es} @tab -@code{isis} @tab -@code{eses}
@item @code{svenska}
- @tab -iss @tab -ess @tab -ississ @tab -essess
+ @tab -@code{iss} @tab -@code{ess} @tab -@code{ississ} @tab -@code{essess}
@item @code{vlaams}
- @tab -k @tab -b @tab -kk @tab -bb
+ @tab -@code{k} @tab -@code{b} @tab -@code{kk} @tab -@code{bb}
@end multitable
@end quotation
@@ -573,7 +615,9 @@ LilyPond ã§ã¯ã©ã¡ãã®å½¢å¼ãèªãããã¾ãã@c
@tab -qs @tab -qf @tab -tqs @tab -tqf
@item @code{espanol} ã¾ã㯠@code{español}
@tab -cs @tab -cb @tab -tcs @tab -tcb
-@item @code{italiano} ã¾ã㯠@code{français}
+@item @code{français}
+ @tab -sd @tab -sb @tab -dsd @tab -bsb
+@item @code{italiano}
@tab -sd @tab -sb @tab -dsd @tab -bsb
@item @code{portugues}
@tab -sqt @tab -bqt @tab -stqt @tab -btqt
@@ -654,9 +698,9 @@ LilyPond ã§ã¯ã©ã¡ãã®å½¢å¼ãèªãããã¾ãã@c
ããã¯åã®é³ç¬¦ã¨ @code{@var{controlpitch}} ã¨ã®éã®é³ç¨ã
4 度以å
ã§ãããã©ããããã§ãã¯ãã¾ã
(ã¤ã¾ããé常ã®ç¸å¯¾ã¢ã¼ãã§ã®ç®åºæ¹æ³ã¨åãã§ã)ã@c
-ãã®ãã§ãã¯ã失æããå ´åãè¦åã表示ããã¾ããã@c
-ãã®ãã§ãã¯ã®åã«ããé³ç¬¦ã¯å¤æ´ããã¾ããã@c
-ãã®å¾ã«ç¶ãé³ç¬¦ã¯ @code{@var{controlpitch}} ããç®åºããã¾ãã
+ãã®ãã§ãã¯ã失æããå ´åãè¦åã表示ããã¾ãã@c
+ãã®ãã§ãã¯ã®åã«ããé³ç¬¦ã¯å¤æ´ããã¾ãããã@c
+ãã®å¾ã«ç¶ãé³ç¬¦ã¯ãªã¯ã¿ã¼ããä¿®æ£ããã¾ãã
@lilypond[verbatim,quote]
\relative {
@@ -896,9 +940,13 @@ music = \relative { c'8. ees16( fis8. a16 b8.) gis16 f8. d16 }
@end lilypond
@knownissues
-@code{\retrograde} ã®ä¸ã«ããæåã®ã¿ã¤ã¯å£ãã¦è¦åãçºãã¾ãã@c
-@ref{Automatic note splitting} ãæå¹ã«ãããã¨ã«ãã£ã¦@c
-èªåçã«çæãããããã¿ã¤ãããã¾ãã
+@code{\retrograde} ã¯é常ã«åç´ãªãã¼ã«ã§ããå¤ãã®ã¤ãã³ãã¯äº¤æã§ã¯ãªã@c
+@q{å転}ãããããã¹ããã®éå§ç¹ã«ãã調æ´ãæ¹åæ示åã¯å¯¾å¿ããçµäºç¹ã«ã@c
+追å ããå¿
è¦ãããã¾ããã¤ã¾ãã@code{^(} 㯠@code{^)} ã«ãã£ã¦çµäºããªããã°@c
+ãªããªãã¨ãããã¨ã§ããå
¨ã¦ã® @code{\<} ã @code{\cresc} 㯠@code{\!} ã
+@code{\endcr} ã§çµãããªããã°ãªãããå
¨ã¦ã® @code{\>} ã @code{\decr} ã¯@c
+@code{\enddecr} ã§çµãããªããã°ãªãã¾ãããå¹æãæ°¸ç¶ãããããª@c
+ããããã£å¤æ´ã®ã³ãã³ãããªã¼ãã©ã¤ãã¯äºæããªãçµæãçã¿åºãããããã¾ããã
@seealso
è¨èæ³ãªãã¡ã¬ã³ã¹:
@@ -991,9 +1039,6 @@ motif = \relative { c'8 d e f g a b c }
\modalInversion @var{around-pitch} @var{to-pitch} @var{scale} @var{motif}
@end example
-@var{motif} ã®é³ç¬¦ã¯ @var{scale} å
ã @var{to-pitch} 㨠@var{from-pitch}
-éã®é³ç¨ã®åº¦æ°ã®åã ãã·ããããã¾ã:
-
@var{motif} ã®é³ç¬¦ã¯ @var{scale} å
ã @var{around-pitch} ããå
ã®é³ç¬¦ã¾ã§ã¨@c
åã度æ°ã®åã ãéåãã«é²ãã ä½ç½®ã«é
ç½®ããããããããã®çµæã¯
@var{scale} å
ã @var{to-pitch} 㨠@var{around-pitch} éã®é³ç¨ã®åº¦æ°åã ã@c
@@ -1099,9 +1144,16 @@ motif = \relative { c'8. ees16 fis8. a16 b8. gis16 f8. d16 }
@funindex \clef
-é³é¨è¨å·ãå¤ãããã¨ãã§ãã¾ãã@c
-以ä¸ã®ããããã®ä¾ã®ä¸ã«ããé³ç¬¦ã¯ãã¹ã¦ããã« C ã§ãã@c
-ä¾ã®ä¸ã«ããé³é¨åãããã« ã¯ã©ã¼ãã§å²ããã¨ãã§ãã¾ã (å¿
é ã§ã¯ããã¾ãã)ã
+ã³ãã³ããæ示ããªãå ´åãLilyPond ã®ããã©ã«ãã®é³é¨è¨å·ã¯é«é³é¨è¨å·
+(ãé³è¨å·) ã§ãã
+
+@lilypond[verbatim,quote,fragment,ragged-right]
+c'2 c'
+@end lilypond
+
+ããããé³é¨è¨å·ã¯ @code{\clef} ã³ãã³ãã¨@c
+é©åãªé³é¨è¨å·ã®ååãç¨ãããã¨ã§å¤ãããã¨ãã§ãã¾ãã@c
+以ä¸ã®ããããã®ä¾ã®ä¸ã«ããé³ç¬¦ã¯ãã¹ã¦@emph{ããã« C} ã§ãã@c
@lilypond[verbatim,quote,fragment]
\clef treble
@@ -1114,46 +1166,25 @@ c'2 c'
c'2 c'
@end lilypond
-ä»ã®é³é¨è¨å·ãããã¾ã:
-
-@c KEEP LY
-@lilypond[verbatim,quote,fragment]
-\clef french
-c'2 c'
-\clef soprano
-c'2 c'
-\clef mezzosoprano
-c'2 c'
-\clef baritone
-c'2 c'
-
-\break
+æå®ãããã¨ã®ã§ããå
¨ã¦ã®é³é¨è¨å·ã®åå㯠@ref{Clef styles} ã«ããã¾ãã
-\clef varbaritone
-c'2 c'
-\clef subbass
-c'2 c'
-\clef percussion
-c'2 c'
-
-\break
+å°éçãªé³é¨è¨å· -- ä¾ãã°@emph{å¤ä»£ã®}é³æ¥½ã«ç¨ãããããã® --ãã¯
+@ref{Mensural clefs} ã @ref{Gregorian clefs} ã«èª¬æãã¦ããã¾ãã@c
+ã¿ãèã®é³é¨è¨å·ãå¿
è¦ãªé³æ¥½ã«é¢ãã¦ã¯ã
+@ref{Default tablatures} ã @ref{Custom tablatures} ã«èª¬æãããã¾ãã
-\clef G % treble ã¨å義ã§ã
-c'2 c'
-\clef F % bass ã¨å義ã§ã
-c'2 c'
-\clef C % alto ã¨å義ã§ã
-c'2 c'
-@end lilypond
+@cindex Cue clefs (åå³é³ç¬¦ã®é³é¨è¨å·)
+@cindex Clefs with cue notes (åå³é³ç¬¦ã®é³é¨è¨å·)
+åå³é³ç¬¦ãç¨ããéã®é³é¨è¨å·ã«ã¤ãã¦ã¯ã@ref{Formatting cue notes} ã®
+@code{\cueClef} ã @code{\cueDuringWithClef} ã³ãã³ããåç
§ãã¦ãã ããã
@cindex transposing clefs (é³é¨ã移調ãã)
@cindex clef, transposing (é³é¨ã移調ãã)
@cindex octave transposition (ãªã¯ã¿ã¼ã移調)
-@c æªè¨³
-@cindex optional octave transposition
-@cindex octave transposition, optional
-@cindex choral tenor clef
-@cindex tenor clef, choral
+@cindex optional octave transposition (ä»»æã®ãªã¯ã¿ã¼ã移調)
+@cindex octave transposition, optional (ä»»æã®ãªã¯ã¿ã¼ã移調)
+@cindex choral tenor clef (åå±èã®ããã¼é³é¨è¨å·)
+@cindex tenor clef, choral (åå±èã®ããã¼é³é¨è¨å·)
é³é¨åã« @code{_8} ã¾ã㯠@code{^8} ãä»ãå ãããã¨ã«ãã£ã¦ã@c
é³é¨ã¯ãããã 1 ãªã¯ã¿ã¼ãä¸/ä¸ã«ç§»èª¿ããã@c
@@ -1188,12 +1219,63 @@ c'2 c'
ãããã¯æ°åã®å¼æ°ãæ¬å¼§ã§å²ã¾ãã¦ããªãå ´åã¨åãã§ãã
-ç¹æ®ãªé³é¨è¨å·ã«ã¤ãã¦ã¯ @ref{Mensural clefs},
-@ref{Gregorian clefs}, @ref{Default tablatures}, ããã«
-@ref{Custom tablatures} ã§èª¬æãã¾ãã@c
-楽èã®ä¸ã§åå³é³ç¬¦ã使ç¨ããã¨ãã«é³é¨è¨å·ãå¤æ´ããå ´åã¯ã@c
-@ref{Formatting cue notes} ã® @code{\cueClef} é¢æ°ã¨
-@code{\cueDuringWithClef} é¢æ°ãåç
§ãã¦ãã ããã
+ããã©ã«ãã§ã¯ãæ¹è¡ã®ã¿ã¤ãã³ã°ã§é³é¨è¨å·ã®å¤æ´ãè¡ãããæã«ã¯ã@c
+次ã®è¡ã®é³é¨è¨å·ã®ä»ã«ãåã®è¡ã®æå¾ã«@emph{äºåã®}é³é¨è¨å·ã表示ããã¾ãã@c
+ãã®@emph{äºåã®}é³é¨è¨å·ã¯è¡¨ç¤ºããªãããã«ãããã¨ãã§ãã¾ãã
+
+@lilypond[verbatim,quote,fragment]
+\clef treble { c'2 c' } \break
+\clef bass { c'2 c' } \break
+\clef alto
+ \set Staff.explicitClefVisibility = #end-of-line-invisible
+ { c'2 c' } \break
+ \unset Staff.explicitClefVisibility
+\clef bass { c'2 c' } \break
+@end lilypond
+
+ããã©ã«ãã§ã¯ã以åã«è¡¨ç¤ºãããé³é¨è¨å·ã¨åãé³é¨è¨å·ã @code{\clef}
+ã³ãã³ãã§æå®ãã¦ããå表示ã¯ãããç¡è¦ããã¾ãããã®æåã¯
+@code{\set Staff.forceClef = ##t} ã§å¤æ´ãããã¨ãã§ãã¾ãã
+
+@lilypond[verbatim,quote,fragment]
+ \clef treble
+ c'1
+ \clef treble
+ c'1
+ \set Staff.forceClef = ##t
+ c'1
+ \clef treble
+ c'1
+@end lilypond
+
+@noindent
+ããã«æ£ç¢ºã«è¨ãã¨ãé³é¨è¨å·ã表示ããã®ã¯ @code{\clef} ã³ãã³ããã®ãã®ã§ã¯@c
+ããã¾ããã代ããã«ããã®ã³ãã³ã㯠@code{Clef_engraver} ã®ããããã£ã@c
+å¤æ´ãã@code{Clef_engraver} ã¯ããã«ãã£ã¦ç¾å¨ã®èã«é³é¨è¨å·ã表示ããã@c
+ã©ããã決å®ãã¾ãã@code{forceClef} ããããã£ã¯ãã®é³é¨è¨å·ã表示ãããã®@c
+決å®ããã®å ´ã§ä¸æ¸ããã¾ãã
+
+æåã§é³é¨è¨å·ãå¤æ´ãããå ´åãå¤æ´å¾ã®é³é¨è¨å·ã¯é常ããå°ãã表示ããã¾ãã@c
+ãã®æåãå¤æ´ãããã¨ãã§ãã¾ãã
+
+@lilypond[verbatim,quote,fragment]
+ \clef "treble"
+ c'1
+ \clef "bass"
+ c'1
+ \clef "treble"
+ c'1
+ \override Staff.Clef.full-size-change = ##t
+ \clef "bass"
+ c'1
+ \clef "treble"
+ c'1
+ \revert Staff.Clef.full-size-change
+ \clef "bass"
+ c'1
+ \clef "treble"
+ c'1
+@end lilypond
@snippets
@@ -1208,6 +1290,9 @@ c'2 c'
@ref{Custom tablatures},
@ref{Formatting cue notes}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{scm/parser-clef.scm}
+
ã³ã¼ãæçé:
@rlsrnamed{Pitches,ããã}
@@ -1226,8 +1311,8 @@ c'2 c'
@lilypond[fragment,quote,verbatim]
\new Staff \with {
- \override ClefModifier.color = #red
\override Clef.color = #blue
+ \override ClefModifier.color = #red
}
\clef "treble_8" c'4
@@ -1249,7 +1334,7 @@ LilyPond ã§ã¯ãé³ç¬¦åã¯æªå å·¥ã®å
¥åã§ãã@c
調å·ã¨é³é¨è¨å·ããã®æªå å·¥ã®å
¥åãã©ã®ããã«è¡¨ç¤ºãããã決å®ãã¾ãã@c
@code{c} ã®ãããªå¤æ´ãå ãããã¦ããªãé³ç¬¦ã¯ã調å·ãé³é¨è¨å·ã¨ã¯ç¡é¢ä¿ã«ã@c
@q{C ããã¥ã©ã«} ãæå³ãã¾ãã@c
-æ´ãªãæ
å ±ã¯ã@rlearning{Accidentals and key signatures} ãåç
§ãã¦ãã ããã}
+æ´ãªãæ
å ±ã¯ã@rlearning{ãããã¨èª¿å·} ãåç
§ãã¦ãã ããã}
調å·ã¯æ¥½æ²ãæ¼å¥ãã¹ã調æ§ã示ãã¾ãã@c
調å·ã¯èã®å
é ã§å¤æ´è¨å· (ãã©ãããã·ã£ã¼ã) ã®ã»ããã«ãã£ã¦ç¤ºããã¾ãã@c
@@ -1309,8 +1394,8 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
(3 . ,NATURAL) (4 . ,NATURAL) (5 . ,FLAT) (6 . ,FLAT))
\relative {
- \key c\freygish c'4 des e f
- \bar "||" \key d\freygish d es fis g
+ \key c \freygish c'4 des e f
+ \bar "||" \key d \freygish d es fis g
}
@end lilypond
@@ -1346,7 +1431,7 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
@rglos{scordatura}
å¦ç¿ããã¥ã¢ã«:
-@rlearning{Accidentals and key signatures}
+@rlearning{ãããã¨èª¿å·}
ã³ã¼ãæçé:
@rlsrnamed{Pitches,ããã}
@@ -1396,6 +1481,12 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
@lilypondfile[verbatim,quote,texidoc,doctitle]
{ottava-text.ly}
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{adding-an-ottava-marking-to-a-single-voice.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{modifying-the-ottava-spanner-slope.ly}
+
@seealso
é³æ¥½ç¨èªé:
@rglos{octavation}
@@ -1447,46 +1538,57 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT) (2 . ,NATURAL)
@lilypond[verbatim,quote]
\new GrandStaff <<
- \new Staff = "violin" {
- \relative c'' {
- \set Staff.instrumentName = #"Vln"
- \set Staff.midiInstrument = #"violin"
- % not strictly necessary, but a good reminder
- \transposition c'
-
- \key c \major
- g4( c8) r c r c4
- }
+ \new Staff = "violin" \with {
+ instrumentName = #"Vln"
+ midiInstrument = #"violin"
}
- \new Staff = "clarinet" {
- \relative c'' {
- \set Staff.instrumentName = \markup { Cl (B\flat) }
- \set Staff.midiInstrument = #"clarinet"
- \transposition bes
-
- \key d \major
- a4( d8) r d r d4
- }
+ \relative c'' {
+ % not strictly necessary, but a good reminder
+ \transposition c'
+ \key c \major
+ g4( c8) r c r c4
+ }
+ \new Staff = "clarinet" \with {
+ instrumentName = \markup { Cl (B\flat) }
+ midiInstrument = #"clarinet"
+ }
+ \relative c'' {
+ \transposition bes
+ \key d \major
+ a4( d8) r d r d4
}
>>
@end lilypond
@code{\transposition} ã¯æ¥½æ²ã®éä¸ã§å¤æ´ããããã¨ãããã¾ãã@c
ä¾ãã°ãã¯ã©ãªãããå¥è
㯠A ã®ã¯ã©ãªããããã B-ãã©ããã®ã¯ã©ãªãããã«@c
-æã¡æ¿ãããã¨ãããã¾ãã
+æã¡æ¿ããªããã°ãªããªããã¨ãããã¾ãã
-@lilypond[verbatim,quote,relative=2]
-\set Staff.instrumentName = #"Cl (A)"
-\key a \major
-\transposition a
-c d e f
-\textLengthOn
-<>^\markup { Switch to B\flat clarinet }
-R1
-
-\key bes \major
-\transposition bes
-c2 g
+@lilypond[verbatim,quote]
+flute = \relative c'' {
+ \key f \major
+ \cueDuring #"clarinet" #DOWN {
+ R1 _\markup\tiny "clarinet"
+ c4 f e d
+ R1 _\markup\tiny "clarinet"
+ }
+}
+clarinet = \relative c'' {
+ \key aes \major
+ \transposition a
+ aes4 bes c des
+ R1^\markup { muta in B\flat }
+ \key g \major
+ \transposition bes
+ d2 g,
+}
+\addQuote "clarinet" \clarinet
+<<
+ \new Staff \with { instrumentName = #"Flute" }
+ \flute
+ \new Staff \with { instrumentName = #"Cl (A)" }
+ \clarinet
+>>
@end lilypond
@seealso
@@ -1595,6 +1697,7 @@ musicB = {
両æ¹ã®èã§åãè¨æè¨å·ã¹ã¿ã¤ã«ã使ãã®ãªãã@c
ãã®ä¾ã®æå¾ã®ãããã¯ã以ä¸ã§ç½®ãæãããã¾ã:
+@c KEEP LY
@example
\new PianoStaff @{
<<
@@ -1826,11 +1929,9 @@ musicB = {
@funindex modern-cautionary
ãã®è¦å㯠@code{modern} ã¨ä¼¼ã¦ãã¾ããã@c
-å¿ åçè¨æè¨å·ã¨ã㦠@q{追å ã®} è¨æè¨å·ãèå»ããã¾ã
-(ãã㯠@code{default} ã§ã¯èå»ããã¾ãã)ã@c
-ããã©ã«ãã§ã¯ããã®è¨æè¨å·ã¯æ¬å¼§ã§å²ã¾ãã¦èå»ããã¾ããã@c
-@code{AccidentalSuggestion} ã® @code{cautionary-style} ããããã£ã@c
-å®ç¾©ãããã¨ã«ãã£ã¦å°ããªãµã¤ãºã§èå»ããããã¨ãããå¾ã¾ãã
+å¿ åçè¨æè¨å·ã¨ã㦠@q{追å ã®} è¨æè¨å·ã (æ¬å¼§ä»ãã§) èå»ããã¾ãã@c
+ãããã®è¨æè¨å·ã¯ã@code{AccidentalCautionary} ã® @code{font-size}
+ããããã£ããªã¼ãã©ã¤ããããã¨ã§ç°ãªã£ããµã¤ãºã§è¡¨ç¤ºãããã¨ãã§ãã¾ãã
@lilypond[quote]
musicA = {
@@ -2133,6 +2234,127 @@ musicB = {
}
@end lilypond
+@item choral
+
+@cindex accidental style, choral (choral è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex accidentals, choral (choral è¨æè¨å·)
+@cindex choral accidental style (choral è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex choral accidentals (choral è¨æè¨å·)
+
+@funindex choral
+
+ãã®ã«ã¼ã«ã¯ @code{modern-voice} 㨠@code{piano} ã®çµã¿åããã§ãã@c
+ããã¯èªèº«ã®ãã¤ã¹ã®ã¿ã追ãææã«ã¨ã£ã¦å¿
è¦ãªå
¨ã¦ã®è¨æè¨å·ã表示ãã@c
+ã¾ã @code{ChoirStaff} ã®å
¨ã¦ã®ãã¤ã¹ãåæã«è¿½ãèªèè
ã®ããã«è¿½å ã®@c
+è¨æè¨å·ã表示ãã¾ãã
+
+ãã®è¨æè¨å·ã¹ã¿ã¤ã«ã¯ @code{ChoirStaff} ã§ããã©ã«ãã§é©ç¨ããã¦ãã¾ãã
+
+@lilypond[quote]
+musicA = {
+ <<
+ \relative {
+ cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 |
+ }
+ \\
+ \relative {
+ ais'2 cis, |
+ fis8 b a4 cis2 |
+ }
+ >>
+}
+
+musicB = {
+ \clef bass
+ \new Voice {
+ \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis>
+ \change Staff = up
+ cis' cis
+ \change Staff = down
+ <fis, a> <fis a>]
+ \showStaffSwitch
+ \change Staff = up
+ dis'4 |
+ \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
+
+\new ChoirStaff {
+ <<
+ \context Staff = "up" {
+ \accidentalStyle choral
+ \musicA
+ }
+ \context Staff = "down" {
+ \musicB
+ }
+ >>
+}
+@end lilypond
+
+@item choral-cautionary
+
+@cindex accidentals, choral cautionary (choral-cautionary è¨æè¨å·)
+@cindex cautionary accidentals, choral (choral-cautionary è¨æè¨å·)
+@cindex choral cautionary accidentals (choral-cautionary è¨æè¨å·)
+@cindex accidental style, choral cautionary (choral-cautionary è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex cautionary accidental style, choral (choral-cautionary è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex choral cautionary accidental style (choral-cautionary è¨æè¨å·ã¹ã¿ã¤ã«)
+
+@funindex choral-cautionary
+
+ãã®è¦å㯠@code{choral} ã¨åãã§ããã追å ã®è¨æè¨å·ã¯å¿ åã¨ãã¦èå»ããã¾ãã
+
+@lilypond[quote]
+musicA = {
+ <<
+ \relative {
+ cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 |
+ }
+ \\
+ \relative {
+ ais'2 cis, |
+ fis8 b a4 cis2 |
+ }
+ >>
+}
+
+musicB = {
+ \clef bass
+ \new Voice {
+ \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis>
+ \change Staff = up
+ cis' cis
+ \change Staff = down
+ <fis, a> <fis a>]
+ \showStaffSwitch
+ \change Staff = up
+ dis'4 |
+ \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
+
+\new ChoirStaff {
+ <<
+ \context Staff = "up" {
+ \accidentalStyle choral-cautionary
+ \musicA
+ }
+ \context Staff = "down" {
+ \musicB
+ }
+ >>
+}
+@end lilypond
+
@item neo-modern
@cindex neo-modern accidental style (neo-modern è¨æè¨å·ã¹ã¿ã¤ã«)
@@ -2205,7 +2427,9 @@ musicB = {
@funindex neo-modern-cautionary
ãã®è¦å㯠@code{neo-modern} ã¨ä¼¼ã¦ãã¾ããã@c
-追å ã®è¨æè¨å·ã¯å¿ åã®è¨æè¨å·ã¨ãã¦èå»ããã¾ãã
+追å ã®è¨æè¨å·ã¯å¿ åã®è¨æè¨å·ã¨ã㦠(æ¬å¼§ä»ãã§) èå»ããã¾ãã@c
+ãããã®è¨æè¨å·ã¯ã@code{AccidentalCautionary} ã® @code{font-size}
+ããããã£ããªã¼ãã©ã¤ããããã¨ã§ç°ãªã£ããµã¤ãºã§è¡¨ç¤ºãããã¨ãã§ãã¾ãã
@lilypond[quote]
musicA = {
@@ -2432,6 +2656,122 @@ musicB = {
}
@end lilypond
+@item dodecaphonic-no-repeat
+
+@cindex dodecaphonic accidental style (dodecaphonic è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex dodecaphonic style, neo-modern (neo-modern 12 é³ã¹ã¿ã¤ã«)
+
+@funindex dodecaphonic-no-repeat
+
+@code{dodecaphonic} ã¨ä¼¼ã¦ãé常@emph{å
¨ã¦ã®} é³ç¬¦ã«è¨æè¨å·ãèå»ããã¾ããã@c
+åãèã®ä¸ã§ããããç´å¾ã«ç¹°ãè¿ãããå ´åã«ã¯èå»ããã¾ããã
+
+@lilypond[quote]
+musicA = {
+ <<
+ \relative {
+ cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 |
+ }
+ \\
+ \relative {
+ ais'2 cis, |
+ fis8 b a4 cis2 |
+ }
+ >>
+}
+
+musicB = {
+ \clef bass
+ \new Voice {
+ \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis>
+ \change Staff = up
+ cis' cis
+ \change Staff = down
+ <fis, a> <fis a>]
+ \showStaffSwitch
+ \change Staff = up
+ dis'4 |
+ \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
+
+\new PianoStaff {
+ <<
+ \context Staff = "up" {
+ \accidentalStyle dodecaphonic-no-repeat
+ \musicA
+ }
+ \context Staff = "down" {
+ \accidentalStyle dodecaphonic-no-repeat
+ \musicB
+ }
+ >>
+}
+@end lilypond
+
+
+@item dodecaphonic-first
+
+@cindex dodecaphonic accidental style (dodecaphonic è¨æè¨å·ã¹ã¿ã¤ã«)
+@cindex dodecaphonic style, neo-modern (neo-modern 12 é³ã¹ã¿ã¤ã«)
+
+@funindex dodecaphonic-first
+
+@code{dodecaphonic} ã¨ä¼¼ã¦ãé常@emph{å
¨ã¦ã®} é³ç¬¦ã«è¨æè¨å·ãèå»ããã¾ããã@c
+å°ç¯å
ã§æåã«åºç¾ãããã®ã«éããã¾ãããªã¯ã¿ã¼ããç°ãªããã®ã¯æ°ãã«@c
+èå»ããã¾ãããç°ãªããã¤ã¹ã§ãè¨æè¨å·ã®å¹æã¯æç¶ãã¾ãã
+
+@lilypond[quote]
+musicA = {
+ <<
+ \relative {
+ cis''8 fis, bes4 <a cis>8 f bis4 |
+ cis2. <c, g'>4 |
+ }
+ \\
+ \relative {
+ ais'2 cis, |
+ fis8 b a4 cis2 |
+ }
+ >>
+}
+
+musicB = {
+ \clef bass
+ \new Voice {
+ \voiceTwo \relative {
+ <fis a cis>8[ <fis a cis>
+ \change Staff = up
+ cis' cis
+ \change Staff = down
+ <fis, a> <fis a>]
+ \showStaffSwitch
+ \change Staff = up
+ dis'4 |
+ \change Staff = down
+ <fis, a cis>4 gis <f a d>2 |
+ }
+ }
+}
+
+\new PianoStaff {
+ <<
+ \context Staff = "up" {
+ \accidentalStyle dodecaphonic-first
+ \musicA
+ }
+ \context Staff = "down" {
+ \accidentalStyle dodecaphonic-first
+ \musicB
+ }
+ >>
+}
+@end lilypond
+
@item teaching
@cindex teaching accidental style (teaching è¨æè¨å·ã¹ã¿ã¤ã«)
@@ -2622,7 +2962,7 @@ musicB = {
å
é¨ãªãã¡ã¬ã³ã¹:
@rinternals{Accidental},
@rinternals{Accidental_engraver},
-@rinternals{GrandStaff} and
+@rinternals{GrandStaff},
@rinternals{PianoStaff},
@rinternals{Staff},
@rinternals{AccidentalSuggestion},
@@ -2766,7 +3106,7 @@ forget = #(define-music-function (music) (ly:music?) #{
@menu
* ç¹æ®ãªç¬¦é ::
* æ¼å¥ã容æã«ããè¨èæ³ã®ç¬¦é ::
-* ã·ã§ã¤ã符é ::
+* ã·ã§ã¤ã ãã¼ãã®ç¬¦é ::
* å³è::
@end menu
@@ -2839,7 +3179,7 @@ forget = #(define-music-function (music) (ly:music?) #{
使ç¨ãããã¨ãã§ãã¾ãã@c
@notation{dead note} ã¨ããç¨èªã¯ã®ã¿ãªã¹ããä¸è¬çã«ä½¿ç¨ãã¾ãã
-ã¾ããåé³ã®ä¸ã§ã®ã¿ä½¿ç¨ã§ãããã¤ã¢ã¢ã³ãå½¢ã®ããã®ç縮è¨æ³ãããã¾ã:
+ã¾ãããã¤ã¢ã¢ã³ãå½¢ã®ããã®ä¼¼ããããªç縮è¨æ³ãããã¾ã:
@lilypond[verbatim,quote]
\relative c'' {
@@ -2933,26 +3273,26 @@ forget = #(define-music-function (music) (ly:music?) #{
@rinternals{note-head-interface}
-@node ã·ã§ã¤ã符é
-@unnumberedsubsubsec ã·ã§ã¤ã符é
+@node ã·ã§ã¤ã ãã¼ãã®ç¬¦é
+@unnumberedsubsubsec ã·ã§ã¤ã ãã¼ãã®ç¬¦é
@translationof Shape note heads
-@cindex note heads, shape (ã·ã§ã¤ã符é )
+@cindex note heads, shape (ã·ã§ã¤ã ãã¼ãã®ç¬¦é )
@cindex note heads, Aiken (Aiken ã®ç¬¦é )
-@cindex note heads, sacred harp (ã»ã¤ã¯ãªãã ãã¼ãã®ç¬¦é )
+@cindex note heads, sacred harp (Sacred Harp ã®ç¬¦é )
@cindex shape notes (ã·ã§ã¤ã ãã¼ã)
-@cindex Aiken shape note heads (Aiken ã®ã·ã§ã¤ã符é )
-@cindex sacred harp note heads (ã»ã¤ã¯ãªãã ãã¼ãã®ç¬¦é )
-@cindex note heads, Southern Harmony
-@cindex Southern Harmony note heads
-@cindex Funk shape note heads
-@cindex note heads, Funk
-@cindex note heads, Harmonica Sacra
-@cindex Harmonica Sacra note heads
-@cindex Christian Harmony note heads
-@cindex note heads, Christian Harmony
-@cindex Walker shape note heads
-@cindex note heads, Walker
+@cindex Aiken shape note heads (Aiken ã®ã·ã§ã¤ã ãã¼ãã®ç¬¦é )
+@cindex sacred harp note heads (Sacred Harp ã®ç¬¦é )
+@cindex note heads, Southern Harmony (Southern Harmony ã®ç¬¦é )
+@cindex Southern Harmony note heads (Southern Harmony ã®ç¬¦é )
+@cindex Funk shape note heads (Funk ã®ã·ã§ã¤ã ãã¼ãã®ç¬¦é )
+@cindex note heads, Funk (Funk ã®ç¬¦é )
+@cindex note heads, Harmonica Sacra (Harmonica Sacra ã®ç¬¦é )
+@cindex Harmonia Sacra note heads (Harmonica Sacra ã®ç¬¦é )
+@cindex Christian Harmony note heads (Christian Harmony ã®ç¬¦é )
+@cindex note heads, Christian Harmony (Christian Harmony ã®ç¬¦é )
+@cindex Walker shape note heads (Walker ã®ã·ã§ã¤ã ãã¼ãã®ç¬¦é )
+@cindex note heads, Walker (Walker ã®ç¬¦é )
@funindex \aikenHeads
@funindex \sacredHarpHeads
@@ -2963,8 +3303,8 @@ forget = #(define-music-function (music) (ly:music?) #{
ã·ã§ã¤ã ãã¼ãè¨èæ³ã§ã¯ã@c
符é ã®å½¢ç¶ã¯é³éã®ä¸ã§ã®é³ç¬¦ã®ä½ç½®ä»ãã«å¯¾å¿ãã¾ãã@c
ãã®è¡¨è¨ã¯ 19 ä¸ç´ã®ã¢ã¡ãªã«ã®æéã§ä¸è¬çãªãã®ã§ãã@c
-ã·ã§ã¤ã符é ã¯ã»ã¤ã¯ãªãã ãã¼ããSouthern Harmonyã@c
-Funk (Harmonica Sacra)ãWalkerãããã« Aiken (Christian Harmony) ã¹ã¿ã¤ã«ã§@c
+ã·ã§ã¤ã ãã¼ãã®ç¬¦é 㯠Sacred HarpãHarmonyã@c
+Funk (Harmonia Sacra)ãWalkerãããã« Aiken (Christian Harmony) ã¹ã¿ã¤ã«ã§@c
使ç¨ããã¾ã:
@lilypond[verbatim,quote]
diff --git a/Documentation/ja/notation/repeats.itely b/Documentation/ja/notation/repeats.itely
index 9767b8bb47..06a1193fdc 100644
--- a/Documentation/ja/notation/repeats.itely
+++ b/Documentation/ja/notation/repeats.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -30,7 +30,9 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
ç¹°ãè¿ãããé³æ¥½ã¯æãåºããã¾ããããç¹°ãè¿ãã®å°ç¯ç·ã§å²ã¾ãã¾ãã@c
ç¹°ãè¿ãã楽æ²ã®å
é ã«ããå ´åãç¹°ãè¿ãã®å°ç¯ç·ã¯ç¹°ãè¿ãã®çµç«¯ã«ã®ã¿@c
èå»ããã¾ãã@c
-ç¹°ãè¿ãæã«å
¥ãæ¿ãã¦æ¼å¥ãããé¨å (volte) ã¯å²ã¿ã®å³å´ã«èå»ããã¾ãã@c
+@c 注: åæã§ã¯è¤æ°å½¢ volte ã使ããã¦ãããã
+@c ããæ¥æ¬èªè©±è
ã«ã¯æ··ä¹±ããããã¨æãããããåæ°å½¢ volta ã使ããã¨ã«ããã
+ç¹°ãè¿ãæã«å
¥ãæ¿ãã¦æ¼å¥ãããé¨å (volta) ã¯å²ã¿ã®å³å´ã«èå»ããã¾ãã@c
ããã¯å
¥ãæ¿ããããç¹°ãè¿ãã®æ¨æºçãªè¨èæ³ã§ãã
@item unfold
@@ -69,16 +71,15 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
* ç¹°ãè¿ããæãåºã::
@end menu
-@c æªè¨³
@cindex volta
-@cindex prima volta
-@cindex seconda volta
-@cindex volta, prima
-@cindex volta, seconda
-@cindex repeat, normal
-@cindex normal repeat
-@cindex repeat with alternate endings
-@cindex alternate endings
+@cindex prima volta (1 ã¤ç®ã® volta)
+@cindex seconda volta (2 ã¤ç®ã® volta)
+@cindex volta, prima (1 ã¤ç®ã® volta)
+@cindex volta, seconda (2 ã¤ç®ã® volta)
+@cindex repeat, normal (é常ã®ç¹°ãè¿ã)
+@cindex normal repeat (é常ã®ç¹°ãè¿ã)
+@cindex repeat with alternate endings (å
¥ãæ¿ãé¨åãæã¤ç¹°ãè¿ã)
+@cindex alternate endings (ç¹°ãè¿ãã®å
¥ãæ¿ãé¨å)
@funindex \repeat
@funindex \alternative
@funindex \partial
@@ -106,6 +107,18 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
}
@end lilypond
+ç¹°ãè¿ãã®@q{éå§}è¨å·ã¯ãããã©ã«ãã§ã¯æåã®å°ç¯ã«ã¯è¡¨ç¤ºããã¾ããã@c
+ããããæåã®é³ç¬¦ã®åã« @code{\bar ".|:"} ãç¨ãããã¨ã§è¡¨ç¤ºããããã¨ã@c
+ã§ãã¾ãã
+
+@lilypond[verbatim,fragment,quote]
+\relative {
+ \repeat volta 2 { \bar ".|:" c''4 d e f }
+ c2 d
+ \repeat volta 2 { d4 e f g }
+}
+@end lilypond
+
ç¹°ãè¿ãæã«å
¥ãæ¿ãã¦æ¼å¥ããé¨å㯠@code{\alternative} ã@c
ç¨ãã¦ä½ãåºããã¨ãã§ãã¾ãã@c
å
¥ãæ¿ãã®åã°ã«ã¼ããæ³¢æ¬å¼§ã§å²ãã§ããã®ãããã¯ã®ä¸ã«é
ç½®ãã¾ãã
@@ -136,8 +149,8 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
}
@end lilypond
-è¤æ°ã®å
¥ãæ¿ãé¨åã 1 åãã¤æ¼å¥ããç¹°ãè¿ãã¯ä»¥ä¸ã®ããã«ãªãã¾ã:
-
+ç¹°ãè¿ããè¤æ°åãããæå¾ã«å
¥ãæ¿ãé¨åãæ¼å¥ããç¹°ãè¿ãã¯@c
+以ä¸ã®ããã«ãªãã¾ã:
@lilypond[verbatim,quote]
\relative {
@@ -150,7 +163,7 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
}
@end lilypond
-ç¹°ãè¿ãé¨åãè¤æ°åç¹°ãè¿ãå ´åã¯ä»¥ä¸ã®ããã«ãªãã¾ã:
+ç¹°ãè¿ããè¤æ°åãããå
¥ãæ¿ãã 2 ã¤ä»¥ä¸ããç¹°ãè¿ãã¯ä»¥ä¸ã®ããã«ãªãã¾ã:
@lilypond[verbatim,quote]
\relative {
@@ -180,124 +193,143 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
@cindex repeat with pickup (ããã¯ã¢ãããæã¤ç¹°ãè¿ã)
@cindex pickup in a repeat (ç¹°ãè¿ãã®ä¸ã«ããããã¯ã¢ãã)
@funindex \partial
+@cindex bar checks with repeats (å°ç¯ãã§ãã¯ã¨ç¹°ãè¿ã)
+@cindex repeats with bar checks (ç¹°ãè¿ãã¨å°ç¯ãã§ãã¯)
+
+å
¥ãæ¿ãã®ç¡ãç¹°ãè¿ããå°ç¯ã®éä¸ã§å§ã¾ãå ´åãé常ã¯å¾ã®å°ç¯ã®å¯¾å¿ãã@c
+ä¸éé¨åã§çµäºãã¾ã (éå§é¨åã¨çµäºé¨å㧠1 ã¤ã®å®å
¨ãªå°ç¯ãä½ããã¾ã)ã@c
+ãã®ãããªå ´åãç¹°ãè¿ãè¨å·ã¯@q{æ¬å½ã®}å°ç¯ç·ã§ã¯ãªãããã@c
+å°ç¯ãã§ãã¯ã @code{\partial} ã³ãã³ããããã«ç½®ãã¹ãã§ã¯ããã¾ãã:
+
+@lilypond[verbatim,quote,relative=1]
+c'4 e g
+\repeat volta 4 {
+ e4 |
+ c2 e |
+ g4 g g
+}
+ g4 |
+ a2 a |
+ g1 |
+@end lilypond
-ç¹°ãè¿ããå°ç¯ã®éä¸ããå§ã¾ããå
¥ãæ¿ãé¨åãç¡ãå ´åã@c
-風éã¯ç¹°ãè¿ãã®çµãããå°ç¯ã®éä¸ã«ãªãã¾ãã@c
-ãã®ããã1 ã¤å°ç¯ã« 2 ã¤ã®çµãããå ãããã¾ãã@c
-ãã®ãããªå ´åãç¹°ãè¿ãè¨å·ã¯æ¬æ¥ã®å°ç¯ç·ã¨ã¯ç°ãªãã¾ãã@c
-ç¹°ãè¿ãè¨å·ãèå»ããå ´æ㧠@code{\partila} ã³ãã³ããå°ç¯ãã§ãã¯ã@c
-使ããªãã§ä¸ãã:
+å
¥ãæ¿ãã®ç¡ãç¹°ãè¿ããé¨åå°ç¯ã§å§ã¾ãå ´åã¯ã@c
+@code{\partial} ã³ãã³ããå°ç¯ã®æåã«å¿
è¦ã§ãããã¨ãé¤ãã°ã@c
+åãååãé©ç¨ããã¾ã:
-@c KEEP LY
-@lilypond[verbatim,quote]
-\relative {
- % ãã㧠\partial ã使ããªãã§ä¸ãã
- c'4 e g % ããã§å°ç¯ãã§ãã¯ãè¡ããªãã§ä¸ãã
- % ãã㧠\partial ã使ããªãã§ä¸ãã
- \repeat volta 4 {
- e4 |
- c2 e |
- % ãã㧠\partial ã使ããªãã§ä¸ãã
- g4 g g % ããã§å°ç¯ãã§ãã¯ãè¡ããªãã§ä¸ãã
- }
- % ãã㧠\partial ã使ããªãã§ä¸ãã
+@lilypond[verbatim,quote,relative=1]
+\partial 4
+\repeat volta 4 {
+ e'4 |
+ c2 e |
+ g4 g g
+}
g4 |
a2 a |
g1 |
-}
@end lilypond
-åæ§ã«ãç¹°ãè¿ãã楽èã®å
é ã®é¨åå°ç¯ããå§ã¾ããå
¥ãæ¿ãé¨åãæããªãå ´åã@c
-楽èã®å
é 㧠@code{\partial} ã³ãã³ããé
ç½®ããå¿
è¦ããããã¨ãé¤ãã¦ã@c
-ä¸ã®ä¾ã¨åãæ¡ä»¶ãé©ç¨ããã¾ã:
+@cindex repeats, with ties (ã¿ã¤ãæã¤ç¹°ãè¿ã)
+@cindex alternative endings, with ties (ã¿ã¤ãæã¤ç¹°ãè¿ãã®å
¥ãæ¿ãé¨å)
+@cindex ties, in repeats (ç¹°ãè¿ãã®ä¸ã«ããã¿ã¤)
+@cindex ties, alternative endings (ã¿ã¤ã¨ç¹°ãè¿ãã®å
¥ãæ¿ãé¨å)
+@funindex \repeatTie
+
+ã¿ã¤ã 2 ã¤ç®ã®çµäºé¨ã«è¿½å ãããã¨ãã§ãã¾ã:
-@c KEEP LY
@lilypond[verbatim,quote]
\relative {
- \partial 4 % \partial ãå¿
è¦ã§ã
- \repeat volta 4 {
- e'4 |
- c2 e |
- % ãã㧠\partial ã使ããªãã§ä¸ãã
- g4 g g % ããã§å°ç¯ãã§ãã¯ãè¡ããªãã§ä¸ãã
+ c''1
+ \repeat volta 2 { c4 d e f~ }
+ \alternative {
+ { f2 d }
+ { f2\repeatTie f, }
}
- % ãã㧠\partial ã使ããªãã§ä¸ãã
- g4 |
- a2 a |
- g1 |
}
@end lilypond
-å®å
¨ãªé·ããæããªãå°ç¯ã§å§ã¾ãå°ç¯ã«å
¥ãæ¿ãé¨åãä»ãå ããå ´åã@c
-以ä¸ã®å ´æ㧠@code{Timing.measureLength} ã³ã³ããã¹ã ããããã£ã@c
-æåã§è¨å®ããå¿
è¦ãããã¾ã:
+@funindex \inStaffSegno
+@cindex repeats, with segno (ã»ã¼ãã§ãæã¤ç¹°ãè¿ã)
+@cindex segno, with repeats (ç¹°ãè¿ããæã¤ã»ã¼ãã§)
-@itemize
-@item
-@code{\alternative} ãããã¯å
ã®ä¸å®å
¨ãªå°ç¯ã®éå§ç¹ã@c
-é常ããã㯠(ããã¦ãã®å ´åã¯) æå¾ã®å
¥ãæ¿ãé¨åãé¤ãã@c
-åå
¥ãæ¿ãé¨åã®æå¾ã®å°ç¯ã«ãªãã¾ãã
+@code{\inStaffSegno} ã³ãã³ãã¯ã@code{\repeat volta} ã³ãã³ãã¨ä¸ç·ã«@c
+ç¨ããããéã«ãç¹°ãè¿ãã®å°ç¯ç·ã¨ã»ã¼ãã§è¨å·ãåä½ãããå°ç¯ç·ã@c
+ä½ãåºãã¾ããã©ã®ç¹°ãè¿ãè¨å·ã使ãããã (ããªãã¡ãéå§è¨å·ããçµäºè¨å·ãã@c
+両è
ãåãããè¨å·ã) ã¯ãèªåçã«é¸æããã¾ãã対å¿ãã @qq{D.S.} è¨å·ã¯@c
+æåã§å
¥åããªããã°ãããªããã¨ã«æ³¨æãã¦ãã ããã
-@item
-æåã®å
¥ãæ¿ãé¨åãé¤ããåå
¥ãæ¿ãé¨åã®éå§ç¹ã
-@end itemize
+ç¹°ãè¿ãã使ããªã:
@lilypond[verbatim,quote]
\relative {
- \partial 4
- \repeat volta 2 { e'4 | c2 e | }
- \alternative {
- {
- f2 d |
- \set Timing.measureLength = #(ly:make-moment 3/4)
- g4 g g % optional bar check is allowed here
- }
- {
- \set Timing.measureLength = #(ly:make-moment 4/4)
- a2 a |
- }
- }
- g1 |
+ e'1
+ \inStaffSegno
+ f2 g a b
+ c1_"D.S." \bar "|."
}
@end lilypond
-@code{measureLength} ããããã£ã«ã¤ãã¦ã®èª¬æ㯠@ref{Time administration}
-ã«ããã¾ãã
+ç¹°ãè¿ãã®å§ã¾ãã«:
-@funindex \inStaffSegno
+@lilypond[verbatim,quote]
+\relative {
+ e'1
+ \repeat volta 2 {
+ \inStaffSegno % start repeat
+ f2 g a b
+ }
+ c1_"D.S." \bar "|."
+}
+@end lilypond
-@code{\inStaffSegno} ã³ãã³ããç¨ãã¦ãã»ã¼ãã§è¨å·ãé
ç½®ãã¦
-@code{\repeat volta} ã³ãã³ãã¨é£æºããããã¨ãã§ãã¾ãã@c
-å·®ãæ¿ãã®å°ç¯ç·è¨å·ã¯ Score ã³ã³ããã¹ãã®ä¸ã§ãããã㣠@code{segnoType},
-@code{startRepeatSegnoType}, @code{endRepeatSegnoType} ãããã¯
-@code{doubleRepeatSegnoType} ãå¿
è¦ã«å¿ãã¦ãªã¼ãã©ã¤ããããã¨ã«ãã@c
-è¨å®ãããã¨ãã§ãã¾ãã
+ç¹°ãè¿ãã®çµããã«:
@lilypond[verbatim,quote]
\relative {
e'1
- \inStaffSegno
+ \repeat volta 2 {
+ f2 g a b
+ \inStaffSegno % end repeat
+ }
f2 g a b
c1_"D.S." \bar "|."
}
@end lilypond
-@cindex repeats, with ties (ã¿ã¤ãæã¤ç¹°ãè¿ã)
-@cindex alternative endings, with ties (ã¿ã¤ãæã¤ç¹°ãè¿ãã®å
¥ãæ¿ãé¨å)
-@cindex ties, in repeats (ç¹°ãè¿ãã®ä¸ã«ããã¿ã¤)
-@cindex ties, alternative endings (ç¹°ãè¿ãã®å
¥ãæ¿ãé¨åã§ã®ã¿ã¤)
-@funindex \repeatTie
+2 ã¤ã®ç¹°ãè¿ãã®éã«:
-ç¹°ãè¿ãã® 2 åç®ã®é¨åã«ã¿ã¤ãä»ãå ãããã¨ãã§ãã¾ã:
+@lilypond[verbatim,quote]
+\relative {
+ e'1
+ \repeat volta 2 {
+ f2 g a b
+ }
+ \inStaffSegno % double repeat
+ \repeat volta 2 {
+ f2 g a b
+ }
+ c1_"D.S." \bar "|."
+}
+@end lilypond
+
+ä»ã®å°ç¯ç·è¨å·ãç¨ããå ´åã (Score ã³ã³ããã¹ãã«) ããããã£
+@code{segnoType}, @code{startRepeatSegnoType}, @code{endRepeatSegnoType},
+@code{doubleRepeatSegnoType} ã好ã¿ã®å¤ãè¨å®ãã¾ããå°ç¯ç·ã®ç¨®é¡ã¯@c
+ãããããå®ç¾©ããã¦ãããã®ããåã« @code{\defineBarLine} ã³ãã³ãã§å®ç¾©@c
+ããã¦ãããã®ããé¸æããå¿
è¦ãããã¾ã (@ref{å°ç¯ç·}ãåç
§ãã¦ãã ãã)ã
@lilypond[verbatim,quote]
+\defineBarLine ":|.S[" #'(":|." "S[" "")
+\defineBarLine "]" #'("]" "" "")
\relative {
- c''1
- \repeat volta 2 { c4 d e f~ }
- \alternative {
- { f2 d }
- { f2\repeatTie f, }
+ e'1
+ \repeat volta 2 {
+ f2 g a b
+ \once \set Score.endRepeatSegnoType = ":|.S["
+ \inStaffSegno
}
+ f2 g \bar "]" a b
+ c1_"D.S." \bar "|."
}
@end lilypond
@@ -329,6 +361,9 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
@ref{Modifying ties and slurs},
@ref{Time administration}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{ly/engraver-init.ly}
+
ã³ã¼ãæçé:
@rlsr{Repeats}
@@ -421,7 +456,7 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
@table @code
@item start-repeat
-@code{|:} å°ç¯ç·ãèå»ãã¾ãã
+@code{.|:} å°ç¯ç·ãèå»ãã¾ãã
@lilypond[verbatim,quote]
\relative {
@@ -446,7 +481,7 @@ LilyPond ã¯ä»¥ä¸ã®ç¨®é¡ã®ç¹°ãè¿ãããµãã¼ããã¾ã:
}
@end lilypond
-@item (volta @var{number}) ... (volta #f)
+@item (volta @var{number}) @dots{} (volta #f)
æå®ãããçªå·ãæã¤æ°ãã volta ãä½æãã¾ãã@c
Volta å²ã¿ã¯æ示çã«çµäºãããå¿
è¦ãããã¾ãã@c
ãããªããã°ãèå»ããã¾ããã
@@ -751,6 +786,26 @@ a'4 b c | a'4 b c
@rinternals{Double_percent_repeat_engraver},
@rinternals{Slash_repeat_engraver}
+@knownissues
+ãã¼ã»ã³ãè¨å·ã®ç¹°ãè¿ãã¯ããã¼ã»ã³ãè¨å·ä»¥å¤ã«ä½ãå«ããã¨ãã§ãã¾ããã@c
+ç¹ã«ãæåã®å¤æ´ã¯ç¹°ãè¿ããã¾ããã
+
+@lilypond[quote,verbatim,relative=2]
+\repeat percent 3 { \time 5/4 c2. 2 \time 4/4 2 2 }
+@end lilypond
+
+@noindent
+æåã®å¤æ´ã @code{\partial} ã³ãã³ãã¯ããã¼ã»ã³ãè¨å·ã®ç¹°ãè¿ãã®@c
+@emph{å¤å´ã«}ãã並åé¨åã§è¡ãããå¿
è¦ãããã¾ã (ä¾ãã°ãç¬ç«ãã@c
+ã¿ã¤ãã³ã° ãã©ãã¯)ã
+
+@lilypond[quote,verbatim,relative=2]
+<<
+ \repeat percent 3 { c2. 2 2 2 }
+ \repeat unfold 3 { \time 5/4 s4*5 \time 4/4 s1 }
+>>
+@end lilypond
+
@node ãã¬ã¢ãã®ç¹°ãè¿ã
@unnumberedsubsubsec ãã¬ã¢ãã®ç¹°ãè¿ã
@@ -802,7 +857,6 @@ a'4 b c | a'4 b c
@end lilypond
@cindex tremolo marks (ãã¬ã¢ãè¨å·)
-@funindex tremoloFlags
@funindex :
é³ç¬¦ã®å¾ã« @code{:@var{N}} ãä»ãå ãããã¨ã«ãã£ã¦@c
@@ -810,7 +864,7 @@ a'4 b c | a'4 b c
@code{@var{N}} ã¯ç´°é¨ã®æ¼å¥æéã表ãã8 以ä¸ã§ããå¿
è¦ãããã¾ãã@c
@code{@var{N}} ã 8 ã§ããå ´åãé³ç¬¦ã®ç¬¦å¹¹ã« 1 æ¬ã®é£æ¡ãä»ãå ãããã¾ãã@c
@code{@var{N}} ãçç¥ãããå ´åã
-æå¾ã®å¤ (@code{tremoloFlags} ã«ä¿åããã¦ãã¾ã) ã使ç¨ããã¾ã:
+æå¾ã®å¤ã使ç¨ããã¾ã:
@lilypond[quote,verbatim]
\relative {
diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely
index c04874f13c..51292c1ba5 100644
--- a/Documentation/ja/notation/rhythms.itely
+++ b/Documentation/ja/notation/rhythms.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: d5647c5fd1c38d4124d2374725b923f4901f3661
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@@ -8,7 +8,7 @@
@c \version "2.19.40"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -101,6 +101,16 @@
\relative { a' a a2 a a4 a a1 a }
@end lilypond
+é³æ¥½ã®ä¸ã§æ¼å¥æéã®ã¿ãå
¥åããå ´åãåã®é³ç¬¦ãåé³ã®ããããå¼ãç¶ãã¾ãã
+
+@lilypond[quote,verbatim]
+\relative {
+ \time 8/1
+ c'' \longa \breve 1 2
+ 4 8 16 32 64 128 128
+}
+@end lilypond
+
@cindex notes, dotted (ä»ç¹é³ç¬¦)
@cindex dotted notes (ä»ç¹é³ç¬¦)
@cindex notes, double-dotted (2 éä»ç¹é³ç¬¦)
@@ -189,10 +199,6 @@
@unnumberedsubsubsec é£ç¬¦
@translationof Tuplets
-@c æ¬é
ç®ã®ã¿å
ã«ç¿»è¨³ 2015-12-31
-@c é£ç¬¦ã®ã³ãã³ãã \times ãã \tuplet ã«å¤æ´ããã¦ããã
-@c å¾åã®ã¾ã¾ã®å
容ã ã¨æ··ä¹±ããããå¯è½æ§ãããããã
-
@cindex tuplets (é£ç¬¦)
@cindex triplets (3 é£ç¬¦)
@@ -343,16 +349,18 @@ MIDI åºåã§ã®æ¼å¥æéã決å®ããããã«ä½¿ç¨ããã¾ãã@c
以ä¸ã®ä¾ã§ã¯ãæåã® 3 ã¤ã®é³ç¬¦ã§ 2 æã§ãããé£ç¬¦å²ã¿ã¯èå»ããã¦ãã¾ããã
@c KEEP LY
-@lilypond[quote,relative=2,verbatim]
-\time 2/4
-% æ¼å¥æéãå¤æ´ã㦠3 é£ç¬¦ã«ãã¾ã
-a4*2/3 gis a
-% é常ã®æ¼å¥æé
-a4 a
-% åé³ã®æ¼å¥æéã 2 åã«ãã¾ã
-<a d>4*2
-% æ¼å¥æé㯠4 åé³ç¬¦ã§ãããè¦ãç®ã¯ 16 åé³ç¬¦ã§ã
-b16*4 c4
+@lilypond[quote,verbatim]
+\relative {
+ \time 2/4
+ % æ¼å¥æéãå¤æ´ã㦠3 é£ç¬¦ã«ãã¾ã
+ a'4*2/3 gis a
+ % é常ã®æ¼å¥æé
+ a4 a
+ % åé³ã®æ¼å¥æéã 2 åã«ãã¾ã
+ <a d>4*2
+ % æ¼å¥æé㯠4 åé³ç¬¦ã§ãããè¦ãç®ã¯ 16 åé³ç¬¦ã§ã
+ b16*4 c4
+}
@end lilypond
空ç½ä¼ç¬¦ã®æ¼å¥æéãæãç®ã«ãã£ã¦å¤æ´ã§ãã¾ãã@c
@@ -371,17 +379,19 @@ b16*4 c4
ããã§ãé³æ¥½ãã©ã®ããã«å§ç¸®ããã伸張ããããã示ãä¾ãæãã¾ã:
@c KEEP LY
-@lilypond[quote,relative=2,verbatim]
-\time 2/4
-% é常ã®æ¼å¥æé
-<c a>4 c8 a
-% 2/3 ãæãã¾ã
-\scaleDurations 2/3 {
- <c a f>4. c8 a f
-}
-% 2 ãæãã¾ã
-\scaleDurations 2/1 {
- <c' a>4 c8 b
+@lilypond[quote,verbatim]
+\relative {
+ \time 2/4
+ % é常ã®æ¼å¥æé
+ <c'' a>4 c8 a
+ % 2/3 ãæãã¾ã
+ \scaleDurations 2/3 {
+ <c a f>4. c8 a f
+ }
+ % 2 ãæãã¾ã
+ \scaleDurations 2/1 {
+ <c' a>4 c8 b
+ }
}
@end lilypond
@@ -397,6 +407,16 @@ b16*4 c4
ã³ã¼ãæçé:
@rlsr{Rhythms}
+@knownissues
+å°ç¯å
ã§ã®ä½ç½®ã®è¨ç®ã¯ãã®å°ç¯ã®é³ç¬¦ã«é©ç¨ãããå
¨ã¦ã®æ¼å¥æéã®ä¼¸ç¸®ãã@c
+ããããåã®å°ç¯ããã®è¨ç®çµæãèæ
®ããå¿
è¦ãããã¾ãã@c
+ãã®è¨ç®ã¯åæ°ãç¨ãã¦è¡ããã¦ãã¾ãã@c
+è¨ç®ã®éä¸ã§ååãããã¯åæ¯ã 2^30 ãè¶
ããã¨ãããã°ã©ã ã®å®è¡ã¨èå»ã¯@c
+ãã®æç¹ã§ã¨ã©ã¼ãçºçããã«æ¢ã¾ãã¾ãã
+(訳注: å
é¨çã«ãååã¨åæ¯ãããããæ´æ°åã¨ãã¦æã¤åæ°åã@c
+ç¨ãã¦ããããããã¾ãã«è¤éãªæ¼å¥æéã®ä¼¸ç¸®ãè¡ãã¨ãè¨ç®ã®éä¸ã§ååãåæ¯ã@c
+2^30 ãè¶
ãã¦ãã¾ãèå»ãéä¸ã§æ¢ã¾ã£ã¦ãã¾ãã¨ãããã¨ã§ãã)
+
@node ã¿ã¤
@unnumberedsubsubsec ã¿ã¤
@@ -413,10 +433,19 @@ b16*4 c4
@emph{ãã¬ã¼ã¸ã³ã° ã¹ã©ã¼} ã¨æ··åããªãã§ãã ããã@c
ã¿ã¤ã¯é³ç¬¦ã®æ¼å¥æéã伸ã°ãåããæã¡ãé³ä¾¡ãå¢ãããããã«ä¼¼ã¦ãã¾ãã}
-ã¿ã¤ã¯ãã«ãè¨å· @code{~} ã使ã£ã¦å
¥åãã¾ã:
+ã¿ã¤ã¯ãçµã°ãã 2 ã¤ã®é³ç¬¦ã® 1 ã¤ç®ã«ãã«ãè¨å· (@code{~}) ãä»å ãããã¨ã§@c
+å
¥åãã¾ãããã®è¨å·ã¯é³ç¬¦ã次ã®é³ç¬¦ã¨ã¿ã¤ã§çµã°ããã¨ãããã¨ã示ãã@c
+次ã®é³ç¬¦ã¯åããããã§ãªããã°ãªãã¾ããã
-@lilypond[quote,verbatim,relative=2]
-a2 ~ 2
+@lilypond[quote,verbatim]
+{ a'2~ 4~ 16 r r8 }
+@end lilypond
+
+ã¿ã¤ã§ã¯ãæ¼å¥æéã®ã¿ãå
¥åãããã¨ã§@q{æå¾ã«æ示ãããããã}ãç¨ãããã¨ã@c
+ã§ãã¾ã:
+
+@lilypond[quote,verbatim]
+{ a'2~ 4~ 16 r r8 }
@end lilypond
ã¿ã¤ã¯ãé³ç¬¦ãå°ç¯ç·ãã¾ãããå ´åãããªãºã ã表ãããã«ãããã@c
@@ -429,8 +458,8 @@ a2 ~ 2
@c KEEP LY
@lilypond[verbatim,quote]
\relative {
- r8 c'8 ~ 2 r4 |
- r8^"ãããã¹ãã§ã¯ããã¾ãã" c2 ~ 8 r4
+ r8 c'4.~ 4 r4 |
+ r8^"ãããã¹ãã§ã¯ããã¾ãã" c2~ 8 r4
}
@end lilypond
@@ -446,9 +475,12 @@ a2 ~ 2
ä¸è´ãã符é ãç¡ãå ´åãã¿ã¤ã¯ä½æããã¾ããã@c
åé³ã®å
é¨ã«ã¿ã¤ãç½®ããã¨ã«ãã£ã¦ãåé³ã®ä¸é¨ã ããã¿ã¤ã§çµã¶ãã¨ãã§ãã¾ãã
-@lilypond[quote,verbatim,relative=1]
-<c e g> ~ <c e g>
-<c~ e g~ b> <c e g b>
+@lilypond[quote,verbatim]
+\relative c' {
+ <c e g>2~ 2 |
+ <c e g>4~ <c e g c>
+ <c~ e g~ b> <c e g b> |
+}
@end lilypond
@cindex repeating ties (ã¿ã¤ãå«ãç¹°ãè¿ã)
@@ -462,13 +494,16 @@ a2 ~ 2
ãã®ãããªç¹°ãè¿ãé¨åã§ã®ã¿ã¤ã¯ä»¥ä¸ã®ããã«æå®ããå¿
è¦ãããã¾ã:
@c KEEP LY
-@lilypond[quote,relative=2,verbatim]
-\repeat volta 2 { c g <c e>2 ~ }
-\alternative {
- % 1 çªç®ã®å·®ãæ¿ãé¨å: å¾ã«ç¶ãé³ç¬¦ã¯é常éãã¿ã¤ã§çµã°ãã¾ã
- { <c e>2. r4 }
- % 2 çªç®ã®å·®ãæ¿ãé¨å: å¾ã«ç¶ãé³ç¬¦ã«ã¯ãªãã¼ãç¨ã®ã¿ã¤ãä»ãã¾ã
- { <c e>2\repeatTie d4 c } }
+@lilypond[quote,verbatim]
+\relative {
+ \repeat volta 2 { c'' g <c e>2~ }
+ \alternative {
+ % 1 çªç®ã®å·®ãæ¿ãé¨å: å¾ã«ç¶ãé³ç¬¦ã¯é常éãã¿ã¤ã§çµã°ãã¾ã
+ { <c e>2. r4 }
+ % 2 çªç®ã®å·®ãæ¿ãé¨å: å¾ã«ç¶ãé³ç¬¦ã«ã¯ãªãã¼ãç¨ã®ã¿ã¤ãä»ãã¾ã
+ { <c e>2\repeatTie d4 c }
+ }
+}
@end lilypond
@cindex laissez vibrer (ã¬ã» ã´ã£ãã¬)
@@ -491,7 +526,7 @@ L.v. ã¿ã¤ã¯ä»¥ä¸ã®ããã«å
¥åãã¾ã:
@funindex \tieDown
@funindex \tieNeutral
-ã¿ã¤ãæåã§èã®ä¸ã¾ãã¯ä¸ã«é
ç½®ãããã¨ãã§ãã¾ãã
+ã¿ã¤ãæåã§ä¸åãã¾ãã¯ä¸åãã«é
ç½®ãããã¨ãã§ãã¾ãã
@ref{Direction and placement} ãåç
§ãã¦ãã ããã
@cindex ties, appearance (ã¿ã¤ã®è¦ãç®)
@@ -506,34 +541,38 @@ L.v. ã¿ã¤ã¯ä»¥ä¸ã®ããã«å
¥åãã¾ã:
ã¿ã¤ãç ´ç·ãç¹ç·ãå®ç·ã¨ç ´ç·ã®çµã¿åããã«ãããã¨ãã§ãã¾ãã
-@lilypond[quote, verbatim, relative=1]
-\tieDotted
-c2 ~ 2
-\tieDashed
-c2 ~ 2
-\tieHalfDashed
-c2 ~ 2
-\tieHalfSolid
-c2 ~ 2
-\tieSolid
-c2 ~ 2
+@lilypond[quote, verbatim]
+\relative c' {
+ \tieDotted
+ c2~ 2
+ \tieDashed
+ c2~ 2
+ \tieHalfDashed
+ c2~ 2
+ \tieHalfSolid
+ c2~ 2
+ \tieSolid
+ c2~ 2
+}
@end lilypond
ç ´ç·ãã¿ã¼ã³ã®ã«ã¹ã¿ãã¤ãºãæå®ãããã¨ãã§ãã¾ã:
-@lilypond[quote, verbatim, relative=1]
-\tieDashPattern #0.3 #0.75
-c2 ~ 2
-\tieDashPattern #0.7 #1.5
-c2 ~ 2
-\tieSolid
-c2 ~ 2
+@lilypond[quote, verbatim]
+\relative c' {
+ \tieDashPattern #0.3 #0.75
+ c2~ 2
+ \tieDashPattern #0.7 #1.5
+ c2~ 2
+ \tieSolid
+ c2~ 2
+}
@end lilypond
ã¿ã¤ã®ç ´ç·ãã¿ã¼ã³å®ç¾©ã®æ§é ã¯ãã¹ã©ã¼ã®ç ´ç·ãã¿ã¼ã³å®ç¾©ã¨åãã§ãã@c
è¤éãªç ´ç·ãã¿ã¼ã³ã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @ref{Slurs} ãåç
§ãã¦ãã ããã
-èã®ä¸ã§ä»ã®ãªãã¸ã§ã¯ãã¨è¡çªããã¿ã¤ã«å¯¾ãã¦ã¯ã@c
+ã¿ã¤ã¨ã®éã«ééãä½ããããªãã¸ã§ã¯ãã«ã¯ã@c
@var{whiteout} ã¬ã¤ã¢ã¦ã ããããã£ã¨ @var{layer} ã¬ã¤ã¢ã¦ã ããããã£ã@c
ãªã¼ãã©ã¤ããã¦ãã ããã
@@ -632,9 +671,9 @@ c2 ~ 2
@c \time 16/1 is used to avoid spurious bar lines
@c and long tracts of empty measures
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim]
\new Staff {
- % ãã® 2 æ¬ç·ã«ã¯æå³ã¯ããã¾ãã
+ % ãã® 2 è¡ã¯ä¾ãè¦ãããããããã®ãã®ã§ã
\time 16/1
\omit Staff.TimeSignature
% å
«å
¨ä¼ç¬¦ãèå»ãã¾ããäºå
¨ä¼ç¬¦ 4 ã¤ã¨ç価ã§ã
@@ -647,7 +686,7 @@ c2 ~ 2
}
@end lilypond
-@cindex rest, multi-measure (è¤æ°å°ç¯ã®ä¼ç¬¦)
+@cindex rest, multi-measure (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦)
@cindex rest, whole-measure (å
¨ä¼ç¬¦)
å
¨ä¼ç¬¦ -- å°ç¯ã®ä¸å¿ã«ç½®ããã¾ã -- ã¯è¤æ°å°ç¯ã®ä¼ç¬¦ã¨ãã¦@c
@@ -759,17 +798,17 @@ c2 ~ 2
空ç½ä¼ç¬¦ã¯ãé³ç¬¦ãä¼ç¬¦ã¨åæ§ã«ã@code{Staff} ã @code{Voice} ã@c
åå¨ããªãå ´åã«ãããããæé»çã«ä½æãã¾ã:
-@lilypond[quote,verbatim,fragment]
-s1 s s
+@lilypond[quote,verbatim]
+{ s1 s s }
@end lilypond
@code{\skip} ã¯ãã é³æ¥½çãªæéãã¹ãããããã ãã§ãã@c
ããã¯ãããªã種é¡ã®åºåãä½æãã¾ããã
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim]
% ããã¯æå¹ãªå
¥åã§ãããä½ããã¾ãã
-\skip 1 \skip1 \skip 1
+{ \skip 1 \skip1 \skip 1 }
@end lilypond
@seealso
@@ -791,41 +830,45 @@ s1 s s
@unnumberedsubsubsec å°ç¯åä½ã®ä¼ç¬¦
@translationof Full measure rests
-@cindex multi-measure rests (è¤æ°ã®å°ç¯ã«ã¾ãããä¼ç¬¦)
+@cindex multi-measure rests (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦)
@cindex full-measure rests (å°ç¯åä½ã®ä¼ç¬¦)
-@cindex rest, multi-measure (è¤æ°ã®å°ç¯ã«ã¾ãããä¼ç¬¦)
+@cindex rest, multi-measure (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦)
@cindex rest, full-measure (å°ç¯åä½ã®ä¼ç¬¦)
@cindex whole rest for a full measure (å°ç¯ã«å¯¾ããå
¨ä¼ç¬¦)
@cindex rest, whole for a full measure (å°ç¯ã«å¯¾ããå
¨ä¼ç¬¦)
+@funindex \compressMMRests
@funindex R
1 ã¤ã¾ãã¯è¤æ°ã®å°ç¯ã«å¯¾ããä¼ç¬¦ã¯@c
é³ç¬¦åã¨ãã¦å¤§æåã® @code{R} ãæã¤é³ç¬¦ã¨ãã¦å
¥åãã¾ã:
-@lilypond[quote,verbatim,relative=2]
+@c KEEP LY
+@lilypond[quote,verbatim]
% ä¼ã¿ã®å°ç¯ã¯ 1 ã¤ã®å°ç¯ã«ã¾ã¨ãããã¾ã
-\compressFullBarRests
-R1*4
-R1*24
-R1*4
-b2^"Tutti" b4 a4
+\compressMMRests {
+ R1*4
+ R1*24
+ R1*4
+ b'2^"Tutti" b'4 a'4
+}
@end lilypond
å°ç¯åä½ã®ä¼ç¬¦ã®æ¼å¥æéã¯ãé³ç¬¦ã«å¯¾ããæ¼å¥æéã¨åã表è¨ã使ãã¾ãã@c
è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ã®æ¼å¥æéã¯å¸¸ã«å°ç¯ã®é·ãã®æ´æ°åã«ãªãã¾ãã@c
ãã®ããããã°ãã°ããããåæ°ã使ãå¿
è¦ãããã¾ã:
-@lilypond[quote,verbatim,relative=2]
-\compressFullBarRests
-\time 2/4
-R1 | R2 |
-\time 3/4
-R2. | R2.*2 |
-\time 13/8
-R1*13/8 | R1*13/8*12 |
-\time 10/8
-R4*5*4 |
+@lilypond[quote,verbatim]
+\compressMMRests {
+ \time 2/4
+ R1 | R2 |
+ \time 3/4
+ R2. | R2.*2 |
+ \time 13/8
+ R1*13/8 | R1*13/8*12 |
+ \time 10/8
+ R4*5*4 |
+}
@end lilypond
1 å°ç¯åã®ä¼ç¬¦ã¯ãæå次第ã§å
¨ä¼ç¬¦ã¾ãã¯äºå
¨ä¼ç¬¦ã®ã©ã¡ããã¨ãã¦ã@c
@@ -843,25 +886,22 @@ R1*2 |
@cindex multi-measure rest, expanding (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ãå±éãã)
@cindex multi-measure rest, contracting (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ãã¾ã¨ãã)
-@funindex \expandFullBarRests
-@funindex \compressFullBarRests
-
ããã©ã«ãã§ã¯ãè¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ã¯@c
ä¼ã¿ã®å°ç¯ãã¹ã¦ãæ示çã«ç¤ºãããã«èå»ããã楽èã«å±éããã¾ãã@c
ãããã代ããã«ãè¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ãè¤æ°å°ç¯ã®ä¼ç¬¦è¨å·ãæã¤åä¸ã®@c
å°ç¯ã¨ãã¦èå»ãããã¨ãã§ãã¾ã -- ä¼ã¿ã®å°ç¯æ°ããã®å°ç¯ã®ä¸ã«èå»ããã¾ãã
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]
% ããã©ã«ãã®æ¯ãèã
\time 3/4 r2. | R2.*2 |
\time 2/4 R2 |
\time 4/4
% ä¼ã¿ã®å°ç¯ã 1 ã¤ã®å°ç¯ã«ã¾ã¨ãã¾ã
-\compressFullBarRests
-r1 | R1*17 | R1*4 |
+\compressMMRests {
+ r1 | R1*17 | R1*4 |
+}
% ä¼ã¿ã®å°ç¯ãå±éãã¾ã
-\expandFullBarRests
\time 3/4
R2.*2 |
@end lilypond
@@ -883,11 +923,12 @@ R2.*2 |
ãã§ã«ãã¼ã¿ãä»ãå ããããã®å®ç¾©æ¸ã¿ã³ãã³ãã¨ãã¦
@code{\fermataMarkup} ãæä¾ããã¦ãã¾ãã
-@lilypond[quote,verbatim,relative=2]
-\compressFullBarRests
-\time 3/4
-R2.*10^\markup { \italic "ad lib." }
-R2.^\fermataMarkup
+@lilypond[quote,verbatim]
+\compressMMRests {
+ \time 3/4
+ R2.*10^\markup { \italic "ad lib." }
+ R2.^\fermataMarkup
+}
@end lilypond
@warning{
@@ -900,7 +941,7 @@ R2.^\fermataMarkup
}
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]
% ãã®ä¾ã¯èª¤ã£ããªãã¸ã§ã¯ãåãæå®ãã¦ãããã失æãã¾ã
\override TextScript.padding = #5
R1^"wrong"
@@ -915,32 +956,28 @@ R1^"right"
@funindex \textLengthOn
@funindex \textLengthOff
-@funindex textLenthOff
@funindex \fermataMarkup
-@funindex \compressFullBarRests
-@funindex \expandFullBarRests
+@funindex \compressMMRests
@predefined
@code{\textLengthOn},
@code{\textLengthOff},
@code{\fermataMarkup},
-@code{\compressFullBarRests},
-@code{\expandFullBarRests}
+@code{\compressMMRests}
@endpredefined
@snippets
-@c æªè¨³
-@cindex church rest
-@cindex rest, church
-@cindex kirchenpausen
+@cindex church rest (æä¼é³æ¥½ã®ä¼ç¬¦)
+@cindex rest, church (æä¼é³æ¥½ã®ä¼ç¬¦)
+@cindex kirchenpausen (æä¼é³æ¥½ã®ä¼ç¬¦)
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{changing-form-of-multi-measure-rests.ly}
-@cindex multi-measure rests, positioning
-@cindex positioning multi-measure rests
+@cindex multi-measure rests, positioning (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ã®ä½ç½®)
+@cindex positioning multi-measure rests (è¤æ°å°ç¯ã«ã¾ãããä¼ç¬¦ã®ä½ç½®)
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{positioning-multi-measure-rests.ly}
@@ -1013,7 +1050,9 @@ R1^"right"
\time 3/4 c''2.
@end lilypond
-@cindex time signature, visibility of (æåã®å¯è¦æ§)
+å°ç¯ã®éä¸ã§æåè¨å·ãå¤æ´ãããã¨ã«ã¤ãã¦ã¯ã@ref{ä¸æ}ã§æ±ã£ã¦ãã¾ãã
+
+@cindex time signature visibility (æåã®å¯è¦æ§)
æåã¯æ¥½æ²ã®å§ã¾ãã¨æåãå¤æ´ãããã¨ãã«èå»ããã¾ãã@c
è¡ã®çµããã§å¤æ´ãèµ·ããå ´åãè¦åã®æåãè¡ã®çµããã«èå»ããã¾ãã@c
@@ -1041,41 +1080,57 @@ R1^"right"
2/2 ã 4/4 ã§ä½¿ç¨ãããæåã¯æ°åã使ç¨ããã¹ã¿ã¤ã«ã«å¤æ´ãããã¨ãã§ãã¾ã:
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
-% ããã©ã«ãã®ã¹ã¿ã¤ã«
-\time 4/4 c1
-\time 2/2 c1
-% æ°åã使ãã¹ã¿ã¤ã«ã«å¤æ´ãã¾ã
-\numericTimeSignature
-\time 4/4 c1
-\time 2/2 c1
-% ããã©ã«ãã®ã¹ã¿ã¤ã«ã«æ»ãã¾ã
-\defaultTimeSignature
-\time 4/4 c1
-\time 2/2 c1
+@lilypond[quote,verbatim]
+\relative c'' {
+ % ããã©ã«ãã®ã¹ã¿ã¤ã«
+ \time 4/4 c1
+ \time 2/2 c1
+ % æ°åã使ãã¹ã¿ã¤ã«ã«å¤æ´ãã¾ã
+ \numericTimeSignature
+ \time 4/4 c1
+ \time 2/2 c1
+ % ããã©ã«ãã®ã¹ã¿ã¤ã«ã«æ»ãã¾ã
+ \defaultTimeSignature
+ \time 4/4 c1
+ \time 2/2 c1
+}
@end lilypond
-å®éæåã«ã¤ãã¦ã¯ @ref{Mensural time signatures} ã§ã«ãã¼ããã¦ãã¾ãã
+è¨éæåã«ã¤ãã¦ã¯ @ref{Mensural time signatures} ã§ã«ãã¼ããã¦ãã¾ãã
@cindex time signature default settings (æåã®ããã©ã«ãè¨å®)
@cindex autobeaming properties for time signatures (æåã®ããã®èªåé£æ¡ããããã£)
@cindex beaming, time signature default properties (é£æ¡ã¨æåã®ããã©ã«ã ããããã£)
@funindex \overrideTimeSignatureSettings
-
-@predefined
-@code{\numericTimeSignature},
-@code{\defaultTimeSignature}
-@endpredefined
-
èå»ãããæåãè¨å®ãããã¨ã«å ãã¦ã@c
@code{\time} ã³ãã³ãã¯æåã«åºã¥ãããããã£
@code{baseMoment}, @code{beatStructure}, ããã« @code{beamExceptions}
-ã®ããã©ã«ãå¤ãè¨å®ãã¾ãã@c
+ã®å¤ãè¨å®ãã¾ãã@c
ãããã®ããããã£ã«ãããããå®ç¾©ããã¦ããããã©ã«ãå¤ã¯
@file{scm/time-signature-settings.scm} ã§è¦ã¤ããã¾ãã@c
-æ¢åã®ããã©ã«ãå¤ãå¤æ´ããããæ°ããããã©ã«ãå¤ãå¤æ´ããããããã¨ãã§ãã¾ã:
+
+@code{beatStructure} ã®ããã©ã«ãã®å¤ã¯ã@code{\time} ã«çç¥å¯è½ãª 1 ã¤ç®ã®@c
+å¼æ°ãä¸ãããã¨ã§ãªã¼ãã©ã¤ãã§ãã¾ã:
+
+@lilypond[quote,verbatim]
+\score {
+ \new Staff {
+ \relative {
+ \time 2,2,3 7/8
+ \repeat unfold 7 { c'8 } |
+ \time 3,2,2 7/8
+ \repeat unfold 7 { c8 } |
+ }
+ }
+}
+@end lilypond
+
+ã¾ãã@code{baseMoment} 㨠@code{beamExceptions} ãå«ãããå
¨ã¦ã®æåã«åºã¥ã@c
+ããããã£ã®ããã©ã«ãã®å¤ãä¸åº¦ã«ã»ãããããã¨ãã§ãã¾ãã@c
+å¤ã¯ç°ãªãæåè¨å·ã«ã¤ãã¦ç¬ç«ã«è¨å®ã§ãã¾ãã@c
+æ°ããå¤ã¯åãæåè¨å·ã® @code{\time} ã³ãã³ããç¶ãæã«æå¹ã¨ãªãã¾ãã
@lilypond[quote,verbatim]
\score {
@@ -1098,7 +1153,7 @@ R1^"right"
@enumerate
@item
-@code{@var{timeSignatureFraction}}, æåã示ãåæ°ã
+@code{@var{timeSignatureFraction}}, ãã®è¨å®ãé©ç¨ããããæåè¨å·ã示ãåæ°ã
@item
@code{@var{baseMomentFraction}}, æåã®åºæ¬ã¿ã¤ãã³ã°ã®åä½ã¨ãªã@c
@@ -1114,39 +1169,6 @@ R1^"right"
@ref{èªåé£æ¡ã®æ¯ãèããè¨å®ãã} ã«èª¬æãããã¾ãã
@end enumerate
-@code{\overrideTimeSignatureSettings} ãä¿æããã³ã³ããã¹ãã¯ã@c
-ãã® @code{\overrideTimeSignatureSettings} å¼ã³åºããå®è¡ãããåã«@c
-ã¤ã³ã¹ã¿ã³ã¹åããã¦ããå¿
è¦ãããã¾ãã@c
-ãã®ãã¨ã¯ããã®ãããªã³ã³ããã¹ãã¯æ示çã«ã¤ã³ã¹ã¿ã³ã¹åãããã@c
-ãã®ã³ã³ããã¹ãå
㧠@code{\overrideTimeSignatureSettings} ã®åã«@c
-é³æ¥½ãç½®ãã¦ããå¿
è¦ãããã¨ãããã¨ãæå³ãã¾ã:
-
-@c KEEP LY
-@lilypond[quote,verbatim]
-\score {
- \relative c' {
- % ã³ã³ããã¹ããã¾ã ã¤ã³ã¹ã¿ã³ã¹åããã¦ããªãããããã®å¼ã³åºãã¯å¤±æãã¾ã
- \overrideTimeSignatureSettings
- 4/4 % timeSignatureFraction
- 1/4 % baseMomentFraction
- 3,1 % beatStructure
- #'() % beamExceptions
- \time 4/4
- c8^\markup {"Beamed (2 2)"}
- \repeat unfold 7 { c8 } |
- % ãã®å¼ã³åºãã¯æåãã¾ã
- \overrideTimeSignatureSettings
- 4/4 % timeSignatureFraction
- 1/4 % baseMomentFraction
- 3,1 % beatStructure
- #'() % beamExceptions
- \time 4/4
- c8^\markup {"Beamed (3 1)"}
- \repeat unfold 7 { c8 } |
- }
-}
-@end lilypond
-
@cindex time signature properties, restoring default values (æåããããã£ãããã©ã«ãå¤ã«æ»ã)
@cindex restoring default properties for time signatures (æåãããã©ã«ã ããããã£ã«æ»ã)
@funindex \revertTimeSignatureSettings
@@ -1212,6 +1234,10 @@ R1^"right"
}
@end lilypond
+ãããã®æåè¨å·ã«åºã¥ãå¤æ°ãå¤æ´ãããããªãæ¹æ³ -- å¤æ´ã®éã«@c
+åãæåè¨å·ãããä¸åº¦è¡¨ç¤ºããããã¨ãé¿ããæ¹æ³ -- ã«ã¤ãã¦ã¯ã
+@ref{Setting automatic beam behavior} ã«ããã¾ãã
+
@predefined
@code{\numericTimeSignature},
@code{\defaultTimeSignature}
@@ -1228,8 +1254,12 @@ R1^"right"
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Mensural time signatures},
+@ref{Setting automatic beam behavior},
@ref{Time administration}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{scm/time-signature-settings.scm}.
+
ã³ã¼ãæçé:
@rlsr{Rhythms}
@@ -1309,6 +1339,26 @@ R1^"right"
}
@end lilypond
+@funindex \markLengthOn
+@funindex \markLengthOff
+
+é·ãä¼ç¬¦ããã楽å¨ã®ãã¼ãèã§ã¯ããã³ã表示å士ãè¿ã¥ãã¦ãã¾ããã¨ã@c
+ããã¾ãã@code{\markLengthOn} ã³ãã³ãã¯ããã³ã表示ãéãªããªãããã«@c
+æ°´å¹³æ¹åã®ã¹ãã¼ã¹ã追å ãã@code{\markLengthOff} ã¯ãã³ã表示ãæ°´å¹³æ¹åã®@c
+ã¹ãã¼ã¹ãç¡è¦ããããã©ã«ãã®æåã«æ»ãã¾ãã
+
+@lilypond[verbatim,quote]
+\compressMMRests {
+ \markLengthOn
+ \tempo "Molto vivace"
+ R1*12
+ \tempo "Meno mosso"
+ R1*16
+ \markLengthOff
+ \tempo "Tranquillo"
+ R1*20
+}
+@end lilypond
@snippets
@@ -1334,7 +1384,7 @@ R1^"right"
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Formatting text},
-@ref{MIDI output}
+@ref{Creating MIDI output}
ã³ã¼ãæçé:
@rlsr{Staff notation}
@@ -1353,6 +1403,7 @@ R1^"right"
@cindex measure, partial (é¨åå°ç¯)
@cindex measure, pickup (ããã¯ã¢ããå°ç¯)
@cindex pickup measure (ããã¯ã¢ããå°ç¯)
+@cindex time signature, mid-measure (å°ç¯ã®éä¸ã®æåè¨å·)
@funindex measurePosition
@funindex \partial
@@ -1364,17 +1415,8 @@ R1^"right"
\partial @var{duration}
@end example
-@noindent
-@code{duration} ã¯ãæåã®å®å
¨ãªé·ããæã¤å°ç¯ã®åã«ç½®ãããå°ç¯ã®é·ãã§ã:
-
-@lilypond[quote,verbatim,relative=1]
-\time 3/4
-\partial 8
-e8 | a4 c8 b c4 |
-@end lilypond
-
-@var{duration} ã¯ãå®å
¨ãªé·ããæã¤å°ç¯ããçãæ¼å¥æéã§ããã°ã@c
-ä»»æã®å¤ãåããã¨ãã§ãã¾ã:
+@code{\partial} ã楽èã®æåã§ç¨ããããéã«ã¯ã@code{@var{duration}} ã¯@c
+æåã®å°ç¯ããåã«ããé³æ¥½ã®é·ãã§ãã
@lilypond[quote,verbatim]
\relative {
@@ -1384,26 +1426,43 @@ e8 | a4 c8 b c4 |
}
@end lilypond
-@code{\partial @var{duration}} ã以ä¸ã®ããã«è¨è¿°ãããã¨ãã§ãã¾ã:
+@code{\partial} ã楽èã®æåããå¾ã«ç¨ããããéã«ã¯ã@code{@var{duration}}ã¯@c
+ç¾å¨ã®å°ç¯ã® @emph{æ®ãã®} é·ãã¨ãªãã¾ããæ°ããçªå·ã®å°ç¯ã¯ä½ããã¾ããã
-@example
-\set Timing.measurePosition -@var{duration}
-@end example
+@lilypond[quote,verbatim]
+\relative {
+ \set Score.barNumberVisibility = #all-bar-numbers-visible
+ \override Score.BarNumber.break-visibility =
+ #end-of-line-invisible
+ \time 9/8
+ d''4.~ 4 d8 d( c) b | c4.~ 4. \bar "||"
+ \time 12/8
+ \partial 4.
+ c8( d) e | f2.~ 4 f8 a,( c) f |
+}
+@end lilypond
-ãã®å ´åã@code{\partial 8} ã¯ä»¥ä¸ã®ããã«ãªãã¾ã:
+@code{\partial} ã³ãã³ãã¯å°ç¯ã®éä¸ã§æåè¨å·ãå¤åããå ´åã«@c
+@emph{å¿
è¦}ã§ãããåç¬ã§ä½¿ããããã¨ãããã¾ãã
-@lilypond[quote,verbatim,relative=1]
-\time 3/4
-\set Timing.measurePosition = #(ly:make-moment -1/8)
-e8 | a4 c8 b c4 |
+@lilypond[quote,verbatim]
+\relative {
+ \set Score.barNumberVisibility = #all-bar-numbers-visible
+ \override Score.BarNumber.break-visibility =
+ #end-of-line-invisible
+ \time 6/8
+ \partial 8
+ e'8 | a4 c8 b[ c b] |
+ \partial 4
+ r8 e,8 | a4 \bar "||"
+ \partial 4
+ r8 e8 | a4
+ c8 b[ c b] |
+}
@end lilypond
-ãããã㣠@code{measurePosition} ã¯ã@c
-ããæç¹ã§ãã®å°ç¯ã¯ã©ããããæ¼å¥æ¸ã¿ã«ãªã£ã¦ãããã示ãæçæ°ãä¿æãã¾ãã@c
-ãã®ããããã£ã¯ @code{\partial} ã«ãã£ã¦è² ã®æ°ã«ã»ãããããã¨ãããã¨ã«@c
-注æãã¦ãã ãã:
-ããªãã¡ã@code{\partial 4} ã¯å
é¨çã« @w{@code{-4}} ã«ç¿»è¨³ããã@c
-@qq{ãã®å°ç¯ã«ã¯ 4 åé³ç¬¦ãæ®ã£ã¦ãã} ã¨ããæå³ã«ãªãã¾ãã
+@code{\partial} ã³ãã³ã㯠@code{Timing.measurePosition} ããããã£ã@c
+ã»ãããã¾ããããã¯å°ç¯ã®ã©ãã ããçµéãããã表ãåæ°ã§ãã
@seealso
é³æ¥½ç¨èªé:
@@ -1419,22 +1478,6 @@ e8 | a4 c8 b c4 |
@rinternals{Timing_translator}
-@knownissues
-@code{\partial} ã³ãã³ãã¯æ¥½æ²ã®éå§æã§ã®ã¿ä½¿ç¨ãã¹ãã§ãã@c
-楽æ²ã®éä¸ã§ãã®ã³ãã³ãã使ç¨ããå ´åã@c
-è¦åãåé¡ãçºçããå¯è½æ§ãããã¾ãã@c
-æ²ã®éä¸ã§ã¯ @code{\partial} ã®ä»£ããã«
-@code{\set Timing.measurePosition} ã使ç¨ãã¦ãã ããã
-
-@lilypond[quote,verbatim,relative=1]
-\time 6/8
-\partial 8
-e8 | a4 c8 b[ c b] |
-\set Timing.measurePosition = #(ly:make-moment -1/4)
-r8 e,8 | a4 c8 b[ c b] |
-@end lilypond
-
-
@node ç¡é»å¾ã®é³æ¥½
@unnumberedsubsubsec ç¡é»å¾ã®é³æ¥½
@translationof Unmetered music
@@ -1479,40 +1522,45 @@ r8 e,8 | a4 c8 b[ c b] |
ã«ãã³ãã¡ãçµããã¨ãå°ç¯çªå·ãåéããã¾ãã
-@lilypond[verbatim,relative=2,quote]
-% ãã¹ã¦ã®å°ç¯çªå·ã表示ãã¾ã
-\override Score.BarNumber.break-visibility = #all-visible
-c4 d e d
-\cadenzaOn
-c4 c d8[ d d] f4 g4.
-\cadenzaOff
-\bar "|"
-d4 e d c
+@c KEEP LY
+@lilypond[verbatim,quote]
+\relative c'' {
+ % ãã¹ã¦ã®å°ç¯çªå·ã表示ãã¾ã
+ \override Score.BarNumber.break-visibility = #all-visible
+ c4 d e d
+ \cadenzaOn
+ c4 c d8[ d d] f4 g4.
+ \cadenzaOff
+ \bar "|"
+ d4 e d c
+}
@end lilypond
-ã«ãã³ãã¡ã®ä¸ã« @code{\bar} ã³ãã³ããæ¿å
¥ããã¨ãã¦ããæ°ããå°ç¯ã@c
-å§ã¾ããã¨ã¯ããã¾ããã@c
-ãã®ããã注æåèµ·ã®ããã®è¨æè¨å·ã¯æåã§æ¿å
¥ããå¿
è¦ãããã¾ãã@c
+ã«ãã³ãã¡ã®ä¸ã« @code{\bar} ã³ãã³ããæ¿å
¥ãã¦ããå°ç¯ç·ã¯è¡¨ç¤ºããã¾ããã@c
+æ°ããå°ç¯ãå§ã¾ããã¨ã¯ããã¾ããã@c
+ãã®ãããå
¨ã¦ã®è¨æè¨å· -- é常å°ç¯ã®æå¾ã¾ã§å¹æãæç¶ãã --
+ã¯ã@code{\bar} ã«ããå°ç¯ç·ã®å¾ã§ãæå¹ã®ã¾ã¾ã§ãã@c
+ããå°ç¯ç·ã®å¾ã®è¨æè¨å·ã表示ãããããªãã°ã親åã®è¨æè¨å· (@code{!}) ã@c
+å¿ åã®è¨æè¨å· (@code{?}) ãæåã§æ¿å
¥ããå¿
è¦ãããã¾ãã@c
@ref{Accidentals} ãåç
§ãã¦ãã ããã
-èªåé£æ¡ã¯ @code{\cadenzaOn} 㧠off ã«ãªãã@c
-@code{\cadenzaOff} 㧠on ã«ãªãã¾ãã@c
-ãã®ãããã«ãã³ãã¡å
ã®é£æ¡ã¯ãã¹ã¦æåã§å
¥åããå¿
è¦ãããã¾ã
-(@ref{æåé£æ¡})ã
-
-@lilypond[verbatim,relative=2,quote]
-c4 d e d
-\cadenzaOn
-cis4 d cis d
-\bar "|"
-cis4 d cis! d
-\cadenzaOff
-\bar "|"
+@c KEEP LY
+@lilypond[verbatim,quote]
+\relative c'' {
+ c4 d e d
+ \cadenzaOn
+ cis4 d cis d
+ \bar "|"
+ % æåã® cis ã¯å°ç¯ç·ã®å¾ã§ãããè¨æè¨å·ç¡ãã§è¡¨ç¤ºããã¾ã
+ cis4 d cis! d
+ \cadenzaOff
+ \bar "|"
+}
@end lilypond
-èªåé£æ¡ã¯ @code{\cadenzaOn} ã«ãã£ã¦ off ã«ãªãã¾ãã@c
-ãã®ãããã«ãã³ãã¡ã®ä¸ã«é£æ¡ãæ¿å
¥ããã«ã¯æåã§è¡ãå¿
è¦ãããã¾ãã@c
-@ref{Manual beams} ãåç
§ãã¦ãã ããã
+èªåé£æ¡ã¯ @code{\cadenzaOn} ã§ç¡å¹ã«ãªãã¾ãã@c
+ãã®ãããã«ãã³ãã¡å
ã®é£æ¡ã¯ãã¹ã¦æåã§å
¥åããå¿
è¦ãããã¾ã
+(@ref{æåé£æ¡})ã
@lilypond[verbatim,quote]
\relative {
@@ -1526,10 +1574,6 @@ cis4 d cis! d
}
@end lilypond
-+These predefined commands affect all staves in the score, even when
-+placed in just one @code{Voice} context. To change this, move the
-+@code{Timing_translator} from the @code{Score} context to the
-+@code{Staff} context. See @ref{Polymetric notation}.
ãããã®å®ç¾©æ¸ã¿ã³ãã³ãã¯ããã¨ã @code{Voice} ã³ã³ããã¹ãã® 1 ã¤ã®@c
ä¸ã«é
ç½®ããã¨ãã¦ãã楽èã®ä¸ã«ãããã¹ã¦ã®èã«å½±é¿ãä¸ãã¾ãã@c
ãããå¤æ´ããã«ã¯ã@code{Timing_translator} ã @code{Score} ã³ã³ããã¹ã@c
@@ -1573,21 +1617,6 @@ cis4 d cis! d
\bar ""
@end example
-@code{\cadenzaOn} ã§æ¥½æ²ãå§ããå ´åã@c
-@code{Voice} ã³ã³ããã¹ããæ示çã«ä½æãã¹ãã§ãã@c
-ãããªãã¨ãäºæããªãã¨ã©ã¼ãçºçããå¯è½æ§ãããã¾ãã
-
-@example
-\new Voice @{
- \relative c' @{
- \cadenzaOn
- c16[^"Solo Free Time" d e f] g2.
- \bar "||"
- \cadenzaOff
- @}
-@}
-@end example
-
@node å¤æåè¨èæ³
@unnumberedsubsubsec å¤æåè¨èæ³
@@ -1598,14 +1627,14 @@ cis4 d cis! d
@cindex double time signatures (2 éæå)
@cindex signatures, polymetric (å¤æå)
-@cindex time signatures, polymetric (å¤æå)
-@cindex time signatures, double (2 éæå)
+@cindex time signature, polymetric (å¤æå)
+@cindex time signature, double (2 éæå)
@cindex polymetric signatures (å¤æå)
@cindex meter, polymetric (å¤æå)
@funindex timeSignatureFraction
@funindex \scaleDurations
-@funindex \times
+@funindex \tuplet
å¤æåè¨èæ³ããµãã¼ãããã¾ãã
è¤åæåè¨èæ³ããµãã¼ãããã¾ãã@c
@@ -1613,7 +1642,7 @@ cis4 d cis! d
伸縮ãããã¨ã«ããè¤åæåã®ã©ã¡ããã§ãã
-@subsubheading ããããã®èã¯ç°ãªãæåãæã¡ãå°ç¯ã®é·ãã¯ç価ã§ããå ´å
+@subsubsubheading ããããã®èã¯ç°ãªãæåãæã¡ãå°ç¯ã®é·ãã¯ç価ã§ããå ´å
åèå
±éã®æåè¨å·ãã»ãããã¦ã@c
@code{timeSignatureFraction} ã«ãæã¿ã®åæ°ãã»ãããã¾ãã@c
@@ -1657,7 +1686,7 @@ cis4 d cis! d
@end lilypond
-@subsubheading ããããã®èã¯ç°ãªãæåãæã¡ãå°ç¯ã®é·ãã¯ç価ã§ã¯ãªãå ´å
+@subsubsubheading ããããã®èã¯ç°ãªãæåãæã¡ãå°ç¯ã®é·ãã¯ç価ã§ã¯ãªãå ´å
@code{Timing_translator} 㨠@code{Default_bar_line_engraver} ã
@code{Staff} ã³ã³ããã¹ãã«ç§»ããã¨ã«ãã£ã¦ã@c
@@ -1704,9 +1733,9 @@ cis4 d cis! d
@funindex \compoundMeter
@cindex compound time signatures (è¤åæåè¨å·)
-@cindex time signature, compound
+@cindex time signature, compound (è¤åæåè¨å·)
-@subsubheading è¤åæåè¨å·
+@subsubsubheading è¤åæåè¨å·
è¤åæåè¨å·ã¯ @code{\compoundMeter} ãç¨ãã¦ä½æãã¾ãã@c
æ§æã¯ä»¥ä¸ã®éãã§ã:
@@ -1808,6 +1837,35 @@ cis4 d cis! d
ä½å°ç¯ãã§é³ç¬¦ããã¡ãã¨æºãããã¦ããªãå ´åã@c
ãã®ã¨ã³ã°ã©ã¼ãã§æ¿å
¥ãããã¿ã¤ããããããã®å°ç¯ã®çãã示ãã¾ãã
+@code{completionUnit} ããããã£ã¯é³ç¬¦ãåå²ããéã®å¥½ã¾ããé·ããæå®ãã¾ãã
+
+@lilypond[quote,verbatim]
+\new Voice \with {
+ \remove "Note_heads_engraver"
+ \consists "Completion_heads_engraver"
+} \relative {
+ \time 9/8 g\breve. d''4. \bar "||"
+ \set completionUnit = #(ly:make-moment 3 8)
+ g\breve. d4.
+}
+@end lilypond
+
+ãããã®ã¨ã³ã°ã©ã¼ãã¯ãé£ç¬¦ã®ãããªé·ãã伸縮ãããé³ç¬¦ã«å¯¾ãã¦ã¯ã@c
+å
¥åã¨åã伸縮çãä¿ã£ãã¾ã¾åå²ãã¾ãã
+
+@lilypond[quote,verbatim]
+\new Voice \with {
+ \remove "Note_heads_engraver"
+ \consists "Completion_heads_engraver"
+} \relative {
+ \time 2/4 r4
+ \tuplet 3/2 {g'4 a b}
+ \scaleDurations 2/3 {g a b}
+ g4*2/3 a b
+ \tuplet 3/2 {g4 a b}
+ r4
+}
+@end lilypond
@seealso
é³æ¥½ç¨èªé: @rglos{tie}
@@ -1827,12 +1885,10 @@ cis4 d cis! d
@rinternals{Forbid_line_break_engraver}
@knownissues
-ãã¹ã¦ã®æ¼å¥æéãé常ã®é³ç¬¦ã¨ä»ç¹ã§æ£ç¢ºã«è¡¨ããã¨ã¯ã§ãã¾ãã
-(ç¹ã«ãé£ç¬¦ãå«ãã§ããå ´å) ãã@c
-@code{Completion_heads_engraver} ãé£ç¬¦ãæ¿å
¥ãããã¨ã¯ããã¾ããã
-
-@code{Completion_heads_engraver} ã¯é³ç¬¦ã«ã ãä½ç¨ãã¾ãã@c
-ä¼ç¬¦ãåå²ãããã¨ã¯ããã¾ããã
+åã®ãã¼ã¸ã§ã³ã®æåãç¶æããããã@code{c1*2} ã®ãã㪠1 å°ç¯ããé·ã@c
+é³ç¬¦ãä¼ç¬¦ã¯ã@code{@{ c1 c1 @}} ã®ããã«ä¼¸ç¸®ããªãé·ãã«åå²ããã¾ãã@c
+@code{completionFactor} ããããã£ã§ãã®æåã調æ´ã§ããããã@code{#f} ã«@c
+ã»ãããããã¨ã§é³ç¬¦ãä¼ç¬¦ã伸縮ãããã¨ãã§ãã¾ãã
@node æå¾ã®ãªãºã ã示ã
@@ -1898,6 +1954,23 @@ cis4 d cis! d
>>
@end lilypond
+åé³ãå«ãé³æ¥½ããã¾ã @code{\reduceChords} é¢æ°ã§ 1 ã¤ã®é³ç¬¦ã«ã¾ã¨ãããã¨ã«@c
+ãã£ã¦ @code{RhythmicStaff} ã«å
¥åãããã@code{Pitch_squash_engraver} ã«@c
+使ç¨ãããã¨ãã§ãã¾ãã
+
+@lilypond[quote,verbatim]
+\new RhythmicStaff {
+ \time 4/4
+ \reduceChords {
+ <c>2
+ <e>2
+ <c e g>2
+ <c e g>4
+ <c e g>4
+ }
+}
+@end lilypond
+
@predefined
@code{\improvisationOn},
@@ -1975,7 +2048,7 @@ cis4 d cis! d
@cindex beams, with melismata (ã¡ãªã¹ãã®é£æ¡)
@warning{ææ²ã®ä¸ã§ã¡ãªã¹ãã表ãããã«é£æ¡ã使ç¨ããå ´åã@c
-@code{\autoBeamOff} ã§èªåé£æ¡ã off ã«ãã¦ãæåã§é£æ¡ã示ãã¹ãã§ãã@c
+@code{@bs{}autoBeamOff} ã§èªåé£æ¡ã off ã«ãã¦ãæåã§é£æ¡ã示ãã¹ãã§ãã@c
@code{@bs{}partcombine} ã @code{@bs{}autoBeamOff} ã¨ä¸ç·ã«@c
ç¨ããã¨äºæããªãçµæã«ãªãå¯è½æ§ãããã¾ãã@c
詳細ã¯ã³ã¼ãæçéãåç
§ãã¦ãã ããã}
@@ -1991,9 +2064,8 @@ cis4 d cis! d
@cindex beams, line breaks (é£æ¡ã¨æ¹è¡)
@cindex line breaks, beams (æ¹è¡ã¨é£æ¡)
-@c æªè¨³
-@cindex beams, with knee gap
-@cindex knee gap, with beams
+@cindex beams, with knee gap (åãã®å¤ããé£æ¡)
+@cindex knee gap, with beams (åãã®å¤ããé£æ¡)
@funindex breakable
@snippets
@@ -2044,36 +2116,91 @@ cis4 d cis! d
@funindex autoBeaming
@funindex baseMoment
-@funindex beamExceptions
+@funindex \beamExceptions
@funindex beatStructure
@funindex measureLength
@funindex \time
@funindex \set
-ããã¦ãã®å ´åãèªåé£æ¡ã¯æã®çµããã§çµäºãã¾ãã@c
-æã®çµäºç¹ã¯ã³ã³ããã¹ã ãããã㣠@code{baseMoment} ã¨
-@code{beatStructure} ã«ãã£ã¦æ±ºå®ããã¾ãã@c
-@code{beatStructure} 㯠@code{baseMoment} ãåä½ã¨ããå°ç¯ã®åæã®@c
-é·ããå®ç¾©ãã Scheme ãªã¹ãã§ãã@c
-ããã©ã«ãã§ã¯ã@code{baseMoment} 㯠@q{1/æåã®åæ¯} ã§ãã@c
-ããã©ã«ãã§ã¯ãåæã®é·ã㯠@code{baseMoment} ã§ãã
+èªåé£æ¡ãæå¹ãªå ´åãé£æ¡ã®é
ç½®ã¯ä»¥ä¸ã® 3 ã¤ã®ã³ã³ããã¹ã ããããã£ã«ãã£ã¦@c
+決å®ããã¾ã:
+@code{baseMoment}, @code{beatStructure}, @code{beamExceptions}ã@c
+ãããã®å¤ã¯ä»¥ä¸ã§ç¤ºãããã«ãªã¼ãã©ã¤ããããã¨ãã§ãã¾ããã@c
+@ref{æå} ã§èª¬æãã¦ããããã«ãããã©ã«ãã®å¤ãã®ãã®ãå¤æ´ãããã¨ã@c
+ã§ãã¾ãã
+
+@code{beamExceptions} ãç¾å¨ã®æåè¨å·ã«å¯¾ãã¦å®ç¾©ããã¦ããæã@c
+ãã®ã«ã¼ã«ã®ã¿ãé£æ¡ã®é
ç½®ã®æ±ºå®ã«ä½¿ç¨ããã¾ãã
+@code{baseMoment} ã @code{beatStructure} ã®å¤ã¯ä½¿ç¨ããã¾ããã
+
+@code{beamExceptions} ãç¾å¨ã®æåè¨å·ã«å¯¾ãã¦å®ç¾©ããã¦ããªãæã@c
+@code{baseMoment} 㨠@code{beatStructure} ã®å¤ã«ãã£ã¦é£æ¡ã®é
ç½®ã決å®ããã¾ãã
+
-@lilypond[quote,relative=2,verbatim]
-\time 5/16
-c16^"default" c c c c |
-\set Timing.beatStructure = 2,3
-c16^"(2+3)" c c c c |
-\set Timing.beatStructure = 3,2
-c16^"(3+2)" c c c c |
+@subsubsubheading @code{baseMoment} 㨠@code{beatStructure} ã«ããé£æ¡
+
+ããã©ã«ãã§ãé常ã«ãã使ãããæåã«å¯¾ãã¦ã¯ @code{beamExceptions} ã®@c
+ã«ã¼ã«ãå®ç¾©ããã¦ãããããèªåé£æ¡ã« @code{baseMoment} ã¨
+@code{beatStructure} ã®å¤ã使ç¨ãããããã«ã¯ã@code{beamExceptions} ã®@c
+ã«ã¼ã«ãç¡å¹åããªããã°ããã¾ããã@code{beamExceptions} ã¯ãã®ããã«ãã¦@c
+ç¡å¹åãã¾ã:
+
+@example
+\set Timing.beamExceptions = #'()
+@end example
+
+@code{beamExceptions} ã @code{#'()} ã«ã»ãããããå ´å (æ示çã«ã»ããããã@c
+å ´åã¨ãç¾å¨ã®æåè¨å·ã«å¯¾ãã¦ã«ã¼ã«ãå®ç¾©ããã¦ããªãå ´åã®ä¸¡æ¹ãå«ã¿ã¾ã)ã@c
+é£æ¡ã®çµäºç¹ã¯ @code{baseMoment} 㨠@code{beatStructure}
+ã³ã³ããã¹ã ããããã£ã§æå®ãããæã«å¾ãã¾ãã@code{beatStructure} ã¯@c
+å°ç¯å
ã®åæã®é·ãã @code{baseMoment} ã®åä½ã§å®ç¾©ããã Scheme ãªã¹ãã§ãã@c
+ããã©ã«ãã§ã¯ã@code{baseMoment} 㯠1/æåã®åæ¯ã§ãã
+
+@code{beatStructure} 㨠@code{baseMoment} ã®å¤ã¯ããããã®æåè¨å·ã«å¯¾ãã¦@c
+å¥ã
ã«åå¨ããã¨ãããã¨ã«æ³¨æãã¦ãã ããããããã®å¤ãå¤æ´ãã¦ããå½±é¿ã@c
+åã¶ã®ã¯ç¾å¨æå¹ãªæåè¨å·ã«å¯¾ãã¦ã®ã¿ã§ãããã®ããããããã®å¤æ´ã¯@c
+æ°ããæåè¨å·ã®ã»ã¯ã·ã§ã³ãå§ã¾ã @code{\time} ã³ãã³ãã®åã§ã¯ãªãå¾ã«@c
+ç½®ãããªããã°ããã¾ãããããæåè¨å·ã«ä¸ããããæ°ããå¤ã¯è¨æ¶ããã¦ããã@c
+ãã®æåè¨å·ãæ°ãã«åºç¾ããéã«åã³æå¹ã«ãªãã¾ãã
+
+@c KEEP LY
+@lilypond[quote,verbatim]
+\relative c'' {
+ \time 5/16
+ c16^"default" c c c c |
+ % beamExceptions 㯠5/16 ã®æåã«ã¤ãã¦ã¯å®ç¾©ããã¦ããªãããã§ããã
+ % 念ã®ããã«ç¡å¹ã«ãã¦ããã¾ããã
+ \set Timing.beamExceptions = #'()
+ \set Timing.beatStructure = 2,3
+ c16^"(2+3)" c c c c |
+ \set Timing.beatStructure = 3,2
+ c16^"(3+2)" c c c c |
+}
+@end lilypond
+
+@c KEEP LY
+@lilypond[quote,verbatim]
+\relative {
+ \time 4/4
+ a'8^"default" a a a a a a a
+ % beamExceptions 㯠4/4 ã«å¯¾ãã¦ã¯æããã«å®ç¾©ããã¦ããããã
+ % ãããç¡å¹ã«ãã¾ã
+ \set Timing.beamExceptions = #'()
+ \set Timing.baseMoment = #(ly:make-moment 1/4)
+ \set Timing.beatStructure = 1,1,1,1
+ a8^"changed" a a a a a a a
+}
@end lilypond
é£æ¡ã®è¨å®å¤æ´ãããç¹å®ã®ããã¹ãã«éå®ãããã¨ãã§ãã¾ãã@c
ä¸ä½ã³ã³ããã¹ãã«é£æ¡ã®è¨å®ãå«ã¾ããªãå ´åã@c
ãã®ã³ã³ããã¹ããå²ãã§ããä¸ä½ã³ã³ããã¹ãã®è¨å®ãé©ç¨ããã¾ãã
-@lilypond[quote, verbatim,relative=1]
+@lilypond[quote, verbatim]
\new Staff {
\time 7/8
+ % beamExceptions 㯠7/8 ã«å¯¾ãã¦ã¯å®ç¾©ããã¦ããªããã
+ % ç¡å¹ã«ããå¿
è¦ã¯ããã¾ãã
\set Staff.beatStructure = 2,3,2
<<
\new Voice = one {
@@ -2097,17 +2224,17 @@ c16^"(3+2)" c c c c |
@code{Staff} ã³ã³ããã¹ãã§è¨å®ãè¡ãå¿
è¦ãããã¾ã:
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]
\time 7/8
% ãªãºã 3-1-1-2
% ããã©ã«ãã§é£æ¡è¨å®ã®å¤æ´ã¯ Voice ã«é©ç¨ããããã¾ãããã¾ãã
% ãªããªããèªåçæããããã¤ã¹ã§ããã¹ã¦ã®æ㯠baseMoment (1 . 8) ã ããã§ã
\set beatStructure = 3,1,1,2
-<< {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >>
+<< \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >>
% ã³ã³ããã¹ã Staff ãæå®ããã¨ãã¾ãããã¾ã
\set Staff.beatStructure = 3,1,1,2
-<< {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >>
+<< \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >>
@end lilypond
@code{baseMoment} ã®å¤ã調æ´ãããã¨ã§ã@c
@@ -2116,54 +2243,45 @@ c16^"(3+2)" c c c c |
@code{beatStructure} ã«æ°ãã @code{baseMoment} ã¨çç¾ããªãå¤ã@c
è¨å®ããå¿
è¦ãããã¾ãã
-@lilypond[quote,verbatim,relative=2]
+@c KEEP LY
+@lilypond[quote,verbatim,fragment]
\time 5/8
+% beamExceptions 㯠5/8 ã«å¯¾ãã¦ã¯å®ç¾©ããã¦ããªããã
+% ç¡å¹ã«ããå¿
è¦ã¯ããã¾ãã
\set Timing.baseMoment = #(ly:make-moment 1/16)
\set Timing.beatStructure = 7,3
-\repeat unfold 10 { a16 }
+\repeat unfold 10 { a'16 }
@end lilypond
@code{beatLength} 㯠@i{moment} -- æ¼å¥æéã®åä½ -- ã§ãã@c
-ã¿ã¤ã @i{momento} ã®éã¯
+ã¿ã¤ã @i{moment} ã®éã¯
Scheme é¢æ° @code{ly:make-moment} ã«ãã£ã¦ä½ãåºããã¾ãã@c
ãã®é¢æ°ã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @ref{Time administration} ãåç
§ãã¦ãã ããã
ããã©ã«ãã§ã¯ã@code{baseMoment} ã«ã¯ã1/æåã®åæ¯ããã»ããããã¦ãã¾ãã@c
ãã®ããã©ã«ãã®ä¾å¤ã¯ @file{scm/time-signature-settings.scm} ã§è¦ã¤ããã¾ãã
+@subsubsubheading @code{beamExceptions} ã«åºã¥ããé£æ¡
+
ç¹æ®ãªèªåé£æ¡è¦å (é£æ¡ã®çµãããæã«å¾ããªããã®) ã¯ããããã£
@code{beamExceptions} ã«å®ç¾©ãã¾ãã
-@c æªè¨³
-@lilypond[quote,relative=2,verbatim]
-\time 3/16
-\set Timing.beatStructure = 2,1
-\set Timing.beamExceptions =
- #'( ;start of alist
- (end . ;entry for end of beams
- ( ;start of alist of end points
- ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16
- ))) %close all entries
-c16 c c |
-\repeat unfold 6 { c32 } |
-@end lilypond
-
-@code{beamExceptions} ã¯è¦åã¿ã¤ãã®ãã¼ã¨é£æ¡è¦åã®å¤ãæã¤é
åãªã¹ãã§ãã
-
-ç¾æç¹ã§ãå©ç¨å¯è½ãªå¯ä¸ã®è¦åã¿ã¤ãã®å¤ã¯ã@c
-é£æ¡ã®çµããã®ããã® @code{'end} ã§ãã
-
-é£æ¡è¦åã¯ãé£æ¡ã¿ã¤ãã¨ãã®é£æ¡ã¿ã¤ãã®æçæ¼å¥æéã®é³ç¬¦ãä¿æããé£æ¡ã«@c
-é©ç¨ãããã°ã«ã¼ãåã®ä»æ¹ã示ã Scheme é
åãªã¹ã (ãããã¯ãã¢ã®ãªã¹ã) ã§ãã
-
-@example
-#'((beam-type1 . grouping-1)
- (beam-type2 . grouping-2)
- (beam-type3 . grouping-3))
-@end example
+@code{beamExceptions} ã®å¤ã¯ -- å°ãè¤é㪠Scheme ãã¼ã¿æ§é ã§ãã -- ã¯ã
+@code{\beamExceptions} é¢æ°ã«ãã£ã¦é常ã«ç°¡åã«çæã§ãã¾ãã@c
+ãã®é¢æ°ã«ã¯ 1 ã¤ä»¥ä¸ã®æåé£æ¡ãå«ããå°ç¯ã®é·ãã®ãªãºã ãã¿ã¼ã³ãä¸ãã¾ã
+(å°ç¯ã¯å°ç¯ãã§ãã¯è¨å·@tie{|} ã§åå²ããã¦ããå¿
è¦ãããã¾ãããã®é¢æ°ã§ã¯@c
+ä»ã«å°ç¯ã®é·ããèå¥ããæ¹æ³ãç¡ãããã§ã)ãç°¡åãªä¾ã示ãã¾ã:
-é£æ¡ã¿ã¤ãã¯ããã®é£æ¡ã®æ¼å¥æéã示ã Scheme ãã¢ã§ããã@c
-ä¾ãã° @code{(1 . 16)} ã§ãã
+@lilypond[quote,verbatim]
+\relative c'' {
+ \time 3/16
+ \set Timing.beatStructure = 2,1
+ \set Timing.beamExceptions =
+ \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
+ c16 c c |
+ \repeat unfold 6 { c32 } |
+}
+@end lilypond
@warning{@code{beamExceptions} ã®å¤ã¯ @emph{å®å
¨ãª} ä¾å¤ãªã¹ãã§ãã@c
å¿
è¦ãããã¾ãã@c
@@ -2179,15 +2297,17 @@ c16 c c |
ããã©ã«ãã®æ¯ãèãã«ãªã»ããããã¾ãã
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
-\time 6/8
-\repeat unfold 6 { a8 }
-% (4 + 2) ã«ã°ã«ã¼ãåãã¾ã
-\set Timing.beatStructure = 4,2
-\repeat unfold 6 { a8 }
-% ããã©ã«ãã®æ¯ãèãã«æ»ãã¾ã
-\time 6/8
-\repeat unfold 6 { a8 }
+@lilypond[quote,verbatim]
+\relative a' {
+ \time 6/8
+ \repeat unfold 6 { a8 }
+ % (4 + 2) ã«ã°ã«ã¼ãåãã¾ã
+ \set Timing.beatStructure = 4,2
+ \repeat unfold 6 { a8 }
+ % ããã©ã«ãã®æ¯ãèãã«æ»ãã¾ã
+ \time 6/8
+ \repeat unfold 6 { a8 }
+}
@end lilypond
ããæåã«å¯¾ããããã©ã«ãã®èªåé£æ¡è¨å®ã¯ @file{scm/beam-settings.scm}
@@ -2203,15 +2323,15 @@ c16 c c |
ãªã¼ãã©ã¤ããããã¨ãã§ãã¾ãã
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]
\time 4/4
\set Timing.baseMoment = #(ly:make-moment 1/8)
\set Timing.beatStructure = 3,3,2
% 以ä¸ã¯ beamExceptions ã®ããã(3 3 2) ã®é£æ¡ã«ã¯ãªãã¾ãã
-\repeat unfold 8 {c8} |
+\repeat unfold 8 {c''8} |
% 以ä¸ã¯ beamExceptions ãã¯ãªã¢ããããã(3 3 2) ã®é£æ¡ã«ãªãã¾ã
\set Timing.beamExceptions = #'()
-\repeat unfold 8 {c8}
+\repeat unfold 8 {c''8}
@end lilypond
åæ§ã«ã3/4 æåã¯ããã©ã«ã㧠8 åé³ç¬¦ãããªãå°ç¯ã 1 ã¤ã®é£æ¡ã§å²ã¿@c
@@ -2220,13 +2340,13 @@ c16 c c |
ãªã»ãããã¾ãã
@c KEEP LY
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]
\time 3/4
% beamExceptions ã«ãããããã©ã«ã㧠(6) ã®é£æ¡ãä»ãã¾ã
-\repeat unfold 6 {a8} |
+\repeat unfold 6 {a'8} |
% beatLength ã«ããããã㯠(1 1 1) ã®é£æ¡ãä»ãã¾ã
\set Timing.beamExceptions = #'()
-\repeat unfold 6 {a8}
+\repeat unfold 6 {a'8}
@end lilypond
ããã³æ´¾ãå¤å
¸æ´¾æ代ã®èå»ã§ã¯ã3/4 æåã®å°ç¯ã®éä¸ããé£æ¡ãå§ã¾ã@c
@@ -2245,7 +2365,7 @@ c16 c c |
}
@end lilypond
-@i{@strong{èªåé£æ¡ã¯ã©ã®ããã«æ©è½ããã®ã}}
+@subsubsubheading èªåé£æ¡ã¯ã©ã®ããã«æ©è½ããã®ã
èªåé£æ¡ãæå¹ã§ããå ´åãèªåé£æ¡ã®é
ç½®ã¯ã³ã³ããã¹ã ããããã£
@code{baseMoment}, @code{beatStructure}, ããã« @code{beamExceptions}
@@ -2255,7 +2375,7 @@ c16 c c |
@itemize
-@item @code{[..]} ã§æåé£æ¡ãæå®ããã¦ããå ´åã@c
+@item @code{[@dots{}]} ã§æåé£æ¡ãæå®ããã¦ããå ´åã@c
é£æ¡ã¯æå®ã©ããã«è¨å®ããã¾ãã@c
æåé£æ¡ãæå®ããã¦ããªãå ´åã
@@ -2289,8 +2409,7 @@ c16 c c |
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{subdividing-beams.ly}
-@c æªè¨³
-@cindex beamlets, orienting
+@cindex beamlets, orienting (16 åé³ç¬¦ä»¥ä¸ã®é£æ¡ã®åã)
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{strict-beat-beaming.ly}
@@ -2310,8 +2429,11 @@ c16 c c |
{beam-endings-in-score-context.ly}
@seealso
+è¨èæ³ãªãã¡ã¬ã³ã¹:
+@ref{æå}
+
ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
-@file{scm/beam-settings.scm}
+@file{scm/time-signature-settings.scm}
ã³ã¼ãæçé:
@rlsr{Rhythms}
@@ -2339,16 +2461,17 @@ c16 c c |
åã«ããèã§ã»ããããã«ã¹ã¿ã é£æ¡ã¯ãªã»ããããã¾ãã@c
ãã®åé¡ãåé¿ããæ¹æ³ã® 1 ã¤ã¯ãæåã®è¨å®ã¯ 1 ã¤ã®èã§ããè¡ããªããã¨ã§ãã
-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim]
<<
\new Staff {
\time 3/4
\set Timing.baseMoment = #(ly:make-moment 1/8)
\set Timing.beatStructure = 1,5
- \repeat unfold 6 { a8 }
+ \set Timing.beamExceptions = #'()
+ \repeat unfold 6 { a'8 }
}
\new Staff {
- \repeat unfold 6 { a8 }
+ \repeat unfold 6 { a'8 }
}
>>
@end lilypond
@@ -2663,25 +2786,38 @@ MIDI åºåã§ã®æ¼å¥æéã¯æ£ç¢ºã§ãã
@end lilypond
@noindent
-ããã«ãç¹°ãè¿ãã®å°ç¯ç·ã 5 種é¡ããã¾ã:
+ããã«ãç¹°ãè¿ãã®å°ç¯ç·ã 9 種é¡ããã¾ã:
+
+@lilypond[quote,verbatim]
+\relative {
+ f'1 \bar ".|:"
+ g1 \bar ":..:"
+ a1 \bar ":|.|:"
+ b1 \bar ":|.:"
+ c1 \bar ":.|.:"
+ d1 \bar "[|:"
+ e1 \bar ":|][|:"
+ f1 \bar ":|]"
+ g1 \bar ":|."
+ a1
+}
+@end lilypond
-@lilypond[quote,relative=1,verbatim]
-f1 \bar ".|:"
-g1 \bar ":..:"
-a1 \bar ":|.|:"
-b1 \bar ":|.:"
-c1 \bar ":|."
-e1
+æ´ã«ãå°ç¯ç·ã¯åç´ãªçç·ã¨ãã¦è¡¨ç¤ºãããã¨ãã§ãã¾ã:
+@lilypond[quote,fragment,verbatim]
+f'1 \bar "'" g'1
@end lilypond
+ãããããã®ãããªçç·ã¯é常ãã°ã¬ã´ãªã¢èæã®ä¸ã§ä½¿ããã¾ããããã§ã¯ä»£ããã«
+@code{\divisioMinima} ãç¨ããã»ããè¯ãã§ããã°ã¬ã´ãªã¢èæã®
+@ref{Divisiones} ã»ã¯ã·ã§ã³ã§èª¬æãã¦ããã¾ãã
-@c æªè¨³
-Additionally, a bar line can be printed as a simple tick:
-@lilypond[quote,relative=1,verbatim]
-f1 \bar "'"
+LilyPond 㯠Kievan è¨èæ³ããµãã¼ããã¦ãããç¹æ®ãª Kievan ã®å°ç¯ç·ã@c
+å
¥åãããã¨ãã§ãã¾ã:
+@lilypond[quote,fragment,verbatim]
+f'1 \bar "k"
@end lilypond
-However, as such ticks are typically used in Gregorian chant, it is preferable
-to use @code{\divisioMinima} there instead, described in the section
-@ref{Divisiones} in Gregorian chant.
+ãã®è¨èæ³ã«é¢ããæ´ãªãæ
å ±ã¯ã@ref{Typesetting Kievan square notation} ã«@c
+説æãã¦ããã¾ãã
@cindex segno (ã»ã¼ãã§)
@@ -2716,8 +2852,8 @@ to use @code{\divisioMinima} there instead, described in the section
(@ref{Repeats} ãåç
§ãã¦ãã ãã)ã@c
ç¹°ãè¿ãã®ã³ãã³ãã¯èªåçã«é©åãªå°ç¯ç·ãèå»ãã¾ãã
-ããã«ã@code{"||:"} ã使ç¨ãããã¨ãã§ãã¾ãã@c
-ãã㯠@code{"|:"} ã¨ç価ã§ãããä¾å¤ã¨ãã¦æ¹è¡ä½ç½®ã§ã¯ã@c
+ããã«ã@code{".|:-||"} ã使ç¨ãããã¨ãã§ãã¾ãã@c
+ãã㯠@code{".|:"} ã¨ç価ã§ãããä¾å¤ã¨ãã¦æ¹è¡ä½ç½®ã§ã¯ã@c
ãã®å°ç¯ç·ã¯è¡ã®çµããã« 2 éç·ã®å°ç¯ç·ãç½®ãã@c
次ã®è¡ã®å§ãã«ç¹°ãè¿ãéå§ã®å°ç¯ç·ãç½®ãã¾ãã
@@ -2764,9 +2900,99 @@ to use @code{\divisioMinima} there instead, described in the section
@end lilypond
ããã«ã@code{\inStaffSegno} ã³ãã³ããããã¾ãã@c
-ããã¯ãã»ã¼ãã§å°ç¯ç·ãä½ãåºãã@code{\repeat volta} ã³ãã³ãã¨é£æº@c
-ãã¾ãã
+ããã¯ã@code{\repeat volta} ã³ãã³ãã¨@c
+ç¨ããããéã«ãç¹°ãè¿ãã®å°ç¯ç·ã¨çµåããã»ã¼ãã§å°ç¯ç·ãä½ãåºãã¾ãã@c
+@ref{é常ã®ç¹°ãè¿ã} ãåç
§ãã¦ãã ããã
+
+@funindex \defineBarLine
+@cindex bar lines, defining (å°ç¯ç·ãå®ç¾©ãã)
+@cindex defining bar lines (å°ç¯ç·ãå®ç¾©ãã)
+
+@code{\defineBarLine} ãç¨ãã¦ãæ°ããå°ç¯ç·ãå®ç¾©ãããã¨ãã§ãã¾ã:
+
+@example
+\defineBarLine @var{bartype} #'(@var{end} @var{begin} @var{span})
+@end example
+
+@code{\defineBarline} ã®å¼æ°ã¯@q{空ã®}æåå @code{""} ãå«ããã¨ãã§ãã@c
+ããã¯ä¸å¯è¦ã®å°ç¯ç·ãä½ãåºãã¾ããã¾ãã¯ã@code{#f} ã«ã»ãããããã¨ã§ã@c
+ä½ã®å°ç¯ç·ã表示ããªãããã«ãããã¨ãã§ãã¾ãã
+
+å®ç¾©ããå¾ãæ°ããå°ç¯ç·ã¯ @code{\bar} @var{bartype} ã§ä½¿ç¨ãããã¨ãã§ãã¾ãã
+ç¾å¨ä½¿ç¨ã§ããå°ç¯ç·ã®è¦ç´ 㯠10 ååå¨ãã¾ã:
+
+@lilypond[quote,verbatim]
+\defineBarLine ":" #'("" ":" "")
+\defineBarLine "=" #'("=" "" "")
+\defineBarLine "[" #'("" "[" "")
+\defineBarLine "]" #'("]" "" "")
+
+\new Staff {
+ s1 \bar "|"
+ s1 \bar "."
+ s1 \bar "!"
+ s1 \bar ";"
+ s1 \bar ":"
+ s1 \bar "k"
+ s1 \bar "S"
+ s1 \bar "="
+ s1 \bar "["
+ s1 \bar "]"
+ s1 \bar ""
+}
+@end lilypond
+
+@code{"="} å°ç¯ç·ã¯ãã»ã¼ãã§è¨å·ã¨çµã¿åããã¦ä½¿ãããã®äºéã®å°ç¯ç·ã@c
+æä¾ãã¾ããäºéã®ç´°ãå°ç¯ç·ãåç¬ã§è¡¨ç¤ºãããããã«ãããã使ããªãã§@c
+ãã ããã@code{\bar} @var{"||"} ã使ã£ã¦ãã ããã
+
+@code{"-"} è¨å·ã¯ãå°ç¯ç·ã«æ³¨éãå
¥ããããã«ä½¿ç¨ãã¾ããããã¯ã@c
+åãè¦ãç®ããã¦ãã¦ãæ¹è¡ã«ãã£ã¦æåãå¤åããå ´åãã@c
+èãã¾ããå°ç¯ç·ã®è¦ãç®ãç°ãªãå ´åã«åºå¥ããã®ã«ä¾¿å©ã§ãã@c
+@code{"-"} ã®å¾ã«ç¶ãé¨åã¯ãå°ç¯ç·ãæ§ç¯ããéã«ä½¿ç¨ããã¾ããã
+
+@lilypond[quote,verbatim]
+\defineBarLine "||-dashedSpan" #'("||" "" "!!")
+
+\new StaffGroup <<
+ \new Staff \relative c'' {
+ c1 \bar "||"
+ c1 \bar "||-dashedSpan"
+ c1
+ }
+ \new Staff \relative c'' {
+ c1
+ c1
+ c1
+ }
+>>
+@end lilypond
+
+æ´ã«ãã¹ãã¼ã¹æå @code{" "} ã¯ãèãã¾ããå°ç¯ç·ãã¡ã¤ã³ã®å°ç¯ç·ã«@c
+æ£ããæãããã«ãããã¬ã¼ã¹ ãã«ãã¨ãã¦æ©è½ãã¾ã:
+
+@lilypond[quote,verbatim]
+\defineBarLine ":|.-wrong" #'(":|." "" "|.")
+\defineBarLine ":|.-right" #'(":|." "" " |.")
+
+\new StaffGroup <<
+ \new Staff \relative c'' {
+ c1 \bar ":|.-wrong"
+ c1 \bar ":|.-right"
+ c1
+ }
+ \new Staff \relative c'' {
+ c1
+ c1
+ c1
+ }
+>>
+@end lilypond
+
+å°ç¯ç·ã®è¦ç´ ã追å ãããå ´åãLilyPond ã¯ããããå®ç¾©ããã·ã³ãã«ãªæ段ã@c
+æä¾ãã¦ãã¾ããå°ç¯ç·ã®å¤æ´ãããã¯è¿½å ã«é¢ããæ´ãªãæ
å ±ã¯ã@c
+ãã¡ã¤ã« @file{scm/bar-line-.scm} ãåç
§ãã¦ãã ããã
å¤ãã®èãæã¤æ¥½èã§ã¯ãããèã® @code{\bar} ã³ãã³ãã¯@c
èªåçã«ãã¹ã¦ã®èã«é©ç¨ããã¾ãã@c
@@ -2791,8 +3017,6 @@ to use @code{\divisioMinima} there instead, described in the section
@cindex default bar lines, changing (ããã©ã«ãã®å°ç¯ç·ãå¤æ´ãã)
@cindex bar lines, default, changing (ããã©ã«ãã®å°ç¯ç·ãå¤æ´ãã)
-@snippets
-
@funindex whichBar
@funindex defaultBarType
@funindex \bar
@@ -2813,6 +3037,9 @@ to use @code{\divisioMinima} there instead, described in the section
@ref{Repeats},
@ref{Grouping staves}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{scm/bar-line.scm}
+
ã³ã¼ãæçé:
@rlsr{Rhythms}
@@ -2838,11 +3065,13 @@ to use @code{\divisioMinima} there instead, described in the section
é常ã¯åå°ç¯ã§èªåçã«æ´æ°ããã¾ãã@c
å°ç¯çªå·ãæåã§è¨å®ãããã¨ãå¯è½ã§ã:
-@lilypond[verbatim,quote,fragment,relative=1]
-c1 c c c
-\break
-\set Score.currentBarNumber = #50
-c1 c c c
+@lilypond[verbatim,quote]
+\relative c' {
+ c1 c c c
+ \break
+ \set Score.currentBarNumber = #50
+ c1 c c c
+}
@end lilypond
@cindex bar numbers, regular spacing è¦åçãªééã§å°ç¯çªå·ãèå»ãã
@@ -2864,14 +3093,17 @@ c1 c c c
(è¡ã®çµäºç¹ã§ã®å¯è¦æ§ãè¡ã®éä¸ã§ã®å¯è¦æ§ãè¡ã®éå§ç¹ã§ã®å¯è¦æ§) ã§ãã@c
以ä¸ã®ä¾ã§ã¯ãèå»å¯è½ãªå ´æãã¹ã¦ã«å°ç¯çªå·ãèå»ãã¦ãã¾ã:
-@lilypond[verbatim,quote,relative=1]
-\override Score.BarNumber.break-visibility = #'#(#t #t #t)
-\set Score.currentBarNumber = #11
-% Permit first bar number to be printed
-\bar ""
-c1 | c | c | c
-\break
-c1 | c | c | c
+@c KEEP LY
+@lilypond[verbatim,quote]
+\relative c' {
+ \override Score.BarNumber.break-visibility = ##(#t #t #t)
+ \set Score.currentBarNumber = #11
+ % æåã®å°ç¯çªå·ã表示ãããããã«ãã¾ã
+ \bar ""
+ c1 | c | c | c |
+ \break
+ c1 | c | c | c |
+}
@end lilypond
@snippets
@@ -2881,6 +3113,9 @@ c1 | c | c | c
@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
{printing-bar-numbers-at-regular-intervals.ly}
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{printing-bar-numbers-with-changing-regular-intervals.ly}
+
@cindex measure number, format (å°ç¯çªå·ã®ãã©ã¼ããã)
@cindex bar number, format (å°ç¯çªå·ã®ãã©ã¼ããã)
@@ -2942,6 +3177,15 @@ c1 | c | c | c
\time 3/4 c2 e4 | g2 |
@end example
+æ£ãããªãæ¼å¥æéã¯æ»
è¶è¦è¶ãªæ¥½èãçæããå¯è½æ§ãããã¾ã
+-- ç¹ã«ãã®æ¥½èãå¤å£°ã§ããå ´åã¯ãããªãå¯è½æ§ãããã¾ãã@c
+å
¥åãä¿®æ£ããã«ã¯ã@c
+ã¾ããã£ã¨è¦ã¦å¤±æããå°ç¯ãã§ãã¯ã¨æ¼å¥æéã®èª¤ããæ¢ãã¨è¯ãã§ãããã
+
+é£ç¶ããå°ç¯ãã§ãã¯ã¯åãé³æ¥½çéé㧠off ã«ãªãã@c
+æåã®è¦åã¡ãã»ã¼ã¸ã ãã表示ããã¾ãã@c
+ããã«ãããè¦åã®ç¦ç¹ãã¿ã¤ãã³ã° ã¨ã©ã¼ã®çºçæºã«çµããã¾ãã
+
æè©ã§ãå°ç¯ãã§ãã¯ã使ç¨ãããã¨ãã§ãã¾ãã@c
以ä¸ã«ä¾ãæãã¾ã:
@@ -2952,15 +3196,10 @@ c1 | c | c | c
@}
@end example
-æ£ãããªãæ¼å¥æéã¯æ»
è¶è¦è¶ãªæ¥½èãçæããå¯è½æ§ãããã¾ã
--- ç¹ã«ãã®æ¥½èãå¤å£°ã§ããå ´åã¯ãããªãå¯è½æ§ãããã¾ãã@c
-å
¥åãä¿®æ£ããã«ã¯ã@c
-ã¾ããã£ã¨è¦ã¦å¤±æããå°ç¯ãã§ãã¯ã¨æ¼å¥æéã®èª¤ããæ¢ãã¨è¯ãã§ãããã
-
-é£ç¶ããå°ç¯ãã§ãã¯ã¯åãé³æ¥½çéé㧠off ã«ãªãã@c
-æåã®è¦åã¡ãã»ã¼ã¸ã ãã表示ããã¾ãã@c
-ããã«ãããè¦åã®ç¦ç¹ãã¿ã¤ãã³ã° ã¨ã©ã¼ã®çºçæºã«çµããã¾ãã
-
+æè©ã§ã®å°ç¯ãã§ã㯠ãã¼ã¯ã¯ããã¼ã¯ãå¦çããã¦@emph{ãã®æ¬¡ã®}é³ç¯ãåºç¾ãã@c
+ã¿ã¤ãã³ã°ã§è©ä¾¡ããã¾ããããæè©ããå°ç¯ã®æåã«ä¼ç¬¦ãæã¤ãã¤ã¹ã¨@c
+é¢é£ã¥ãã¦ãããªãããã®å°ç¯ã®æåã«é
ç½®ã§ããé³ç¯ãåå¨ããã@c
+è¦åã表示ããã¾ãã
@funindex |
@funindex "|"
@@ -3092,9 +3331,9 @@ c1 | c | c | c
@end lilypond
ãã¡ã¤ã« @file{scm/translation-functions.scm} ã¯
-@code{format-mark-numbers} (ããã©ã«ãã®ãã©ã¼ããã),
-@code{format-mark-box-numbers}, @code{format-mark-letters} ããã«
-@code{format-mark-box-letters} ã®å®ç¾©ãä¿æãã¦ãã¾ãã@c
+@code{format-mark-letters} (ããã©ã«ãã®ãã©ã¼ããã),
+@code{format-mark-box-letters}, @code{format-mark-numbers} ããã«
+@code{format-mark-box-numbers} ã®å®ç¾©ãä¿æãã¦ãã¾ãã@c
ããããåèã«ãã¦ä»ã®ãã©ã¼ãããé¢æ°ãä½ãåºããã¨ãã§ãã¾ãã
å ç®ãããæ°åãæåã®ä»£ããã«å°ç¯çªå·ãåå¾ããããã«
@@ -3117,7 +3356,7 @@ c1 | c | c | c
@cindex segno (ã»ã¼ãã§)
@cindex coda (ã³ã¼ã)
-@cindex D.S al Fine (ããã§æ²ã®å
é ã«æ»ããFine ã§çµãã)
+@cindex D.S. al Fine (ããã§æ²ã®å
é ã«æ»ããFine ã§çµãã)
@cindex fermata (ãã§ã«ãã¼ã¿)
@cindex music glyphs (é³æ¥½çå³æ)
@cindex glyphs, music (é³æ¥½çå³æ)
@@ -3206,18 +3445,12 @@ c1 | c | c | c
@emph{acciaccatura} (é·ããæããªãè£
飾å°é³ç¬¦ã§ã@c
ã¹ã©ã¼ã§ã¤ãªããããã¹ã©ãã·ã¥ä»ãã®ç¬¦å¹¹ãæã¤é³ç¬¦) ã¨ã
@emph{appoggiatura} (ä¸å®ã®æ¯çã§ä¸»é³ç¬¦ããæ¼å¥æéãåãã@c
-ã¹ã©ãã·ã¥ãæããªãé³ç¬¦)
+ã¹ã©ãã·ã¥ãæããªãé³ç¬¦) ã§ãã@c
ã¹ã©ã¼ã§çµã°ãã主é³ç¬¦ã®éã«è£
飾å°é³ç¬¦ãé
ç½®ããããã«ã@c
@code{\slashedGrace} é¢æ°ãç¨ãã¦ã
@emph{acciaccatura} ã®ããã«ã¹ã©ãã·ã¥ä»ãã®ç¬¦å¹¹ãæã¤ã@c
ã¹ã©ã¼ã¯ä»ããªãè£
飾å°é³ç¬¦ãèå»ãããã¨ãã§ãã¾ãã
-LilyPond ã¯ããã« 2 ã¤ç¹æ®ãªã¿ã¤ãã®è£
飾å°é³ç¬¦ããµãã¼ããã¾ã:
-@emph{acciaccatura} (é·ããæããªãè£
飾å°é³ç¬¦ã§ã@c
-ã¹ã©ãã·ã¥ä»ãã®ç¬¦å¹¹ãæã¤ã¹ã©ã¼ã§ã¤ãªããããå°ããªé³ç¬¦) ã¨
-@emph{appoggiatura} (ä¸å®ã®æ¯çã§ä¸»é³ç¬¦ããæ¼å¥æéãã¨ãã@c
-ã¹ã©ãã·ã¥ãæããªãå°ããªé³ç¬¦ã§èå»ããã¾ã) ã§ãã
-
@lilypond[quote,verbatim]
\relative {
\acciaccatura d''8 c4
@@ -3253,12 +3486,21 @@ LilyPond ã¯ããã« 2 ã¤ç¹æ®ãªã¿ã¤ãã®è£
飾å°é³ç¬¦ããµãã¼ã
\relative { c''1 \afterGrace d1 { c16[ d] } c1 }
@end lilypond
-ããã¯ä¸»é³ç¬¦ã®é·ãã® 3/4 ã®ã¹ãã¼ã¹ãã¨ã£ãå¾ã«@c
-è£
飾å°é³ç¬¦ãé
ç½®ãã¦ãã¾ãã@c
-ããã©ã«ãã®åæ° 3/4 㯠@code{afterGraceFraction} ãè¨å®ãããã¨ã«ãã@c
-å¤æ´ãããã¨ãã§ãã¾ãã@c
-以ä¸ã®ä¾ã§ã¯ãã¹ãã¼ã¹ãããã©ã«ãã主é³ç¬¦ã® 15/16ãæå¾ã¯ 1/2 ã«@c
-è¨å®ããçµæã示ãã¦ãã¾ãã
+ããã¯ä¸»é³ç¬¦ã®@emph{å¾ã«}è£
飾å°é³ç¬¦ãé
ç½®ãã¾ãã@c
+è£
飾å°é³ç¬¦ãã©ã®ã¿ã¤ãã³ã°ã§é
ç½®ããããã¯ã主é³ç¬¦ã®é·ãã¨ã®å²åã§@c
+決ãããã¾ãã以ä¸ã«ç¤ºãããã©ã«ãã®è¨å®ã¯ãããã¬ãã«ã§@c
+åå®ç¾©ãããã¨ãã§ãã¾ã:
+
+@example
+afterGraceFraction = 3/4
+@end example
+
+@noindent
+代ããã«ãåã
ã® @code{\afterGrace} ã³ãã³ãã®ç´å¾ã«åæ°ãä¸ãããã¨ã§@c
+å²åãæå®ãããã¨ãã§ãã¾ãã
+
+次ã®ä¾ã¯é ã«ãããã©ã«ãã®ã¹ãã¼ã¹ã主é³ç¬¦ã® @code{15/16} ã«æå®ããå ´åã@c
+主é³ç¬¦ã® @code{1/2} ã«æå®ããå ´åã®çµæã示ãã¦ãã¾ãã
@lilypond[quote,verbatim]
<<
@@ -3266,18 +3508,15 @@ LilyPond ã¯ããã« 2 ã¤ç¹æ®ãªã¿ã¤ãã®è£
飾å°é³ç¬¦ããµãã¼ã
c''1 \afterGrace d1 { c16[ d] } c1
}
\new Staff \relative {
- #(define afterGraceFraction (cons 15 16))
- c''1 \afterGrace d1 { c16[ d] } c1
+ c''1 \afterGrace 15/16 d1 { c16[ d] } c1
}
\new Staff \relative {
- #(define afterGraceFraction (cons 1 2))
- c''1 \afterGrace d1 { c16[ d] } c1
+ c''1 \afterGrace 1/2 d1 { c16[ d] } c1
}
>>
@end lilypond
-主é³ç¬¦ã¨è£
飾å°é³ç¬¦ã®éã®ã¹ãã¼ã¹ã¯ç©ºç½é³ç¬¦ã使ã£ã¦@c
-æå®ãããã¨ãã§ãã¾ãã@c
+@code{\afterGrace} ã®å¹æã¯ã空ç½ä¼ç¬¦ãç¨ãã¦ãå¾ããã¨ãã§ãã¾ãã@c
以ä¸ã®ä¾ã§ã¯ã主é³ç¬¦ã®é·ãã® 7/8 ã®ã¹ãã¼ã¹ãã¨ã£ãå¾ã«è£
飾å°é³ç¬¦ã@c
é
ç½®ãã¦ãã¾ãã
@@ -3352,6 +3591,7 @@ LilyPond ã¯ããã« 2 ã¤ç¹æ®ãªã¿ã¤ãã®è£
飾å°é³ç¬¦ããµãã¼ã
å
é¨ãªãã¡ã¬ã³ã¹:
@rinternals{GraceMusic},
@rinternals{Grace_beam_engraver},
+@rinternals{Grace_auto_beam_engraver},
@rinternals{Grace_engraver},
@rinternals{Grace_spacing_engraver}
@@ -3392,32 +3632,9 @@ LilyPond ã¯ããã« 2 ã¤ç¹æ®ãªã¿ã¤ãã®è£
飾å°é³ç¬¦ããµãã¼ã
>>
@end lilypond
-ãã¤ã¹ ã³ã³ããã¹ãã®ä¸ã§è£
飾éé³ç¬¦ãè¨è¿°ããã¨ã@c
-ãã¤ã¹ã®èå»ã«æ··ä¹±ãæãã¾ãã@c
-ãããå
æããã«ã¯ãè£
飾å°é³ç¬¦ã®ã»ã¯ã·ã§ã³ãå¤æ°ã«å
¥ãã¾ãã
-
-@lilypond[quote,verbatim]
-accMusic = {
- \acciaccatura { f8 } e8 r8 \acciaccatura { f8 } e8 r4
-}
-
-\new Staff {
- <<
- \new Voice {
- \relative c'' {
- r8 r8 \voiceOne \accMusic \oneVoice r8 |
- r8 \voiceOne r8 \accMusic \oneVoice r8 |
- }
- }
- \new Voice {
- \relative c' {
- s8 s8 \voiceTwo \accMusic \oneVoice s8 |
- s8 \voiceTwo r8 \accMusic \oneVoice s8 |
- }
- }
- >>
-}
-@end lilypond
+å®éã®é³ç¬¦é¨åã«ã¯ @code{\acciaccatura} ã @code{\appoggiatura} ãç¨ãã¦ããã¨@c
+ãã¦ãã空ç½ä¼ç¬¦ã®é¨åã«ã¯ @code{\grace} ã³ãã³ããç¨ããããã«ãã¦ãã ããã@c
+ããããªãã¨ãè¦ããªãè£
飾å°é³ç¬¦ã¨æ¬¡ã®é³ç¬¦ã¨ãç¹ããéãã¹ã©ã¼ã表示ããã¾ãã
è£
飾å°é³ç¬¦ã»ã¯ã·ã§ã³ã¯ã·ã¼ã±ã³ã·ã£ã«ãªé³æ¥½è¡¨è¨ã®ä¸ã§ã®ã¿ä½¿ç¨ãã¹ãã§ãã@c
è£
飾å°é³ç¬¦ã»ã¯ã·ã§ã³ã®ãã¹ãã並置ã¯ãµãã¼ãããã¦ãããã@c
@@ -3430,19 +3647,19 @@ MIDI åºåã«ããã¦è£
飾å°é³ç¬¦ã¯ãããã 1/4 ã®å®æ¼å¥æéã
ä¾ãã°:
@example
-\acciaccatura @{ c'8[ d' e' f' g'] @}
+c'8 \acciaccatura @{ c'8[ d' e' f' g'] @}
@end example
ã以ä¸ã®ããã«ãã¾ã:
@example
-\acciaccatura @{ c'16[ d' e' f' g'] @}
+c'8 \acciaccatura @{ c'16[ d' e' f' g'] @}
@end example
ãããã¯ãæ示çã«æ¼å¥æéãå¤æ´ãã¾ã:
@example
-\acciaccatura @{ \scaleDurations 1/2 @{ c'8[ d' e' f' g'] @} @}
+c'8 \acciaccatura @{ \scaleDurations 1/2 @{ c'8[ d' e' f' g'] @} @}
@end example
@ref{Scaling durations} ãåç
§ãã¦ãã ããã
@@ -3567,10 +3784,10 @@ MyCadenza = \relative {
@end lilypond
@noindent
-ãã®ä¾ã示ãããã«ã@code{ly:make-moment n m} ã¯å
¨é³ç¬¦ã® n/m ã®é·ãã®@c
+ãã®ä¾ã示ãããã«ã@code{ly:make-moment n/m} ã¯å
¨é³ç¬¦ã® n/m ã®é·ãã®@c
æ¼å¥æéãæ§æãã¾ãã@c
-ä¾ãã°ã@code{ly:make-moment 1 8} 㯠1 åã® 8 åé³ç¬¦ã®æ¼å¥æéã§ããã@c
-@code{ly:make-moment 7 16} 㯠7 åã® 16 åé³ç¬¦ã®æ¼å¥æéã§ãã
+ä¾ãã°ã@code{ly:make-moment 1/8} 㯠1 åã® 8 åé³ç¬¦ã®æ¼å¥æéã§ããã@c
+@code{ly:make-moment 7/16} 㯠7 åã® 16 åé³ç¬¦ã®æ¼å¥æéã§ãã
@seealso
è¨èæ³ãªãã¡ã¬ã³ã¹:
diff --git a/Documentation/ja/notation/simultaneous.itely b/Documentation/ja/notation/simultaneous.itely
index c89e52bebd..1c36789a18 100644
--- a/Documentation/ja/notation/simultaneous.itely
+++ b/Documentation/ja/notation/simultaneous.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@@ -9,7 +9,7 @@
@c \version "2.19.29"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -81,9 +81,11 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
@end lilypond
ããããªãããããã¤ãã®è¨èè¦ç´
--- å¼·å¼±è¨å·ããã¢ãã³ãããã«ã¹ã©ã¼ãªã© --
+-- å¼·å¼±è¨å·ããã¢ãã³ãªã© --
ã¯åé³ã®ä¸ã®é³ç¬¦ã§ã¯ãªããåé³ã«ä»ããå¿
è¦ãããã¾ãã@c
-ããããªããã°ãèå»ããã¾ããã
+ããããªããã°ãèå»ããã¾ããã@c
+éæãã¹ã©ã¼ãªã©ã®ä»ã®è¨èè¦ç´ ãåé³ã®ä¸ã®é³ç¬¦ã«ä»ããããå ´åã@c
+åé³å
¨ä½ãåé³ã«ä»ããå ´åã¨æ¯ã¹ã¦é
ç½®ãæããã«å¤åãã¾ãã
@lilypond[verbatim,quote]
\relative {
@@ -92,9 +94,8 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
}
@end lilypond
-@c ãããã L2100
@cindex chords, empty (空ã®åé³)
-@cindex placeholder events ()
+@cindex placeholder events (ãã¬ã¼ã¹ãã«ãã¼ ã¤ãã³ã)
åé³ã¯åé³ã«å«ã¾ããé³ç¬¦ãã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ãããã«ä»ã®ä»å±è¦ç´ ã®@c
ã³ã³ããã«ããã¾ããã@c
@@ -168,8 +169,9 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
@unnumberedsubsubsec åé³ã®ç¹°ãè¿ã
@translationof Chord repetition
-@cindex Chord, repetition (åé³ã®ç¹°ãè¿ã)
+@cindex chord, repetition (åé³ã®ç¹°ãè¿ã)
@cindex repetition, using @code{q} (@code{q} ãç¨ããç¹°ãè¿ã)
+@cindex @code{q}, chord repetition (@code{q} ãç¨ããåé³ã®ç¹°ãè¿ã)
å
¥åã®æéãçãããã«ãåã®åé³ãç¹°ãè¿ãããã®ç縮è¨æ³ãããã¾ãã@c
åé³ãç¹°ãè¿ãããã®ã·ã³ãã«ã¯ @code{q} ã§ã:
@@ -227,26 +229,24 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
ãã¨ã§äºæããªãçµæã«ãªã£ã¦ãã¾ã:
@code{\chordRepeats} ã®åé³ã¤ãã³ããå±éãããã¨ã@c
é常ã©ããã«å
¥åãããåé³ã¨åºå¥ãä»ããã@c
-@code{\relative} ã¯ã«ã¬ã³ãã®ã³ã³ããã¹ãã«åºã¥ãã¦é³ç¨ãå²ãå½ã¦ã¾ãã
+@code{\relative} ã¯ç¾å¨ã®ç¶æ
ã«åºã¥ãã¦ãªã¯ã¿ã¼ããå²ãå½ã¦ã¾ãã
ãã¹ãããã @code{\relative} ã®ã¤ã³ã¹ã¿ã³ã¹ã¯å
å¤ã®ã¤ã³ã¹ã¿ã³ã¹ã«@c
å½±é¿ãä¸ããªãã®ã§ã@c
@code{\chordRepeats} ã®å
å´ã« @code{\relative} ãé
ç½®ãããã¨ã§@c
-@code{\chordRepeats} ã®åé³ãå±éããåã«é³ç¨ã確å®ããããã¨ãã§ãã¾ãã@c
-ä»åã®ã±ã¼ã¹ã§ã¯ãå
å´ã«ãã @code{\relative} ã®å
容ã¯@c
+@code{\chordRepeats} ã®åé³ãå±éããåã«ãªã¯ã¿ã¼ãã確å®ããããã¨ã@c
+ã§ãã¾ããä»åã®ã±ã¼ã¹ã§ã¯ãå
å´ã«ãã @code{\relative} ã®å
容ã¯@c
å¤å´ã«ãã @code{\relative} ã®å½±é¿ãåããªãã®ã§ã@c
ç¹°ãè¿ãã®åé³ã¯åã®åé³ã®é³ç¨ãç¶æãã¦ãã¾ãã@c
ã¾ããå
å´ã® @code{\relative} ã¯å¤å´ã® @code{\relative} ã«å½±é¿ãä¸ããªãã®ã§ã@c
æå¾ã®é³ç¬¦ã®ãªã¯ã¿ã¼ãå
¥åãå¤åãã¾ãã
-@c Without \new Voice, implicit voice creation does the dumbest thing.
@lilypond[verbatim,quote]
-\new Voice
-\relative c'' {
+\relative {
\chordRepeats #'(articulation-event)
\relative
{ <a'-. c\prall e>1\sfz c'4 q2 r8 q8-. } |
- q2 c |
+ q2 c'' |
}
@end lilypond
@@ -284,6 +284,7 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
}
@end lilypond
+@c KEEP LY
@lilypond[quote,verbatim]
\relative {
% åä¸ã®é³ç¬¦ã§å§ã¾ãã¾ã
@@ -320,7 +321,6 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
ããã§ã¯ããªãºã ãç°ãªã£ã¦ãã¦ãåé¡ããã¾ããã@c
ç°ãªããã¤ã¹ã ã¨è§£éãããããã§ãã
-@cindex collisions, clashing note columns (é³ç¬¦åã®è¡çª)
@cindex collisions, ignoring (è¡çªãç¡è¦ãã)
@knownissues
@@ -329,7 +329,7 @@ LilyPond ã®ä¸ã§å¤å£°é¨ã¯åãèã«ããè¤æ°ã®ãã¤ã¹ãåç
§ã
ã³ã³ãã¤ã«ä¸ã«ä»¥ä¸ã®ã¡ãã»ã¼ã¸ã表示ããã¾ã:
@example
-warning: ignoring too many clashing note columns
+warning: This voice needs a \voiceXx or \shiftXx setting
@end example
@@ -404,6 +404,7 @@ warning: ignoring too many clashing note columns
* åä¸èã®å¤å£°::
* ãã¤ã¹ ã¹ã¿ã¤ã«::
* è¡çªã®è§£æ±º::
+* ä¼ç¬¦ã®ãã¼ã¸::
* èªåãã¼ãçµå::
* é³æ¥½ã並åã«è¨è¿°ãã::
@end menu
@@ -447,13 +448,13 @@ warning: ignoring too many clashing note columns
åãã«æ»ãã¾ãã
@c passage: 楽ç¯
-@subsubsubheading ä¸æçã«å¤å£°ã¨ãªãæ¥½ç¯ (passage)
+@subsubsubheading ä¸æçã«å¤å£°ã¨ãªãæ¥½ç¯ (ããã»ã¼ã¸)
ä¸æçã«å¤å£°ã¨ãªã楽ç¯ã¯ä»¥ä¸ã®ãããªæ§æã§ä½æãããã¨ãã§ãã¾ã:
@example
-<< @{ \voiceOne ... @}
- \new Voice @{ \voiceTwo ... @}
+<< @{ \voiceOne @dots{} @}
+ \new Voice @{ \voiceTwo @dots{} @}
>> \oneVoice
@end example
@@ -494,7 +495,7 @@ warning: ignoring too many clashing note columns
@subsubsubheading 2 éããã¯ã¹ã©ãã·ã¥æ§é
-@code{<< @{...@} \\ @{...@} >>} æ§é
+@code{<< @{@dots{}@} \\ @{@dots{}@} >>} æ§é
-- ãã®ä¸ã§ã¯ 2 㤠(ãããã¯ãã以ä¸) ã®è¡¨è¨ã
2 éããã¯ã¹ã©ãã·ã¥ã§åºåããã¦ãã¾ã --
ã¯ãåããããªæ§é ã ã 2 éããã¯ã¹ã©ãã·ã¥ãæããªãæ§é ã¨ã¯@c
@@ -569,12 +570,34 @@ etc.
\\
{ e'2 } % 4: ä¸ãã 2 çª
\\
- { b'2 } % 5: ä¸ãã 2 çª
+ { b'2 } % 5: ä¸ãã 3 çª
+ \\
+ { g'2 } % 6: ä¸ãã 3 çª
+>>
+@end lilypond
+
+@funindex \voices
+ãã¤ã¹ã®å
¥åé åºãå¤æ´ãããå ´åã@code{\voices} ã³ãã³ããå½¹ã«ç«ã¡ã¾ã:
+
+@c KEEP LY
+@lilypond[quote,verbatim]
+\new Staff \voices 1,3,5,6,4,2 <<
+ \time 2/4
+ { f''2 } % 1: æä¸æ®µ
+ \\
+ { d''2 } % 3: ä¸ãã 2 çª
+ \\
+ { b'2 } % 5: ä¸ãã 3 çª
\\
{ g'2 } % 6: ä¸ãã 3 çª
+ \\
+ { e'2 } % 4: ä¸ãã 2 çª
+ \\
+ { c'2 } % 2: æä¸æ®µ
>>
@end lilypond
+
@warning{æè©ãã¹ãã (ã¹ã©ã¼ãã¿ã¤ãå¼·å¼±ã®ãã¢ãã³ç) ã¯ãã¤ã¹ã @q{è·¨ã}
ãã¨ã¯ã§ãã¾ããã}
@@ -674,7 +697,7 @@ etc.
@cindex note collisions (é³ç¬¦ã®è¡çª)
@cindex collisions (è¡çª)
@cindex shift note (é³ç¬¦ã®ã·ãã)
-@cindex multiple voices
+@cindex multiple voices (è¤æ°ã®ãã¤ã¹)
@cindex voices, multiple (è¤æ°ã®ãã¤ã¹)
@cindex polyphonic music (å¤å£°ã®é³æ¥½)
@cindex shifting voices (ãã¤ã¹ãããã)
@@ -715,9 +738,8 @@ etc.
>>
@end lilypond
-以ä¸ã«ç¤ºãããã«ãç°ãªã符é ãæã¤é³ç¬¦ããã¼ã¸ãããã¨ãã§ãã¾ã
--- ä¾å¤ã¨ãã¦ãåé³ç¬¦ã¨ 4 åé³ç¬¦ã®ãã¼ã¸ã¯ã§ãã¾ããã@c
-第 1 å°ç¯ã® 1 æç®ã®ç¬¦é ããã¼ã¸ããã¾ãã:
+以ä¸ã«ç¤ºãããã«ãç°ãªã符é ãæã¤é³ç¬¦ããã¼ã¸ãããã¨ãã§ãã¾ãã@c
+ãã®ä¾ã§ã¯ã第 1 å°ç¯ã® 1 æç®ã®ç¬¦é ããã¼ã¸ããã¾ãã:
@lilypond[quote,verbatim]
<<
@@ -738,6 +760,9 @@ etc.
>>
@end lilypond
+ååé³ç¬¦ã¨äºåé³ç¬¦ã¯ãã®æ¹æ³ã§ã¯ãã¼ã¸ããã¾ããã@c
+ãªããªãåºå¥ãé£ãããªãããã§ãã
+
第 1 å°ç¯ã® 3 æç®ã®ããã«ç°ãªãä»ç¹ãæã¤ç¬¦é ããã¼ã¸ãããã¨ãã§ãã¾ã:
@lilypond[quote,verbatim]
@@ -894,23 +919,46 @@ etc.
@ignore
@knownissues
-ä¸åãã®ç¬¦å¹¹ãæ㤠8 åé³ç¬¦ããããããçãé³ç¬¦ã¨ä¸åãã®ç¬¦å¹¹ãæã¤@c
-åé³ç¬¦ã«å¯¾ã㦠@code{\mergeDifferentlyHeadedOn} ã使ç¨ããå ´åã@c
-8 åé³ç¬¦ã®ç¬¦å¹¹ã®ãªãã»ããã¯ãããã«æ£ãããªãã¾ããã@c
-ãªããªããåé³ç¬¦ã®ç¬¦é ã·ã³ãã«ã¨å¹
ãç°ãªãããã§ãã
-
@c TODO investigate! Sometimes it works, sometimes not. --FV
The requirements for successfully merging different note heads that
are at the same time differently dotted are not clear.
-
-åãåé³ã®ä¸ã§åãé³ç¬¦ãç°ãªãè¨æè¨å·ãæã¤å ´åããã®åé³ã®è¡çªåé¿ã¯@c
-ãµãã¼ãããã¾ããã@c
-ãã®ãããªå ´åãç°ååé³ (ã¨ã³ãã¼ã¢ããã¯) ã«æ¸ãæãããã@c
-ã¯ã©ã¹ã¿ã¨ããç¹æ®ãªè¨èæ³ (@ref{ã¯ã©ã¹ã¿} ãåç
§ãã¦ãã ãã)
-ãç¨ãããã¨ãæ¨å¥¨ãã¾ãã
@end ignore
+@node ä¼ç¬¦ã®ãã¼ã¸
+@unnumberedsubsubsec ä¼ç¬¦ã®ãã¼ã¸
+@translationof Merging rests
+
+è¤æ°ã®ãã¤ã¹ãç¨ããå ´åã両æ¹ã®ãã¼ãã«åºç¾ããä¼ç¬¦ã¯ãã¼ã¸ãããã®ã@c
+ä¸è¬çã§ãããã㯠@code{Merge_rests_engraver} ãç¨ãããã¨ã§éæã§ãã¾ãã
+
+@lilypond[quote,verbatim]
+voiceA = \relative { d''4 r d2 | R1 | }
+voiceB = \relative { fis'4 r g2 | R1 | }
+\score {
+ <<
+ \new Staff \with {
+ instrumentName = "unmerged"
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ \new Staff \with {
+ instrumentName = "merged"
+ \consists #Merge_rests_engraver
+ }
+ <<
+ \new Voice { \voiceOne \voiceA }
+ \new Voice { \voiceTwo \voiceB }
+ >>
+ >>
+}
+@end lilypond
+
+@code{suspendRestMerging} ã³ã³ããã¹ã ããããã£ã @code{##t} ã«@c
+ã»ãããããã¨ã§ãä¼ç¬¦ã®ãã¼ã¸ãä¸æçã«ç¡å¹ã«ãããã¨ãã§ãã¾ãã
+
@node èªåãã¼ãçµå
@unnumberedsubsubsec èªåãã¼ãçµå
@translationof Automatic part combining
@@ -978,6 +1026,35 @@ instrumentTwo = \relative {
æå¥ (@notation{äºéå¥}) ãã¼ãã«ã¯ãããã©ã«ãã§ãããã¹ã @qq{a2} ã¨ãã@c
ãã¼ã¯ãä»ãããã¾ãã
+ããã©ã«ãã§ã¯ã@code{\partcombine} ã¯åããããã®é³ç¬¦ã @notation{äºéå¥} ã®@c
+é³ç¬¦ã¨ãã¦ãã¼ã¸ãã¾ããã¾ããåããªãºã ã§é³ç¨ã 9 度以ä¸ã®é³ç¬¦ã¯åé³ã¨ãã¦@c
+çµåãã9 度ãã大ãã (ãããã¯ããã¤ã¹ã交差ãã¦ãã) å ´åã¯å¥ã
ã®ãã¤ã¹ã«@c
+ãªãã¾ãããã®æå㯠@code{\partcombine} ã³ãã³ãã®å¾ã«ãçç¥å¯è½ãª@c
+æ°åã®ãã¢ã®å¼æ°ãä¸ãããã¨ã§ãªã¼ãã©ã¤ããããã¨ãã§ãã¾ã:
+1 ã¤ç®ããçµåãå§ã¾ãé³ç¨ (ããã©ã«ã㯠0) ã§ã@c
+2 ã¤ç®ãå¥ã
ã®ãã¤ã¹ã¨ãªãé³ç¨ã§ãã@c
+2 ã¤ç®ã®å¼æ°ã 0 ã«ãããã¨ã§ã2 度以ä¸ã®é³ç¬¦ãåå²ãã@c
+1 ã«ãããã¨ã§ 3 度以ä¸ã®é³ç¬¦ãåå²ããã¨ããããã«ãªãã¾ãã
+
+@lilypond[quote,verbatim]
+instrumentOne = \relative {
+ a4 b c d |
+ e f g a |
+ b c d e |
+}
+
+instrumentTwo = \relative {
+ c'4 c c c |
+ c c c c |
+ c c c c |
+}
+
+<<
+ \new Staff \partcombine \instrumentOne \instrumentTwo
+ \new Staff \partcombine #'(2 . 3) \instrumentOne \instrumentTwo
+>>
+@end lilypond
+
@code{\partcombine} ã® 2 ã¤ã®å¼æ°ã¯å¥åã® @code{Voice} ã³ã³ããã¹ãã¨ãã¦@c
解éããã¾ãã@c
ãã®ãããç¸å¯¾ãªã¯ã¿ã¼ããç¨ããå ´åã両æ¹ã®ãã¼ã㧠@code{\relative} ã@c
@@ -1007,35 +1084,34 @@ instrumentTwo = \relative {
ã§ããããé³ç¬¦ãåé³ã«çµã¿åããããã¨ã¨ã1 ã¤ã®ãã¤ã¹ãã½ãã¨ãã¦è¡¨ç¤ºãããã¨@c
ã¯ç価ã§ã¯ããã¾ããã@c
ãªããªãã@code{\partcombine} é¢æ°ã¯åé³ç¬¦ãåã
ã«èæ
®ããããã§ãã
-ãã®ãããªå ´åã@code{\partcombine} é¢æ°ã以ä¸ã®ã³ãã³ãã§@c
-ãªã¼ãã©ã¤ããããã¨ãã§ãã¾ã:
-
-@code{...Once} ã§çµããã³ãã³ãã¯ãã³ãã³ãã®æ¬¡ã«æ¥ãé³ç¬¦ã ãã«é©ç¨ããã¾ãã
+ãã®ãããªå ´åã@code{\partcombine} é¢æ°ã以ä¸ã®ã³ãã³ãã®ããããã§@c
+ãªã¼ãã©ã¤ããããã¨ãã§ãã¾ããå
¨ã¦ã®ã³ãã³ãã¯é³æ¥½è¡¨è¨ã®ä¸ã§@c
+次ã®é³ç¬¦ã ãã«é©ç¨ãããããã« @code{\once} æ¥é è¾ãä»ãããã¨ãã§ãã¾ãã
@itemize
@item
-@code{\partcombineApart} 㨠@code{\once \partcombineApart} ã¯@c
+@code{\partcombineApart} ã¯@c
é³ç¬¦ã 2 ã¤ã®å¥åã®ãã¤ã¹ã¨ãã¦èå»ãã¾ã
-- ãã¨ãåé³ãã¦ãã¾ã³ã«ã§ããå ´åã§ãã£ã¦ãåãã¦èå»ãã¾ãã
@item
-@code{\partcombineChords} 㨠@code{\once \partcombineChords} ã¯@c
+@code{\partcombineChords} ã¯@c
é³ç¬¦ãçµã¿åããã¦ãåé³ã¨ãã¦èå»ãã¾ãã
@item
-@code{\partcombineUnisono} 㨠@code{\once \partcombineUnisono} ã¯@c
+@code{\partcombineUnisono} ã¯@c
é³ç¬¦ãçµã¿åããã¦ã@qq{ã¦ãã¾ã³} ã¨ãã¦èå»ãã¾ãã
@item
-@code{\partcombineSoloI} 㨠@code{\once \partcombineSoloI} ã¯@c
+@code{\partcombineSoloI} ã¯@c
ãã¤ã¹ 1 ã ããèå»ãã¦ã@qq{Solo} ã®ãã¼ã¯ãä»ãã¾ãã
@item
-@code{\partcombineSoloII} 㨠@code{\once \partcombineSoloII} ã¯@c
+@code{\partcombineSoloII} ã¯@c
ãã¤ã¹ 2 ã ããèå»ãã¦ã@qq{Solo} ã®ãã¼ã¯ãä»ãã¾ãã
@item
-@code{\partcombineAutomatic} 㨠@code{\once \partcombineAutomatic}ã¯@c
+@code{\partcombineAutomatic} ã¯@c
ä¸è¨ã®ã³ãã³ãã®å¹æãçµããããæ¨æºã® @code{\partcombine} ã«æ»ãã¾ãã
@end itemize
@@ -1064,6 +1140,18 @@ instrumentTwo = \relative {
>>
@end lilypond
+
+@subsubsubheading \partcombine ãæè©ã¨åæã«ä½¿ã
+
+@cindex \partcombine and lyrics (\partcombine ã¨æè©)
+
+@code{\partcombine} ã¯æè©ã¨åæã«åä½ããããã«è¨è¨ããã¦ãã¾ããã@c
+æè©ãä»ããããã«ããã¤ã¹ã®çæ¹ã«ååãæ示ããã¦ããå ´åããã¼ãçµåã¯@c
+åä½ãåæ¢ãã¾ãããããã@code{NullVoice} ã³ã³ããã¹ããç¨ãããã¨ã§@c
+å¹æãå¾ããã¨ãã§ãã¾ãã@ref{Polyphony with shared lyrics} ã@c
+åç
§ãã¦ãã ããã
+
+
@snippets
@lilypondfile[verbatim,quote,texidoc,doctitle]
@@ -1088,11 +1176,9 @@ instrumentTwo = \relative {
@rinternals{Voice}
@knownissues
-ãã¹ã¦ã® @code{\partcombine...} ã¯ãã¤ã¹ã 2 ã¤ã ãåãåããã¨ãã§ãã@c
-æè©ãå¦çããããã«ã¯è¨è¨ããã¦ãã¾ããã@c
-ãã¤ã¹ã«æè©ãä»ãããã¦ããå ´åããã¼ãçµåã¯å¦çãåæ¢ãã¾ãã
+ãã¹ã¦ã® @code{\partcombine@dots{}} ã¯ãã¤ã¹ã 2 ã¤ã ãåãåããã¨ãã§ãã¾ãã
-@code{\partcombine...} é¢æ°ã @code{\tuplet} ãããã¯ã @code{\relative}
+@code{\partcombine@dots{}} é¢æ°ã @code{\tuplet} ãããã¯ã @code{\relative}
ãããã¯ã®ä¸ã«ç½®ããã¨ã¯ã§ãã¾ããã
@code{printPartCombineTexts} ãã»ããããã¦ãã¦ãããå°ç¯ã§ 2 ã¤ã®ãã¤ã¹ã®@c
diff --git a/Documentation/ja/notation/staff.itely b/Documentation/ja/notation/staff.itely
index cfae43a644..0a32372692 100644
--- a/Documentation/ja/notation/staff.itely
+++ b/Documentation/ja/notation/staff.itely
@@ -1,6 +1,6 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. See TRANSLATION for details.
@@ -9,7 +9,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -42,7 +42,7 @@
* æ°ãã«èãã¤ã³ã¹ã¿ã³ã¹åãã::
* èãã°ã«ã¼ãåãã::
* ãã¹ããããèã°ã«ã¼ã::
-* Separating systems::
+* ã·ã¹ãã ãåå²ãã::
@end menu
@@ -222,8 +222,8 @@
詳細㯠@ref{Instrument names} ãåç
§ãã¦ãã ããã
@lilypond[verbatim,quote]
-\new PianoStaff <<
- \set PianoStaff.instrumentName = #"Piano"
+\new PianoStaff \with { instrumentName = #"Piano" }
+<<
\new Staff \relative { c''1 c }
\new Staff \relative { \clef bass c1 c }
>>
@@ -248,11 +248,10 @@
@lilypondfile[verbatim,quote,texidoc,doctitle]
{display-bracket-with-only-one-staff-in-a-system.ly}
-@c æªè¨³
-@cindex mensurstriche layout
-@cindex renaissance music)
-@cindex transcription of mensural music
-@cindex mensural music, transcription of
+@cindex mensurstriche layout (è¨éé³æ¥½é¢¨ã®ã¬ã¤ã¢ã¦ã)
+@cindex renaissance music (ã«ããµã³ã¹é³æ¥½)
+@cindex transcription of mensural music (è¨éé³æ¥½ã®ç·¨æ²)
+@cindex mensural music, transcription of (è¨éé³æ¥½ã®ç·¨æ²)
@lilypondfile[verbatim,quote,texidoc,doctitle]
{mensurstriche-layout-bar-lines-between-the-staves.ly}
@@ -281,9 +280,6 @@
@rinternals{SystemStartBracket},
@rinternals{SystemStartSquare}
-@knownissues
-ããã©ã«ãã§ã¯ @code{PianoStaff} 㯠@code{ChordNames} ãåãä»ãã¾ããã
-
@node ãã¹ããããèã°ã«ã¼ã
@unnumberedsubsubsec ãã¹ããããèã°ã«ã¼ã
@@ -301,17 +297,17 @@
ããããå ´åãããããã®åã³ã³ããã¹ãã¯ã@c
親ã°ã«ã¼ãã®è§æ¬å¼§ã«é£æ¥ãã¦æ°ããè§æ¬å¼§ãä½æãã¾ãã
-@lilypond[verbatim,quote,relative=2]@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote]
\new StaffGroup <<
- \new Staff { c2 c | c2 c }
+ \new Staff \relative { c''2 c | c2 c }
\new StaffGroup <<
- \new Staff { g2 g | g2 g }
+ \new Staff \relative { g'2 g | g2 g }
\new StaffGroup \with {
systemStartDelimiter = #'SystemStartSquare
}
<<
- \new Staff { e2 e | e2 e }
- \new Staff { c2 c | c2 c }
+ \new Staff \relative { e'2 e | e2 e }
+ \new Staff \relative { c'2 c | c2 c }
>>
>>
>>
@@ -344,19 +340,20 @@
@rinternals{SystemStartSquare}
-@c æªè¨³
-@node Separating systems
-@unnumberedsubsubsec Separating systems
+@node ã·ã¹ãã ãåå²ãã
+@unnumberedsubsubsec ã·ã¹ãã ãåå²ãã
+@translationof Separating systems
-@cindex system separator mark
+@cindex system separator mark (ã·ã¹ãã åå²è¨å·)
-If the number of systems per page changes from page to page it is
-customary to separate the systems by placing a system separator mark
-between them. By default the system separator is blank, but can be
-turned on with a @code{\paper} option.
+1 ãã¼ã¸ãããã®ã·ã¹ãã ã®æ°ããã¼ã¸ã«ãã£ã¦ç°ãªãå ´åã@c
+ã·ã¹ãã åå²è¨å·ãéã«ç½®ããã¨ã§ã·ã¹ãã ãåå²ããã¨ããæ
£ç¿ãããã¾ãã@c
+ããã©ã«ãã§ã¯ãã·ã¹ãã åå²è¨å·ã¯ç©ºã«ãªã£ã¦ãã¾ããã
+@code{\paper} ãªãã·ã§ã³ã§æå¹ã«ãããã¨ãã§ãã¾ãã
@c \book is required here to display the system separator
@c ragged-right is required as there are two systems
+@c KEEP LY
@lilypond[verbatim,quote,ragged-right]
\book {
\score {
@@ -379,7 +376,7 @@ turned on with a @code{\paper} option.
}
\paper {
system-separator-markup = \slashSeparator
- % following commands are needed only to format this documentation
+ % 以ä¸ã®ã³ãã³ãã¯ãã®ããã¥ã¡ã³ãã§ã®ä½è£ãæ´ããããã ãã®ãã®ã§ã
paper-width = 100\mm
paper-height = 100\mm
tagline = ##f
@@ -392,7 +389,7 @@ turned on with a @code{\paper} option.
@ref{Page layout}
ã³ã¼ãæçé:
-@rlsr{Staff notation}.
+@rlsr{Staff notation}
@node åã
ã®èãå¤æ´ãã
@@ -440,7 +437,7 @@ turned on with a @code{\paper} option.
@code{\stopStaff}
@endpredefined
-@code{StaffSymbol} ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ã (å ç·ãå«ã) ã«å±ããèã®ç·ã¯@c
+èã®ç· (å ç·ãå«ã) 㯠@code{StaffSymbol} ã°ã©ãã£ã«ã« ãªãã¸ã§ã¯ãã«å±ãã
@code{StaffSymbol} ããããã£ãç¨ãã¦å¤æ´ãããã¨ãã§ãã¾ãã@c
ããããªãããå¤æ´ã¯èã (å) éå§ããåã«è¡ãå¿
è¦ãããã¾ãã
@@ -459,8 +456,9 @@ turned on with a @code{\paper} option.
@end lilypond
åèç·ã®ä½ç½®ãå¤æ´ãããã¨ãã§ãã¾ãã@c
-å¤ã®åä½ã¯èç·ã®ééã® @emph{åå} ã§ã@c
-æ°ããä½ç½®ã¯é常ã®ä¸å¤®ç·ããã®ç¸å¯¾ä½ç½®ã§ãã@c
+æ°åã®ãªã¹ãã§ããããã®èç·ã®ä½ç½®ãæå®ãã¾ãã@c
+@code{0}@tie{}ã¯é常ã®èã«ãããä¸å¤®ã®ç·ã§ã@c
+é常ã®èã®èç·ã®ä½ç½®ã¯ @code{(-4@tie{}-2@tie{}0@tie{}2@tie{}4)} ã¨ãªãã¾ãã
1 ã¤ã®å¤ã«å¯¾ã㦠1 æ¬ã®èç·ãèå»ãããã®ã§ã@c
1 ã¤ã®ãªã¼ãã©ã¤ãã§èç·ã®ä½ç½®ã¨æ¬æ°ãå¤æ´ãããã¨ãã§ãã¾ãã
@@ -475,8 +473,11 @@ turned on with a @code{\paper} option.
}
@end lilypond
+符幹ã®åããé常éã (èã®ä¸ååã§ã¯ä¸åããä¸ååã§ã¯ä¸åã) ã«ãªãããã«ã@c
+ã«ã¹ã¿ãã¤ãºããèã§ã¯ä¸å¤®ã®ç· (ãããã¯ãéã) ãé常ã®ä¸å¤®ã®ä½ç½® (0) ã«@c
+é
ç½®ããããã«ãã¦ãã ããã
æ°ããèç·ã«å¯¾å¿ãã¦ã@c
-é³é¨è¨å·ã¨ããã« C ã®ä½ç½®ã調ç¯ããå¿
è¦ãããããããã¾ããã@c
+é³é¨è¨å·ã¨ããã«@tie{}C ã®ä½ç½®ã調ç¯ããå¿
è¦ãããããããã¾ããã@c
@ref{Clef} ãåç
§ãã¦ãã ããã
èç·ã®å¤ªããå¤ãããã¨ãã§ãã¾ãã@c
@@ -491,9 +492,7 @@ turned on with a @code{\paper} option.
}
@end lilypond
-ããããªãããå ç·ã®å¤ªããèç·ã®å¤ªãããç¬ç«ãã¦è¨å®ãããã¨ãã§ãã¾ãã@c
-2 ã¤ã®å¤ã¯èç·ã®å¤ªãã¨èç·ã®ééã«æãç®ããã@c
-ããããå ç®ããå¤ãå ç·ã®å¤ªãã«ãªãã¾ãã
+å ç·ã®å¤ªããèç·ã®å¤ªãããç¬ç«ãã¦è¨å®ãããã¨ãã§ãã¾ãã
@lilypond[verbatim,quote]
\new Staff \with {
@@ -504,6 +503,10 @@ turned on with a @code{\paper} option.
}
@end lilypond
+@noindent
+1 ã¤ç®ã®å¤ã¯èç·ã®å¤ªãã«ã2 ã¤ç®ã¯èç·ã®ééã«æãç®ããã@c
+ããã 2 ã¤ã®å¤ãå ç®ããå¤ãå ç·ã®å¤ªãã«ãªãã¾ãã
+
å ç·ã®åç´æ¹åã®ä½ç½®ãå¤æ´ãããã¨ãã§ãã¾ã:
@lilypond[verbatim,quote]
@@ -532,13 +535,15 @@ turned on with a @code{\paper} option.
以ä¸ã®ä¾ã§ã@code{StaffSymbol} å
¨ä½ã«å¯¾ãã @code{\override} ãå
ã«æ»ãã«ã¯@c
@code{\stopStaff} ãè¡ãå¿
è¦ãããã¾ãã
-@lilypond[fragment,quote,relative=1]
-\override Staff.StaffSymbol.line-positions = #'(-8 0 2 4)
-d4 e f g
-\stopStaff
-\startStaff
-\override Staff.StaffSymbol.ledger-positions = #'(-8 -6 (-4 -2) 0)
-d4 e f g
+@lilypond[verbatim,quote]
+\relative d' {
+ \override Staff.StaffSymbol.line-positions = #'(-8 0 2 4)
+ d4 e f g
+ \stopStaff
+ \startStaff
+ \override Staff.StaffSymbol.ledger-positions = #'(-8 -6 (-4 -2) 0)
+ d4 e f g
+}
@end lilypond
èç·ã®ééãå¤ãããã¨ãã§ãã¾ãããã®è¨å®ã¯å ç·ã®ééã«ãå½±é¿ãä¸ãã¾ãã
@@ -576,11 +581,9 @@ d4 e f g
@unnumberedsubsubsec ãªãã·ã¢è
@translationof Ossia staves
-@c æªè¨³
-@cindex staff, Frenched
+@cindex staff, Frenched (é ãããè)
@cindex ossia (ãªãã·ã¢)
-@c æªè¨³
-@cindex Frenched staves
+@cindex Frenched staves (é ãããè)
@cindex staff, resizing of (èããªãµã¤ãºãã)
@cindex resizing of staves (èããªãµã¤ãºãã)
@@ -614,7 +617,7 @@ d4 e f g
æãé©åãªæ¹æ³ã§ãã
@lilypond[verbatim,quote]
-\new Staff = main \relative {
+\new Staff = "main" \relative {
c''4 b d c
<<
{ c4 b d c }
@@ -622,9 +625,7 @@ d4 e f g
\new Staff \with {
\remove "Time_signature_engraver"
alignAboveContext = #"main"
- fontSize = #-3
- \override StaffSymbol.staff-space = #(magstep -3)
- \override StaffSymbol.thickness = #(magstep -3)
+ \magnifyStaff #2/3
firstClef = ##f
}
{ e4 d f e }
@@ -643,12 +644,10 @@ d4 e f g
@lilypond[verbatim,quote,ragged-right]
<<
- \new Staff = ossia \with {
+ \new Staff = "ossia" \with {
\remove "Time_signature_engraver"
\hide Clef
- fontSize = #-3
- \override StaffSymbol.staff-space = #(magstep -3)
- \override StaffSymbol.thickness = #(magstep -3)
+ \magnifyStaff #2/3
}
{ \stopStaff s1*6 }
@@ -656,7 +655,7 @@ d4 e f g
c'4 b c2
<<
{ e4 f e2 }
- \context Staff = ossia {
+ \context Staff = "ossia" {
\startStaff e4 g8 f e2 \stopStaff
}
>>
@@ -664,7 +663,7 @@ d4 e f g
c4 b c2
<<
{ g4 a g2 }
- \context Staff = ossia {
+ \context Staff = "ossia" {
\startStaff g4 e8 f g2 \stopStaff
}
>>
@@ -674,21 +673,20 @@ d4 e f g
@end lilypond
ãªãã·ã¢èãä½æããããã®ä»£æ¿æ段ã¨ãã¦ã@c
-@code{\RemoveEmptyStaffContext} ã³ãã³ããç¨ããããããããã¾ããã@c
+@code{\RemoveAllEmptyStaves} ã³ãã³ããç¨ããããããããã¾ããã@c
ãã®ææ³ã¯ããªãã·ã¢èãæ¹è¡ã®ç´å¾ã«çºçããå ´åãæã便å©ãªææ³ã§ãã@c
@c ãã®ãããªã±ã¼ã¹ã§ã¯ã空ç½ä¼ç¬¦ã使ç¨ããå¿
è¦ã¯ã¾ã£ããããã¾ãã:
@c @code{\startStaff} 㨠@code{\stopStaff} ãå¿
è¦ã§ããã ãã§ãã@c
-@code{\RemoveEmptyStaffContext} ã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ã@c
+@code{\RemoveAllEmptyStaves} ã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ã@c
@ref{Hiding staves} ãåç
§ãã¦ãã ããã
@lilypond[verbatim,quote,ragged-right]
<<
- \new Staff = ossia \with {
+ \new Staff = "ossia" \with {
\remove "Time_signature_engraver"
\hide Clef
- fontSize = #-3
- \override StaffSymbol.staff-space = #(magstep -3)
- \override StaffSymbol.thickness = #(magstep -3)
+ \magnifyStaff #2/3
+ \RemoveAllEmptyStaves
} \relative {
R1*3
c''4 e8 d c2
@@ -702,13 +700,6 @@ d4 e f g
e4 d c2
}
>>
-
-\layout {
- \context {
- \Staff \RemoveEmptyStaves
- \override VerticalAxisGroup.remove-first = ##t
- }
-}
@end lilypond
@@ -742,16 +733,18 @@ d4 e f g
@unnumberedsubsubsec èãé ã
@translationof Hiding staves
-@c æªè¨³
-@cindex Frenched score
-@c æªè¨³
-@cindex Frenched staff
+@cindex Frenched score (èãé ããã楽è)
+@cindex Frenched staff (é ãããè)
@cindex staff, hiding (èãé ã)
@cindex staff, empty (空ã®è)
-@cindex hiding of staves (èãé ã)
+@cindex hiding staves (èãé ã)
+@cindex hiding ancient staves (å¤ä»£èãé ã)
+@cindex hiding rhythmic staves (ãªãºã èãé ã)
+@cindex hiding vaticana staves (ããã«ã³èãé ã)
@cindex empty staves (空ã®è)
@funindex \RemoveEmptyStaves
+@funindex \RemoveAllEmptyStaves
@funindex Staff_symbol_engraver
@funindex \stopStaff
@@ -766,14 +759,17 @@ d4 e f g
\relative { a''8 f e16 d c b a2 }
@end lilypond
-@c æªè¨³: Frenched Score
-@code{\layout} ãããã¯ã®ä¸ã§
-@code{\RemoveEmptyStaffContext} ã³ãã³ããã»ãããããã¨ã«ãã£ã¦ã@c
-空ã®èãé ããã¨ãã§ãã¾ãã@c
-ãªã¼ã±ã¹ãã©èã§ã¯ã@c
-ãã®ãããªã¹ã¿ã¤ã«ã®è㯠@q{Frenched Score} ã¨ãã¦ç¥ããã¦ãã¾ãã@c
-ããã©ã«ãã§ã¯ããã®ã³ãã³ãã¯@c
-æåã®ã·ã¹ãã 以å¤ã®ã¨ããã«ãããã¹ã¦ã®ç©ºã®èãé ãã¦ãåé¤ãã¾ãã
+@c Frenched Score
+@c é©å½ãªè¨³èªãè¦ã¤ãããªããããåæã®ã¾ã¾ã¨ãã
+@c indexä¸ã§ã¯ãé ãããèããªã©ã¨ãã
+空ã®èã¯é ããã¨ãã§ãã¾ã (ãããã @q{Frenched Score} ã«ãããã)ã@c
+ããã¯ãã³ã³ããã¹ãä¸ã§ @code{\RemoveEmptyStaves} ãé©ç¨ãããã¨ã§@c
+å®ç¾ã§ãã¾ãã(@code{\layout} ãããã¯å
ã«é©ç¨ãããã¨ã«ãã£ã¦) 楽èå
¨ä½ã«@c
+è¨å®ãããã¨ãã(@code{\with} ãããã¯å
ã«é©ç¨ãããã¨ã«ãã£ã¦) ç¹å®ã®èã«@c
+éå®ãããã¨ãã§ãã¾ãããã®ã³ãã³ãã¯ãæåã®ã·ã¹ãã ãé¤ãã¦ã@c
+楽èå
ã«ããå
¨ã¦ã®ç©ºã®èãåé¤ãã¾ããæåã®ã·ã¹ãã ã«ããèãé ãããå ´åã¯ã@c
+@code{\RemoveAllEmptyStaves} ã使ã£ã¦ãã ããããµãã¼ããã¦ããã³ã³ããã¹ãã¯
+@code{Staff}, @code{RhythmicStaff}, @code{VaticanaStaff} ã§ãã
@warning{èã空ã§ããã¨è¦ãªãããã®ã¯ã@c
ãããè¤æ°å°ç¯ã«ãããä¼ç¬¦ãä¼ç¬¦ãã¹ãããã空ç½ä¼ç¬¦ã@c
@@ -782,7 +778,8 @@ d4 e f g
@lilypond[verbatim,quote,ragged-right]
\layout {
\context {
- \Staff \RemoveEmptyStaves
+ \Staff
+ \RemoveEmptyStaves
}
}
@@ -804,32 +801,14 @@ d4 e f g
@noindent
èã«å¯¾ãã¦ãªãã·ã¢ ã»ã¯ã·ã§ã³ãä½æããããã«ã@c
-@code{\RemoveEmptyStaffContext} ãç¨ãããã¨ãã§ãã¾ãã@c
+@code{\RemoveAllEmptyStaves} ãç¨ãããã¨ãã§ãã¾ãã@c
詳細㯠@ref{Ossia staves} ãåç
§ãã¦ãã ããã
-@cindex hiding ancient staves (å¤ä»£èãé ã)
-@cindex hiding rhythmic staves (ãªãºã èãé ã)
-
-@funindex \RemoveEmptyStaves
-
-å¤ä»£é³æ¥½ã³ã³ããã¹ãã®ä¸ã«ãã空ã®èãé ãããã«ã@c
-@code{\VaticanaStaff \RemoveEmptyStaves} ã³ãã³ããç¨ãããããã¨ãããã¾ãã@c
-åæ§ã«ã空㮠@code{RhythmicStaff} ã³ã³ããã¹ããé ãããã«ã@c
-@code{\RhythmicStaff \RemoveEmptyStaves} ãç¨ãããããã¨ãããã¾ãã
-
-
@predefined
-@code{\Staff \RemoveEmptyStaves},
-@code{\VaticanaStaff \RemoveEmptyStaves},
-@code{\RhythmicStaff \RemoveEmptyStaves}
+@code{\RemoveEmptyStaves},
+@code{\RemoveAllEmptyStaves}
@endpredefined
-
-@snippets
-
-@lilypondfile[verbatim,quote,texidoc,doctitle]
-{removing-the-first-empty-line.ly}
-
@seealso
é³æ¥½ç¨èªé:
@rglos{Frenched staff}
@@ -991,60 +970,42 @@ d4 e f g
@cindex instrument names, changing (楽å¨åãå¤æ´ãã)
@cindex changing instrument names (楽å¨åãå¤æ´ãã)
-楽æ²ã®éä¸ã§ @code{shortInstrumentName} ãå¤æ´ãããã¨ãã§ãã¾ãã@c
+楽æ²ã®éä¸ã§ @code{shortInstrumentName} ããæ°ãã楽å¨ã«å¿
è¦ãªãã®ä»ã®è¨å®ã@c
+å¤æ´ãããã¨ãã§ãã¾ãã@c
ããããªããã@code{instrumentName} ã¯æåã®ã¤ã³ã¹ã¿ã³ã¹ãèå»ããã@c
楽æ²ã®éä¸ã§ã®å¤æ´ã¯ç¡è¦ããã¾ã:
-@lilypond[verbatim,quote,ragged-right,relative=1]
-\new Staff \with {
- instrumentName = #"Flute"
- shortInstrumentName = #"Flt."
-}
-{
- c1 c c c \break
- c1 c c c \break
- \set Staff.instrumentName = #"Clarinet"
- \set Staff.shortInstrumentName = #"Clt."
- c1 c c c \break
- c1 c c c \break
-}
-@end lilypond
-
-@cindex instrument switch (楽å¨ãåãæãã)
-@cindex switching instruments (楽å¨ãåãæãã)
+@lilypond[verbatim,quote,ragged-right]
+prepPiccolo = <>^\markup \italic { muta in Piccolo }
-@funindex \addInstrumentDefinition
-@funindex \instrumentSwitch
+prepFlute = <>^\markup \italic { muta in Flauto }
-楽å¨ã® @emph{åãæ¿ã} ãå¿
è¦ãªå ´åãåãæ¿ãã®ããã«å¿
è¦ã¨ããã@c
-å¤æ´ã®è©³ç´°ãªãªã¹ããä½æããããã«ã@code{\addInstrumentDefinition} ã
-@code{\instrumentSwitch} ã¨çµã¿åããã¦ä½¿ç¨ãããã¨ãããã¾ãã@c
-@code{\addInstrumentDefinition} ã³ãã³ã㯠2 ã¤ã®å¼æ°ãã¨ãã¾ã:
-èå¥æååã¨ã楽å¨ã§ä½¿ç¨ãããã³ã³ããã¹ã ããããã£ã¨å¤ã®é£æ³ãªã¹ãã§ãã@c
-ãã®ã³ãã³ãã¯æä¸ä½ã®ã¹ã³ã¼ãã«é
ç½®ããå¿
è¦ãããã¾ãã@c
-@code{\instrumentSwitch} ã¯é³æ¥½è¡¨è¨ã®ä¸ã§ä½¿ç¨ããã楽å¨ã®åãæ¿ãã宣è¨ãã¾ã:
+setPiccolo = {
+ <>^\markup \bold { Piccolo }
+ \transposition c''
+}
-@lilypond[verbatim,quote,ragged-right]
-\addInstrumentDefinition #"contrabassoon"
- #`((instrumentTransposition . ,(ly:make-pitch -1 0 0))
- (shortInstrumentName . "Cbsn.")
- (clefGlyph . "clefs.F")
- (middleCPosition . 6)
- (clefPosition . 2)
- (instrumentCueName . ,(make-bold-markup "cbsn."))
- (midiInstrument . "bassoon"))
+setFlute = {
+ <>^\markup \bold { Flute }
+ \transposition c'
+}
\new Staff \with {
- instrumentName = #"Bassoon"
+ instrumentName = #"Flute"
+ shortInstrumentName = #"Flt."
}
-\relative c' {
- \clef tenor
- \compressFullBarRests
- c2 g'
- R1*16
- \instrumentSwitch "contrabassoon"
- c,,2 g \break
- c,1 ~ | 1
+\relative {
+ g'1 g g g \break
+ g1 g \prepPiccolo R R \break
+ \set Staff.instrumentName = #"Piccolo"
+ \set Staff.shortInstrumentName = #"Picc."
+ \setPiccolo
+ g1 g g g \break
+ g1 g \prepFlute R R \break
+ \set Staff.instrumentName = #"Flute"
+ \set Staff.shortInstrumentName = #"Flt."
+ \setFlute
+ g1 g g g
}
@end lilypond
@@ -1132,6 +1093,40 @@ oboeNotes = \relative {
}
@end lilypond
+@code{\unfoldRepeats} ã³ãã³ãã @code{\quoteDuring} ã¨ä¸ç·ã«ä½¿ãå ´åã@c
+å¼ç¨ã®ä¸ã§ã @code{\unfoldRepeats} ã³ãã³ãã使ããªããã°ãªãã¾ãã:
+
+@lilypond[verbatim,quote]
+fluteNotes = \relative {
+ \repeat volta 2 { a'4 gis g gis }
+}
+
+oboeNotesDW = \relative {
+ \repeat volta 2 \quoteDuring #"incorrect" { s1 }
+}
+
+oboeNotesW = \relative {
+ \repeat volta 2 \quoteDuring #"correct" { s1 }
+}
+
+
+\addQuote "incorrect" { \fluteNotes }
+
+\addQuote "correct" { \unfoldRepeats \fluteNotes }
+
+\score {
+ \unfoldRepeats
+ <<
+ \new Staff \with { instrumentName = "Flute" }
+ \fluteNotes
+ \new Staff \with { instrumentName = "Oboe (incorrect)" }
+ \oboeNotesDW
+ \new Staff \with { instrumentName = "Oboe (correct)" }
+ \oboeNotesW
+ >>
+}
+@end lilypond
+
@code{\quoteDuring} ã³ãã³ãã¯å¼ç¨ããããã¼ãã¨å¼ç¨ãããã¼ã両æ¹ã®
@code{\transposition} ã使ç¨ãã¦ã@c
å¼ç¨ããããã¼ãã¨åãé¿ãã®ãããã«å¤æãã¦ã@c
@@ -1163,6 +1158,8 @@ oboeNotes = \relative {
@cindex articulation-event
@cindex dynamic-event
@cindex rest-event
+@cindex slur-event
+@cindex crescendo-event
@funindex quotedEventTypes
@funindex quotedCueEventTypes
@@ -1204,6 +1201,9 @@ oboeNotes = \relative {
@ref{Instrument transpositions},
@ref{Using tags}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{scm/define-event-classes.scm}.
+
ã³ã¼ãæçé:
@rlsr{Staff notation}
@@ -1226,7 +1226,7 @@ LilyPond ãã¯ã©ãã·ã¥ããå¯è½æ§ããããã¾ãã
@translationof Formatting cue notes
@cindex cue notes (åå³é³ç¬¦)
-@cindex fragments (楽èã®ä¸é¨å)
+@cindex fragments (楽æ²ã®æç)
@cindex cue notes, formatting (åå³é³ç¬¦ããã©ã¼ããããã)
@cindex formatting, cue notes (åå³é³ç¬¦ããã©ã¼ããããã)
@cindex voices, quoting(ãã¤ã¹ãå¼ç¨ãã)
@@ -1315,18 +1315,10 @@ LilyPond ãã¯ã©ãã·ã¥ããå¯è½æ§ããããã¾ãã
@code{CueVoice} ã³ã³ããã¹ãã¨ãã¦è¿½å ããã¦
@code{@var{music}} ã¨åæé²è¡ãã¦ã@c
å¤å£°ã«ãªãã¾ãã@c
-@code{@var{direction}} ã¯å¼æ° @code{UP} ã¾ã㯠@code{DOWN} ãåãã@c
-ãããã第 1 åã³ç¬¬ 2 ãã¤ã¹ã¨èª¿åãã¦ã@c
+@code{@var{direction}} ã¯å¼æ° @code{UP} ã¾ã㯠@code{DOWN} ãåã
+-- ãããã第 1 ãã¤ã¹åã³ç¬¬ 2 ãã¤ã¹ã¨å¯¾å¿ãã¾ã --
åå³é³ç¬¦ãä»ã®ãã¤ã¹ã«å¯¾ãã¦ã©ã®ããã«èå»ããããã決å®ãã¾ãã
-ãã®ã³ãã³ã㯠@code{@var{partname}} ã®è©²å½ããå°ç¯ããé³ç¬¦ã¨ä¼ç¬¦ã ãã
-@code{CueVoice} ã«ã³ãã¼ãã¾ãã@c
-@code{CueVoice} ã¯æé»çã«ä½æãã㦠@code{@var{music}} ã¨åæé²è¡ãã@c
-çµæã¨ãã¦å¤å£°ã«ãªãã¾ãã@c
-å¼æ° @code{@var{voice}} ã¯åå³é³ç¬¦ã第 1 ãã¤ã¹ã¨ãã¦è¨èãã¹ããã@c
-第 2 ãã¤ã¹ã¨ãã¦è¨èãã¹ããã決å®ãã¾ãã@c
-@code{UP} ã¯ç¬¬ 1 ãã¤ã¹ã«ç¸å½ãã@code{DOWN} ã¯ç¬¬ 2 ãã¤ã¹ã«ç¸å½ãã¾ãã
-
@lilypond[verbatim,quote]
fluteNotes = \relative {
r2. c''4 | d8 c d e fis2 | g2 d |
@@ -1334,7 +1326,7 @@ fluteNotes = \relative {
oboeNotes = \relative c'' {
R1
- \new CueVoice { \set instrumentCueName = "flute" }
+ <>^\markup \tiny { flute }
\cueDuring #"flute" #UP { R1 }
g2 c,
}
@@ -1346,10 +1338,11 @@ oboeNotes = \relative c'' {
}
@end lilypond
+
@noindent
@code{instrumentCueName} ããããã£ãè¨å®ãããã¨ã«ãã£ã¦ã@c
-@code{\cueDuring} ã§é³æ¥½ã®ã©ã®å´é¢ãå¼ç¨ããã調ç¯ãããã¨ãã§ãã¾ãã@c
+@code{\cueDuring} ã§é³æ¥½ã®ã©ã®é¨åãå¼ç¨ããã調ç¯ãããã¨ãã§ãã¾ãã@c
ãã®ããããã£ã®ããã©ã«ãå¤ã¯ @code{'(note-event rest-event
tie-event beam-event tuplet-span-event)} ã§ãããé³ç¬¦ãä¼ç¬¦ãã¿ã¤ãé£æ¡ã@c
ããã«é£ç¬¦ã ããå¼ç¨ãããã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ãå¼·å¼±è¨å·ããã¼ã¯ã¢ããçã¯@c
@@ -1375,13 +1368,7 @@ oboeNotes = \relative {
}
@end lilypond
-@c ãããã L2334
-ä¸æç㪠@code{CueVoice} ã³ã³ããã¹ãã®ä¸ã® @code{instrumentCueName}
-ããããã£ãè¨å®ãããã¨ã§ãåå³ãæ¼å¥ãã楽å¨ã®ååã表示ããããã¨ã@c
-ã§ãã¾ãã@c
-@code{instrumentCueName} ã®ä½ç½®ã¨ã¹ã¿ã¤ã«ã¯ @code{\instrumentSwitch}
-ãªãã¸ã§ã¯ãã«ãã£ã¦å¶å¾¡ããã¾ã -- @ref{Instrument names} ãåç
§ãã¦@c
-ãã ããã@c
+å¼ç¨ããã楽å¨ã®ååã表示ããããã«ããã¼ã¯ã¢ãããç¨ãããã¨ãã§ãã¾ãã@c
åå³é³ç¬¦ãé³ç¬¦è¨å·ã®å¤æ´ãå¿
è¦ã¨ããå ´åãæåã§å¤æ´ãããã¨ãã§ãã¾ããã@c
åå³é³ç¬¦ãçµãã£ãã¨ããã§æåã§å
ã®é³é¨è¨å·ã«æ»ãå¿
è¦ãããï½ãã
@@ -1394,7 +1381,7 @@ bassoonNotes = \relative c {
\clef bass
R1
\clef treble
- \new CueVoice { \set instrumentCueName = "flute" }
+ <>^\markup \tiny { flute }
\cueDuring #"flute" #UP { R1 }
\clef bass
g4. b8 d2
@@ -1420,7 +1407,7 @@ fluteNotes = \relative {
bassoonNotes = \relative c {
\clef bass
R1
- \new CueVoice { \set instrumentCueName = "flute" }
+ <>^\markup { \tiny "flute" }
\cueDuringWithClef #"flute" #UP #"treble" { R1 }
g4. b8 d2
}
@@ -1471,7 +1458,6 @@ bassClarinetNotes = \relative c' {
@cindex cue notes, removing (åå³é³ç¬¦ãåé¤ãã)
@funindex \killCues
-@funindex \addInstrumentDefinition
@code{\killCues} ã³ãã³ãã¯é³æ¥½è¡¨è¨ããåå³é³ç¬¦ãåé¤ãã¾ãã@c
ããã«ãããåãé³æ¥½è¡¨è¨ã使ã£ã¦åå³ãæã¤æ¥½å¨ãã¼ãã¨æ¥½èãä½ãåºããã¨ã@c
@@ -1493,7 +1479,7 @@ bassoonNotes = \relative c {
R1
\tag #'part {
\clef treble
- \new CueVoice { \set instrumentCueName = "flute" }
+ <>^\markup \tiny { flute }
}
\cueDuring #"flute" #UP { R1 }
\tag #'part \clef bass
diff --git a/Documentation/ja/notation/text.itely b/Documentation/ja/notation/text.itely
index 605484fc7b..2182ad8186 100644
--- a/Documentation/ja/notation/text.itely
+++ b/Documentation/ja/notation/text.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: 76ee88f5adfc7bcd8eff487543e3605e43a93d80
+ Translation of GIT committish: eb38c33a95cbe6adf9f176dfbb794373ec062605
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -11,7 +11,7 @@
@c \version "2.19.21"
-@c Translators: Masamichi Hosoda, Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Masamichi Hosoda, Yoshiki Sawada
@c Translation status: post-GDP
@@ -247,9 +247,12 @@ LilyPond ãå¦çã§ããããã¹ã ã¹ãã㯠1 ãã¤ã¹ã«ã¤ãã1
@lilypond[verbatim,quote]
\relative {
- c''4
- \mark "Allegro"
- c c c
+ \mark "Verse"
+ c'2 g'
+ \bar "||"
+ \mark "Chorus"
+ g2 c,
+ \bar "|."
}
@end lilypond
@@ -534,7 +537,7 @@ allegro = \markup { \bold \large Allegro }
@rlsr{Text}
@knownissues
-ãã¼ã¯ã¢ãã ã¢ã¼ãã®æ§æã¨ã©ã¼ã¯æ··ä¹±ããããã§ãã
+ãã¼ã¯ã¢ãã ã¢ã¼ãã®æ§æã¨ã©ã¼ ã¡ãã»ã¼ã¸ã¯æ··ä¹±ããããã§ãã
@node ãã©ã³ãã¨ãã©ã³ã ãµã¤ãºãé¸æãã
@@ -572,7 +575,7 @@ allegro = \markup { \bold \large Allegro }
@funindex \larger
@funindex \magnify
-ãã©ã³ã ãµã¤ãºãããã¤ãã®æ¹æ³ã§ã°ãã¼ãã«èãµã¤ãºã¨ã®ç¸å¯¾å¤ã§å¤æ´ãããã¨ãã§ãã¾ãã
+ãã©ã³ã ãµã¤ãºãã°ãã¼ãã«èãµã¤ãºã¨ã®ç¸å¯¾å¤ã§å¤æ´ããæ¹æ³ã¯ããã¤ãããã¾ãã
ãã©ã³ã ãµã¤ãºããããããå®ç¾©ããã¦ãããµã¤ãºã«è¨å®ãããã¨ãã§ãã¾ã:
@@ -594,8 +597,8 @@ allegro = \markup { \bold \large Allegro }
}
@end lilypond
-ãã©ã³ã ãµã¤ãºãã°ãã¼ãã«èãµã¤ãºã«ãã£ã¦è¨å®ããã¦ããå¤ã§æ¡å¤§ãããã¯ç¸®å°ããã@c
-ãã¨ãã§ãã¾ã:
+ãã©ã³ã ãµã¤ãºãã°ãã¼ãã«èãµã¤ãºã«ãã£ã¦è¨å®ããã¦ããå¤ã§æ¡å¤§ãããã¯@c
+縮å°ããããã¨ãã§ãã¾ã:
@lilypond[quote,verbatim]
\relative b' {
@@ -605,8 +608,8 @@ allegro = \markup { \bold \large Allegro }
}
@end lilypond
-ããã«ããã©ã³ã ãµã¤ãºãã°ãã¼ãã«èãµã¤ãºã¨ã¯ç¡é¢ä¿ã«ãåºå®ãã¤ã³ã ãµã¤ãºã«è¨å®ãã@c
-ãã¨ãã§ãã¾ã:
+ããã«ããã©ã³ã ãµã¤ãºãã°ãã¼ãã«èãµã¤ãºã¨ã¯ç¡é¢ä¿ã«ãåºå®ãã¤ã³ã ãµã¤ãºã«@c
+è¨å®ãããã¨ãã§ãã¾ã:
@lilypond[quote,verbatim]
\relative b' {
@@ -801,7 +804,7 @@ allegro = \markup { \bold \large Allegro }
@end lilypond
@noindent
-ãªãã¸ã§ã¯ãã®ä¸ã«ã¯æããããã®ããã·ã¼ã¸ã£ãããèªèº«ã§æã£ã¦ãããã®ãããã@c
+ãªãã¸ã§ã¯ãã®ä¸ã«ã¯æããããã®æ©è½ãããèªèº«ã§æã£ã¦ãããã®ãããã@c
ãããã¯ä¸è¨ã®ã³ãã³ãã§ã¯å½±é¿ãåãã¾ããã@c
@ref{ããã¹ã ãã¼ã¯} ã®ä¸ã®ä¾ã§ç¤ºããã¦ããããã«ã@c
ãã®ãããªãã¼ã¯ã¢ãã ãªãã¸ã§ã¯ãå
¨ä½ã移åããããã¨ãå¯è½ã§ãã
@@ -1150,7 +1153,7 @@ c'
@seealso
è¨èæ³ãªãã¡ã¬ã³ã¹:
@ref{Align},
-Dimensions,
+@ref{Dimensions},
@ref{ç·¨éè
ã®æ³¨é},
@ref{Graphic}
@@ -1356,12 +1359,12 @@ a'1_\markup {
æ¡å¼µ:
@rextend{New markup list command definition}
-ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
-@file{scm/define-markup-commands.scm}
-
ã³ã¼ãæçé:
@rlsr{Text}
+ã¤ã³ã¹ãã¼ã«ããã¦ãããã¡ã¤ã«:
+@file{scm/define-markup-commands.scm}
+
å
é¨ãªãã¡ã¬ã³ã¹:
@rinternals{TextScript}
@@ -1403,7 +1406,7 @@ FontConfig ã¯ã·ã¹ãã ã§å©ç¨å¯è½ãªãã©ã³ããæ¤åºããããã«
é³æ¥½è¨èãã©ã³ãã¯ããã¤ãã®ãã¡ããªã«åé¡ãããç¹æ®ãªå³æã®ã»ããã¨@c
è¨ããã¨ãã§ãã¾ãã@c
以ä¸ã®æ§æã«ããã@c
-ãã¾ãã¾ãª LilyPond @code{feta} éããã¹ã ãã©ã³ãã@c
+LilyPond ã®ãã¾ãã¾ãª @code{Feta} ã°ãªãã@c
ãã¼ã¯ã¢ãã ã¢ã¼ãã®ä¸ã§ç´æ¥ä½¿ç¨ãããã¨ãå¯è½ã«ãªãã¾ã:
@lilypond[quote,verbatim,fragment]
diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely
index 5d7677b663..fbb0309aaf 100644
--- a/Documentation/ja/notation/vocal.itely
+++ b/Documentation/ja/notation/vocal.itely
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@node 声楽
@@ -877,6 +877,7 @@
* æè©ã®æ°´å¹³æ¹åã®é
ç½®::
* æè©ã¨ç¹°ãè¿ã::
* æè©ã®ãã£ã´ã£ã¼ã¸::
+* æè©ãå
±æããå¤å£°::
@end menu
@@ -1648,6 +1649,95 @@ contraltoWords = \lyricmode { Con -- tral -- to words }
}
@end lilypond
+@c 2017-9-22 ãã®ãã¼ãã®ã¿å
ã«ç¿»è¨³
+@c 第1ç« ã®xrefãæ£ããåä½ãããããã
+@node æè©ãå
±æããå¤å£°
+@unnumberedsubsubsec æè©ãå
±æããå¤å£°
+@translationof Polyphony with shared lyrics
+
+@cindex NullVoice
+@cindex polyphony, shared lyrics (æè©ãå
±æããå¤å£°)
+@cindex lyrics, shared among voices (æè©ãå
±æããå¤å£°)
+@cindex \partcombine and lyrics (\partcombine ã¨æè©)
+@funindex \partcombine
+
+2 ã¤ã®ãã¤ã¹ãç°ãªããªãºã ãæã¡ãåãæè©ãå
±æããå ´åã@c
+çæ¹ã®ãã¤ã¹ã«æè©ãåãããã¨ããçæ¹ã«ã¯åãã¾ããã@c
+ä¸ã®ä¾ã§ã¯ãæè©ãä¸ã®ãã¤ã¹ã«ã®ã¿åããããã¦ããããã@c
+2 ã¤ç®ã®å»¶é·ç·ãçããã¾ã:
+
+@lilypond[quote,verbatim]
+soprano = \relative { b'8( c d c) d2 }
+alto = \relative { g'2 b8( a g a) }
+words = \lyricmode { la __ la __ }
+
+\new Staff <<
+ \new Voice = "sopranoVoice" { \voiceOne \soprano }
+ \new Voice { \voiceTwo \alto }
+ \new Lyrics \lyricsto "sopranoVoice" \words
+>>
+@end lilypond
+
+æãã§ããçµæãå¾ãã«ã¯ã2 ã¤ã®ãã¤ã¹ãé©åã«åãããæ°ããª
+@code{NullVoice} ã³ã³ããã¹ããä½ããæè©ãããã«åããã¾ãã@c
+@code{NullVoice} ã³ã³ããã¹ãã®é³ç¬¦ã¯åºåã«ã¯ç¾ãã¾ãããã@c
+æè©ãæ£ããåãããã®ã«ä½¿ããã¨ãã§ãã¾ã:
+
+@lilypond[quote,verbatim]
+soprano = \relative { b'8( c d c) d2 }
+alto = \relative { g'2 b8( a g a) }
+aligner = \relative { b'8( c d c) b( a g a) }
+words = \lyricmode { la __ la __ }
+
+\new Staff <<
+ \new Voice { \voiceOne \soprano }
+ \new Voice { \voiceTwo \alto }
+ \new NullVoice = "aligner" \aligner
+ \new Lyrics \lyricsto "aligner" \words
+>>
+@end lilypond
+
+ãã®æ¹æ³ã¯ãåä½ã§ã¯æè©ããµãã¼ããã¦ããªã
+@code{\partcombine} é¢æ°ã«ãç¨ãããã¨ãã§ãã¾ã:
+
+@lilypond[quote,verbatim]
+soprano = \relative { b'8( c d c) d2 }
+alto = \relative { g'2 b8( a g a) }
+aligner = \relative { b'8( c d c) b( a g a) }
+words = \lyricmode { la __ la __ }
+
+\new Staff <<
+ \new Voice \partcombine \soprano \alto
+ \new NullVoice = "aligner" \aligner
+ \new Lyrics \lyricsto "aligner" \words
+>>
+@end lilypond
+
+@knownissues
+@code{\addLyrics} é¢æ°ã¯ @code{Voice} ã«ã®ã¿åä½ããããã@c
+@code{NullVoice} ã¨ä¸ç·ã«ç¨ãããã¨ã¯ã§ãã¾ããã
+
+@noindent
+@code{\partcombine} é¢æ°ã«ã¤ãã¦ã¯ã@ref{èªåãã¼ãçµå}ã«èª¬æãããã¾ãã
+
+æå¾ã«ããã®æ¹æ³ã¯ãã¤ã¹ãç°ãªãèã«ããå ´åã«ãç¨ãããã¨ãã§ãã@c
+2 ã¤ãããå¤ãã®ãã¤ã¹ã«ãé©ç¨ãããã¨ãã§ãã¾ã:
+
+@lilypond[quote,verbatim]
+soprano = \relative { b'8( c d c) d2 }
+altoOne = \relative { g'2 b8( a b4) }
+altoTwo = \relative { d'2 g4( fis8 g) }
+aligner = \relative { b'8( c d c) d( d d d) }
+words = \lyricmode { la __ la __ }
+
+\new ChoirStaff \with {\accepts NullVoice } <<
+ \new Staff \soprano
+ \new NullVoice = "aligner" \aligner
+ \new Lyrics \lyricsto "aligner" \words
+ \new Staff \partcombine \altoOne \altoTwo
+>>
+@end lilypond
+
@node æè©ã®ç¯
@subsection æè©ã®ç¯
@@ -2558,7 +2648,7 @@ LilyPond ã§å°è©ãèå»ãããã¨ã¯ã§ãã¾ãããå°è©ã«ã¯é³æ¥½
@ref{Text},
@ref{Text markup commands}
-LilyPond ã®æ¡å¼µ:
+æ¡å¼µ:
@rextend{Markup construction in Scheme}
diff --git a/Documentation/ja/translations.itexi b/Documentation/ja/translations.itexi
index 6884f984e6..55419ec32c 100644
--- a/Documentation/ja/translations.itexi
+++ b/Documentation/ja/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{æçµæ´æ°æ¥ Sat Jun 24 12:50:41 UTC 2017
+@emph{æçµæ´æ°æ¥ Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -118,7 +118,9 @@ Yoshiki Sawada
2 ä¸è¬çãªè¨èæ³
@*
4421
-@tab Masamichi Hosoda
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@tab
@@ -136,18 +138,20 @@ Yoshiki Sawada
@ifhtml
@html
-<span style="background-color: #25fe1f">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
3 åºç¤ã¨ãªãã³ã³ã»ãã
@*
11240
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@@ -163,65 +167,69 @@ partially
@ifhtml
@html
-<span style="background-color: #76fe2a">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
4 åºåã調æ´ãã
@*
16592
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@html
-<span style="background-color: #dfef77">ä¸é¨ (95 %)</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-ä¸é¨ (95 %)
+ã¯ã
@end ifnothtml
@tab
@ifhtml
@html
-<span style="background-color: #83fe2c">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
A ãã³ãã¬ã¼ã
@*
1236
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@html
-<span style="background-color: #dfef77">ä¸é¨ (97 %)</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-ä¸é¨ (97 %)
+ã¯ã
@end ifnothtml
@tab
@ifhtml
@html
-<span style="background-color: #ffdd42">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@end multitable
@@ -509,7 +517,7 @@ partially
@item
1.8 ããã¹ã
@*
-2754
+2952
@tab Masamichi Hosoda
@*
Yoshiki Sawada
@@ -528,7 +536,7 @@ Yoshiki Sawada
@ifhtml
@html
-<span style="background-color: #33ff21">partially</span>
+<span style="background-color: #47ff24">partially</span>
@end html
@end ifhtml
@ifnothtml
@@ -986,8 +994,10 @@ Yoshiki Sawada
@item
1 @command{lilypond} ãå®è¡ãã
@*
-5469
-@tab Masamichi Hosoda
+5391
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@tab
@@ -1005,45 +1015,49 @@ Yoshiki Sawada
@ifhtml
@html
-<span style="background-color: #33ff21">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
2 @command{convert-ly} ã使ã£ã¦ãã¡ã¤ã«ãæ´æ°ãã
@*
2097
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@html
-<span style="background-color: #dfef77">ä¸é¨ (89 %)</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-ä¸é¨ (89 %)
+ã¯ã
@end ifnothtml
@tab
@ifhtml
@html
-<span style="background-color: #ffd244">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
3 @command{lilypond-book} ãå®è¡ãã
@*
4211
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@@ -1059,45 +1073,49 @@ partially
@ifhtml
@html
-<span style="background-color: #47ff24">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab pre-GDP
@item
4 å¤é¨ããã°ã©ã
@*
2786
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@html
-<span style="background-color: #dfef77">ä¸é¨ (87 %)</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-ä¸é¨ (87 %)
+ã¯ã
@end ifnothtml
@tab
@ifhtml
@html
-<span style="background-color: #f6fe3b">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@item
5 LilyPond å
¥åãã¡ã¤ã«ã®è¨è¿°ã«å¯¾ããææ¡
@*
2793
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@tab
@tab
@ifhtml
@@ -1113,11 +1131,11 @@ partially
@ifhtml
@html
-<span style="background-color: #83fe2c">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab post-GDP
@end multitable
@@ -1197,8 +1215,10 @@ Yoshinobu Ishizaki
@item
å°å
¥é¨
@*
-5793
-@tab Masamichi Hosoda
+5800
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@*
@@ -1218,11 +1238,11 @@ Yoshinobu Ishizaki
@ifhtml
@html
-<span style="background-color: #2cff20">partially</span>
+<span style="background-color: #1fff1f">ã¯ã</span>
@end html
@end ifhtml
@ifnothtml
-partially
+ã¯ã
@end ifnothtml
@tab pre-GDP
@item
diff --git a/Documentation/ja/usage/external.itely b/Documentation/ja/usage/external.itely
index ae6ef2e14e..a334296619 100644
--- a/Documentation/ja/usage/external.itely
+++ b/Documentation/ja/usage/external.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: 5fb3f8cf17ce7b57d22584429d736f188e4827d7
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -32,45 +32,32 @@ LilyPond ã¯æ§ã
ãªæ¹æ³ã§ä»ã®ããã°ã©ã ã¨é£æºãããã¨ãã§
@section ãã¤ã³ãï¼ã¯ãªãã¯
@translationof Point and click
-ãã¤ã³ãï¼ã¯ãªãã¯ã¯ PDF ããã¥ã¡ã³ãã«é³æ¥½è¦ç´ ã¸ã®ãªã³ã¯ã追å ãã¾ãã
+@cindex point and click (ãã¤ã³ãï¼ã¯ãªãã¯)
+
+ãã¤ã³ãï¼ã¯ãªãã¯ã¯ PDF ãã¥ã¼ã¢ã®ä¸ã§è¡¨è¨ãã¯ãªãã¯ãããã¨ã§@c
+å
¥åã®ä¸ã®è¡¨è¨ãè¦ã¤ãåºããã¨ãå¯è½ã«ãã¾ãã@c
+ããã¯æ¥½èã®ä¸ã§ã¨ã©ã¼ãå¼ãèµ·ããå
¥åãè¦ã¤ãåºããã¨ããã容æã«ãã¾ãã
@menu
+* ãã¤ã³ãï¼ã¯ãªãã¯ã®ããã«ã·ã¹ãã ãè¨å®ãã::
* ãã¤ã³ãï¼ã¯ãªãã¯ãæå¹ã«ãã::
* é¸æçãªãã¤ã³ãï¼ã¯ãªãã¯::
@end menu
-@node ãã¤ã³ãï¼ã¯ãªãã¯ãæå¹ã«ãã
-@unnumberedsubsec ãã¤ã³ãï¼ã¯ãªãã¯ãæå¹ã«ãã
-@translationof Enabling point and click
-
-@cindex point and click (ãã¤ã³ãï¼ã¯ãªãã¯)
-ãã¤ã³ãï¼ã¯ãªãã¯ã¯ PDF ãã¥ã¼ã¢ã®ä¸ã§è¡¨è¨ãã¯ãªãã¯ãããã¨ã§@c
-å
¥åã®ä¸ã®è¡¨è¨ãè¦ã¤ãåºããã¨ãå¯è½ã«ãã¾ãã@c
-ããã¯æ¥½èã®ä¸ã§ã¨ã©ã¼ãå¼ãèµ·ããå
¥åãè¦ã¤ãåºããã¨ãã容æã«ãã¾ãã
+@node ãã¤ã³ãï¼ã¯ãªãã¯ã®ããã«ã·ã¹ãã ãè¨å®ãã
+@subsection ã·ã¹ãã ãè¨å®ãã
+@translationof Configuring the system for point and click
ãã®æ©è½ãã¢ã¯ãã£ããªå ´åã@c
-LilyPond 㯠PDF ãã¡ã¤ã«ã«ãã¤ãã¼ãªã³ã¯ãä»ãå ãã¾ãã@c
-ãããã®ãã¤ãã¼ãªã³ã¯ã¯ Web ãã©ã¦ã¶ã«éããã@c
-Web ãã©ã¦ã¶ã¯ã«ã¼ã½ã«ãæã¤ããã¹ã ã¨ãã£ã¿ãé©åãªä½ç½®ã«éãã¾ãã
+LilyPond 㯠PDF ãã¡ã¤ã«ã SVG ãã¡ã¤ã«ã«ãã¤ãã¼ãªã³ã¯ãä»ãå ãã¾ãã@c
+ãããã®ãã¤ãã¼ãªã³ã¯ã¯ @q{URI ãã«ãã¼}ã Web ãã©ã¦ã¶ã«éããã@c
+ããã¹ã ã¨ãã£ã¿ãéãã«ã¼ã½ã«ãé©åãªä½ç½®ã«ç½®ãã¾ãã
ãã®ä¸é£ã®åä½ãæå¹ã«ããã«ã¯ã@c
PDF ãã¥ã¼ã¢ã LilyPond ã§æä¾ããã @file{lilypond-invoke-editor}
ã¹ã¯ãªããã使ã£ã¦ãã¤ãã¼ãªã³ã¯ã追ãããã«è¨å®å¤æ´ããå¿
è¦ãããã¾ãã
-UNIX ã® Xpdf ã§ã¯ã@c
-@file{xpdfrc}@footnote{UNIXã§ã¯ããã®ãã¡ã¤ã«ã¯ @file{/etc/xpdfrc} ã@c
-ãã¼ã ãã£ã¬ã¯ããªã®ä¸ã® @file{.xpdfrc} ã¨ãã¦ã®ã©ã¡ããã§ãã}
-ã®ä¸ã«ä»¥ä¸ã®è¨è¿°ãå¿
è¦ã§ã:
-
-以ä¸ã®è¨è¿°ã @file{xpdfrc} ã®ä¸ã«åå¨ãã¦ããå¿
è¦ãããã¾ãã
-UNIX ã«ããã¦ããã®ãã¡ã¤ã«ã¯ @file{/etc/xpdfrc} ã®ä¸ã¾ãã¯
-@file{$HOME/.xpdfrc} ã¨ãã¦åå¨ãã¾ãã
-
-@example
-urlCommand "lilypond-invoke-editor %s"
-@end example
-
ããã°ã©ã @file{lilypond-invoke-editor} ã¯å°ããªæ¯æ´ããã°ã©ã ã§ãã@c
ããã¯ç¹å¥ãª @code{textedit} URI ã«å¯¾ãã¦ã¨ãã£ã¿ãå¼ã³åºãã@c
ãã以å¤ã«å¯¾ãã¦ã¯ Web ãã©ã¦ã¶ãå¼ã³åºãã¾ãã@c
@@ -88,6 +75,7 @@ emacsclient --no-wait +@var{line}:@var{column} @var{file}
@example
gvim --remote +:@var{line}:norm@var{column} @var{file}
@end example
+
@item nedit
ãã®ããã°ã©ã ã¯ä»¥ä¸ãå¼ã³åºãã¾ã
@example
@@ -105,11 +93,145 @@ gvim --remote +:@var{line}:norm@var{column} @var{file}
emacsclient --no-wait +%(line)s:%(column)s %(file)s
@end example
+@menu
+* ãã¤ã³ãï¼ã¯ãªãã¯ã« Xpdf ã使ç¨ãã::
+* ãã¤ã³ãï¼ã¯ãªãã¯ã« GNOME 2 ã使ç¨ãã::
+* ãã¤ã³ãï¼ã¯ãªãã¯ã« GNOME 3 ã使ç¨ãã::
+* Evince ã®ããã®è¿½å ã®è¨å®::
+@end menu
+
+
+@node ãã¤ã³ãï¼ã¯ãªãã¯ã« Xpdf ã使ç¨ãã
+@unnumberedsubsubsec Xpdf ã使ç¨ãã
+@translationof Using Xpdf for point and click
+
+@cindex Xpdf
+
+UNIX 㧠Xpdf ã使ç¨ããã«ã¯ã@file{xpdfrc} ã«ä»¥ä¸ã®è¨è¿°ãåå¨ãã¦ããå¿
è¦ã@c
+ããã¾ããUNIX ã§ã¯ããã®ãã¡ã¤ã«ã¯ @file{/etc/xpdfrc} ãããã¯
+@file{$HOME/.xpdfrc} ã¨ãã¦åå¨ãã¾ãã
+
+@example
+urlCommand "lilypond-invoke-editor %s"
+@end example
+
+Ubuntu ã使ç¨ãã¦ããå ´åãã·ã¹ãã ã«ã¤ã³ã¹ãã¼ã«ããã¦ãã Xpdf ã¯å
¨ã¦ã®
+PDF ãã¡ã¤ã«ã§ã¯ã©ãã·ã¥ãå¼ãèµ·ããããããã¾ãã: ãã®ç¶æ
ã¯æ°å¹´é@c
+ç¶ãã¦ãããã©ã¤ãã©ãªã®ä¸ä¸è´ãåå ã§ãã代ããã«ãDebian ããç¾å¨ã®@c
+ãã¼ã¸ã§ã³ã® @samp{xpdf} ã¨å¯¾å¿ãã @samp{libpoppler} ããã±ã¼ã¸ã@c
+ã¤ã³ã¹ãã¼ã«ããã¨è¯ãã§ããããããã§åä½ã確èªã§ãããã@c
+Ubuntu ãã¯ã©ãã·ã¥ããããã±ã¼ã¸ã®@q{ã¢ãããã¼ã}ã§ä¸æ¸ãããªãããã«ã
+
+@example
+sudo apt-mark hold xpdf
+@end example
+
+@noindent
+ãå®è¡ããã¨è¯ãããããã¾ããã
+
+
+@node ãã¤ã³ãï¼ã¯ãªãã¯ã« GNOME 2 ã使ç¨ãã
+@unnumberedsubsubsec GNOME 2 ã使ç¨ãã
+@translationof Using GNOME 2 for point and click
+
+(PDF ãã¥ã¼ã¢ãçµ±åããã¦ãã) GNOME 2 ã使ç¨ããã«ã¯ã@samp{textedit:} URI
+ãã·ã¹ãã ã«ç»é²ããããã«ã以ä¸ã®ã³ãã³ããå®è¡ãã¾ã:
+
+@smallexample
+gconftool-2 -t string -s /desktop/gnome/url-handlers/textedit/command "lilypond-invoke-editor %s"
+gconftool-2 -s /desktop/gnome/url-handlers/textedit/needs_terminal false -t bool
+gconftool-2 -t bool -s /desktop/gnome/url-handlers/textedit/enabled true
+@end smallexample
+
+ãããããã
+
+@example
+gnome-open textedit:///etc/issue:1:0:0
+@end example
+
+@noindent
+ã¨ãããã¨ã§ããã¡ã¤ã«ãéãããã« @file{lilypond-invoke-editor} ãå®è¡ããã@c
+ã¯ãã§ãã
+
+
+@node ãã¤ã³ãï¼ã¯ãªãã¯ã« GNOME 3 ã使ç¨ãã
+@unnumberedsubsubsec GNOME 3 ã使ç¨ãã
+@translationof Using GNOME 3 for point and click
+
+GNOME 3 ã§ã¯ãURI 㯠@q{gconf} ã§ã¯ãªã @q{gvfs} ã¬ã¤ã¤ã«ãã£ã¦å¦çããã¾ãã
+@file{/tmp} ãªã©ã®ãã¼ã«ã« ãã£ã¬ã¯ããªã«ã@file{lilypond-invoke-editor.desktop}
+ã¨ããååã§ã以ä¸ã®å
容ãæã¤ãã¡ã¤ã«ãä½æãã¦ãã ãã:
+
+@example
+[Desktop Entry]
+Version=1.0
+Name=lilypond-invoke-editor
+GenericName=Textedit URI handler
+Comment=URI handler for textedit:
+Exec=lilypond-invoke-editor %u
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/textedit;
+Categories=Editor
+NoDisplay=true
+@end example
+ããã¦ä»¥ä¸ã®ã³ãã³ããå®è¡ãã¦ãã ãã:
+@example
+xdg-desktop-menu install ./lilypond-invoke-editor.desktop
+xdg-mime default lilypond-invoke-editor.desktop x-scheme-handler/textedit
+@end example
+
+ãããããã
+
+@example
+gnome-open textedit:///etc/issue:1:0:0
+@end example
+@noindent
+ã¨ãããã¨ã§ããã¡ã¤ã«ãéãããã« @file{lilypond-invoke-editor} ãå®è¡ããã@c
+ã¯ãã§ãã
+
+
+@node Evince ã®ããã®è¿½å ã®è¨å®
+@unnumberedsubsubsec Evince ã®ããã®è¿½å ã®è¨å®
+@translationof Extra configuration for Evince
+
+@cindex Evince
+
+@code{gnome-open} ã¯åä½ããããEvince ã権éãç¡ãã¨ããçç±ã§@c
+ãã¤ã³ãï¼ã¯ãªãã¯ãæå¦ããå ´åãEvince ãå®è¡ã§ããã¢ã¯ã·ã§ã³ãè¦å®ãã
+Apparmor ãããã¡ã¤ã«ãå¤æ´ããå¿
è¦ãããããããã¾ããã
+
+Ubuntu ã使ç¨ãã¦ããå ´åã@file{/etc/apparmor.d/local/usr.bin.evince}
+ãç·¨éãã以ä¸ã®è¡ã追å ãã¾ã:
+
+@example
+# For Textedit links
+/usr/local/bin/lilypond-invoke-editor Cx -> sanitized_helper,
+@end example
+@noindent
+
+ãããã追å ãããã
+
+@example
+sudo apparmor_parser -r -T -W /etc/apparmor.d/usr.bin.evince
+@end example
+
+@noindent
+ãå®è¡ãããã¨ã§ãEvince ããã¤ã³ãï¼ã¯ãªãã¯ã®ãªã³ã¯ãéããã¨ãã§ããããã«@c
+ãªãã¯ãã§ããä»ã®ãã¥ã¼ã¢ã§ãåããããªè¨å®ãæå¹ã§ããããããã¾ããã
+
+
+@node ãã¤ã³ãï¼ã¯ãªãã¯ãæå¹ã«ãã
+@unnumberedsubsec ãã¤ã³ãï¼ã¯ãªãã¯ãæå¹ã«ãã
+@translationof Enabling point and click
@cindex file size, output (åºåã®ãã¡ã¤ã« ãµã¤ãº)
+ãã¤ã³ãï¼ã¯ãªãã¯ã®æ©è½ã¯ PDF ããã㯠SVG ãã¡ã¤ã«ãçæããæã«@c
+ããã©ã«ãã§æå¹åããã¦ãã¾ãã
+
ãã¤ã³ãï¼ã¯ãªãã¯ã®ãªã³ã¯ã¯åºåãã¡ã¤ã«ãè¥å¤§åããã¾ãã@c
-PDF ãã¡ã¤ã«ã¨ PS ãã¡ã¤ã«ã®ãµã¤ãºãå°ããããã«ã¯ã@c
+ãããã®ãã¡ã¤ã« (㨠PS ãã¡ã¤ã«) ã®ãµã¤ãºãå°ããããã«ã¯ã@c
@file{.ly} ãã¡ã¤ã«ã®ä¸ã«ä»¥ä¸ãè¨è¿°ãã¦ãã¤ã³ãï¼ã¯ãªãã¯ã OFF ã«ãã¾ã:
@example
@@ -131,13 +253,13 @@ lilypond -dno-point-and-click file.ly
@end example
@warning{é
å¸ãã LilyPond ãã¡ã¤ã«ã§ã¯å¸¸ã«ãã¤ã³ãï¼ã¯ãªãã¯ã OFF ã«ãã¦ã@c
-.pdf ãã¡ã¤ã«ã«ããªãã®ã³ã³ãã¥ã¼ã¿ã® Path æ
å ±ãå«ã¾ããªãããã«ãã¹ãã§ãã@c
+PDF ãã¡ã¤ã«ã«ããªãã®ã³ã³ãã¥ã¼ã¿ã® Path æ
å ±ãå«ã¾ããªãããã«ãã¹ãã§ãã@c
é
å¸ãã .pdf ãã¡ã¤ã«ã« Path æ
å ±ãå«ã¾ãã¦ããã¨@c
ã»ãã¥ãªã㣠ãªã¹ã¯ã¨ãªãã¾ãã}
-@c ãããã L47
@node é¸æçãªãã¤ã³ãï¼ã¯ãªãã¯
@unnumberedsubsec é¸æçãªãã¤ã³ãï¼ã¯ãªãã¯
+@translationof Selective point-and-click
ã¤ã³ã¿ã©ã¯ãã£ããªã¢ããªã±ã¼ã·ã§ã³ã§ã¯ã@c
ããç¹å®ã®ãã¤ã³ãï¼ã¯ãªãã¯è¦ç´ ã ããå«ããã¨ãæã¾ããå ´åãããã¾ãã@c
@@ -273,6 +395,7 @@ LilyPond ç¨ã®ãã¡ã¤ã«ã¿ã¤ã ãã©ã°ã¤ã³ãã¤ã³ãã³ã ã¢ã¼ã
filetype off
set runtimepath+=/usr/local/share/lilypond/current/vim/
filetype on
+syntax on
@end example
@noindent
@@ -310,7 +433,6 @@ LilyPond å
¥åãä½ãåºããã¼ã«ã¯ä»ã«ãããã¾ãã@c
ãããã®ã¹ã¯ãªãã (ä¾ãã° @code{convert-ly}) ãå®è¡ããéã«åé¡ã@c
çºçããå ´åã¯ã@rweb{MacOS X} ãåç
§ãã¦ãã ããã
-
@knownissues
æ®å¿µãªãã¨ã«æã
ã«ã¯ãããã®ããã°ã©ã ãç¶æãã¦ããã ãã®ä½åã¯ããã¾ããã@c
@qq{ããããã®èª²é¡} ã«ãªã£ã¦ããã¨èãã¦ãã ããã@c
@@ -356,8 +478,8 @@ MIDI ãä½ãåºããã»ã©æ£ç¢ºã§ã¯ããã¾ããã@c
ãã®ããã人éã®æ¼å¥ã§çæããã MIDI ãã¡ã¤ã«ã @command{midi2ly} ã§@c
å¤æãããã¨ã¯ãå§ãã§ãã¾ããã
-
@command{midi2ly} ã¯ä»¥ä¸ã®ããã«ã³ãã³ã ã©ã¤ã³ããå¼ã³åºãã¾ã:
+
@example
midi2ly [@var{option}]@dots{} @var{midi-file}
@end example
@@ -410,9 +532,7 @@ Verbose ã¢ã¼ã (ãã°çã詳細) ã§å®è¡ãã¾ãã
ãã¹ã¦ã®ããã¹ããæè©ã¨ãã¦æ±ãã¾ãã
@end table
-
@knownissues
-
ã¢ã«ãã¸ãªã§ã®é³ç¬¦ã®ãªã¼ãã©ããã¯æ£ããå¤æããã¾ããã@c
æåã®é³ç¬¦ã¯èªã¿è¾¼ã¾ãã¾ãããä»ã®é³ç¬¦ã¯ç¡è¦ããã¾ãã@c
ãã¹ã¦ã®é³ç¬¦ãåæã«éå§ãããåãæ¼å¥ã«ãã¦ã@c
@@ -431,8 +551,8 @@ XML ã®æ´¾çèªã§ãã
@command{musicxml2ly} 㯠Part-wise (æé軸åªå
ã§ã¯ãªããã¼ãåªå
ã®) MusicXML
ãããé³ç¬¦ãã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã楽èæ§é ãæè©çãæ½åºãã@c
ãããã @file{.ly} ãã¡ã¤ã«ã«è¨è¿°ãã¾ãã@c
-
ãã®ããã°ã©ã ã¯ã³ãã³ã ã©ã¤ã³ãã以ä¸ã®ããã«å¼ã³åºãã¾ã:
+
@example
musicxml2ly [@var{option}]@dots{} @var{xml-file}
@end example
@@ -470,7 +590,7 @@ XML 解æã« lxml.etree Python ããã±ã¼ã¸ã使ç¨ãã¾ãã@c
@item -m, --midi
MIDI ãããã¯ãæå¹ã«ãã¾ãã
-@item -nd --no-articulation-directions
+@item -nd, --no-articulation-directions
ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ãå¼·å¼±çã®æ示 (@code{^}, @code{_} ããã㯠@code{-})
ãå¤æãã¾ããã
@@ -500,7 +620,7 @@ Verbose ã¢ã¼ã (ãã°çã詳細) ã§å®è¡ãã¾ãã
@subsection @code{abc2ly} ãå¼ã³åºã
@translationof Invoking @code{abc2ly}
-@warning{ãã®ããã°ã©ã ã¯ãµãã¼ãããã¦ãã¾ããã@c
+@warning{ãã®ããã°ã©ã ã¯ç¾å¨ãµãã¼ãããã¦ãã¾ããã@c
LilyPond å°æ¥ã®ãã¼ã¸ã§ã³ããã¯åé¤ãããå¯è½æ§ãããã¾ãã}
@cindex ABC
@@ -540,7 +660,7 @@ be strict about success
@end table
LilyPond ã³ã¼ãã ABC ã½ã¼ã¹ ãã¡ã¤ã«ã«ä»ãå ããããã®ç°¡åãªæ©è½ãããã¾ãã@c
-以ä¸ã®ããã«è¨è¿°ããå ´å:
+ä¾ãã°ä»¥ä¸ã®ããã«è¨è¿°ããå ´å:
@example
%%LY voices \set autoBeaming = ##f
@@ -558,9 +678,7 @@ LilyPond åºåãã¡ã¤ã«ã®ã«ã¬ã³ãã®ãã¤ã¹ã«æ¿å
¥ããã¾ãã
ããã¯ããã¼ã¯ã¼ã @q{slyrics} ã®å¾ã«ç¶ãããã¹ãã@c
æè©ã®ã«ã¬ã³ãè¡ã«æ¿å
¥ãã¾ãã
-
@knownissues
-
ABC ã®æ¨æºã¯ããã¾ã§ã @q{æ¨æº} ã§ããããã¾ããã@c
æ©è½æ¡å¼µ (ä¾ãã°ãå¤å£°é³æ¥½) ã®ããã«ãç°ãªãæ¸å¼ãããã¾ãã
@@ -579,42 +697,41 @@ ABC ã¯è¡ã®å
é ã§åèªã¨é³ç¬¦ã¨ã®åæãã¨ãã¾ããã@c
@warning{ãã®ããã°ã©ã ã¯ãµãã¼ãããã¦ãã¾ããã@c
LilyPond å°æ¥ã®ãã¼ã¸ã§ã³ããã¯åé¤ãããå¯è½æ§ãããã¾ãã}
-@c not yet
+@cindex Enigma Transport Format
@cindex ETF
@cindex enigma
@cindex Finale
@cindex Coda Technology
-ETF (Enigma Transport Format) is a format used by Coda Music
-Technology's Finale product. @command{etf2ly} will convert part of an ETF
-file to a ready-to-use LilyPond file.
+ETF (Enigma Transport Format) 㯠Coda Music Technology ã® Finale 製åã«@c
+ç¨ãããããã©ã¼ãããã§ãã@command{etf2ly} 㯠ETF ãã¡ã¤ã«ã®ä¸é¨ã
+使ç¨å¯è½ãª LilyPond ãã¡ã¤ã«ã«å¤æãã¾ãã
-It is invoked from the command-line as follows.
+ã³ãã³ã ã©ã¤ã³ããã¯ä»¥ä¸ã®ããã«å¼ã³åºãã¾ã:
@example
etf2ly [@var{option}]@dots{} @var{etf-file}
@end example
-Note that by @q{command-line}, we mean the command line of the
-operating system. See @ref{Converting from other formats}, for
-more information about this.
+@q{ã³ãã³ã ã©ã¤ã³} ã¨ã¯ãOS ã®ã³ãã³ã ã©ã¤ã³ãæå³ãã¦ããã¨ãããã¨ã«@c
+注æãã¦ãã ããã@c
+ãã®ãã¨ã«ã¤ãã¦ã®æ´ãªãæ
å ±ã¯ @ref{ä»ã®ãã©ã¼ãããããå¤æãã}
+ãåç
§ãã¦ãã ããã
-The following options are supported by @command{etf2ly}:
+@command{etf2ly} ã«ã¯ä»¥ä¸ã®ãªãã·ã§ã³ãããã¾ãã
@table @code
@item -h, --help
-this help
+ãã®ãã«ãã表示ãã¾ãã
@item -o, --output=@var{FILE}
-set output filename to @var{FILE}
+åºåå
ã®ãã¡ã¤ã«åã @var{FILE} ã«ãã¾ãã
@item --version
-version information
+ãã¼ã¸ã§ã³æ
å ±ã表示ãã¾ãã
@end table
-
@knownissues
-
-The list of articulation scripts is incomplete. Empty measures
-confuse @command{etf2ly}. Sequences of grace notes are ended improperly.
+ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã®ä¸è¦§ã¯æªå®æã§ãã空ã®å°ç¯ã¯ @command{etf2ly} ã@c
+æ··ä¹±ããã¾ããé£ç¶ããè£
飾é³ç¬¦ã¯æ£ããçµäºãã¾ããã
@node ãã®ä»ã®ãã©ã¼ããã
@@ -636,42 +753,51 @@ LilyPond èªä½ã¯ä»ã®ãã©ã¼ããããä¸åãµãã¼ããã¾ããã
ããã¹ãã¨æ¥½èãçµ±åããææ³ã示ãã¾ãã
@menu
-* 大ããªæ¥½èããå¤ãã®å¼ç¨ãè¡ã::
-* LilyPond åºåã OpenOffice.org ã«æ¿å
¥ãã::
-* LilyPond åºåãä»ã®ããã°ã©ã ã«æ¿å
¥ãã::
+* LuaTex::
+* OpenOffice 㨠LibreOffice::
+* ä»ã®ããã°ã©ã ::
@end menu
-@node 大ããªæ¥½èããå¤ãã®å¼ç¨ãè¡ã
-@unnumberedsubsec 大ããªæ¥½èããå¤ãã®å¼ç¨ãè¡ã
-@translationof Many quotes from a large score
-大ããªæ¥½èããå¤ãã®æçãå¼ç¨ããå¿
è¦ãããå ´åã@c
-ã·ã¹ãã ãã¯ãªããããæ©è½ã使ããã¨ãã§ãã¾ãã@c
-@c @ruser{é³æ¥½ã®æçãæ½åºãã}
-@ruser{Extracting fragments of music} ãåç
§ãã¦ãã ããã
+@node LuaTex
+@subsection LuaTex
+@translationof LuaTex
+
+@cindex LuaTex
+@cindex lyluatex
-@node LilyPond åºåã OpenOffice.org ã«æ¿å
¥ãã
-@unnumberedsubsec LilyPond åºåã OpenOffice.org ã«æ¿å
¥ãã
-@translationof Inserting LilyPond output into OpenOffice.org
+@code{lilypond-book} ã§ã LilyPond åºåãçµã¿è¾¼ããã¨ãã§ãã¾ããã
+LuaTex ã使ç¨ããå ´åã@c
+@uref{https://github.com/jperon/lyluatex/blob/master/README.en.md,lyluatex}
+ã¨å¼ã°ãã代æ¿ããã°ã©ã ãããã¾ãã
+
+
+@node OpenOffice 㨠LibreOffice
+@subsection OpenOffice 㨠LibreOffice
+@translationof OpenOffice and LibreOffice
@cindex OpenOffice.org
+@cindex LibreOffice.org
+@cindex OOoLilyPond
@uref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond} ãç¨ãã¦
-LilyPond è¨èã OpenOffice.org ã«ä»ãå ãããã¨ãã§ãã¾ãã
+LilyPond åºåã OpenOffice.org 㨠LibreOffice ã«ä»ãå ãããã¨ãã§ãã¾ãã@c
+ãã㯠OpenOffice.org ã®ããã¥ã¡ã³ãå
㧠LilyPond ã®ãã¡ã¤ã«ãç»åã«å¤æãã
+OpenOffice.org ã®æ¡å¼µæ©è½ã§ããç¾å¨ã¯éçºããã¦ãã¾ãããããã¼ã¸ã§ã³ 4
+ã§ãåä½ããããã§ãã
-@node LilyPond åºåãä»ã®ããã°ã©ã ã«æ¿å
¥ãã
-@unnumberedsubsec LilyPond åºåãä»ã®ããã°ã©ã ã«æ¿å
¥ãã
-@translationof Inserting LilyPond output into other programs
+@node ä»ã®ããã°ã©ã
+@subsection ä»ã®ããã°ã©ã
+@translationof Other programs
-LilyPond åºåãä»ã®ããã°ã©ã ã«æ¿å
¥ããã«ã¯ã@c
+@file{PNG}, @file{EPS}, @file{PDF} ãæ±ããã¨ãã§ããä»ã®ããã°ã©ã ã§ã¯ã@c
@code{lilypond-book} ã§ã¯ãªãã@code{lilypond} ã使ç¨ãã¾ãã@c
-ããããã®ä¾ãåã
ã«ä½æãã¦ããã¥ã¡ã³ãã«ä»ãå ãã¾ãã@c
-大æµã®ããã°ã©ã ã« @file{PNG}, @file{EPS}, ããã㯠@file{PDF} ãã©ã¼ãããã®
-LilyPond åºåãæ¿å
¥ãããã¨ãã§ãã¾ãã
+LilyPond åºåãã¡ã¤ã«ã 1 ã¤ãã¤ä½æãæ¿å
¥ããå¿
è¦ãããã¾ãã
+ä»ã®ã½ã¼ã¹ãããã¡ã¤ã«ãæ¿å
¥ããæ¹æ³ã«ã¤ãã¦ãããããã®ããã°ã©ã ã®@c
+ããã¥ã¡ã³ããåç
§ãã¦ãã ããã
LilyPond 楽èã®å¨ãã®ç©ºç½ãæ¸ããã«ã¯ã以ä¸ã®ãªãã·ã§ã³ã使ç¨ãã¾ã:
-the following options
@example
\paper@{
@@ -683,36 +809,45 @@ the following options
scoreTitleMarkup = ##f
@}
-@{ c1 @}
+@var{ @dots{} music @dots{} }
@end example
-æç¨ãªç»åãã¡ã¤ã«ãä½ãåºãã«ã¯ã以ä¸ã®ããã«ãã¾ã:
+@noindent
+@file{EPS} ãã¡ã¤ã«ãçæããã«ã¯:
@example
-EPS
-
lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts myfile.ly
+@end example
-PNG
+@noindent
+@file{PNG} ãã¡ã¤ã«ãçæããã«ã¯:
+@example
lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts --png myfile.ly
+@end example
-éé PNG
+@noindent
+éé @file{PNG} ãã¡ã¤ã«ãçæããã«ã¯:
-lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts \
- -dpixmap-format=pngalpha --png myfile.ly
-@end example
+@smallexample
+lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts -dpixmap-format=pngalpha --png myfile.ly
+@end smallexample
+
+@cindex fragments, music (楽æ²ã®æç)
+@cindex quoting, music fragments (楽æ²ã®æçãå¼ç¨ãã)
+@cindex music fragments, quoting (楽æ²ã®æçãå¼ç¨ãã)
+
+大ããªã¹ã³ã¢ããå¤ãã®æçãå¼ç¨ãããå ´åãã¯ãªããæ©è½ãç¨ãããã¨ã@c
+ã§ãã¾ãã@ruser{é³æ¥½ã®æçãæ½åºãã} ãåç
§ãã¦ãã ããã
@node ç¬ç«ãã include
@section ç¬ç«ãã @code{include}
@translationof Independent @code{include}s
-å
±æå¯è½ãªå¤§ã㪠(ããã¦æç¨ãªï¼) ã³ã¼ããè¨è¿°ãã¦ãã人ããã¾ãã@c
-ãããã®ã³ã¼ãã¯ç¬èªã®ããæ¹ã§ LilyPond ã include ãã¦ãå ´åãããã¾ãã@c
-include ãè¡ãããªãå ´åãinclude ããããã¡ã¤ã«ããã¦ã³ãã¼ããã¦@c
-æåã§ãããã include ããå¿
è¦ãããã¾ãã
-
+åºåã«ããå¹æãçã¿åºãããã«ãLilyPond ã« @code{\include} ãããã¨ã®ã§ãã@c
+ãã¡ã¤ã«ãä½ã£ã¦ããã¦ã¼ã¶ããã¾ãã以ä¸ã«ãããã®ã¯ LilyPond ã«@c
+ä»å±ãã¦ãããã®ã§ãã@ruser{å
¥åãã¡ã¤ã«ã«åãçµã} ãåç
§ãã¦ãã ããã
@menu
* MIDI ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³::
@@ -723,25 +858,11 @@ include ãè¡ãããªãå ´åãinclude ããããã¡ã¤ã«ããã¦ã³ã
@subsection MIDI ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³
@translationof MIDI articulation
-LilyPond 㯠@qq{æ ¡é²} ã®ããã« MIDI åºåãä½ãåºããã¨ãã§ãã¾ãã@c
-ããããªãã MIDI ã«åºåãããã®ã¯ãå¼·å¼±è¨å·ãæ示çãªãã³ãè¨å·ã@c
-é³ç¬¦ã¨æ¼å¥æéã ãã§ãã
-
-@emph{ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³} ããã¸ã§ã¯ãã¯ã@c
-楽èã®æ
å ±ãããå¤ã MIDI ã«çµã¿è¾¼ããã¨ãã¦ãã試ã¿ã® 1 ã¤ã§ãã@c
-é³ç¬¦ã« @q{ã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³} ãå ããããã@c
-ã¹ã©ã¼ã®ä»ãã¦ããªãé³ç¬¦ã縮ãã¾ãã@c
-縮ããé·ãã¯é³ç¬¦ã«ä»ãã¦ããã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³è¨å·ã«åºã¥ãã¦ã決ã¾ãã¾ã:
-ä¾ãã°ãã¹ã¿ãã«ã¼ãã¯é³ä¾¡ãååã«ãã@c
-ããã¼ãã¯é³ç¬¦ãæ¼å¥æéãã£ã±ãé³´ããã¾ãã@c
-ããã«ããã®ã¹ã¯ãªããã¯ããªã«ã¨ã¿ã¼ã³ãç解ãã@c
-ã¢ã«ãã³ããªã©ä»ã®è£
飾ãç解ããããæ¡å¼µãããã¨ãã§ãã¾ãã
-
-@example
-@uref{http://@/www@/.nicta@/.com@/.au/@/people/@/chubbp/@/articulate}
-@end example
-
-@knownissues
+@cindex MIDI
+@cindex Articulate project (Articulate ããã¸ã§ã¯ã)
-ãã®æ©è½ã¯ç解ã§ãããã®ã«ããå¹æãæã¡ã¾ãã:
-(é³ç¬¦ã®ããããã£ã®ä»£ããã®) ããã¹ã ãã¼ã¯ã¢ããã¯ç¡è¦ããã¾ãã
+@uref{http://www.nicta.com.au/articulate,Articulate} ããã¸ã§ã¯ãã¯
+LilyPond ã® MIDI åºåãæ¹åãããã¨ãããã®ã§ãããã㯠(ã¹ã©ã¼ã®ä¸ã«ç¡ã)
+é³ç¬¦ã®é·ãããã¢ã¼ãã£ãã¥ã¬ã¼ã·ã§ã³ã«åããã¦èª¿æ´ãããã¨ã«ãã£ã¦@c
+å®ç¾ããã¦ãã¾ããä¾ãã°ã@q{ã¹ã¿ãã«ã¼ã}ã¯é³é·ãååã«ãã@q{ããã¼ã}ã¯@c
+é³ç¬¦ãã£ã±ãã®é³é·ã«ãã¾ãã@ruser{Enhancing MIDI output} ãåç
§ãã¦ãã ããã
diff --git a/Documentation/ja/usage/lilypond-book.itely b/Documentation/ja/usage/lilypond-book.itely
index 41f141d5ad..160e68d4e4 100644
--- a/Documentation/ja/usage/lilypond-book.itely
+++ b/Documentation/ja/usage/lilypond-book.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: c1b0482f63f881bd3f67845e5f76a3e04675ef2a
+ Translation of GIT committish: 5fb3f8cf17ce7b57d22584429d736f188e4827d7
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.22"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Note: keep this node named so that `info lilypond-book' brings you here.
@node lilypond-book
@@ -127,11 +127,11 @@ Windows ã Mac OS X ã®ã³ãã³ã ã©ã¤ã³ãç¨ã㦠@code{lilypond-book}
lilypond-book --output=out --pdf lilybook.lytex
@emph{lilypond-book (GNU LilyPond) @version{} }
@emph{Reading lilybook.lytex...}
-@emph{..lots of stuff deleted..}
+@emph{@dots{}lots of stuff deleted@dots{}}
@emph{Compiling lilybook.tex...}
cd out
pdflatex lilybook
-@emph{..lots of stuff deleted..}
+@emph{@dots{}lots of stuff deleted@dots{}}
xpdf lilybook
@emph{(@command{xpdf} ãã好ã¿ã® PDF ãã¥ã¼ã¢ã«ç½®ãæãã¦ãã ãã)}
@end example
@@ -221,19 +221,19 @@ LilyPond ããã¾ãã¾ãªåºåãã©ã¼ãããã¨çµ±åããæ¹æ³ã説
@itemize
@item
-@code{\lilypond@{...@}} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ããå
¥åãã@c
+@code{\lilypond@{@dots{}@}} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ããå
¥åãã@c
ãã¨ãã§ãã¾ã
@item
-@code{\begin@{lilypond@}...\end@{lilypond@}} ç°å¢: ããã«é·ã lilypond
+@code{\begin@{lilypond@}@dots{}\end@{lilypond@}} ç°å¢: ããã«é·ã lilypond
ã³ã¼ããå
¥åãããã¨ãã§ãã¾ã
@item
-@code{\lilypondfile@{...@}} ã³ãã³ã: ãã®ã³ãã³ã㧠lilypond ãã¡ã¤ã«ã@c
+@code{\lilypondfile@{@dots{}@}} ã³ãã³ã: ãã®ã³ãã³ã㧠lilypond ãã¡ã¤ã«ã@c
æ¿å
¥ãããã¨ãã§ãã¾ã
@item
-@code{\musicxmlfile@{...@}} ã³ãã³ã: ãã®ã³ãã³ã㧠MusicXML ãã¡ã¤ã«ã@c
+@code{\musicxmlfile@{@dots{}@}} ã³ãã³ã: ãã®ã³ãã³ã㧠MusicXML ãã¡ã¤ã«ã@c
æ¿å
¥ãããã¨ãã§ãã¾ãã@c
æ¿å
¥ããããã¡ã¤ã«ã¯ @code{musicxml2ly} 㨠@code{lilypond} ã§å¦çããã¾ã
@@ -355,11 +355,8 @@ kpsewhich feta20.tex
@snippets
-@c æªè¨³
-@c 楽èè¦ç´ (ã¿ã¤ãã¹ã©ã¼ç) ãï½ï½ãã®ããã«
-@c 表示ãããã¨ãæç¨ãªå ´åãããã¾ãã@c
-Sometimes it is useful to display music elements (such as ties and slurs)
-as if they continued after the end of the fragment.
+楽èè¦ç´ (ã¿ã¤ãã¹ã©ã¼ç) ãæçã®å¾ã«ç¶ããã®ããã«@c
+表示ãããã¨ãæç¨ãªå ´åãããã¾ãã@c
ããã¯èãæ¹è¡ãã¦ãæ®ãã® LilyPond åºåãæå¶ãããã¨ã§å®ç¾ã§ãã¾ãã
@LaTeX{} ã®ä¸ã§ @code{\betweenLilyPondSystem} ãå®ç¾©ãã¦ãå¿
è¦ãªæ¥½è段æ°@c
@@ -415,9 +412,9 @@ as if they continued after the end of the fragment.
@example
\onlyFirstNSystems@{3@}
-\begin@{lilypond@}...\end@{lilypond@}
+\begin@{lilypond@}@dots{}\end@{lilypond@}
\onlyFirstNSystems@{1@}
-\begin@{lilypond@}...\end@{lilypond@}
+\begin@{lilypond@}@dots{}\end@{lilypond@}
@end example
@@ -442,19 +439,19 @@ Texinfo ããã¥ã¡ã³ãã®ä¾ã® 1 ã¤ã¯ãã®ããã¥ã¢ã«ã§ãã@c
@itemize
@item
-@code{@@lilypond@{...@}} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ãã@c
+@code{@@lilypond@{@dots{}@}} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ãã@c
å
¥åãããã¨ãã§ãã¾ã
@item
-@code{@@lilypond...@@end lilypond} ç°å¢: ããã«é·ã lilypond
+@code{@@lilypond@dots{}@@end lilypond} ç°å¢: ããã«é·ã lilypond
ã³ã¼ããå
¥åãããã¨ãã§ãã¾ã
@item
-@code{@@lilypondfile@{...@}} ã³ãã³ã: ãã®ã³ãã³ã㧠lilypond
+@code{@@lilypondfile@{@dots{}@}} ã³ãã³ã: ãã®ã³ãã³ã㧠lilypond
ãã¡ã¤ã«ãæ¿å
¥ãããã¨ãã§ãã¾ã
@item
-@code{@@musicxmlfile@{...@}} ã³ãã³ã: ãã®ã³ãã³ã㧠MusicXML ãã¡ã¤ã«ã@c
+@code{@@musicxmlfile@{@dots{}@}} ã³ãã³ã: ãã®ã³ãã³ã㧠MusicXML ãã¡ã¤ã«ã@c
æ¿å
¥ãããã¨ãã§ãã¾ãã@c
æ¿å
¥ããããã¡ã¤ã«ã¯ @code{musicxml2ly} 㨠@code{lilypond} ã§å¦çããã¾ã
@@ -508,7 +505,7 @@ c' d' e' f' g'2 g'
@lilypond[fragment,staffsize=11]{<c' e' g'>}
-@LaTeX{} ã¨ã¯å¯¾ç
§çã«ã@code{@@lilypond@{...@}} ã¯ã¤ã³ã©ã¤ã³ç»åã@c
+@LaTeX{} ã¨ã¯å¯¾ç
§çã«ã@code{@@lilypond@{@dots{}@}} ã¯ã¤ã³ã©ã¤ã³ç»åã@c
çæãã¾ããã@c
çæãããç»åã¯å¸¸ã« 1 ã¤ã®æ®µè½ãæ§æãã¾ãã
@@ -523,19 +520,19 @@ c' d' e' f' g'2 g'
@itemize
@item
-@code{<lilypond ... />} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ããå
¥åãã@c
+@code{<lilypond @dots{} />} ã³ãã³ã: ããã«ç´æ¥çã lilypond ã³ã¼ããå
¥åãã@c
ãã¨ãã§ãã¾ã
@item
-@code{<lilyond>...</lilypond>} ç°å¢: ããã«é·ã lilypond
+@code{<lilyond>@dots{}</lilypond>} ç°å¢: ããã«é·ã lilypond
ã³ã¼ããå
¥åãããã¨ãã§ãã¾ã
@item
-@code{<lilypondfile>...</lilypondfile>} ã³ãã³ã: ãã®ã³ãã³ãã§
+@code{<lilypondfile>@dots{}</lilypondfile>} ã³ãã³ã: ãã®ã³ãã³ãã§
lilypond ãã¡ã¤ã«ãæ¿å
¥ãããã¨ãã§ãã¾ã
@item
-@code{<musicxmlfile>...</musicxmlfile>} ã³ãã³ã: ãã®ã³ãã³ãã§
+@code{<musicxmlfile>@dots{}</musicxmlfile>} ã³ãã³ã: ãã®ã³ãã³ãã§
MusicXML ãã¡ã¤ã«ãæ¿å
¥ãããã¨ãã§ãã¾ãã@c
æ¿å
¥ããããã¡ã¤ã«ã¯ @code{musicxml2ly} 㨠@code{lilypond} ã§å¦çããã¾ã
@@ -570,7 +567,7 @@ MusicXML ãã¡ã¤ã«ãæ¿å
¥ãããã¨ãã§ãã¾ãã@c
\key c \minor c4 es g2
@end lilypond
-ã¤ã³ã©ã¤ã³ç»åãå¾ãã«ã¯ã@code{<lilypond ... />} ã使ãã¾ãã@c
+ã¤ã³ã©ã¤ã³ç»åãå¾ãã«ã¯ã@code{<lilypond @dots{} />} ã使ãã¾ãã@c
以ä¸ã®ããã«ãã³ãã³ @code{:} ã§ãªãã·ã§ã³ã¨æ¥½èã³ã¼ããåºåãã¾ã:
@example
@@ -581,7 +578,7 @@ HTML ãã¡ã¤ã«ã¨ã¯å¥ã«è¨è¿°ãã lilypond ãã¡ã¤ã«ãçµã¿è¾¼ã
以ä¸ã®ããã«ãã¾ã:
@example
-<lilypondfile @var{option1} @var{option2} ...>@var{filename}</lilypondfile>
+<lilypondfile @var{option1} @var{option2} @dots{}>@var{filename}</lilypondfile>
@end example
@code{<musicxmlfile>} 㯠@code{<lilypondfile>} ã¨åãæ§æã使ãã@c
@@ -947,6 +944,20 @@ ps2pdf yourfile.ps
@command{latex} ã 2 åã¢ã¼ãã§å®è¡ããã®ã§ããã°ãå¿ããã«
@command{dvips} ã®ãªãã·ã§ã³ã« @option{-t landscape} ãä»ãå ãã¦ãã ããã
+以ä¸ã®ãããªç°å¢:
+
+@example
+\begin@{lilypond@} @dots{} \end@{lilypond@}
+@end example
+
+@noindent
+㯠@LaTeX{} ã§ã¯è§£éããã¾ããã代ããã«ã@code{lilypond-book} ããããã®@c
+@q{ç°å¢}ãå°ç¨ãã¡ã¤ã«ã«æ½åºããLilyPond ãå¼ã³åºãã¾ããããã¦åºåçµæã®@c
+ç»åãç¨ã㦠@code{\begin@{lilypond@}}@dots{}@code{\end@{lilypond@}} ãã¯ãã@c
+@q{ç»åã®ã¤ã³ã¯ã«ã¼ã}ã³ãã³ãã«ç½®ãæãããã @file{.tex} ãã¡ã¤ã«ã@c
+çæãã¾ãã@LaTeX{} ã¯ãã®æã«å®è¡ãã¾ã (@code{\linewidth} ãªã©ã®è¨ç®ã@c
+è¡ãããã« @LaTeX{} ã¯ãã®åã«@q{空ã®}ããã¥ã¡ã³ãã§å®è¡ããã¦ããã®ã§ãã)ã
+
@knownissues
@code{\pageBreak} ã³ãã³ã㯠@code{\begin@{lilypond@} @dots{}
\end@{lilypond@}} ç°å¢ã®ä¸ã§ã¯æ©è½ãã¾ããã
@@ -1042,24 +1053,24 @@ lilypond-book --filter='convert-ly --from=2.0.0 -' my-book.tely
@example
lilypond-book --output=out yourfile.lytex
cd out
-...
+@dots{}
@end example
-@itemx --skip-lily-check
+@item --skip-lily-check
lilypond åºåãè¦ã¤ãããªãã¦ãå¦çãçµäºãã¾ããã@c
ç»åãæããªã LilyPond Info ããã¥ã¡ã³ããä½æããããã«ä½¿ãã¾ãã
-@itemx --skip-png-check
+@item --skip-png-check
EPS ãã¡ã¤ã«ãä½æããããã® PNG ç»åãè¦ã¤ãããªãã¦ãå¦çãçµäºãã¾ããã@c
ç»åãæããªã LilyPond Info ããã¥ã¡ã³ããä½æããããã«ä½¿ãã¾ãã
-@itemx --lily-output-dir=@var{dir}
+@item --lily-output-dir=@var{dir}
lily-XXX ãã¡ã¤ã«ããã£ã¬ã¯ã㪠@var{dir} ã«æ¸ãåºãã@option{--output}
ãã£ã¬ã¯ããªã«ãªã³ã¯ããã¾ãã@c
ãã®ãªãã·ã§ã³ã¯å¥ã
ã®ãã£ã¬ã¯ããªã®ä¸ã«ãããå¤ãã®æ¥½èæçãå
±æãã@c
ããã¥ã¡ã³ãããã«ãããæéãç¯ç´ããããã«ä½¿ãã¾ãã
-@itemx --lily-loglevel=@var{loglevel}
+@item --lily-loglevel=@var{loglevel}
å¼ã³åºããã @command{lilypond} ã®åºåã®é¥èãã @var{loglevel} ã«ã»ãã@c
ãã¾ãã@c
åãå¾ãå¤ã¯ @code{NONE}, @code{ERROR}, @code{WARNING},
@@ -1068,15 +1079,16 @@ lily-XXX ãã¡ã¤ã«ããã£ã¬ã¯ã㪠@var{dir} ã«æ¸ãåºãã@option{-
ãã®ãªãã·ã§ã³ã使ããªãã£ãå ´åãç°å¢å¤æ° @code{LILYPOND_LOGLEVEL}
ãã»ããããããã®å¤ã loglevel ã¨ãã¦ä½¿ããã¾ãã
-@itemx --info-images-dir=@var{dir}
+
+@item --info-images-dir=@var{dir}
Texinfo åºåããã©ã¼ããããã¦ãInfo ã @var{dir} ã®ä¸ã«ãã楽èç»åã@c
æ¢ãããã«ãã¾ãã
-@itemx --latex-program=@var{prog}
+@item --latex-program=@var{prog}
@command{latex} ã®ä»£ããã«å®è¡å¯è½ãª @command{prog} ãå®è¡ãã¾ãã@c
ããã¯ãä¾ãã°ããã¥ã¡ã³ãã @command{xelatex} ã§å¦çããå ´åã«æç¨ã§ãã
-@itemx --left-padding=@var{amount}
+@item --left-padding=@var{amount}
EPS ããã¯ã¹ã®ããã£ã³ã°ãæå®ãã¾ãã@c
@var{amount} ã®åä½ã¯ããªã¡ã¼ãã«ã§ãããã©ã«ãå¤ã¯ 3.0 ã§ãã@c
ãã®ãªãã·ã§ã³ã¯æ¥½èãå³ãã¼ã¸ã³ã«é£ãè¾¼ãå ´åã«ä½¿ãã¾ãã
diff --git a/Documentation/ja/usage/running.itely b/Documentation/ja/usage/running.itely
index c0bfd3f1ef..95b40f8a42 100644
--- a/Documentation/ja/usage/running.itely
+++ b/Documentation/ja/usage/running.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: 2429e825c154f15cda52cf8a44f12e23d9f6a1e6
+ Translation of GIT committish: 5fb3f8cf17ce7b57d22584429d736f188e4827d7
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Masamichi Hosoda, Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Masamichi Hosoda, Yoshiki Sawada
@c Translation status: post-GDP
@node lilypond ãå®è¡ãã
@@ -225,7 +225,7 @@ pdfsizeopt.py --use-multivalent=no gsout.pdf final.pdf
@item -d, --define-default=@var{var}=@var{val}
-@ref{Advanced command line options for LilyPond} ãåç
§ãã¦ãã ããã
+@ref{LilyPond ã®é«åº¦ãªã³ãã³ã ã©ã¤ã³ ãªãã·ã§ã³} ãåç
§ãã¦ãã ããã
@cindex Scheme, expression evaluation (Scheme 表è¨ã®è©ä¾¡)
@cindex expression evaluation, Scheme (Scheme 表è¨ã®è©ä¾¡)
@@ -261,6 +261,11 @@ lilypond -e '(define-public a 42)'
ä¾: @code{lilypond -fpng @var{filename}.ly}
+@noindent
+@code{svg} ãã©ã¼ãããã @code{eps} ãã©ã¼ããããåºåããã«ã¯
+@code{-dbackend} ãªãã·ã§ã³ãç¨ãã¾ãã
+@ref{LilyPond ã®é«åº¦ãªã³ãã³ã ã©ã¤ã³ ãªãã·ã§ã³} ãåç
§ãã¦ãã ããã
+
@item -h, --help
使ç¨æ¹æ³ã®è¦ç´ã表示ãã¾ãã
@@ -291,7 +296,7 @@ init ãã¡ã¤ã«ã¨ã㦠@var{file} ãã»ãããã¾ã (ããã©ã«ã: @f
Web ãµã¼ãçµç±ã§ LilyPond èå»ãæä¾ããæã
LilyPond ãå¤é¨ã½ã¼ã¹ããéããã¦ããã³ãã³ããå®è¡ããæã«ã@c
@code{--dsafe} ãããèªç±åº¦ã®é«ã代æ¿æ段ãæä¾ãã¾ãã
-ï¼@ref{Advanced command line options for LilyPond} ãåç
§ãã¦ãã ãããï¼
+ï¼@ref{LilyPond ã®é«åº¦ãªã³ãã³ã ã©ã¤ã³ ãªãã·ã§ã³} ãåç
§ãã¦ãã ãããï¼
@code{--jail} ãªãã·ã§ã³ã¯ã³ã³ãã¤ã« ããã»ã¹ã®éå§ç´åã«
@command{lilypond} ã®ã«ã¼ã ãã£ã¬ã¯ããªã @var{jail} ã«å¤æ´ãã¾ãã@c
@@ -514,22 +519,22 @@ GNU LilyPond ã®ä¿è¨¼è²¬ä»»ã表示ãã¾ãã@c
@item
@tab @code{svg}
@tab ãã¼ã¸æ¯ã® SVG ãã¡ã¤ã«ãå
¨ãã¼ã¸åä½ããã¾ãã@c
-LilyPond èªèº«ã®é³æ¥½ã°ãªããé¤ãããã©ã³ãã¯åãè¾¼ã¾ãã¾ããã@c
+é³æ¥½ã°ãªãã¯ãã¯ã¿ç»åã«å¤æããã¾ãããæåãã©ã³ã㯠SVG ãã¡ã¤ã«ã«ã¯@c
+@emph{åãè¾¼ã¾ãã¾ãã}ã
ãã®ãããããã¹ããæè©ã®æé©ãªæç»ãå¾ãããã«ã¯ã@c
-SVG ãã¥ã¢ã¼ã«ãã©ã³ããå¿
è¦ã¨ãªãã¾ãã@c
+SVG ãã¥ã¢ã¼ã«é¢é£ããããã¹ããã©ã³ããå¿
è¦ã¨ãªãã¾ãã@c
SVG ãã¥ã¢ã¼ã対å¿ãã¦ããªããã¨ãããã®ã§ã@c
-@q{ãã©ã³ãã¨ã¤ãªã¢ã¹} ã @q{ãã©ã³ããªã¹ã} ã使ç¨ããªããã¨ããå§ããã¾ãã@c
+@q{ãã©ã³ããªã¹ã} ã @q{ãã©ã³ãã¨ã¤ãªã¢ã¹} ã使ç¨ããªããã¨ããå§ããã¾ãã@c
@emph{Web Open Font Format} (WOFF) ãã¡ã¤ã«ã使ãã¨ãã«ã¯ã@c
追å ã® @code{svg-woff} ã¹ã¤ãããå¿
è¦ã¨ãªãã¾ãã
@end multitable
@noindent
@strong{SVG ããã°ã¨ã³ãåºåã®æ³¨æ:}
-LilyPond ã®ããã©ã«ããã©ã³ãï¼@code{LilyPond Serif},
-@code{LilyPond Sans Serif} 㨠@code{LilyPond Monospace}ï¼ã¯ã@c
-ã¾ãã« @emph{ãã¼ã«ã«} ãã©ã³ãã¨ã¤ãªã¢ã¹ã§ãã@c
+ããã©ã«ãã§ã¯ãSVG åºåã«ã¯ä¸è¬ç㪠@code{font-family} ã®å¤
+@code{serif}, @code{sans-serif}, @code{monospace} ãç¨ãããã¾ãã@c
ãã®ããã@code{svg} ããã¯ã¨ã³ãã使ãå ´åã¯ã@c
-ã½ã¼ã¹ãã¡ã¤ã«ã§æ示çã«ããã©ã«ããã©ã³ããè¨å®ããå¿
è¦ãããã¾ã;
+ã½ã¼ã¹ãã¡ã¤ã«ã§æ示çã«ç¹å®ã®ããã©ã«ããã©ã³ããè¨å®ããå¿
è¦ãããã¾ã;
@quotation
@verbatim
@@ -546,51 +551,51 @@ LilyPond ã®ããã©ã«ããã©ã³ãï¼@code{LilyPond Serif},
@ruser{ããã¥ã¡ã³ãå
¨ä½ã®ãã©ã³ã} ãåç
§ãã¦ãã ããã
@multitable @columnfractions .33 .16 .51
-@c æªè¨³
@item @code{check-internal-types}
@tab @code{#f}
-@tab Check every property assignment for types.
+@tab å
¨ã¦ã®ããããã£ä»£å
¥ã«ã¤ãã¦åãã§ãã¯ãè¡ãã¾ãã
@item @code{clip-systems}
@tab @code{#f}
-@tab Extract music fragments out of a score. This requires that the
-@code{clip-regions} function has been defined within the @code{\layout}
-block. See @ruser{Extracting fragments of music}. No fragments are
-extracted though if used with the @option{-dno-print-pages} option.
+@tab 楽èããæçãåãåºãã¾ããããã使ç¨ããã«ã¯ã
+@code{\layout} ãããã¯ã« @code{clip-regions} é¢æ°ãå®ç¾©ããã¦ããå¿
è¦ã@c
+ããã¾ãã@ruser{é³æ¥½ã®æçãæ½åºãã}ãåç
§ãã¦ãã ããã
+@option{-dno-print-pages} ã¨ä¸ç·ã«ç¨ããããå ´åãæçã¯å
¨ãåºåããã¾ããã
@item @code{datadir}
@tab
-@tab Prefix for data files (read-only).
+@tab ãã¼ã¿ãã¡ã¤ã« ãã¹ã®æ¥é è¾ã§ã (èªã¿åãå°ç¨)ã
@item @code{debug-gc}
@tab @code{#f}
-@tab Dump memory debugging statistics.
+@tab ã¡ã¢ãªã«é¢ãããããã°ç¨ã®çµ±è¨ãåãåºãã¾ãã
@item @code{debug-gc-assert-parsed-dead}
@tab @code{#f}
-@tab For memory debugging: Ensure that all references to parsed objects
-are dead. This is an internal option, and is switched on automatically
-for @code{`-ddebug-gc'}.
+@tab ã¡ã¢ãªã«é¢ãããããã°ç¨: ãã¼ã¹ããããªãã¸ã§ã¯ãã¸ã®å
¨ã¦ã®åç
§ã@c
+ç¡ããªã£ã¦ãããã¨ãä¿è¨¼ãã¾ããããã¯å
é¨ãªãã·ã§ã³ã§ããã@c
+@code{`-ddebug-gc'} ã«ãã£ã¦èªåçã«ãªã³ã«ãªãã¾ãã
@item @code{debug-lexer}
@tab @code{#f}
-@tab Debug the flex lexer.
+@tab Flex ææ³è§£æã½ããã¦ã§ã¢ããããã°ãã¾ãã
@item @code{debug-page-breaking-scoring}
@tab @code{#f}
-@tab Dump scores for many different page breaking configurations.
+@tab å¤ãã®æ¹ãã¼ã¸è¨å®ã«é¢ããã¹ã³ã¢ãåãåºãã¾ãã
@item @code{debug-parser}
@tab @code{#f}
-@tab Debug the bison parser.
+@tab Bison ãã¼ãµããããã°ãã¾ãã
@item @code{debug-property-callbacks}
@tab @code{#f}
-@tab Debug cyclic callback chains.
+@tab ã³ã¼ã«ããã¯å¾ªç°ããããã°ãã¾ãã
@item @code{debug-skylines}
@tab @code{#f}
-@tab Debug skylines.
+@tab ã¹ã«ã¤ã©ã¤ã³ (訳注: è¡ãã¨ã®ãªãã¸ã§ã¯ãã®æé«ä½ç½®ã¨æä½ä½ç½®ãç·ã§@c
+表示ãããã®) ã表示ãã¾ãã
@item @code{delete-intermediate-files}
@tab @code{#t}
@@ -605,16 +610,24 @@ for @code{`-ddebug-gc'}.
@tab @code{#f}
@tab åãã¡ã¤ã«ã®ã¡ã¢ãªã¨ CPU æéæ
å ±ãåãåºãã¾ãã
-@c æªè¨³
@item @code{dump-signatures}
@tab @code{#f}
-@tab Dump output signatures of each system. Used for regression testing.
+@tab ã·ã¹ãã ãã¨ã«åºåæ
å ±ãåãåºãã¾ããå帰ãã¹ãã«ç¨ãããã¾ãã
+
+@item @code{embed-source-code}
+@tab @code{#f}
+@tab åºåããã PDF ããã¥ã¡ã³ãã« LilyPond ã½ã¼ã¹ãã¡ã¤ã«ãåãè¾¼ã¿ã¾ãã
@item @code{eps-box-padding}
@tab @code{#f}
@tab åºåããã EPS ã®å·¦ç«¯ã«ä¸ããããæ°ã®ä½ç½ã追å ãã¾ã
(åä½ã¯ mm ã§ã)ã
+@item @code{font-export-dir}
+@tab @code{#f [dir]}
+@tab PostScript ãã¡ã¤ã«ã¨ãã¦ãã©ã³ããã¨ã¯ã¹ãã¼ããããã£ã¬ã¯ããªã@c
+æå®ãã¾ãã
+
@item @code{gs-load-fonts}
@tab @code{#f}
@tab Ghostscript çµç±ã§ãã©ã³ããèªã¿è¾¼ã¿ã¾ãã
@@ -623,6 +636,11 @@ for @code{`-ddebug-gc'}.
@tab @code{#f}
@tab LilyPond ã®ãã©ã³ãã ãã Ghostscript çµç±ã§èªã¿è¾¼ã¿ã¾ãã
+@item @code{gs-never-embed-fonts}
+@tab @code{#f}
+@tab Ghostscript ã TrueType ãã©ã³ãã®ã¿ãåãè¾¼ãããã«ãªãã@c
+ä»ã®ãã©ã¼ãããã®ãã©ã³ãã¯åãè¾¼ã¾ãã¾ããã
+
@item @code{gui}
@tab @code{#f}
@tab åºåã表示ããã«å¦çãè¡ãããã¹ã¦ã®åºåããã° ãã¡ã¤ã«ã«@c
@@ -674,10 +692,9 @@ for @code{`-ddebug-gc'}.
@tab MIDI åºåãã¡ã¤ã«ã®ããã©ã«ãã®ãã¡ã¤ã«æ¡å¼µåãä¸ããããæååã«@c
è¨å®ãã¾ãã
-@c æªè¨³
@item @code{music-strings-to-paths}
@tab @code{#f}
-@tab Convert text strings to paths when glyphs belong to a music font.
+@tab è¨èãã©ã³ããç¨ããããã¹ãããã¹ã«å¤æãã¾ãã
@item @code{paper-size}
@tab @code{\"a4\"}
@@ -808,16 +825,15 @@ CPU ã¨ã¡ã¢ãªä½¿ç¨ãå¶éãã¹ãã§ãã
@tab åºåãã¡ã¤ã«åãæ§ç¯ããæã«å
¥åãã¡ã¤ã«ã®ãã£ã¬ã¯ããªã使ç¨@c
ãã¾ããã
-@c æªè¨³
@item @code{strokeadjust}
@tab @code{#f}
-@tab Force PostScript stroke adjustment. This option is mostly
-relevant when a PDF is generated from PostScript output (stroke
-adjustment is usually enabled automatically for low-resolution bitmap
-devices). Without this option, PDF previewers tend to produce widely
-inconsistent stem widths at resolutions typical for screen display. The
-option does not noticeably affect print quality and causes large file
-size increases in PDF files.
+@tab PostScript ã«ç·å¹
è£æ£ (stroke adjustment) ãå¼·å¶ãã¾ãããã®ãªãã·ã§ã³ã¯@c
+æ®éãPDF ãã¡ã¤ã«ã PostScript åºåããçæããã¦ããå ´åã«æå³ãããã¾ã
+(ç·å¹
è£æ£ã¯ãä½è§£å度ã®ãããããã ããã¤ã¹ã«å¯¾ãã¦èªåçã«æå¹ã«ãªãã¾ã)ã@c
+ãã®ãªãã·ã§ã³ãæå®ããªãå ´åãPDF ãã¥ã¼ã¢ã¯å
¸åçãªè§£å度ã®@c
+ã¹ã¯ãªã¼ã³ã«ããã¦ãä¸è²«æ§ã®ç¡ã符幹ã®å¹
ãåºåãããã¨ãã¾ãã@c
+ãã®ãªãã·ã§ã³ã¯å°å·çµæã®å質ã«ã¯ç®ç«ã£ã¦å½±é¿ãããPDF ã®ãã¡ã¤ã« ãµã¤ãºã@c
+大ããå¢å ããã¾ãã
@item @code{svg-woff}
@tab @code{#f}
@@ -1111,9 +1127,9 @@ test.ly:2:19: error: not a duration: 5
* ä½è¨ãªèã表示ããã::
* ã¨ã©ã¼ ã¡ãã»ã¼ã¸ Unbound variable %::
* ã¨ã©ã¼ ã¡ãã»ã¼ã¸ FT_Get_Glyph_Name::
-* è¦å -- Warning staff affinities should only decrease::
-* Error message unexpected new::
-* Warning this voice needs a voiceXx or shiftXx setting::
+* è¦å staff affinities should only decrease::
+* ã¨ã©ã¼ ã¡ãã»ã¼ã¸ unexpected new::
+* è¦å this voice needs a voiceXx or shiftXx setting::
@end menu
@node 楽èããã¼ã¸ããã¯ã¿åºã
@@ -1201,12 +1217,11 @@ Scheme å½¢å¼ã®ã³ã¡ã³ãã¯ã»ãã³ãã³ (@code{;}) ã§å§ã¾ãã¾ãã
UTF-8 ã¨ã³ã³ã¼ãã§ä¿åããã¦ããªãå ´åã@c
ãã®ã¨ã©ã¼ ã¡ãã»ã¼ã¸ãã³ã³ã½ã¼ã«åºåããã° ãã¡ã¤ã«ã«è¡¨ç¤ºããã¾ãã@c
詳細ã¯ã
-@c @ruser{ããã¹ã ã¨ã³ã³ã¼ãã£ã³ã°}
-@ruser{Text encoding} ãåç
§ãã¦ãã ããã
+@ruser{ããã¹ã ã¨ã³ã³ã¼ãã£ã³ã°} ãåç
§ãã¦ãã ããã
-@node è¦å -- Warning staff affinities should only decrease
-@unnumberedsubsec è¦å -- Warning staff affinities should only decrease
+@node è¦å staff affinities should only decrease
+@unnumberedsubsec è¦å staff affinities should only decrease
@translationof Warning staff affinities should only decrease
ãã®è¦åã¯ãèå»ãããåºåã®ä¸ã«èãç¡ãå ´åã«è¡¨ç¤ºããã¾ãã@c
@@ -1224,15 +1239,15 @@ UTF-8 ã¨ã³ã³ã¼ãã§ä¿åããã¦ããªãå ´åã@c
@qq{èã§ã¯ãªãè¡ã®ã¹ãã¼ã¹} ãåç
§ãã¦ãã ããã
-@node Error message unexpected new
-@unnumberedsubsec Error message unexpected @code{@bs{}new}
+@node ã¨ã©ã¼ ã¡ãã»ã¼ã¸ unexpected new
+@unnumberedsubsec ã¨ã©ã¼ ã¡ãã»ã¼ã¸ unexpected @code{@bs{}new}
+@translationof Error message unexpected new
-A @code{\score} block must contain a @emph{single} music expression.
-If instead it contains several @code{\new Staff},
-@code{\new StaffGroup} or similar contexts introduced with @code{\new}
-without them being enclosed in either curly brackets,
-@code{@{ @dots{} @}}, or double angle brackets, @code{<< @dots{} >>},
-like this:
+@code{\score} ãããã¯ã¯ @emph{1 ã¤ã®} é³æ¥½è¡¨è¨ãå«ãå¿
è¦ãããã¾ãã
+@code{\new Staff} ã @code{\new StaffGroup}ããã®ä» @code{\new} ã§çæããã@c
+åæ§ã®ã³ã³ããã¹ããæ³¢æ¬å¼§ @code{@{ @dots{} @}} ã@c
+äºéã®å±±æ¬å¼§ @code{<< @dots{} >>} ã§å²ã¾ããã«è¤æ°åå¨ããå ´åã«ã@c
+ã¨ã©ã¼ ã¡ãã»ã¼ã¸ãåºåããã¾ãã以ä¸ã®ããã«ã§ã:
@example
\score @{
@@ -1242,14 +1257,10 @@ like this:
@}
@end example
-@noindent
-the error message will be produced.
-
-To avoid the error, enclose all the @code{\new} statements in
-curly or double angle brackets.
+ã¨ã©ã¼ãé¿ããããã«ã¯ãå
¨ã¦ã® @code{\new} æãæ³¢æ¬å¼§ãããã¯äºéã®å±±æ¬å¼§ã§@c
+å²ãã§ãã ããã
-Using curly brackets will introduce the @code{\new} statements
-sequentially:
+æ³¢æ¬å¼§ã¯é£ç¶çã« @code{\new} æãå°å
¥ãã¾ã:
@lilypond[quote,verbatim]
\score {
@@ -1261,8 +1272,8 @@ sequentially:
@end lilypond
@noindent
-but more likely you should be using double angle brackets so the new
-staves are introduced in parallel, i.e. simultaneously:
+ããããäºéã®å±±æ¬å¼§ãç¨ããã¹ãå ´é¢ã®æ¹ãå¤ãã§ãããã@c
+èã¯ä¸¦è¡ã« (ã¤ã¾ããåæã«) å°å
¥ããã¾ã:
@lilypond[quote,verbatim]
\score {
@@ -1273,37 +1284,34 @@ staves are introduced in parallel, i.e. simultaneously:
}
@end lilypond
-@node Warning this voice needs a voiceXx or shiftXx setting
-@unnumberedsubsec Warning this voice needs a @code{@bs{}voiceXx}
- or @code{@bs{}shiftXx} setting
-
-If notes from two different voices with stems in the same direction
-occur at the same musical moment, but the voices have no
-voice-specific shifts specified, the warning message
-@samp{warning: this voice needs a \voiceXx or \shiftXx setting} will appear
-when compiling the LilyPond file. This warning will appear even when
-the notes have no visible stems, e.g. whole notes, if the stems for
-shorter notes at the same pitch would be in the same direction.
-
-Remember that the stem direction depends on the position of the
-note on the staff unless the stem direction is specified, for example
-by using @code{\voiceOne}, etc. In this case the warning will appear
-only when the stems happen to be in the same direction, i.e. when the
-notes are in the same half of the staff.
-
-By placing the notes in voices with stem directions and shifts
-specified, for example by using @code{\voiceOne}, etc., these warnings
-may be avoided.
-
-Notes in higher numbered voices, @code{\voiceThree} etc., are
-automatically shifted to avoid clashing note columns. This causes a
-visible shift for notes with stems, but whole notes are not visibly
-shifted unless an actual clash of the note heads occurs, or when the
-voices cross over from their natural order (when @code{\voiceThree}
-is higher than @code{\voiceOne}, etc.)
+@node è¦å this voice needs a voiceXx or shiftXx setting
+@unnumberedsubsec è¦å this voice needs a @code{@bs{}voiceXx} or @code{@bs{}shiftXx} setting
+@translationof Warning this voice needs a voiceXx or shiftXx setting
+
+2 ã¤ã®ç°ãªããã¤ã¹ãåãåãã®ç¬¦å¹¹ãæã¡ãããããåãã¿ã¤ãã³ã°ã§åºç¾ãã@c
+æããã¤ã¹ã«ã·ãããæå®ããã¦ããªãå ´åã«
+@samp{warning: this voice needs a \voiceXx or \shiftXx setting}
+ã¨ããè¦åã¡ãã»ã¼ã¸ã LilyPond ãã¡ã¤ã«ãã³ã³ãã¤ã«ããéã«åºåããã¾ãã@c
+ãã®è¦åã¯ç¬¦å¹¹ãè¦ããªãå ´å (ä¾ãã°ãå
¨é³ç¬¦) ã«ãã@c
+åããããã«ããçãæ¹ã®é³ç¬¦ã®ç¬¦å¹¹ãåãåãã«ããå ´åãåºåããã¾ãã
+
+符幹ã®åãã¯ã@code{\voiceOne} ãªã©ã«ãã£ã¦æå®ãããªãéãã@c
+èã®ä¸ã§ã®é³ç¬¦ã®ä½ç½®ã«ä¾åãã¾ãããã®ã¨ããè¦åã¯@c
+符幹ãåãåãã«ãªã£ã¦ãã¾ã£ãå ´å -- ã¤ã¾ããè¤æ°ã®ãã¤ã¹ãèã®ä¸ååã¾ãã¯@c
+ä¸ååã«åºã¾ã£ã¦ãã¾ã£ãå ´å -- ã«ã®ã¿åºåããã¾ãã
+
+@code{\voiceOne} ãªã©ãç¨ãããã¨ã«ãã£ã¦ã符幹ã®åãã¨ã·ããã@c
+æå®ãããã¤ã¹ã§é³ç¬¦ãé
ç½®ããå ´åããããã®è¦åãåé¿ãããã¨ãã§ãã¾ãã
+
+ãã大ãããã¤ã¹çªå·ãæã¤é³ç¬¦ (ä¾ãã° @code{\voiceThree} ãªã©) ã¯ã@c
+é³ç¬¦åã®è¡çªãé¿ããããã«èªåçã«ç§»åãã¾ãã符幹ã®ããé³ç¬¦ã«å¯¾ãã¦ã¯@c
+移åãç®ã«è¦ãã¾ãããå
¨é³ç¬¦ã¯å®éã«ç¬¦é ãè¡çªããªãéãããããã¯@c
+ãã¤ã¹ãèªç¶ãªé çªã«é
ç½®ããã¦ããªãå ´å (ä¾ãã° @code{\voiceThree} ã
+@code{\voiceOne} ãããé«ãä½ç½®ã«ããå ´å) ã§ã¯ãªãéãã@c
+移åãã¦ããããã«è¦ãã¾ããã
@seealso
-@rlearning{Explicitly instantiating voices},
-@rlearning{Real music example},
-@ruser{Single-staff polyphony},
-@ruser{Collision resolution}.
+@rlearning{ãã¤ã¹ãæ示çã«ã¤ã³ã¹ã¿ã³ã¹åãã},
+@rlearning{å®éã®é³æ¥½ããã®ä¾},
+@ruser{åä¸èã®å¤å£°},
+@ruser{è¡çªã®è§£æ±º}
diff --git a/Documentation/ja/usage/suggestions.itely b/Documentation/ja/usage/suggestions.itely
index 1147340047..60558ebbba 100644
--- a/Documentation/ja/usage/suggestions.itely
+++ b/Documentation/ja/usage/suggestions.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: 5fb3f8cf17ce7b57d22584429d736f188e4827d7
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.19.21"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -62,57 +62,96 @@ LilyPond å
¥åãã¡ã¤ã«ã¯ãã容æã« (ãããã¯ããå°é£ã«)
@section ä¸è¬çãªææ¡
@translationof General suggestions
-ããã§ãããªããåé¡ãåé¿ãããä¿®æ£ããæå©ãã«ãªã@c
-å¯è½æ§ãããææ¡ãããã¤ãæãã¾ã:
+ããã§ãèå»ã®éã«èµ·ãããæãããããåé¡ãåé¿ (ãããã¯ä¿®æ£) ãã@c
+æå©ãã«ãªãããææ¡ãããã¤ãæãã¾ã:
@itemize
-@item @strong{ãã¹ã¦ã®ãã¡ã¤ã«ã« @code{@bs{}version} çªå·ãå«ãã¾ã}ã@c
+@item
+ã©ããªã«å°ãããã¡ã¤ã«ã§ãã@strong{ãã¹ã¦ã®å
¥åãã¡ã¤ã«ã«å¿
ã
+@code{@bs{}version} çªå·ãå«ããã¹ãã§ã}ã@c
+ããã¯ãLilyPond ã®ã©ã®ãã¼ã¸ã§ã³ã§ãã¡ã¤ã«ãä½ãããããè¦ãã¦ãããªãã¦@c
+è¯ããªãã¾ããã@ref{convert-ly ã使ã£ã¦ãã¡ã¤ã«ãæ´æ°ãã} ã®éã«ç¹ã«@c
+é¢ãã£ã¦ãã¾ã (convert-ly 㯠@code{\version} ãå«ã¾ãã¦ããå¿
è¦ãããã¾ã)ã@c
+ãããã¯ä»ã®ã¦ã¼ã¶ã«å
¥åãã¡ã¤ã«ãéãé (ä¾ãã°ã¡ã¼ãªã³ã° ãªã¹ãã§å©ãã@c
+å¾ãã¨ã) ã«ãéè¦ã§ãã@c
ãã³ãã¬ã¼ãã¯ãã¹ã¦ @code{@bs{}version} æ
å ±ãä¿æãã¦ããã¨ãããã¨ã«@c
-注æãã¦ãã ããã@c
-常㫠@code{@bs{}version} ãå«ããã㨠-- ãã¡ã¤ã«ã®å¤§å°ã«ããããã --
-ãå¼·ãæ¨å¥¨ãã¾ãã@c
-å人çãªçµé¨ããè¨ã£ã¦ãæ°å¹´åã«ä½¿ã£ã¦ãã LilyPond ã®ãã¼ã¸ã§ã³ã@c
-æãåºããã¨ãããã¨ã¯å¤§å¤ãªãã¨ã§ãã@c
-@command{convert-ly} ã¯ä½¿ç¨ãã LilyPond ã®ãã¼ã¸ã§ã³ã宣è¨ãããã¨ã@c
-å¿
è¦ã¨ãã¾ãã
-
-@item @strong{ãã§ãã¯ãå«ãã¾ã}:
-@ruser{å°ç¯ã¨å°ç¯çªå·ã®ãã§ãã¯}, @ruser{ãªã¯ã¿ã¼ã ãã§ãã¯}ã@c
-æã
ãã§ãã¯ãå
¥ãã¦ããã°ããã¹ãããã¨ãã«ç´ æ©ãããã@c
-è¦ã¤ãåºããã¨ãã§ãã¾ãã@c
-@q{æã
} ã¨ã¯ã©ããããã®é »åº¦ãªã®ã§ããããï¼@c
-ããã¯ãã®é³æ¥½ã®è¤éã次第ã§ãã@c
-ã¨ã¦ãç°¡åãªé³æ¥½ã§ããã°ããã¶ã 1 åã 2 åã§ãã@c
-ã¨ã¦ãè¤éãªé³æ¥½ã§ããã°ãããããåå°ç¯ã«ãã§ãã¯ãå
¥ãã¾ãã
-
-@item @strong{ããã¹ã 1 è¡ã«ã¤ã 1 å°ç¯ã«ãã¾ã}ã@c
-é³æ¥½èªä½ãæã¿ã®åºåãè¤éã§ããå ´åã1 è¡ã« 1 å°ç¯ã ããè¨è¿°ããã¨@c
-è¯ãå ´åãå¤ãã§ãã@c
-ç»é¢ã¹ãã¼ã¹ãç¯ç´ããããã« 1 è¡ã« 8 å°ç¯ãè©°ãè¾¼ããã¨ã¯ã@c
-å
¥åãã¡ã¤ã«ã @q{ãããã°} ããªããã°ãªããªãå ´åã«ã@c
-ããããã ãã®ä¾¡å¤ã¯ããã¾ããã
-
-@item @strong{å
¥åãã¡ã¤ã«ã«ã³ã¡ã³ããã¤ãã¾ã}ã@c
-ã³ã¡ã³ãã¨ãã¦å°ç¯çªå· (æã
) ãé³æ¥½ãã¼ãã¸ã®åç
§
-(@q{second theme in violins}, @q{fourth variation}
-(@q{ã´ã¡ã¤ãªãªã³ã®ç¬¬ 2 ãã¼ã}, @q{第 4 ã´ã¡ã¤ãªãªã³})
-ãªã©) ã使ç¨ãã¾ãã@c
-åãã¦æ¥½æ²ãæ¸ãã¦ããã¨ãã¯ã³ã¡ã³ããã¤ããå¿
è¦ã¯ç¡ãããããã¾ããã@c
-ããããªãããæ°å¹´å¾ã«ä½ãå¤æ´ãå ãããã¨æã£ãå ´åãã@c
-ã½ã¼ã¹ãå人ã«æ¸¡ãå ´åãããªãããã¡ã¤ã«ã«ã³ã¡ã³ããã¤ãã¦ããªããã°ã@c
-ããªãã®æå³ããã¡ã¤ã«ãã©ã®ããã«æ§æããã¦ããã®ããç¹å®ãããã¨ã¯@c
-ãã£ã¨å¤§å¤ã«ãªãã¾ãã
-
-@item @strong{æ³¢æ¬å¼§ã«ã¤ã³ãã³ããå
¥ãã}ã@c
-å¤ãã®åé¡ã¯ @code{@{} 㨠@code{@}} ã®æ°ãé£ãéããã¨ã«ãã£ã¦çãã¾ãã
-
-@item ã»ã¯ã·ã§ã³ãå¤æ°ã®éå§æã«@strong{æ示çã«æ¼å¥æéãä»ãå ãã}ã@c
-ãã¬ã¼ãºã®éå§æã« @code{c4 d e} (@code{c d e} ã§ã¯ãªã) ã¨è¨è¿°ãã¦ããã°ã@c
-å¾ã«ãªã£ã¦é³æ¥½ãåç·¨æããå ´åã«åé¡ã®çºçãå
ããå¯è½æ§ãããã¾ãã
-
-@item é³æ¥½å®ç¾©ãã@strong{調æ´ãåé¢ãã¾ã}ã@c
-@rlearning{å¤æ°ã¨é¢æ°ãç¨ãã¦å
¥åã®æéãçã} ã¨
-@rlearning{ã¹ã¿ã¤ã« ã·ã¼ã} ãåç
§ãã¦ãã ããã
+注æãã¦ãã ããã
+
+@item
+@strong{å
¥åãã¡ã¤ã« 1 è¡ã«ã¤ãã1 å°ç¯ã®é³æ¥½ãæ¸ãã¾ã}ã ããã¯@c
+å
¥åãã¡ã¤ã«ã«é¢ããããããåé¡ã®ãããã°ãç°¡åã«ãã¾ãã
+
+@item
+@strong{@ruser{å°ç¯ã¨å°ç¯çªå·ã®ãã§ãã¯}ã¨@ruser{ãªã¯ã¿ã¼ã ãã§ãã¯}ãå«ãã¾ãã}@c
+å
¥åãã¡ã¤ã«ã«ãã®ãããª@q{ãã§ãã¯}ãå«ãã¦ãããã¨ã§ã@c
+ãã¹ãç¹å®ããã®ãæ©ããªãã¾ãã@c
+ãã§ãã¯ãã©ã®ãããã®é »åº¦ã§è¿½å ãããã¯ããã®é³æ¥½ã®è¤éã次第ã§ãã@c
+ç°¡åãªé³æ¥½ã§ããã°ãæ¦ç¥ä¸éè¦ãªãã¤ã³ãã«ããã¤ã追å ããã ãã§ååã§ãããã@c
+ããããå¤ãã®å£°é¨ãèãæã¤ãããªãã£ã¨è¤éãªé³æ¥½ã§ããã°ãããããåå°ç¯ã«@c
+ãã§ãã¯ãå
¥ããã»ããè¯ãã§ãããã
+
+@item
+@strong{å
¥åãã¡ã¤ã«ã«ã³ã¡ã³ããã¤ãã¾ã}ã@c
+ã³ã¡ã³ãã¨ãã¦é³æ¥½ãã¼ãã¸ã®åç
§
+(@q{ã´ã¡ã¤ãªãªã³ã®ç¬¬ 2 ãã¼ã}, @q{第 4 å¤å¥})
+ãªã©) ããåç´ã«å°ç¯çªå·ã追å ãããã¨ã¯ã@c
+å
¥åãã¡ã¤ã«ã®ä¸ã®å ´æãç¹å®ããã®ãç°¡åã«ãã¾ããç¹ã«å¾ã§ä½ããå¤æ´ããªããã°@c
+ãªããªãå ´åããLilyPond å
¥åãã¡ã¤ã«ãä»ã®äººã«æ¸¡ãéã«ã¯ç¹ã«å½¹ç«ã¡ã¾ãã
+
+@item
+@strong{ã»ã¯ã·ã§ã³ã®éå§æã«æ示çã«æ¼å¥æéãä»ãå ãã¾ã}ã@c
+ä¾ãã°ããã @code{c d e f} ã¨æ¸ã代ããã« @code{c4 d e f} ã¨æ¸ããã¨ã§ã@c
+å¾ã§é³æ¥½ãåé
ç½®ããã®ãç°¡åã«ãªãã¾ãã
+
+@item
+@strong{æ³¢æ¬å¼§ã¨ä¸¦å表è¨ã«ã¤ã³ãã³ããæ½ãã¾ã}ãåé¡ã¯ãã°ãã°ã@c
+ã©ã¡ããã®æ¬å¼§ã@q{足ããªã}ãã¨ãåå ã§ããæ³¢æ¬å¼§ã®@q{å§ã¾ã}ã¨@q{çµãã}
+(ããã㯠@code{<<} 㨠@code{>>}) ã«æ確ãªã¤ã³ãã³ãã追å ãããã¨ã§ã@c
+ãã®ãããªåé¡ãé¿ãããããªãã¾ããä¾ãã°ä»¥ä¸ã®å
¥å:
+
+@example
+\new Staff @{
+ \relative @{
+ r4 g'8 g c8 c4 d |
+ e4 r8 |
+ % Ossia section
+ <<
+ @{ f8 c c | @}
+ \new Staff @{
+ f8 f c |
+ @}
+ >>
+ r4 |
+ @}
+@}
+@end example
+
+@noindent
+ã¯ä»¥ä¸ã®å
¥åããæ¬å¼§ã®å¯¾å¿ã追ããããããã§ã:
+
+@example
+\new Staff @{ \relative @{ r4 g'8 g c4 c8 d | e4 r8
+% Ossia section
+<< @{ f8 c c @} \new Staff @{ f8 f c @} >> r4 | @} @}
+@end example
+
+@item
+@code{\layout} ãããã¯ã«ãªã¼ãã©ã¤ãã追å ãããã¨ã«ãã£ã¦ã@c
+@strong{é³æ¥½ã¨ã¹ã¿ã¤ã«ãåå²ãã¾ã}:
+
+@example
+\score @{
+ @var{@dots{}music@dots{}}
+ \layout @{
+ \override TabStaff.Stemstencil = ##f
+ @}
+@}
+@end example
+
+ãã®ãªã¼ãã©ã¤ãã¯æ°ããã³ã³ããã¹ããçæãã¾ãããã@c
+ã³ã³ããã¹ããçæãããéã«é©ç¨ããã¾ãã@c
+@rlearning{å¤æ°ã¨é¢æ°ãç¨ãã¦å
¥åã®æéãçã}ã@c
+@rlearning{ã¹ã¿ã¤ã« ã·ã¼ã}ãåç
§ãã¦ãã ããã
@end itemize
@@ -148,7 +187,7 @@ LilyPond å
¥åãã¡ã¤ã«ã¯ãã容æã« (ãããã¯ããå°é£ã«)
移調楽å¨ã®é³ç¬¦ã¯ä»¥ä¸ã§å²ããã¨ãæ¨å¥¨ãã¾ã:
@example
-\transpose c natural-pitch @{...@}
+\transpose c natural-pitch @{@dots{}@}
@end example
@noindent
@@ -188,7 +227,7 @@ LilyPond å
¥åãã¡ã¤ã«ã®æ§é ããã£ããããã¦ãããã¨ãä¸
violin = \relative @{
g'4 c'8. e16
@}
-...
+@dots{}
\score @{
\new GrandStaff @{
\new Staff @{
@@ -225,7 +264,7 @@ LilyPond ãè¿ãã¡ãã»ã¼ã¸ã¯ã¨ã©ã¼ãè¦ã¤ãåºã@c
åé¡ã®åå ãæ¢ãåºãããã«èª¿æ»ãè¡ãå¿
è¦ãããã¾ãã
ãã®ç®çã®ããã®æãå¼·åãªãã¼ã«ã¯ 1 è¡ã³ã¡ã³ã (@code{%} ã§è¨è¿°ãã¾ã) ã¨@c
-ããã㯠ã³ã¡ã³ã (@code{%@{ ... %@}} ã§è¨è¿°ãã¾ã) ã§ãã@c
+ããã㯠ã³ã¡ã³ã (@code{%@{@dots{}%@}} ã§è¨è¿°ãã¾ã) ã§ãã@c
åé¡ãã©ãã«ãããããããªãå ´åã@c
å
¥åãã¡ã¤ã«ã®å¤§ããªä¸é¨åãã³ã¡ã³ã ã¢ã¦ããããã¨ããå§ãã¾ãã@c
ããã»ã¯ã·ã§ã³ãã³ã¡ã³ã ã¢ã¦ããã¦ããã®ãã¡ã¤ã«ãåã³ã³ã³ãã¤ã«ãã¦ã¿ã¾ãã@c
@@ -276,6 +315,9 @@ bass = \relative @{
@section Make 㨠Makefile
@translationof Make and Makefiles
+@cindex makefiles
+@cindex make
+
LilyPond ãå®è¡ã§ããã»ã¨ãã©ãã¹ã¦ã®ãã©ãããã©ã¼ã ã
@code{make} ã¨ããã½ããã¦ã§ã¢ããµãã¼ããã¾ãã@c
ãã®ã½ããã¦ã§ã¢ã¯ @code{Makefile} ã¨ããååã®ç¹æ®ãªãã¡ã¤ã«ãèªã¿è¾¼ã¿ã¾ãã@c
diff --git a/Documentation/ja/usage/updating.itely b/Documentation/ja/usage/updating.itely
index 6d9d3e3266..d3c613c8ea 100644
--- a/Documentation/ja/usage/updating.itely
+++ b/Documentation/ja/usage/updating.itely
@@ -1,7 +1,7 @@
@c -*- coding: utf-8; mode: texinfo; documentlanguage: ja -*-
@ignore
- Translation of GIT committish: fabcd22c8f88ea9a87241597f1e48c0a9adbfc6e
+ Translation of GIT committish: 5fb3f8cf17ce7b57d22584429d736f188e4827d7
When revising a translation, copy the HEAD committish of the
version that you are working on. For details, see the Contributors'
@@ -10,7 +10,7 @@
@c \version "2.16.0"
-@c Translators: Yoshiki Sawada
+@c Translators: Tomohiro Tatejima, Yoshiki Sawada
@c Translation status: post-GDP
@@ -21,13 +21,13 @@
@cindex Updating a LilyPond file (LilyPond ãã¡ã¤ã«ãæ´æ°ãã)
@cindex convert-ly
-LilyPond ã®å
¥åæ§æã¯ããã¾ãã¾ãªæ¹æ³ã§åç´åã¾ãã¯æ¹åããããã«ã@c
-å®æçã«å¤æ´ããã¾ãã@c
-ãã®å¯ä½ç¨ã¨ãã¦ãLilyPond ã®ã¤ã³ã¿ããªã¿ã¯@c
-ãã°ãã°å¤ãå
¥åãã¡ã¤ã«ã¨äºææ§ãæããªããªãã¾ãã@c
-ãããææ¸ããããã«ãããã°ã©ã @command{convert-ly} ãç¨ãããã¨ã§ã@c
-ããã¦ãã® LilyPond ã®ãã¼ã¸ã§ã³éã§ã®æ§æå¤æ´ãå¦çãããã¨ãã§ãã¾ãã
+LilyPond ãæ¹åãã¦ããã«ã¤ããããã¤ãã®ã³ãã³ããé¢æ°ã®æ§æ (å
¥åè¨èª) ã¯@c
+å¤ãããã¨ãããã¾ãããã®ãã¨ã«ãã£ã¦ãæã®ãã¼ã¸ã§ã³ã® LilyPond ã§ä½ããã@c
+å
¥åãã¡ã¤ã«ãæ°ãããã¼ã¸ã§ã³ã§ä½¿ãæã«ãäºæããªãã¨ã©ã¼ãè¦åããããã¯@c
+誤ã£ãåºåãå¼ãèµ·ããå¯è½æ§ãããã¾ãã
+ããã«å¯¾å¦ããããããã®ãããªæã®å
¥åãã¡ã¤ã«ãæ°ããæ§æã«æ´æ°ãã
+@command{convert-ly} ã³ãã³ãã使ããã¨ãã§ãã¾ãã
@menu
* ä½æ
æ§æã¯å¤æ´ãããã®ãï¼::
@@ -35,6 +35,7 @@ LilyPond ã®å
¥åæ§æã¯ããã¾ãã¾ãªæ¹æ³ã§åç´åã¾ãã¯æ¹å
* convert-ly ã®ã³ãã³ã ã©ã¤ã³ ãªãã·ã§ã³::
* convert-ly ã®åé¡ç¹::
* æåå¤æ::
+* è¤æ°ã®ãã¼ã¸ã§ã³ã«å¯¾å¿ããã³ã¼ããæ¸ã::
@end menu
@node ä½æ
æ§æã¯å¤æ´ãããã®ãï¼
@@ -44,12 +45,12 @@ LilyPond ã®å
¥åæ§æã¯ããã¾ãã¾ãªæ¹æ³ã§åç´åã¾ãã¯æ¹å
@cindex convert-ly
@cindex updating old input files (å¤ãå
¥åãã¡ã¤ã«ãæ´æ°ãã)
-LilyPond ã®å
¥åæ§æã¯ãã°ãã°å¤æ´ããã¾ãã@c
-LilyPond èªä½ãæ¹è¯ããããããæ§æ (å
¥åè¨èª) ãããã«åããã¦å¤æ´ããã¾ãã@c
-å¤æ´ã®ç®çã¯ãå
¥åãã¡ã¤ã«ãèªã¿ããããæ¸ããããããããã§ãã£ããã@c
-LilyPond ã«æ°ããæ©è½ãæãããããã§ãã£ãããã¾ãã
+å
¥åãã¡ã¤ã«ãèªã¿ããããæ¸ããããããããã«ããã°ãã°æ§æã¯å¤æ´ããã¾ããã@c
+æã«ããæ¢åã®é¢æ°ããæ°ããæ©è½ãæ¹åã«åããã¦å¤æ´ããããã¨ãããã¾ãã
-ä¾ãã°ã@code{\paper} 㨠@code{\layout} ã®ããããã£åã¯
+ãããå®éã«ãã£ãä¾ã§ã:
+
+@code{\paper} 㨠@code{\layout} ã®ããããã£åã¯å
¨ã¦ã@c
@code{first-second-third} ã¨ããå½¢å¼ã§è¨è¿°ãããã¨ã«ãªã£ã¦ãã¾ãã@c
ããããªããããã¼ã¸ã§ã³ 2.11.60 㧠@code{printallheaders} ããããã£ã@c
ãã®è¦åã«å¾ã£ã¦ããªããã¨ãå¤æãã¾ããã@c
@@ -57,71 +58,138 @@ LilyPond ã«æ°ããæ©è½ãæãããããã§ãã£ãããã¾ãã
(æ°ããã¦ã¼ã¶ã¯ã¤ãã¤ã¾ã®åããªãå
¥åå½¢å¼ã§æ··ä¹±ããã§ãããã)
ããã¨ããå¤æ´ãã¹ãã§ããããï¼
(æ¢åã®æ¥½èãæã¤ã¦ã¼ã¶ã«ã¯ç
©ããããã¨ã§ãã)
+
ãã®ã±ã¼ã¹ã§ã¯ãããããã£åã @code{print-all-headers} ã«å¤æ´ãããã¨ã@c
-決æãã¾ããã@c
-幸éãªãã¨ã«ã@c
-ãã®å¤æ´ã¯ @command{convert-ly} ãã¼ã«ã§èªåçã«å¤æãããã¨ãã§ãã¾ãã
+決æãã¾ãããããã¦ãæã®ã¦ã¼ã¶ã¯ @command{convert-ly} ã³ãã³ãã«ãã£ã¦@c
+æ¢ã«ããå
¥åãã¡ã¤ã«ãèªåçã«ã¢ãããã¼ããããã¨ãã§ãã¾ããã
-ä¸å¹¸ãªãã¨ã«ã@c
+ãããã@c
@command{convert-ly} ã¯ãã¹ã¦ã®å¤æ´ãå¦çã§ããããã§ã¯ããã¾ããã@c
-ä¾ãã°ããã¼ã¸ã§ã³ 2.4 以åã® LilyPond ã§ã¯ã@c
-ã¢ã¯ã»ã³ãæåã¨éè±èªæåã LaTeX ãç¨ãã¦å
¥åãã¦ãã¾ãã
--- Christmas ã®ãã©ã³ã¹èªã¯ @code{No\"el} ã®ããã«å
¥åããã¦ãã¾ããã@c
+ä¾ãã°ããã¼ã¸ã§ã³ 2.4.2 以åã® LilyPond ã§ã¯ã@c
+ã¢ã¯ã»ã³ãæåã¨éè±èªæåã LaTeX ã®è¨æ³ãç¨ãã¦å
¥åãã¦ãã¾ããã
+ä¾ãã° Christmas ã®ãã©ã³ã¹èªã¯ @code{No\"el} ã®ããã«å
¥åããã¦ãã¾ããã@c
ããããªããããã¼ã¸ã§ã³ 2.6 以éã® LilyPond ã§ã¯ã@c
-ç¹æ®æå @code{ë} ã UTF-8 æåã¨ãã¦ç´æ¥ LilyPond ãã¡ã¤ã«ã«@c
-å
¥åãããã¨ã«ãªãã¾ããã@c
+ç¹æ®æå @code{ë} ã UTF-8 æåã¨ãã¦ç´æ¥ LilyPond ãã¡ã¤ã«ã«@c
+å
¥åããªããã°ãªããªããªãã¾ããã@c
@command{convert-ly} ã¯ãã¹ã¦ã® LaTeX ã®ç¹æ®æåã UTF-8 æåã«å¤æãã@c
ãã¨ã¯ã§ãã¾ããã@c
æåã§å¤ã LilyPond å
¥åãã¡ã¤ã«ãæ´æ°ããå¿
è¦ãããã¾ãã
+@command{convert-ly} ã³ãã³ãã®å¤æã«ã¼ã«ã¯ãããã¹ãã®ãã¿ã¼ã³ãããã³ã°ã¨@c
+ç½®æã«ãã£ã¦åä½ãã¦ãã¾ã (ã¤ã¾ããä¸ããããå
¥åãã¡ã¤ã«ã®ä¸ã§ä½ã@c
+å¤æ´ããããã®æèã@q{ç解}ãã¦ã¯ããªãã¨ãããã¨ã§ã)ã
+ããã¯ããã¤ãã®çµæãããããã¾ã:
+
+@itemize @bullet
+@item
+å¤æã®ä¿¡é ¼æ§ã¯ãããããã®é©ç¨ãããã«ã¼ã«ã»ããã®å質ã¨ã@c
+対å¿ããå¤æ´ã®è¤éã次第ã§ããå¤æãã追å ã»æåã®ä¿®æ£ãè¦æ±ãããã¨ã@c
+ããã¾ããã§ãããä¸ãä¸ã®ããã«ãå¤æåã®å
¥åãã¡ã¤ã«ã¯æ¯è¼ã®ããã«@c
+æ®ãã¦ããã¹ãã§ãã
+
+@item
+ããæ°ãããã¼ã¸ã§ã³ã¸ã®æ§æã®å¤æ´ã®ã¿ãå¯è½ã§ã: LilyPond ã®æã®ãã¼ã¸ã§ã³ã¸@c
+å¤æããã«ã¼ã«ã»ããã¯åå¨ãã¾ããããã®ãããå
¥åãã¡ã¤ã«ãæ´æ°@c
+ããã®ã¯ãæã®ãã¼ã¸ã§ã³ã® LilyPond ãããã¡ã³ããã³ã¹ããã¦ããªãæã«éã@c
+ã¹ãã§ããç¹°ãè¿ãã¾ãããä¸ãä¸ã®ããã«å¤æåã®å
¥åãã¡ã¤ã«ã¯æ®ãã¦ããã¹ã@c
+ã§ããGit ã®ãããªãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã使ãã¨ãè¤æ°ã®ãã¼ã¸ã§ã³ã®@c
+å
¥åãã¡ã¤ã«ã管çããã®ã«å½¹ç«ã¤ããããã¾ããã
+
+@item
+LilyPond ã¯å¦çã®éãä½è¨ã«é
ç½®ãããããããã¯çç¥ããã空ç½ã«@c
+å·¦å³ããã¾ããããããã@command{convert-ly} ã§ç¨ããããã«ã¼ã«ã¯ã³ã¼ãã®@c
+ã¹ã¿ã¤ã«ã«ããããã®ä»®å®ãç½®ãå ´åãããã¾ããã§ããããæ£å¸¸ãªå¤æã@c
+è¡ãããã«ãLilyPond ã®ããã¥ã¢ã«ã§ç¨ããããã¹ã¿ã¤ã«ã«å¾ããã¨ãæ¨å¥¨ãã¾ãã@c
+ç¹ã«ããã¥ã¢ã«èªä½ããã¹ã¦ã®ä¾ã @command{convert-ly} ã³ãã³ãã§@c
+æ´æ°ããã¦ãã¾ãã
+@end itemize
+
@node convert-ly ãå¼ã³åºã
@section @command{convert-ly} ãå¼ã³åºã
@translationof Invoking convert-ly
-@command{convert-ly} ã¯å¤ããã¼ã¸ã§ã³çªå·ãæ¤åºããããã«@c
-å
¥åãã¡ã¤ã«ã® @code{version} ã¹ãã¼ãã¡ã³ãã使ç¨ãã¾ãã@c
+@command{convert-ly} ã³ãã³ãã¯å¤ããã¼ã¸ã§ã³ãæ¤åºããããã«@c
+å
¥åãã¡ã¤ã«ã® @code{version} çªå·ã使ç¨ãã¾ãã@c
ããã¦ãã®å ´åãããªãã®å
¥åãã¡ã¤ã«ãæ´æ°ããã«ã¯ã@c
-ãã®ãã¡ã¤ã«ãä¿æãã¦ãããã£ã¬ã¯ããªã§ä»¥ä¸ãå®è¡ãããã¨ã§ååã§ã:
+ãã®å
¥åãã¡ã¤ã«ãä¿æãã¦ãããã£ã¬ã¯ããªã§ä»¥ä¸ãå®è¡ããã ãã§ååã§ã:
@example
convert-ly -e myfile.ly
@end example
@noindent
-ããã«ããã@code{myfile.ly} ã¯æ´æ°ããã@c
-ãªãªã¸ãã« ãã¡ã¤ã«ã¯ @code{myfile.ly~} ã«ä¿åããã¾ãã
+ããã«ããã@code{myfile.ly} ã¯ãã®å ´ã§æ´æ°ããã@c
+ãªãªã¸ãã« ãã¡ã¤ã«ã¯ @code{myfile.ly~} ã«ååãå¤æ´ããã¦ä¿åããã¾ãã@c
+æ´æ°ãããå
¥åãã¡ã¤ã«ã® @code{\version} çªå·ããå¿
è¦ãªæ§æã®æ´æ°ã«åããã¦@c
+å¤æ´ããã¾ãã
-@warning{@command{convert-ly} ã®ãã¼ã¸ã§ã³ã¯ã@c
-ãããæ±ãææ°ã®æ§æå¤æ´ã«åããã¦å¤æ´ããã¾ãã@c
-ãã®ãããå
¥åãã¡ã¤ã«ã® @code{\version} çªå·ã¯ããã¦ã@c
-@command{convert-ly} ã®ãã¼ã¸ã§ã³ãããä½ããã¨ã«ãªãã¾ãã}
+@command{convert-ly} ã³ãã³ããå®è¡ãããæãå¤æãè¡ããããã¼ã¸ã§ã³ã®çªå·ã@c
+åºåãã¾ãããã¼ã¸ã§ã³çªå·ãåºåãããªãã£ãå ´åããã®ãã¡ã¤ã«ã¯æ¢ã«@c
+æ´æ°ããã¦ãããææ°ã® LilyPond æ§æã使ç¨ãã¦ãã¾ãã
-ãã£ã¬ã¯ããªã®ä¸ã«ããå
¥åãã¡ã¤ã«ããã¹ã¦å¤æããã«ã¯ã@c
-以ä¸ã®ããã«ãã¾ã:
+@warning{LilyPond ã®æ°ãããã¼ã¸ã§ã³ãã¨ã«ãæ°ãã @command{convert-ly}
+ã³ãã³ããä½ããã¾ããããããå
¨ã¦ã®ãã¼ã¸ã§ã³ããã®åã®ãã¼ã¸ã§ã³ã®@c
+å
¥åãã¡ã¤ã«ããæ§æã®å¤æ´ãå¿
è¦ã¨ããããã§ã¯ããã¾ãããã¤ã¾ã
+@command{convert-ly} ã³ãã³ãã¯ãå
¥åãã¡ã¤ã«ããã®æç¹ã®ææ°ã®æ§æã«ã¾ã§@c
+ããå¤æããªãã¨ãããã¨ã§ãããéã«è¨ãã°ãå¤æããããã¡ã¤ã«ã®
+@code{\version} çªå·ã @command{convert-ly} ã³ãã³ãèªä½ã®ãã¼ã¸ã§ã³ãã@c
+åã®ãã¼ã¸ã§ã³ã«ãªãå ´åãããã¨ãããã¨ã§ãã}
+
+åä¸ã®ãã£ã¬ã¯ããªã«ããå
¨ã¦ã®å
¥åãã¡ã¤ã«ãå¤æããã«ã¯ã以ä¸ã®ããã«ãã¾ã:
@example
convert-ly -e *.ly
@end example
-ãªãªã¸ãã« ãã¡ã¤ã«ããã®ã¾ã¾æ®ãã¦ããã
-æ´æ°ããããã¡ã¤ã«ã«æ°ãããã¡ã¤ã«åãæå®ããã«ã¯ä»¥ä¸ã®ããã«ãã¾ã:
+Linux ã MacOS@tie{}X ã®ã¦ã¼ã¶ã¼ã¯ãé©å½ãªã¿ã¼ããã«ãããã®ã³ãã³ãã@c
+å®è¡ã§ãã¾ãããMacOS@tie{}X ã®ã¦ã¼ã¶ã¼ã¯ãã¡ãã¥ã¼ã®
+@code{Compile > Update syntax} ãããç´æ¥ã³ãã³ããå®è¡ã§ãã¾ãã
+
+Windows ã¦ã¼ã¶ã¼ãã³ãã³ã ã©ã¤ã³ãç¨ããå ´åã¯ãã®ããã«ãªãã¾ã:
@example
-convert-ly myfile.ly > mynewfile.ly
+convert-ly.py -e *.ly
+@end example
+
+@noindent
+ãããã@code{ã³ãã³ã ããã³ãã}ããå®è¡ãã¾ãã@c
+@code{ã³ãã³ã ããã³ãã}ã¯é常ã@c
+@code{ã¹ã¿ã¼ã > ã¢ã¯ã»ãµãª > ã³ãã³ã ããã³ãã}ã«ããã¾ããã@c
+Windows 8 ã¦ã¼ã¶ã¼ã§ãããªããæ¤ç´¢ã¦ã£ã³ãã¦ã«@q{ã³ãã³ã ããã³ãã}ã¨@c
+å
¥åãããã¨ã§ãå®è¡ã§ãã¾ãã
+
+è¤æ°ã®ãµããã£ã¬ã¯ããªå
ã«ããå
¨ã¦ã®å
¥åãã¡ã¤ã«ãå¤æããã«ã¯ã@c
+以ä¸ã®ããã«ãã¾ã:
+
+@example
+find . -name '*.ly' -exec convert-ly -e '@{@}' \;
@end example
-ãã®ããã°ã©ã ã¯å¤æå
ã®ãã¼ã¸ã§ã³çªå·ããªã¹ãã¢ãããã¾ãã
-ãã¼ã¸ã§ã³çªå·ããªã¹ãã¢ãããããªãå ´åã@c
-ãã®ãã¡ã¤ã«ã¯ææ°ã§ããã¨ãããã¨ã«ãªãã¾ãã
+ãã®ä¾ã¯ãç¾å¨ã®ãã£ã¬ã¯ããªã¨ãã®ä¸ã«ããå
¨ã¦ã®ãã£ã¬ã¯ããªã«åå¨ãã@c
+å
¥åãã¡ã¤ã«ããå帰çã«è¦ã¤ãåºãå¤æãã¾ããå¤æããããã¡ã¤ã«ã¯@c
+ãªãã¼ã ãããå
ã®ãã¡ã¤ã«ã¨åããã£ã¬ã¯ããªã«é
ç½®ããã¾ããããã¯
+MacOS@tie{}X ã§ãåä½ããã¯ãã§ã (ã¿ã¼ããã«ããã®å®è¡ã®ã¿ã¨ãªãã¾ãã)ã
+
+Windows ã¦ã¼ã¶ã¼ã¯ä»¥ä¸ã®ããã«ãã¾ã:
+
+@example
+forfiles /s /M *.ly /c "cmd /c convert-ly.py -e @@file"
+@end example
+
+代ããã«ã@code{/p} ãªãã·ã§ã³ã使ã£ã¦ãå
¥åãã¡ã¤ã«ãå«ãå
¨ã¦ã®ãµããã©ã«ãã@c
+ä¿æãããããã¬ãã«ã®ãã©ã«ããæå®ãããã¨ãã§ãã¾ã:
+
+@example
+forfiles /s /p C:\Documents\MyScores /M *.ly /c "cmd /c convert-ly.py -e @@file"
+@end example
-MacOS@tie{}X ã¦ã¼ã¶ã¯ãã®ã³ãã³ããã¡ãã¥ã¼ ã¨ã³ããª
-(@code{Compile > Update syntax}) ä¸ã§å®è¡ãããã¨ã«ãªãããããã¾ããã
+ãããã¬ãã«ã®ãã©ã«ãã¸ã®ãã¹ã«ã¹ãã¼ã¹ãå«ã¾ããå ´åã«ã¯ããã¹å
¨ä½ã@c
+ããã«ã¯ã©ã¼ãã§æ¬ãå¿
è¦ãããã¾ã:
-Windows ã¦ã¼ã¶ã¯ãããã®ã³ãã³ãã @q{ã³ãã³ã ããã³ãã} ã¦ã£ã³ãã¦ãã@c
-å®è¡ããå¿
è¦ãããã¾ãã@c
-ã³ãã³ã ããã³ããã¯é常ã@code{ã¹ã¿ã¼ã > ã¢ã¯ã»ãµãª > ã³ãã³ã ããã³ãã}
-ã§è¦ã¤ããã¾ãã
+@example
+forfiles /s /p "C:\Documents\My Scores" /M *.ly /c "cmd /c convert-ly.py -e @@file"
+@end example
@node convert-ly ã®ã³ãã³ã ã©ã¤ã³ ãªãã·ã§ã³
@@ -138,11 +206,37 @@ convert-ly [@var{option}]@dots{} @var{filename}@dots{}
@table @code
@item -d, --diff-version-update
-@code{\version} ãææ°ã«æ´æ°ãã¾ããææ°ãã¼ã¸ã§ã³ããã大ããå ´åã¯@c
-ä½ããã¾ããã
+ãã¡ã¤ã«ãå®éã«å¤æ´ãããå ´åã«ã®ã¿ @code{\version} ãæ´æ°ãã¾ãã
+ãããæå®ããå ´åã®ãã¼ã¸ã§ã³çªå·ã¯ãæå¾ã«å®éã«å¤æãè¡ãããå¾ã®@c
+ãã¼ã¸ã§ã³ã«å¯¾å¿ãã¾ããä¸å®å®çã®ãã¼ã¸ã§ã³çªå·ã¯ãã¿ã¼ã²ããã®@c
+ãã¼ã¸ã§ã³çªå·ãè¶
ããªãéãã次ã®å®å®çã®ãã¼ã¸ã§ã³çªå·ã«ä¸ãããã¾ãã@c
+ãã®ãªãã·ã§ã³ãæå®ããªãã¨ãæå¾ã®å¤æã@emph{è¡ããã¨ãã}ãã¼ã¸ã§ã³ã«æ´æ°@c
+ããã¾ãã
@item -e, --edit
-å
¥åãã¡ã¤ã«ã«ç´æ¥å¤æãé©ç¨ãã¦ãããããã®å ´ã§å¤æ´ãã¾ãã
+å
¥åãã¡ã¤ã«ããã®å ´ã§ç´æ¥å¤æãã¾ãã@c
+å¤æå
ã®ãã¡ã¤ã«ã¯ @file{myfile.ly~} ã®ããã«ååãå¤æ´ããã¾ãã@c
+ãã®ããã¯ã¢ãããã¡ã¤ã«ã¯ããªãã¬ã¼ãã£ã³ã°ã·ã¹ãã ã«ãã£ã¦ã¯@c
+é ããã¡ã¤ã«ã¨ãã¦æ±ããã¦ããããããã¾ããã@c
+å¤ãå
¥åãã¡ã¤ã«ã« @code{~} ãä»å ãã @code{-e} ã使ããã«ã@c
+æ´æ°ããããã¡ã¤ã«ã®ååãå¥ã«æå®ãããå ´åã¯ã代ããã«@c
+åºåããªãã¤ã¬ã¯ããããã¨ãã§ãã¾ã:
+
+@example
+convert-ly myfile.ly > mynewfile.ly
+@end example
+
+Windows ã¦ã¼ã¶ã¼ã¯:
+
+@example
+convert-ly.py myfile.ly > mynewfile.ly
+@end example
+
+@item -b, --backup-numbered
+@samp{-e} ãªãã·ã§ã³ã¨åæã«ç¨ããå ´åãåã®ãã¼ã¸ã§ã³ã®ãã¡ã¤ã«ãä¸æ¸ã@c
+ãããªãããã«ãããã¯ã¢ãããã¡ã¤ã«ã®ååã«çªå·ãä»ãã¾ãã@c
+ããã¯ã¢ãããã¡ã¤ã«ã¯ããªãã¬ã¼ãã£ã³ã°ã·ã¹ãã ã«ãã£ã¦ã¯@c
+é ããã¦ããããããã¾ããã
@item -f, --from=@var{from-patchlevel}
å¤æå
ã®ãã¼ã¸ã§ã³ãã»ãããã¾ãã@c
@@ -169,7 +263,8 @@ convert-ly [@var{option}]@dots{} @var{filename}@dots{}
@item -t, --to=@var{to-patchlevel}
å¤æå
ã®ãã¼ã¸ã§ã³ãæ示ãã¦ã»ãããã¾ãã@c
-æ示ãããªãå ´åã¯ãããã©ã«ãã§ææ°ãã¼ã¸ã§ã³ã«ã»ãããã¾ãã
+æ示ãããªãå ´åã¯ãããã©ã«ãã§ææ°ãã¼ã¸ã§ã³ã«ã»ãããã¾ãã@c
+å¤æå
ã®ãã¼ã¸ã§ã³ãããé«ããªã£ã¦ããå¿
è¦ãããã¾ãã
@example
convert-ly --to=2.14.1 myfile.ly
@@ -181,14 +276,14 @@ texinfo ãã¡ã¤ã«ã®ä¸ã«ãã LilyPond æçãæ´æ°ããã«ã¯@c
以ä¸ã使ç¨ãã¦ãã ãã:
@example
-convert-ly --from=... --to=... --no-version *.itely
+convert-ly --from=@dots{} --to=@dots{} --no-version *.itely
@end example
2 ã¤ã®ãã¼ã¸ã§ã³éã§ã® LilyPond æ§æã®å¤æ´ã調ã¹ãã«ã¯ã@c
以ä¸ã使ç¨ãã¦ãã ãã:
@example
-convert-ly --from=... --to=... -s
+convert-ly --from=@dots{} --to=@dots{} -s
@end example
@@ -295,3 +390,44 @@ converted.
\score{} must now begin with a music expression. Anything else
(particularly \header{}) must come after the music.
@end verbatim
+
+
+@node è¤æ°ã®ãã¼ã¸ã§ã³ã«å¯¾å¿ããã³ã¼ããæ¸ã
+@section è¤æ°ã®ãã¼ã¸ã§ã³ã«å¯¾å¿ããã³ã¼ããæ¸ã
+@translationof Writing code to support multiple versions
+
+ããã¤ãã®å ´é¢ã§ãç¹ã«@emph{ã©ã¤ãã©ãªã®}ã³ã¼ããæ¸ãå ´åãç ´å£çãªæ§æå¤æ´ã@c
+å«ãã è¤æ°ã® LilyPond ãã¼ã¸ã§ã³ããµãã¼ããããã¨ã¯æã¾ããã§ãããã@c
+ããã¯ããã¼ã¸ã§ã³ã«ãã£ã¦å¤æ´ãå¿
è¦ãªé¨åããç¾å¨å®è¡ããã¦ãã
+LilyPond ã®ãã¼ã¸ã§ã³ã§åå²ããæ¡ä»¶æã§å²ããã¨ã§å®ç¾ã§ãã¾ãã@c
+Scheme é¢æ° @code{ly:version?} ã¯æ¯è¼æ¼ç®å @var{op} ã¨ãæ¯è¼ã®å¯¾è±¡ã¨ãªã@c
+ãã¼ã¸ã§ã³ã 3 ã¤ã¾ã§ã®æ´æ°ã®ãªã¹ãã§è¡¨ç¾ãã @var{ver} ãå¼æ°ã«åãã¾ãã
+æ´æ°ã®æ°ã足ããªãå ´åã¯ç¡è¦ããã¾ããä¾ãã°ã@code{'(2 20)} ã¯@c
+@emph{å
¨ã¦ã®} 2.20 ã®ç³»åã®ãã¼ã¸ã§ã³ã¨çãããªãã¾ãã@c
+ãã®ãããªè¡¨è¨ãå¯è½ã§ã:
+
+@verbatim
+#(cond
+ ((ly:version? > '(2 20))
+ (ly:message "This is code to run for LilyPond after 2.20"))
+ ((ly:version? = '(2 19 57))
+ (ly:message "This will only be executed with LilyPond 2.19.57"))
+ (else (ly:message "This will be executed in any other version")))
+@end verbatim
+
+é常ããã㯠(訳注: ãã¼ã¸ã§ã³ã«ãã£ã¦) å¥ã®æ§æã使ããããã«ããããã«@c
+ã©ã¤ãã©ãªé¢æ°ã«çµã¿è¾¼ã¾ãã¾ããã以ä¸ã®ä¾ã®ããã«ãæ¯è¼ãç´æ¥é³æ¥½ã®ä¸ã«@c
+ç¨ãããã¨ãã§ãã¾ã:
+
+@verbatim
+{
+ c' d' e' f'
+ #(if (ly:version? = '(2 21))
+ #{ \override NoteHead.color = #red #}
+ #{ \override NoteHead.color = #blue #})
+ g' a' b' c''
+}
+@end verbatim
+
+@strong{注æ:} ãã®é¢æ°ã¯ LilyPond 2.19.57 ã§å°å
¥ããã¾ããã@c
+ãã®ãããããããå¤ããã¼ã¸ã§ã³ã¨æ¯è¼ãããã¨ã¯ã§ãã¾ããã
diff --git a/Documentation/nl/translations.itexi b/Documentation/nl/translations.itexi
index e726c18c5d..0f37c807fd 100644
--- a/Documentation/nl/translations.itexi
+++ b/Documentation/nl/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Meest recente update Sat Jun 24 12:50:41 UTC 2017
+@emph{Meest recente update Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -285,7 +285,7 @@ ja
@item
Inleiding
@*
-5793
+5800
@tab Jan Nieuwenhuizen
@tab Tineke de Munnik
@tab
@@ -302,7 +302,7 @@ ja
@ifhtml
@html
-<span style="background-color: #efff3a">gedeeltelijk</span>
+<span style="background-color: #f6fe3b">gedeeltelijk</span>
@end html
@end ifhtml
@ifnothtml
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely
index 4970bccd79..6a30ee6044 100644
--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -2804,21 +2804,62 @@ Here are a few sample bars of music set in LilyPond's Feta glyphs:
@sourceimage{Gonville_before,15cm,,}
-@subsubheading Installation Instructions for MacOS
+@subsubheading Installation Instructions
+
+Download and extract the font files.
+Copy the
+@file{gonville-11.otf},
+@file{gonville-13.otf},
+@file{gonville-14.otf},
+@file{gonville-16.otf},
+@file{gonville-18.otf},
+@file{gonville-20.otf},
+@file{gonville-23.otf},
+@file{gonville-26.otf}, and @file{gonville-brace.otf}
+files to @file{@dots{}/share/lilypond/current/fonts/otf} or
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/otf}.
+If you have @file{gonville-*.svg} and @file{gonville-*.woff} files,
+copy them to @file{@dots{}/share/lilypond/current/fonts/svg} or
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/svg}.
+For more information, see @rlearning{Other sources of information}.
+
+Note: @file{gonville-*.otf} files are
+for @code{ps} and @code{eps} backend (for PDF and PostScript outputs).
+@file{gonville-*.svg} files are
+for @code{svg} backend without @code{svg-woff} option.
+@file{gonville-*.woff} files are
+for @code{svg} backend with @code{svg-woff} option.
+For more information, see @rprogram{Advanced command line options for LilyPond}.
+
+The following syntax changes the notation font (general and brace)
+to the Gonville font.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "gonville"
+ #:brace "gonville"
+ ))
+@}
+@end example
-Download and extract the zip file. Copy the @code{lilyfonts}
-directory to @file{@var{SHARE_DIR}/lilypond/current}; for more
-information, see @rlearning{Other sources of information}. Rename the
-existing @code{fonts} directory to @code{fonts_orig} and the
-@code{lilyfonts} directory to @code{fonts}. To revert back to Feta,
-reverse the process.
+Note: Each call to @code{set-global-fonts} completely resets both the main
+notation and text fonts. If any category is left unspecified, then the default
+font will be used for that category.
+Each call to @code{set-global-fonts} changes the fonts for each @code{\book}
+that follows it, whether created explicitly or implicitly. This means that each
+@code{\book} can have its own set of main fonts by calling
+@code{set-global-fonts} before it.
+For more information, see @ref{Entire document fonts}.
@seealso
Learning Manual:
@rlearning{Other sources of information}.
Notation Reference:
-@ref{The Emmentaler font}.
+@ref{The Emmentaler font},
+@ref{Entire document fonts}.
@knownissues
Gonville cannot be used to typeset @q{Ancient Music} notation and it is
@@ -2827,6 +2868,43 @@ Gonville font family. Please refer to the author's website for more
information on these and other specifics, including licensing of
Gonville.
+@subsubheading Other notation fonts
+
+If you have other notation fonts like @file{@var{fontname}-*.otf},
+@file{@var{fontname}-*.svg}, and @file{@var{fontname}-*.woff},
+you can use them in the same way as Gonville.
+
+That is, copy the
+@file{@var{fontname}-*.otf}
+files to @file{@dots{}/share/lilypond/current/fonts/otf} or
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/otf}.
+If you have @file{@var{fontname}-*.svg} and @file{@var{fontname}-*.woff} files,
+copy them to @file{@dots{}/share/lilypond/current/fonts/svg} or
+@file{@dots{}/share/lilypond/@var{X.Y.Z}/fonts/svg}.
+
+Note: At the moment, LilyPond expects the font file names to have the following
+suffixes, all of which must be present in the above installation folder(s) to
+work properly:
+@file{-11}, @file{-13}, @file{-14}, @file{-16},
+@file{-18}, @file{-20}, @file{-23}, @file{-26}, @file{-brace}.
+For example, @file{emmentaler-11.otf}, @file{emmentaler-20.svg},
+and @file{emmentaler-brace.woff} etc.
+
+The following syntax changes the notation font (general and brace)
+to the @var{fontname} font.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "@var{fontname}" ; font filename without suffix and extension
+ #:brace "@var{fontname}" ; font filename without suffix and extension
+ ))
+@}
+@end example
+
+Note: For @code{music} and @code{brace} categories,
+specify the font filename without the suffix and extension.
@node Creating MIDI output
@section Creating MIDI output
diff --git a/Documentation/notation/pitches.itely b/Documentation/notation/pitches.itely
index 15af95d140..6b921cec27 100644
--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -3252,8 +3252,8 @@ Internals Reference:
@cindex Southern Harmony note heads
@cindex Funk shape note heads
@cindex note heads, Funk
-@cindex note heads, Harmonica Sacra
-@cindex Harmonica Sacra note heads
+@cindex note heads, Harmonia Sacra
+@cindex Harmonia Sacra note heads
@cindex Christian Harmony note heads
@cindex note heads, Christian Harmony
@cindex Walker shape note heads
@@ -3269,7 +3269,7 @@ In shape note head notation, the shape of the note head
corresponds to the harmonic function of a note in the scale. This
notation was popular in nineteenth-century American song books.
Shape note heads can be produced in Sacred Harp, Southern Harmony,
-Funk (Harmonica Sacra), Walker, and Aiken (Christian Harmony) styles:
+Funk (Harmonia Sacra), Walker, and Aiken (Christian Harmony) styles:
@lilypond[verbatim,quote]
\relative c'' {
diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index 1ad24d94b9..04fed836b3 100644
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -7,7 +7,7 @@
Guide, node Updating translation committishes..
@end ignore
-@c \version "2.19.29"
+@c \version "2.19.80"
@node Simultaneous notes
@@ -930,7 +930,7 @@ voiceB = \relative { fis'4 r g2 | R1 | }
>>
\new Staff \with {
instrumentName = "merged"
- \consists #Merge_rests_engraver
+ \consists "Merge_rests_engraver"
}
<<
\new Voice { \voiceOne \voiceA }
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 39e9d815c3..0d802ac631 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -1430,7 +1430,7 @@ DejaVu Sans Mono,
and @code{LilyPond Monospace} are font aliases defined
in the LilyPond dedicated FontConfig configuration file
@code{00-lilypond-fonts.conf}.
-Where a character dosen't exist in the first font listed,
+Where a character doesn't exist in the first font listed,
the next font listed will be used instead for that character.
For details of alias definitions, please see
to @code{00-lilypond-fonts.conf} under the installed directory.
@@ -1477,6 +1477,42 @@ is preferable to use the simpler syntax explained in
}
@end lilypond
+@noindent
+When using OpenType fonts, font features can be used.
+OpenType font scripts and languages can not be specified.
+Note: Not all OpenType fonts have all functions.
+If you request a feature that doesn't exist in the chosen font,
+then the feature is simply ignored.
+
+@lilypond[quote,verbatim]
+% True small caps
+\markup { Normal Style: Hello HELLO }
+\markup { \caps { Small Caps: Hello } }
+\markup { \override #'(font-features . ("smcp"))
+ { True Small Caps: Hello } }
+
+% Number styles
+\markup { Normal Number Style: 0123456789 }
+\markup { \override #'(font-features . ("onum"))
+ { Old Number Style: 0123456789 } }
+
+% Stylistic Alternates
+\markup { \override #'(font-features . ("salt 0"))
+ { Stylistic Alternates 0: εÏÏÏθ } }
+\markup { \override #'(font-features . ("salt 1"))
+ { Stylistic Alternates 1: εÏÏÏθ } }
+
+% Multiple features
+\markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Multiple features: Hello 0123456789 εÏÏÏθ } }
+@end lilypond
+
+@noindent For the full OpenType font feature list please see:
+@uref{https://www.microsoft.com/typography/otspec/featurelist.htm}
+
+@noindent For identifying features of OpenType fonts please see:
+@uref{http://lists.gnu.org/archive/html/lilypond-devel/2017-08/msg00004.html}
+
Although it is easy to switch between preconfigured fonts, it is also
possible to use other fonts, as explained in the following sections:
@ref{Single entry fonts} and @ref{Entire document fonts}.
@@ -1573,13 +1609,90 @@ described. For an explanation of fonts, see @ref{Fonts explained}.
}
@end lilypond
+Note: @code{make-pango-font-tree} resets the notation fonts to default of
+Emmentaler.
+
@c we don't do Helvetica / Courier, since GS incorrectly loads
@c Apple TTF fonts
+The following syntax allows you to change the specific fonts,
+leaving others to the default values.
+The following example has the same effect
+as the above @code{make-pango-font-tree} example.
+The same as @code{make-pango-font-tree},
+you can specify a comma-separated list of @q{fonts} for @code{roman},
+@code{sans}, and @code{typewriter} categories.
+If you don't change the staff size from the default of 20 pt,
+@code{#:factor (/ staff-height pt 20)} is unnecessary.
+
+@funindex set-global-fonts
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:roman "Times New Roman"
+ #:sans "Nimbus Sans,Nimbus Sans L"
+ #:typewriter "Luxi Mono"
+ #:factor (/ staff-height pt 20) ; unnecessary if the staff size is default
+ ))
+@}
+@end example
+
+It also can specify the notation fonts.
+The following example also has the same effect as the above examples,
+because it sets the notation fonts as the default.
+For more information, see @ref{Replacing the notation font}.
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ #:music "emmentaler" ; default
+ #:brace "emmentaler" ; default
+ #:roman "Times New Roman"
+ #:sans "Nimbus Sans,Nimbus Sans L"
+ #:typewriter "Luxi Mono"
+ #:factor (/ staff-height pt 20) ; unnecessary if the staff size is default
+ ))
+@}
+@end example
+
+Note: Each call to @code{set-global-fonts} completely resets both the main
+notation and text fonts. If any category is left unspecified, then the default
+font will be used for that category.
+Each call of @code{set-global-fonts} affects each @code{\book} blocks that
+follow it.
+If there are multiple @code{\book} blocks and you want to use different fonts
+for each, simply call @code{set-global-fonts} again, like this:
+
+@example
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ @dots{}
+ ))
+@}
+\book @{
+ @dots{}
+@}
+
+\paper @{
+ #(define fonts
+ (set-global-fonts
+ @dots{}
+ ))
+@}
+\book @{
+ @dots{}
+@}
+@end example
+
@seealso
Notation Reference:
@ref{Fonts explained},
@ref{Single entry fonts},
@ref{Selecting font and font size},
-@ref{Font}.
+@ref{Font},
+@ref{Replacing the notation font}.
diff --git a/Documentation/translations.itexi b/Documentation/translations.itexi
index be8b0f457c..9244f58341 100644
--- a/Documentation/translations.itexi
+++ b/Documentation/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{Last updated Sat Jun 24 12:50:41 UTC 2017
+@emph{Last updated Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.25 0.25 0.25 0.25
@@ -28,7 +28,7 @@ LilyPond Changes
@item
Section titles
@*
-(2784)
+(2988)
@tab Francisco Vila
@*
@@ -46,11 +46,11 @@ translated
@ifhtml
@html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #33ff21">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
-up to date
+partially up to date
@end ifnothtml
@tab Jean-Charles Malahieude
@*
@@ -2599,7 +2599,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Masamichi Hosoda
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@*
@@ -2618,11 +2620,11 @@ translated
@ifhtml
@html
-<span style="background-color: #25fe1f">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Jan Nieuwenhuizen
@*
@@ -2900,7 +2902,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@@ -2917,11 +2921,11 @@ translated
@ifhtml
@html
-<span style="background-color: #76fe2a">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Jan Nieuwenhuizen
@*
@@ -3208,28 +3212,30 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@html
-<span style="background-color: #dfef77">partially translated (95 %)</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-partially translated (95 %)
+translated
@end ifnothtml
@*
@ifhtml
@html
-<span style="background-color: #83fe2c">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Jan Nieuwenhuizen
@*
@@ -3481,28 +3487,30 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@html
-<span style="background-color: #dfef77">partially translated (97 %)</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-partially translated (97 %)
+translated
@end ifnothtml
@*
@ifhtml
@html
-<span style="background-color: #ffdd42">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Jan Nieuwenhuizen
@*
@@ -5291,11 +5299,11 @@ translated
@ifhtml
@html
-<span style="background-color: #25fe1f">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Frédéric Chiasson
@*
@@ -5392,11 +5400,11 @@ translated
@ifhtml
@html
-<span style="background-color: #25fe1f">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Yoshiki Sawada
@*
@@ -5655,11 +5663,11 @@ partially up to date
@ifhtml
@html
-<span style="background-color: #d0f0f8">not translated</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-not translated
+translated
@end ifnothtml
@*
@@ -5810,7 +5818,7 @@ partially up to date
@item
1.8 Text
@*
-(2754)
+(2952)
@tab Walter Garcia-Fontes
@*
@@ -5837,22 +5845,22 @@ partially up to date
@ifhtml
@html
-<span style="background-color: #d0f0f8">not translated</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-not translated
+translated
@end ifnothtml
@*
@ifhtml
@html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #39ff22">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
-up to date
+partially up to date
@end ifnothtml
@tab Till Paala
@*
@@ -5871,7 +5879,7 @@ translated
@ifhtml
@html
-<span style="background-color: #9eff30">partially up to date</span>
+<span style="background-color: #acff31">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -5894,11 +5902,11 @@ translated
@ifhtml
@html
-<span style="background-color: #1fff1f">up to date</span>
+<span style="background-color: #39ff22">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
-up to date
+partially up to date
@end ifnothtml
@tab Jean-Charles Malahieude
@*
@@ -6016,7 +6024,7 @@ translated
@ifhtml
@html
-<span style="background-color: #33ff21">partially up to date</span>
+<span style="background-color: #47ff24">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -9635,7 +9643,7 @@ up to date
@item
1 Running @command{lilypond}
@*
-(5469)
+(5391)
@tab Walter Garcia-Fontes
@*
@@ -9673,7 +9681,7 @@ partially translated (95 %)
@ifhtml
@html
-<span style="background-color: #8aff2d">partially up to date</span>
+<span style="background-color: #83fe2c">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -9807,7 +9815,7 @@ partially translated (91 %)
@ifhtml
@html
-<span style="background-color: #ffad4a">partially up to date</span>
+<span style="background-color: #ffaf4a">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -9856,7 +9864,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Masamichi Hosoda
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@*
@@ -9875,11 +9885,11 @@ translated
@ifhtml
@html
-<span style="background-color: #33ff21">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@item
2 Updating files with @command{convert-ly}
@@ -10083,28 +10093,30 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@html
-<span style="background-color: #dfef77">partially translated (89 %)</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-partially translated (89 %)
+translated
@end ifnothtml
@*
@ifhtml
@html
-<span style="background-color: #ffd244">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@item
3 Running @command{lilypond-book}
@@ -10328,7 +10340,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@@ -10345,11 +10359,11 @@ translated
@ifhtml
@html
-<span style="background-color: #47ff24">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@item
4 External programs
@@ -10535,28 +10549,30 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@html
-<span style="background-color: #dfef77">partially translated (87 %)</span>
+<span style="background-color: #1fff1f">translated</span>
@end html
@end ifhtml
@ifnothtml
-partially translated (87 %)
+translated
@end ifnothtml
@*
@ifhtml
@html
-<span style="background-color: #f6fe3b">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@item
5 Suggestions for writing files
@@ -10784,7 +10800,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Yoshiki Sawada
+@tab Tomohiro Tatejima
+@*
+Yoshiki Sawada
@*
@ifhtml
@@ -10801,11 +10819,11 @@ translated
@ifhtml
@html
-<span style="background-color: #83fe2c">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@item
A GNU Free Documentation License
@@ -11640,7 +11658,7 @@ up to date
@item
Introduction
@*
-(5793)
+(5800)
@tab Walter Garcia-Fontes
@*
@@ -11678,7 +11696,7 @@ translated
@ifhtml
@html
-<span style="background-color: #2cff20">partially up to date</span>
+<span style="background-color: #33ff21">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -11726,7 +11744,7 @@ translated
@ifhtml
@html
-<span style="background-color: #2cff20">partially up to date</span>
+<span style="background-color: #33ff21">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
@@ -11868,7 +11886,9 @@ translated
@ifnothtml
up to date
@end ifnothtml
-@tab Masamichi Hosoda
+@tab Tomohiro Tatejima
+@*
+Masamichi Hosoda
@*
Yoshiki Sawada
@*
@@ -11889,11 +11909,11 @@ translated
@ifhtml
@html
-<span style="background-color: #2cff20">partially up to date</span>
+<span style="background-color: #1fff1f">up to date</span>
@end html
@end ifhtml
@ifnothtml
-partially up to date
+up to date
@end ifnothtml
@tab Jan Nieuwenhuizen
@*
@@ -11932,7 +11952,7 @@ translated
@ifhtml
@html
-<span style="background-color: #efff3a">partially up to date</span>
+<span style="background-color: #f6fe3b">partially up to date</span>
@end html
@end ifhtml
@ifnothtml
diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi
index 005ba154b5..21cc3ee3b8 100644
--- a/Documentation/web/news-headlines.itexi
+++ b/Documentation/web/news-headlines.itexi
@@ -11,7 +11,7 @@
@ifclear web_version
@c no anchor links, just link to News page
-@ref{News, LilyPond 2.19.65 released - @emph{August 06, 2017}}
+@ref{News, LilyPond 2.19.80 released - @emph{October 15, 2017}}
@ref{News, Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
@@ -23,8 +23,8 @@
@ifset web_version
@c anchor links, link to individual news items by their <a> tag
-@uref{news.html#LilyPond-2_002e19_002e65-released-August-06_002c-2017,
- LilyPond 2.19.65 released - @emph{August 06, 2017}}
+@uref{news.html#LilyPond-2_002e19_002e80-released-October-15_002c-2017,
+ LilyPond 2.19.80 released - @emph{October 15, 2017}}
@uref{news.html#Two-LilyPond-projects-in-Google-Summer-of-Code-2016-April-23_002c-2016,
Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
diff --git a/Documentation/web/news-new.itexi b/Documentation/web/news-new.itexi
index d20f7ad2b3..e4849e8570 100644
--- a/Documentation/web/news-new.itexi
+++ b/Documentation/web/news-new.itexi
@@ -9,12 +9,11 @@
@c used for news about the upcoming release; see CG on Release Work
@newsItem
-@subheading LilyPond 2.19.65 released @emph{August 06, 2017}
+@subheading LilyPond 2.19.80 released @emph{October 14, 2017}
We are happy to announce the release of LilyPond
-2.19.65. This release includes a number of enhancements, and contains some
-work in progress. You will have access to the very latest features, but
-some may be incomplete, and you may encounter bugs and crashes. If you
+2.19.80. This release is a pre-release test version for the upcoming
+stable 2.20 release. If you
require a stable version of LilyPond, we recommend using the 2.18
version.
diff --git a/Documentation/web/news-old.itexi b/Documentation/web/news-old.itexi
index 96bd95ab0c..d478936c0e 100644
--- a/Documentation/web/news-old.itexi
+++ b/Documentation/web/news-old.itexi
@@ -26,6 +26,18 @@ NOTE:
* don't duplicate entries from news-new.itexi
@end ignore
+@newsItem
+@subheading LilyPond 2.19.65 released @emph{August 06, 2017}
+
+We are happy to announce the release of LilyPond
+2.19.65. This release includes a number of enhancements, and contains some
+work in progress. You will have access to the very latest features, but
+some may be incomplete, and you may encounter bugs and crashes. If you
+require a stable version of LilyPond, we recommend using the 2.18
+version.
+
+@newsEnd
+
@newsItem
@subheading LilyPond 2.19.64 released @emph{July 15, 2017}
diff --git a/Documentation/web/we-wrote.bib b/Documentation/web/we-wrote.bib
index 922be9ef6c..93ab97d165 100644
--- a/Documentation/web/we-wrote.bib
+++ b/Documentation/web/we-wrote.bib
@@ -56,3 +56,10 @@
note = {(@uref{http://lilypond.org/website/pdf/lilypond_lac2013.pdf, PDF 890k})}
}
+@phdthesis{vila01,
+ title = {TipografÃa musical para la educación y análisis de la dinámica del software libre (Spanish language)},
+ author = {Francisco Vila},
+ school = {Universidad de Extremadura},
+ year = 2015,
+ note = {(@uref{https://paconet.org/wiki/index.php?title=Tesis, PDF 20M})}
+}
diff --git a/Documentation/zh/translations.itexi b/Documentation/zh/translations.itexi
index 740663ea3c..d96ce58474 100644
--- a/Documentation/zh/translations.itexi
+++ b/Documentation/zh/translations.itexi
@@ -16,7 +16,7 @@ td { border: 1px solid black; text-align: center; }
@end html
@end ifhtml
-@emph{æè¿æ´æ° Sat Jun 24 12:50:41 UTC 2017
+@emph{æè¿æ´æ° Sun Sep 10 17:19:23 UTC 2017
}
@multitable @columnfractions 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667 0.166666666667
@@ -88,7 +88,7 @@ Anthony Fok
@item
ç®ä»
@*
-5793
+5800
@tab Ben Luo
@*
Anthony Fok
diff --git a/NEWS.txt b/NEWS.txt
index f845199263..ed819b19e3 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,265 +1,366 @@
New features in 2.20 since 2.18
*******************************
- ⢠It is now possible to move systems with reference to their current
- position using the âextra-offsetâ subproperty of
- âNonMusicalPaperColumn.line-break-system-detailsâ. Both vertical
- and horizontal changes are possible. This feature is especially
- useful for making slight adjustments to the default vertical
- position of individual systems. See *note
- (lilypond-notation)Explicit staff and system positioning:: for more
- information.
+New for musical notation
+------------------------
- ⢠It is now possible to add text to analysis brackets through the
- âHorizontalBracketTextâ object.
- \layout {
- \context {
- \Voice
- \consists "Horizontal_bracket_engraver"
- }
- }
+*Displaying pitch improvements*
+
+ ⢠Pitches that have a sharp or flat in their name now need to be
+ hyphenated;
+
+ \key a-flat \major
+
+ instead of:
+
+ \key aflat \major
+
+ Pitches that contain _double_ sharps or flats in their name,
+ however, do not need a second hyphen. For example using the Dutch
+ notation âcisisâ:
+
+ \key c-sharpsharp \major
+
+ ⢠Accidental rules can now be defined _across_ âChoirStaffâ contexts.
+
+ ⢠Two new accidental rules have been added. Both combine the
+ characteristics of âmodern-voiceâ, âpianoâ and their equivalents:
+ âchoralâ
- {
- \once \override HorizontalBracketText.text = "a"
- c''\startGroup d''\stopGroup
- e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
- }
image of music
- ⢠The ends of hairpins may now be fine-tuned using the âshorten-pairâ
- grob property, which previously only affected text-spanners like
- âTupletBracketâ and âOttavaBracketâ. Positive values offset to the
- right, negative to the left.
- { \once \override Hairpin.shorten-pair = #'(2 . 2)
- c'1~\<
- c'2~ c'\!
- \once \override Hairpin.shorten-pair = #'(-2 . -2)
- c'1~\<
- c'2~ c'\! }
+ This is the now the default accidental style for âChoirStaffâ.
+
+ âchoral-cautionaryâ
+
image of music
- ⢠In fret-diagrams the distance between frets and the distance
- between strings is now independently adjustable. Available are
- âfret-distanceâ and âstring-distanceâ as subproperties of
- âfret-diagram-detailsâ.
- fretMrkp = \markup { \fret-diagram-terse #"x;x;o;2;3;2;" }
+ The same as âchoralâ but with the extra accidentals typeset as
+ cautionaries instead.
- \markuplist
- \override #'(padding . 2)
- \table #'(0 -1) {
- "default"
+ Also see *note (lilypond-notation)Automatic accidentals::.
- \fretMrkp
+ ⢠Four new clef glyphs are now available; âGGâ (double-G), âTenor Gâ,
+ âvarCâ plus related tessitura and âVarpercussionâ:
- "fret-distance"
+ Example Output Example Output
+
+ ----------------------------------------------------------------------------
+ â\clef GGâ image of music â\clef tenorGâ image of music
+ â\clef varCâ image of music â\clef altovarCâ image of music
+ â\clef tenorvarCâ image of music â\clef baritonevarCâ image of music
+ â\clef image of music
+ varpercussionâ
- \override #'(fret-diagram-details . ((fret-distance . 2)))
- \fretMrkp
+ Also see _Clef styles_.
- "string-distance"
+ ⢠French note names are now explicitly defined â previously they were
+ aliased to Italian note names. The D pitch may be entered as
+ either âreâ or âréâ.
- \override #'(fret-diagram-details . ((string-distance . 2)))
- \fretMrkp
- }
+ \language "français"
+ do ré mi fa | sol la si do | ré1
image of music
- ⢠Accidental rules can now be defined across âChoirStaffâ contexts.
- Two new rules âchoralâ and âchoral-cautionaryâ are available that
- combine the characteristics of âmodern-voiceâ and âpianoâ or their
- equivalents with cautionary accidentals.
+ Double sharps are entered using an âxâ suffix.
- ⢠The music function â\unfoldRepeatsâ can now take an optional
- argument-list specifying which type(s) of repeated music should be
- unfolded. Possible entries are âpercentâ, âtremoloâ, âvoltaâ. If
- the optional argument-list is unspecified, ârepeated-musicâ will be
- used, unfolding all.
+ \language "français"
+ dob, rebb misb fabsb | sold ladd six dosd | rédsd1
+ image of music
- ⢠A new âoutput-attributesâ grob property is now used for svg output
- instead of the âidâ grob property. It allows multiple attributes
- to be defined as an association list. For example, â#'((id . 123)
- (class . foo) (data-whatever . âbarâ))â will produce the following
- group tag in an SVG file: â<g id=â123â class=âfooâ
- data-whatever=âbarâ> ... </g>â.
+ *Rhythm improvements*
- ⢠Slurs and phrasing slurs may now be started from individual notes
- in a chord. Several simultanous slurs per âVoiceâ need to be
- distinguished by âspanner-idâ setting.
+ ⢠Multi-measure rests have length according to their total duration,
+ under the control of âMultiMeasureRest.space-incrementâ. Note the
+ default value is â2.0â.
- ⢠The music and grob property âspanner-idâ for distinguishing
- simultaneous slurs and phrasing slurs has been changed from a
- string to a âkeyâ, a non-negative integer or symbol.
+ \compressFullBarRests
+ R1*2 R1*4 R1*64 R1*16
+ image of music
- ⢠There is a new command â\=â for specifying the âspanner-idâ for
- simultaneous slurs and phrasing slurs.
- \fixed c' {
- <c~ f\=1( g\=2( >2 <c e\=1) a\=2) >
- }
+ \compressFullBarRests
+ \override Staff.MultiMeasureRest.space-increment = 2.5
+ R1*2 R1*4 R1*64 R1*16
image of music
- ⢠Blocks introduced with â\headerâ can be stored in variables and
- used as arguments to music and scheme functions and as the body of
- â#{...#}â constructs. They are represented as a Guile module.
+ ⢠Improvements to the â\partialâ command have been made when used
+ with parallel music and/or multiple contexts.
- While â\bookâ, â\bookpartâ, â\scoreâ, â\withâ, â\layoutâ, â\midiâ,
- â\paperâ blocks can be passed around in similar manner, they are
- represented by different data types.
+ ⢠It is now possible to change the time signature mid-measure by
+ using both the â\timeâ and â\partialâ commands together.
- ⢠Dot-separated symbol lists like âFretBoard.stencilâ were already
- supported as of version 2.18. They may now also contain unsigned
- integers, and may alternatively be separated by commata. This
- allows usage such as
- { \time 2,2,1 5/8 g'8 8 8 8 8 }
+ f f f f | f2. \bar "||"
+ \time 3/4 \partial 4
+ f8 8 | f2 f8 f |
image of music
- and
- \tagGroup violin,oboe,bassoon
+ ⢠Isolated durations in music now stand for unpitched notes. Pitches
+ are taken from the preceding note or chord. This is especially
+ convenient for specifying rhythms in both music and scheme
+ functions and can help improve the readability of LilyPond source
+ files.
- ⢠Such lists may also be used in expressions for assignments, sets,
- and overrides. This allows usage such as
- { \unset Timing.beamExceptions
- \set Timing.beatStructure = 1,2,1
- g'8 8 8 8 8 8 8 8 }
+ c64[ 64] 32 16 8^- <g b d>4~ 2 | 1
image of music
- ⢠Association list elements could previously be assigned values
- individually (for example, paper variables like
- âsystem-system-spacing.basic-distanceâ). They may now be also
- referenced in this manner, as with
- \paper {
- \void \displayScheme \system-system-spacing.basic-distance
+ \new DrumStaff \with { \override StaffSymbol.line-count = 1 }
+ \drummode {
+ \time 3/4
+ tambourine 8 \tuplet 3/2 { 16 16 16 }
+ 8 \tuplet 3/2 { 16 16 16 } 8 8 |
}
+ image of music
- In combination with the previously mentioned changes, this allows
- setting and referencing pseudovariables like âviolin.1â.
+ ⢠Beaming exceptions can now be constructed using the simpler
+ â\beamExceptionsâ scheme function. Previously, this would have
+ required writing:
- ⢠LilyPond source files may now be embedded inside the generated PDF
- files. This experimental feature is disabled by default and may be
- regarded as unsafe, as PDF documents with hidden content tend to
- present a security risk. Please note that not all PDF viewers have
- the ability to handle embedded documents (if not, the PDF output
- will appear normally and source files will remain invisible). This
- feature only works with the PDF backend.
+ \set Timing.beamExceptions =
+ #'( ;start of alist
+ (end . ;entry for end of beams
+ ( ;start of alist of end points
+ ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16
+ )))
- ⢠French note names are now defined specifically instead of being
- aliased to Italian note names: in addition to the generic
- Italian-derived syntax, the D pitch may be entered as âréâ. Double
- sharps may also be entered using the â-xâ suffix.
+ \time #'(2 1) 3/16
+ c16 c c
+ \repeat unfold 6 { c32 }
- ⢠Additional bass strings (for lute tablature) are supported.
- m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
+ With the new â\beamExceptionsâ scheme function, this becomes:
- \score {
- \new TabStaff \m
- \layout {
- \context {
- \Score
- tablatureFormat = #fret-letter-tablature-format
- }
- \context {
- \TabStaff
- stringTunings = \stringTuning <a, d f a d' f'>
- additionalBassStrings = \stringTuning <c, d, e, fis, g,>
- fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
- }
- }
- }
+ \set Timing.beamExceptions =
+ \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
+
+ \time #'(2 1) 3/16
+ c16 c c |
+ \repeat unfold 6 { c32 } |
image of music
- ⢠The markup-list-command â\tableâ is now available. Each column may
- be aligned differently.
- \markuplist {
- \override #'(padding . 2)
- \table
- #'(0 1 0 -1)
- {
- \underline { center-aligned right-aligned center-aligned left-aligned }
- one "1" thousandth "0.001"
- eleven "11" hundredth "0.01"
- twenty "20" tenth "0.1"
- thousand "1000" one "1.0"
- }
- }
+ with multiple exceptions separated by bar checks. Note that
+ writing the exception pattern without pitches is convenient but not
+ mandatory (also see the previous documented rhythm improvement â
+ *note (lilypond-notation)Isolated durations in music now stand for
+ unpitched notes::.
+
+ ⢠The positioning of tuplet numbers for kneed beams has been
+ improved. Previously, tuplet numbers were placed according to the
+ position of the tuplet bracket, even if the bracket was not
+ printed. This could lead to tuplet numbers being âstrandedâ.
+
+ Previously:
+
image of music
- ⢠A new markup-command, â\with-dimensions-fromâ, makes
- â\with-dimensionsâ easier to use by taking the new dimensions from
- a markup object, given as first argument.
- \markup {
- \pattern #5 #Y #0 "x"
- \pattern #5 #Y #0 \with-dimensions-from "x" "f"
- \pattern #5 #Y #0 \with-dimensions-from "x" "g"
- \override #'(baseline-skip . 2)
- \column {
- \pattern #5 #X #0 "n"
- \pattern #5 #X #0 \with-dimensions-from "n" "m"
- \pattern #5 #X #0 \with-dimensions-from "n" "!"
- }
- }
+ Now, when the bracket is not drawn, tuplet numbers are positioned
+ closer.
+
image of music
- ⢠There are two new page breaking functions. âly:one-page-breakingâ
- automatically adjusts the height of the page to fit the music, so
- that everything fits on one page.
- âly:one-line-auto-height-breakingâ is like âly:one-line-breakingâ,
- placing the music on a single line and adjusting the page width
- accordingly, however it also automatically adjusts the page height
- to fit the music.
+ ⢠Collision detection for the kneed beam tuplet numbers has also been
+ added, shifting the offset horizontally if the number is too close
+ to an adjoining note column (but still preserving the numberâs
+ vertical distance). In the event of a collision â for example with
+ an accidental â the tuplet number will be shifted vertically
+ instead. If the tuplet number is itself too large to fit within
+ the available space, the original, âbracket-basedâ, positioning
+ system will be used instead.
- ⢠Markup-command â\draw-squiggle-lineâ is now available. Customizing
- is possible with overrides of âthicknessâ, âangularityâ, âheightâ
- and âorientationâ
- \markup
- \overlay {
- \draw-squiggle-line #0.5 #'(3 . 3) ##t
+ image of music
- \translate #'(3 . 3)
- \override #'(thickness . 4)
- \draw-squiggle-line #0.5 #'(3 . -3) ##t
+ The original kneed-beam tuplet behavior is still available with a
+ new, âknee-to-beamâ property for the âTupletNumberâ layout object.
- \translate #'(6 . 0)
- \override #'(angularity . -5)
- \draw-squiggle-line #0.5 #'(-3 . -3) ##t
+ \time 2/4
+ \override Beam.auto-knee-gap = 3
+ \override TupletNumber.knee-to-beam = ##f
+ \override TupletBracket.bracket-visibility = ##t
+ \tuplet 3/2 4 { g8 c'' e, }
+ \once \override TupletBracket.bracket-visibility = ##f
+ \tuplet 3/2 4 { g,,8 c'' e, }
+ image of music
- \translate #'(3 . -3)
- \override #'(angularity . 2)
- \override #'(height . 0.3)
- \override #'(orientation . -1)
- \draw-squiggle-line #0.2 #'(-3 . 3) ##t
+ *Expressive mark improvements*
+
+ ⢠The ends of hairpins may now be fine-tuned using the âshorten-pairâ
+ grob property. This previously only affected text-spanners (e.g.
+ âTupletBracketâ and âOttavaBracketâ).
+
+ Positive and negative values offset right and left respectively.
+
+ \once \override Hairpin.shorten-pair = #'(0 . 2)
+ a1\< | a2 a\!
+
+ \once \override Hairpin.shorten-pair = #'(2 . 0)
+ \once \override Hairpin.stencil = #constante-hairpin
+ a1\< | a2 a\!
+
+ \once \override Hairpin.shorten-pair = #'(-1 . -1)
+ \once \override Hairpin.stencil = #flared-hairpin
+ a1\< | a2 a\!
+ image of music
+
+ ⢠Individual slurs and phrasing slurs may now be started from an
+ explicit note within a chord.
+
+ <f a( c>1 | <c') e g(> | <a c) e>
+ image of music
+
+ <f( a\( c>1 | <c'\) e\( g> | <a c e\)>
+ image of music
+
+ ⢠A new command â\=Xâ has been added â where âXâ can be any
+ non-negative integer or symbol â so that a specific âidâ can be
+ assigned to the start and end of slurs and phrasing slurs.
+
+ This is useful when simultaneous slurs are required or if one slur
+ overlaps another or when nesting short slurs within a longer one.
+
+ <a c e\=7\(>1 | <g b d\=£(> |
+ <f\=A( a c\="foo"(> | <c'\="foo")\=A) e\=£) g\=7\)> |
+ image of music
+
+ Also see *note (lilypond-notation)Expressive marks as curves::.
+
+ *Repeat notation improvements*
+
+ ⢠The visual style of tremolo slashes (shape, style and slope) is now
+ more finely controlled.
+ image of music
+
+ ⢠The music function â\unfoldRepeatsâ can now take an optional
+ argument-list specifying which type(s) of repeated music should be
+ unfolded. Possible entries are âpercentâ, âtremoloâ, âvoltaâ. If
+ the optional argument-list is unspecified, ârepeated-musicâ will be
+ used, unfolding all.
+
+ *Staff notation improvements*
+
+ ⢠A new command â\magnifyStaffâ has been added which scales staff
+ sizes, staff lines, bar lines, beamlets and horizontal spacing
+ generally at the âStaffâ context level. Staff lines are prevented
+ from being scaled smaller than the default since the thickness of
+ stems, slurs, and the like are all based on the staff line
+ thickness.
+
+ ⢠A new command â\magnifyMusicâ has been added, which allows the
+ notation size to be changed without changing the staff size, while
+ automatically scaling stems, beams, and horizontal spacing.
+
+ \new Staff <<
+ \new Voice \relative {
+ \voiceOne
+ <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
}
+ \new Voice \relative {
+ \voiceTwo
+ \magnifyMusic 0.63 {
+ \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
+ r32 c'' a c a c a c r c a c a c a c
+ r c a c a c a c a c a c a c a c
+ }
+ }
+ >>
image of music
⢠A new command, â\RemoveAllEmptyStavesâ, has been made available,
which acts exactly like â\RemoveEmptyStavesâ, except for also
removing empty staves on the first system in a score.
- ⢠Markup-commands â\undertieâ and â\overtieâ are now available, as
- well as the generic markup-command â\tieâ.
- \markup {
- \undertie "undertied"
- \overtie "overtied"
- }
+ ⢠A new markup command â\justify-lineâ has been added. Similar to
+ the â\fill-lineâ markup command except that instead of setting
+ _words_ in columns, the â\justify-lineâ command balances the
+ whitespace between them ensuring that when there are three or more
+ words in a markup, the whitespace is always consistent.
- m = {
- c''1 \prall -\tweak text \markup \tie "131" -1
- }
+ \markup \fill-line {oooooo oooooo oooooo oooooo}
+ \markup \fill-line {ooooooooo oooooooo oo ooo}
+ image of music
- { \voiceOne \m \voiceTwo \m }
+ \markup \justify-line {oooooo oooooo oooooo oooooo}
+ \markup \justify-line {ooooooooo oooooooo oo ooo}
image of music
- ⢠âTabStaffâ is now able to print micro-tones for bendings etc.
+ *Editorial annotation improvements*
+
+ ⢠It is now possible to add text to analysis brackets through the
+ âHorizontalBracketTextâ object.
\layout {
\context {
- \Score
- supportNonIntegerFret = ##t
+ \Voice
+ \consists "Horizontal_bracket_engraver"
}
}
- mus = \relative { c'4 cih d dih }
+ {
+ \once \override HorizontalBracketText.text = "a"
+ c''\startGroup d''\stopGroup
+ e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
+ }
+ image of music
- <<
- \new Staff << \clef "G_8" \mus >>
- \new TabStaff \mus
- >>
+ *Text formatting improvements*
+
+ ⢠Support for making it easier to use alternative âmusicâ fonts other
+ than the default Emmentaler in LilyPond has been added. See *note
+ (lilypond-notation)Replacing the notation font:: for more
+ information.
+
+ ⢠Default text fonts have been changed from âCentury Schoolbook Lâ,
+ âsans-serifâ, and âmonospaceâ.
+
+ For âsvgâ backend:
+ Family Default font
+ -----------------------------------
+ _roman_ âserifâ
+ _sans_ âsans-serifâ
+ _typewriter_âmonospaceâ
+
+ âserifâ, âsans-serifâ, and âmonospaceâ are âgeneric-familyâ in SVG
+ and CSS specifications.
+
+ For other backends:
+ Family Default font (alias) Alias definition lists
+ ----------------------------------------------------------------------------
+ _roman_ âLilyPond Serifâ TeX Gyre Schola, C059, Century
+ SchoolBook URW, Century Schoolbook L,
+ DejaVu Serif, ..., serif
+ _sans_ âLilyPond Sans TeX Gyre Heros, Nimbus Sans, Nimbus
+ Serifâ Sans L, DejaVu Sans, ..., sans-serif
+ _typewriter_âLilyPond Monospaceâ TeX Gyre Cursor, Nimbus Mono PS,
+ Nimbus Mono, Nimbus Mono L, DejaVu
+ Sans Mono, ..., monospace
+
+ âLilyPond Serifâ, âLilyPond Sans Serifâ, and âLilyPond Monospaceâ
+ are font aliases defined in the LilyPond dedicated FontConfig
+ configuration file â00-lilypond-fonts.confâ. Where a character
+ dosenât exist in the first font listed, the next font listed will
+ be used instead for that character. For details of alias
+ definitions, please see to â00-lilypond-fonts.confâ under the
+ installed directory.
+
+ ⢠When using OpenType fonts, font features can be used. Note: Not
+ all OpenType fonts have all functions.
+
+ % True small caps
+ \markup { Normal Style: Hello HELLO }
+ \markup { \caps { Small Caps: Hello } }
+ \markup { \override #'(font-features . ("smcp"))
+ { True Small Caps: Hello } }
+
+ % Number styles
+ \markup { Normal Number Style: 0123456789 }
+ \markup { \override #'(font-features . ("onum"))
+ { Old Number Style: 0123456789 } }
+
+ % Stylistic Alternates
+ \markup { \override #'(font-features . ("salt 0"))
+ { Stylistic Alternates 0: εÏÏÏθ } }
+ \markup { \override #'(font-features . ("salt 1"))
+ { Stylistic Alternates 1: εÏÏÏθ } }
+
+ % Multiple features
+ \markup { \override #'(font-features . ("onum" "smcp" "salt 1"))
+ { Multiple features: Hello 0123456789 εÏÏÏθ } }
image of music
⢠Two new styles of whiteout are now available. The âoutlineâ style
@@ -297,197 +398,113 @@ New features in 2.20 since 2.18
}
image of music
- ⢠All of â\overrideâ, â\revertâ, â\setâ, and â\unsetâ now work with
- the â\onceâ prefix for making one-time settings.
- \relative {
- c'4 d
- \override NoteHead.color = #red
- e4 f |
- \once \override NoteHead.color = #green
- g4 a
- \once \revert NoteHead.color
- b c |
- \revert NoteHead.color
- f2 c |
+ ⢠A new markup-command, â\with-dimensions-fromâ, makes
+ â\with-dimensionsâ easier to use by taking the new dimensions from
+ a markup object, given as first argument.
+ \markup {
+ \pattern #5 #Y #0 "x"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "f"
+ \pattern #5 #Y #0 \with-dimensions-from "x" "g"
+ \override #'(baseline-skip . 2)
+ \column {
+ \pattern #5 #X #0 "n"
+ \pattern #5 #X #0 \with-dimensions-from "n" "m"
+ \pattern #5 #X #0 \with-dimensions-from "n" "!"
+ }
}
image of music
- ⢠When outputting MIDI, LilyPond will now store the âtitleâ defined
- in a scoreâs â\headerâ block (or, if there is no such definition on
- the â\scoreâ level, the first such definition found in a â\headerâ
- block of the scoreâs enclosing â\bookpartâ, â\bookâ, or top-level
- scope) as the name of the MIDI sequence in the MIDI file.
- Optionally, the name of the MIDI sequence can be overridden using
- the new âmidititleâ â\headerâ field independently of âtitleâ (for
- example, in case âtitleâ contains markup code which does not render
- as plain text in a satisfactory way automatically).
-
- ⢠Music (and scheme and void) functions and markup commands that just
- supply the final parameters to a chain of overrides, music function
- and markup command calls can now be defined in the form of just
- writing the expression cut short with â\etcâ.
-
- bold-red-markup = \markup \bold \with-color #red \etc
- highlight = \tweak font-size 3 \tweak color #red \etc
-
- \markup \bold-red "text"
- \markuplist \column-lines \bold-red { One Two }
-
- { c' \highlight d' e'2-\highlight -! }
- image of music
-
- ⢠LilyPond functions defined with âdefine-music-functionâ,
- âdefine-event-functionâ, âdefine-scheme-functionâ and
- âdefine-void-functionâ can now be directly called from Scheme as if
- they were genuine Scheme procedures. Argument checking and
- matching will still be performed in the same manner as when calling
- the function through LilyPond input. This includes the insertion
- of defaults for optional arguments not matching their predicates.
- Instead of using â\defaultâ in the actual argument list for
- explicitly skipping a sequence of optional arguments,
- â*unspecified*â can be employed.
-
- ⢠Current input location and parser are now stored in GUILE fluids
- and can be referenced via the function calls â(*location*)â and
- â(*parser*)â. Consequently, a lot of functions previously taking
- an explicit âparserâ argument no longer do so.
-
- Functions defined with âdefine-music-functionâ,
- âdefine-event-functionâ, âdefine-scheme-functionâ and
- âdefine-void-functionâ no longer use âparserâ and âlocationâ
- arguments.
-
- With those particular definitions, LilyPond will try to recognize
- legacy use of âparserâ and âlocationâ arguments, providing
- backwards-compatible semantics for some time.
-
- ⢠In the "english" notename language, the long notenames for pitches
- with accidentals now contain a hyphen for better readability. You
- now have to write
- \key a-flat \major
- instead of the previous
- \key aflat \major
-
- Double accidentals do not get another hyphen, so the Dutch âcisisâ
- has the long English notename âc-sharpsharpâ.
-
- ⢠The visual style of tremolo slashes (shape, style and slope) is now
- more finely controlled.
- image of music
-
- ⢠Multi-measure rests have length according to their total duration,
- under the control of âMultiMeasureRest.space-incrementâ.
- image of music
-
- ⢠Page numbers may now be printed in roman numerals, by setting the
- âpage-number-typeâ paper variable.
-
- ⢠It is now possible to use â\timeâ and â\partialâ together to change
- the time signature in mid measure.
+ ⢠Markup-command â\draw-squiggle-lineâ is now available. Customizing
+ is possible with overrides of âthicknessâ, âangularityâ, âheightâ
+ and âorientationâ
+ \markup
+ \overlay {
+ \draw-squiggle-line #0.5 #'(3 . 3) ##t
- \override Score.BarNumber.break-visibility = #end-of-line-invisible
- \partial 4 \time 3/4 f4 | 2 4 | 2 \bar "||"
- \time 9/8 \partial 4. f8 8 8 | 2. 8 8 8 |
- image of music
+ \translate #'(3 . 3)
+ \override #'(thickness . 4)
+ \draw-squiggle-line #0.5 #'(3 . -3) ##t
- ⢠It is now possible to override the âtextâ property of chord names.
+ \translate #'(6 . 0)
+ \override #'(angularity . -5)
+ \draw-squiggle-line #0.5 #'(-3 . -3) ##t
- <<
- \new ChordNames \chordmode {
- a' b c:7
- \once \override ChordName.text = #"foo"
- d
- }
- >>
+ \translate #'(3 . -3)
+ \override #'(angularity . 2)
+ \override #'(height . 0.3)
+ \override #'(orientation . -1)
+ \draw-squiggle-line #0.2 #'(-3 . 3) ##t
+ }
image of music
- ⢠Improved horizontal alignment when using âTextScriptâ, with
- âDynamicTextâ or âLyricTextâ.
-
- ⢠A new command â\magnifyStaffâ has been added which scales staff
- sizes, staff lines, bar lines, beamlets and horizontal spacing
- generally at the âStaffâ context level. Staff lines are prevented
- from being scaled smaller than the default since the thickness of
- stems, slurs, and the like are all based on the staff line
- thickness.
-
- ⢠âInstrumentNameâ now supports âtext-interfaceâ.
-
- ⢠There is now support for controlling the âexpression levelâ of MIDI
- channels using the âStaff.midiExpressionâ context property. This
- can be used to alter the perceived volume of even sustained notes
- (albeit in a very âlow-levelâ way) and accepts a number value
- between â0.0â and â1.0â.
-
- \score {
- \new Staff \with {
- midiExpression = #0.6
- midiInstrument = #"clarinet"
- }
- <<
- { a'1~ a'1 }
- {
- \set Staff.midiExpression = #0.7 s4\f\<
- \set Staff.midiExpression = #0.8 s4
- \set Staff.midiExpression = #0.9 s4
- \set Staff.midiExpression = #1.0 s4
+ ⢠Markup-commands â\undertieâ and â\overtieâ are now available, as
+ well as the generic markup-command â\tieâ.
+ \markup {
+ \undertie "undertied"
+ \overtie "overtied"
+ }
- \set Staff.midiExpression = #0.9 s4\>
- \set Staff.midiExpression = #0.8 s4
- \set Staff.midiExpression = #0.7 s4
- \set Staff.midiExpression = #0.6 s4\!
- }
- >>
- \midi { }
+ m = {
+ c''1 \prall -\tweak text \markup \tie "131" -1
}
- ⢠Support for making it easier to use alternative âmusicâ fonts other
- than the default Emmentaler in LilyPond has been added. See
- <http://fonts.openlilylib.org/> for more information.
+ { \voiceOne \m \voiceTwo \m }
+ image of music
- ⢠Grobs and their parents can now be aligned separately allowing more
- flexibility for grob positions. For example the âleftâ edge of a
- grob can now be aligned on the âcenterâ of its parent.
+New for specialist notation
+---------------------------
- ⢠Improvements to the â\partialâ command have been made to avoid
- problems when using multiple, parallel contexts.
+*Vocal music improvements*
- ⢠â\chordmodeâ can now use â< >â and â<< >>â constructs.
+ ⢠A new flexible template suitable for a range of choral music, is
+ now provided. This may be used to create simple choral music, with
+ or without piano accompaniment, in two or four staves. Unlike
+ other templates, this template is âbuilt-inâ, which means it does
+ not need to be copied and edited: instead it is simply â\includeââd
+ in the input file. For details, see *note
+ (lilypond-learning)Built-in templates::.
- ⢠A new command â\tagGroupâ has now been added. This complements the
- existing â\keepWithTagâ and â\removeWithTagâ commands. For
- Example:
+ ⢠The â\addlyricsâ function now works with arbitrary contexts
+ incuding âStaffâ.
- \tagGroup #'(violinI violinII viola cello)
+ ⢠â\lyricstoâ and â\addLyricsâ have been âharmonizedâ. Both now
+ accept the same kind of delimited argument list that â\lyricsâ and
+ â\chordsâ accept. Backward compatibility has been added so music
+ identifiers (i.e. â\musâ) are permitted as arguments. A
+ âconvert-lyâ rule has been added that removes redundant uses of
+ â\lyricmodeâ and rearranges combinations with context starters such
+ that â\lyricstoâ in general is applied last (i.e. like
+ â\lyricmodeâ would be).
- declares a list of âtagsâ that belong to a single âtag groupâ.
+ *Unfretted and fretted string instrument improvements*
- \keepWithTag #'violinI
+ ⢠A new note head style for Tabulature has been added â
+ âTabNoteHead.style = #'slashâ.
- Is now only concerned with âtagsâ from âviolinIââs tag group.
+ ⢠In fret-diagrams the distance between frets and the distance
+ between strings is now independently adjustable. Available are
+ âfret-distanceâ and âstring-distanceâ as subproperties of
+ âfret-diagram-detailsâ.
+ fretMrkp = \markup { \fret-diagram-terse #"x;x;o;2;3;2;" }
- Any element of the included music tagged with one or more tags from
- the group, but _not_ with VIOLINI, will be removed.
+ \markuplist
+ \override #'(padding . 2)
+ \table #'(0 -1) {
+ "default"
- ⢠The â\addlyricsâ function now works with arbitrary contexts
- incuding âStaffâ.
+ \fretMrkp
- ⢠String numbers can now also be used to print roman numerals (e.g.
- for unfretted string instruments).
- c2\2
- \romanStringNumbers
- c\2
- \arabicStringNumbers
- c1\3
- image of music
+ "fret-distance"
- ⢠The âthin-kernâ property of the âBarLineâ grob has been renamed to
- âsegno-kernâ.
+ \override #'(fret-diagram-details . ((fret-distance . 2)))
+ \fretMrkp
- ⢠âKeyCancellationâ grobs now ignore cue clefs (like âKeySignatureâ
- grobs do).
+ "string-distance"
- ⢠Add support for â\once \unsetâ
+ \override #'(fret-diagram-details . ((string-distance . 2)))
+ \fretMrkp
+ }
+ image of music
⢠It is now possible to individually color both the dots and
parentheses in fret diagrams when using the â\fret-diagram-verboseâ
@@ -555,98 +572,234 @@ New features in 2.20 since 2.18
}
image of music
- ⢠A new markup command â\justify-lineâ has been added. Similar to
- the â\fill-lineâ markup command except that instead of setting
- _words_ in columns, the â\justify-lineâ command balances the
- whitespace between them ensuring that when there are three or more
- words in a markup, the whitespace is always consistent.
+ ⢠Additional bass strings (for lute tablature) are supported.
+ m = { f'4 d' a f d a, g, fis, e, d, c, \bar "|." }
- \markup \fill-line {oooooo oooooo oooooo oooooo}
- \markup \fill-line {ooooooooo oooooooo oo ooo}
+ \score {
+ \new TabStaff \m
+ \layout {
+ \context {
+ \Score
+ tablatureFormat = #fret-letter-tablature-format
+ }
+ \context {
+ \TabStaff
+ stringTunings = \stringTuning <a, d f a d' f'>
+ additionalBassStrings = \stringTuning <c, d, e, fis, g,>
+ fretLabels = #'("a" "b" "r" "d" "e" "f" "g" "h" "i" "k")
+ }
+ }
+ }
image of music
- \markup \justify-line {oooooo oooooo oooooo oooooo}
- \markup \justify-line {ooooooooo oooooooo oo ooo}
+ ⢠String numbers can now also be used to print roman numerals (e.g.
+ for unfretted string instruments).
+ c2\2
+ \romanStringNumbers
+ c\2
+ \arabicStringNumbers
+ c1\3
image of music
- ⢠A new command â\magnifyMusicâ has been added, which allows the
- notation size to be changed without changing the staff size, while
- automatically scaling stems, beams, and horizontal spacing.
+ ⢠âTabStaffâ is now able to print micro-tones for bendings etc.
+ \layout {
+ \context {
+ \Score
+ supportNonIntegerFret = ##t
+ }
+ }
- \new Staff <<
- \new Voice \relative {
- \voiceOne
- <e' e'>4 <f f'>8. <g g'>16 <f f'>8 <e e'>4 r8
+ mus = \relative { c'4 cih d dih }
+
+ <<
+ \new Staff << \clef "G_8" \mus >>
+ \new TabStaff \mus
+ >>
+ image of music
+
+ *Chord notation improvements*
+
+ ⢠â\chordmodeâ can now use â< >â and â<< >>â constructs.
+
+ ⢠It is now possible to override the âtextâ property of chord names.
+
+ <<
+ \new ChordNames \chordmode {
+ a' b c:7
+ \once \override ChordName.text = #"foo"
+ d
+ }
+ >>
+ image of music
+
+New for input and output
+------------------------
+
+*Input structure improvements*
+
+ ⢠Blocks introduced with â\headerâ can be stored in variables and
+ used as arguments to music and scheme functions and as the body of
+ â#{...#}â constructs. They are represented as a Guile module.
+
+ While â\bookâ, â\bookpartâ, â\scoreâ, â\withâ, â\layoutâ, â\midiâ,
+ â\paperâ blocks can be passed around in similar manner, they are
+ represented by different data types.
+
+ *Titles and header improvements*
+
+ ⢠Page numbers may now be printed in roman numerals, by setting the
+ âpage-number-typeâ paper variable.
+
+ *Input file improvements*
+
+ ⢠A new command â\tagGroupâ has now been added. This complements the
+ existing â\keepWithTagâ and â\removeWithTagâ commands. For
+ Example:
+
+ \tagGroup #'(violinI violinII viola cello)
+
+ declares a list of âtagsâ that belong to a single âtag groupâ.
+
+ \keepWithTag #'violinI
+
+ Is now only concerned with âtagsâ from âviolinIââs tag group.
+
+ Any element of the included music tagged with one or more tags from
+ the group, but _not_ with VIOLINI, will be removed.
+
+ *Output improvements*
+
+ ⢠LilyPond source files may now be embedded inside the generated PDF
+ files. This experimental feature is disabled by default and may be
+ regarded as unsafe, as PDF documents with hidden content tend to
+ present a security risk. Please note that not all PDF viewers have
+ the ability to handle embedded documents (if not, the PDF output
+ will appear normally and source files will remain invisible). This
+ feature only works with the PDF backend.
+
+ ⢠The âoutput-classic-frameworkâ procedure and the â-dclip-systemsâ
+ are now available with the âSVGâ backend.
+
+ ⢠An argument, â-dcropâ, has been added, formatting âSVGâ and âPDFâ
+ output without margins or page-breaks.
+
+ ⢠A new âoutput-attributesâ grob property is now used for svg output
+ instead of the âidâ grob property. It allows multiple attributes
+ to be defined as an association list. For example, â#'((id . 123)
+ (class . foo) (data-whatever . âbarâ))â will produce the following
+ group tag in an SVG file: â<g id=â123â class=âfooâ
+ data-whatever=âbarâ> ... </g>â.
+
+ ⢠The PostScript functionality of stroke adjustment is no longer
+ applied automatically but left to the discretion of the PostScript
+ device (by default, Ghostscript uses it for resolutions up to
+ 150dpi when generating raster images). When it is enabled, a more
+ complex drawing algorithm designed to benefit from stroke
+ adjustment is employed mostly for stems and bar lines.
+
+ Stroke adjustment can be forced by specifying the command line
+ option â-dstrokeadjustâ to LilyPond. When generating âPDFâ files,
+ this will usually result in markedly better looking âPDFâ previews
+ but significantly larger file size. Print quality at high
+ resolutions will be unaffected.
+
+ ⢠Added a new âmake-path-stencilâ function that supports all âpathâ
+ commands both relative and absolute:
+
+ âlinetoâ, ârlinetoâ, âcurvetoâ, ârcurvetoâ, âmovetoâ, ârmovetoâ,
+ âclosepathâ. The function also supports âsingle-letterâ syntax
+ used in standard SVG path commands:
+
+ âLâ, âlâ, âCâ, âcâ, âMâ, âmâ, âZâ and âzâ. The new command is also
+ backward-compatible with the original âmake-connected-path-stencilâ
+ function. Also see âscm/stencil.scmâ.
+
+ *MIDI improvements*
+
+ ⢠The most common articulations are now reflected in MIDI output.
+ Accent and marcato make notes louder; staccato, staccatissimo and
+ portato make them shorter. Breath marks shorten the previous note.
+
+ This behavior is customizable through the âmidiLengthâ and
+ âmidiExtraVelocityâ properties on âArticulationEventâ. See
+ âscript-init.lyâ for examples.
+
+ ⢠Improved MIDI output for breathe marks. After tied notes, breaths
+ take time _only_ from the last note of the tie; e.g. â{ c4~ c8
+ \breathe }â performs as â{ c4~ c16 r }â instead of â{ c4 r8 }â.
+ This is more consistent with articulations and how humans interpret
+ breaths after ties. It now also makes it easier to align
+ simultaneous breathe marks over multiple parts, all with different
+ note lengths.
+
+ ⢠There is now support for controlling the âexpression levelâ of MIDI
+ channels using the âStaff.midiExpressionâ context property. This
+ can be used to alter the perceived volume of even sustained notes
+ (albeit in a very âlow-levelâ way) and accepts a number value
+ between â0.0â and â1.0â.
+
+ \score {
+ \new Staff \with {
+ midiExpression = #0.6
+ midiInstrument = #"clarinet"
}
- \new Voice \relative {
- \voiceTwo
- \magnifyMusic 0.63 {
- \override Score.SpacingSpanner.spacing-increment = #(* 1.2 0.63)
- r32 c'' a c a c a c r c a c a c a c
- r c a c a c a c a c a c a c a c
+ <<
+ { a'1~ a'1 }
+ {
+ \set Staff.midiExpression = #0.7 s4\f\<
+ \set Staff.midiExpression = #0.8 s4
+ \set Staff.midiExpression = #0.9 s4
+ \set Staff.midiExpression = #1.0 s4
+
+ \set Staff.midiExpression = #0.9 s4\>
+ \set Staff.midiExpression = #0.8 s4
+ \set Staff.midiExpression = #0.7 s4
+ \set Staff.midiExpression = #0.6 s4\!
}
- }
- >>
- image of music
+ >>
+ \midi { }
+ }
- ⢠A new flexible template suitable for a range of choral music, is
- now provided. This may be used to create simple choral music, with
- or without piano accompaniment, in two or four staves. Unlike
- other templates, this template is âbuilt-inâ, which means it does
- not need to be copied and edited: instead it is simply â\includeââd
- in the input file. For details, see *note
- (lilypond-learning)Built-in templates::.
+ ⢠When outputting MIDI, LilyPond will now store the âtitleâ defined
+ in a scoreâs â\headerâ block (or, if there is no such definition on
+ the â\scoreâ level, the first such definition found in a â\headerâ
+ block of the scoreâs enclosing â\bookpartâ, â\bookâ, or top-level
+ scope) as the name of the MIDI sequence in the MIDI file.
+ Optionally, the name of the MIDI sequence can be overridden using
+ the new âmidititleâ â\headerâ field independently of âtitleâ (for
+ example, in case âtitleâ contains markup code which does not render
+ as plain text in a satisfactory way automatically).
- ⢠The positioning of tuplet numbers for kneed beams has been
- significantly improved. Previously, tuplet numbers were placed
- according to the position of the tuplet bracket, even if it was not
- printed. This could lead to stranded tuplet numbers. Now they are
- now positioned closer to the kneed-beam when an appropriate beam
- segment exists for its placement and when the bracket is not drawn.
-
- Collision detection is also added, offsetting horizontally if too
- close to an adjoining note column but preserving the numberâs
- vertical distance from the kneed beam. If the number itself is too
- large to fit in the available space the original, bracket-based,
- positioning system is used instead; and in the event of a collision
- (e.g. with an accidental) the tuplet number is moved vertically
- away instead.
+ *Extracting music improvements*
- \time 3/4
- \override Beam.auto-knee-gap = 3
- \tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
- }
- image of music
+ ⢠â\displayLilyMusicâ and its underlying Scheme functions no longer
+ omit redundant note durations. This makes it easier to reliably
+ recognize and format standalone durations in expressions like
+ { c4 d4 8 }
- The original kneed-beam tuplet behavior is still available through
- an â\overrideâ via a new, âknee-to-beamâ property.
+New for spacing issues
+----------------------
- \time 3/4
- \override Beam.auto-knee-gap = 3
- \override TupletNumber.knee-to-beam = ##f
- \tuplet 3/2 4 {
- g8 c'' e,
- c'8 g,, e''
- g,,8 e''' c,,
- }
- image of music
+*Page breaking improvements*
- ⢠â\lyricstoâ and â\addLyricsâ have been âharmonizedâ. Both now
- accept the same kind of delimited argument list that â\lyricsâ and
- â\chordsâ accept. Backward compatibility has been added so music
- identifiers (i.e. â\musâ) are permitted as arguments. A
- âconvert-lyâ rule has been added that removes redundant uses of
- â\lyricmodeâ and rearranges combinations with context starters such
- that â\lyricstoâ in general is applied last (i.e. like
- â\lyricmodeâ would be).
+ ⢠There are two new page breaking functions. âly:one-page-breakingâ
+ automatically adjusts the height of the page to fit the music, so
+ that everything fits on one page.
+ âly:one-line-auto-height-breakingâ is like âly:one-line-breakingâ,
+ placing the music on a single line and adjusting the page width
+ accordingly, however it also automatically adjusts the page height
+ to fit the music.
- ⢠Scheme functions and identifiers can now be used as output
- definitions.
+ *Vertical and Horizontal spacing improvements*
- ⢠Scheme expressions can now be used as chord constituents.
+ ⢠It is now possible to move systems with reference to their current
+ position using the âextra-offsetâ subproperty of
+ âNonMusicalPaperColumn.line-break-system-detailsâ. Both vertical
+ and horizontal changes are possible. This feature is especially
+ useful for making slight adjustments to the default vertical
+ position of individual systems. See *note
+ (lilypond-notation)Explicit staff and system positioning:: for more
+ information.
⢠Improved visual spacing of small and regular âMIâ Funk and Walker
noteheads so they are now the same width as other shaped notes in
@@ -657,22 +810,45 @@ New features in 2.20 since 2.18
⢠âLeftEdgeâ now has a definable âY-extentâ (i.e.vertical). See
*note (lilypond-internals)LeftEdge::.
- ⢠Added a new âmake-path-stencilâ function that supports all âpathâ
- commands both relative and absolute:
+ ⢠Grobs and their parents can now be aligned separately allowing more
+ flexibility for grob positions. For example the âleftâ edge of a
+ grob can now be aligned on the âcenterâ of its parent.
- âlinetoâ, ârlinetoâ, âcurvetoâ, ârcurvetoâ, âmovetoâ, ârmovetoâ,
- âclosepathâ. The function also supports âsingle-letterâ syntax
- used in standard SVG path commands:
+ ⢠Improved horizontal alignment when using âTextScriptâ, with
+ âDynamicTextâ or âLyricTextâ.
- âLâ, âlâ, âCâ, âcâ, âMâ, âmâ, âZâ and âzâ. The new command is also
- backward-compatible with the original âmake-connected-path-stencilâ
- function. Also see âscm/stencil.scmâ.
+New for changing defaults
+-------------------------
+
+ ⢠All of â\overrideâ, â\revertâ, â\setâ, and â\unsetâ now work with
+ the â\onceâ prefix for making one-time settings.
+ \relative {
+ c'4 d
+ \override NoteHead.color = #red
+ e4 f |
+ \once \override NoteHead.color = #green
+ g4 a
+ \once \revert NoteHead.color
+ b c |
+ \revert NoteHead.color
+ f2 c |
+ }
+ image of music
+
+New for Internal interfaces and functions
+-----------------------------------------
+
+ ⢠The music and grob property âspanner-idâ, used for distinguishing
+ simultaneous slurs and phrasing slurs, has been changed from a
+ string to a _key_ which can be either a non-negative integer or
+ symbol (also see the previous documented expressive mark
+ improvement â _A new command \=X has been added_).
⢠Context properties named in the âalternativeRestoresâ property are
restored to their value at the start of the _first_ alternative in
all subsequent alternatives.
- Currently the default set restores âcurrent meterâ;
+ Currently the default set restores âcurrent meterâ:
\time 3/4
\repeat volta 2 { c2 e4 | }
@@ -683,7 +859,7 @@ New features in 2.20 since 2.18
g2. |
image of music
- âmeasure positionâ;
+ âmeasure positionâ:
\time 3/4
\repeat volta 2 { c2 e4 | }
@@ -696,7 +872,7 @@ New features in 2.20 since 2.18
g2. |
image of music
- and âchord changesâ;
+ and âchord changesâ:
<<
\new ChordNames {
@@ -714,135 +890,101 @@ New features in 2.20 since 2.18
>>
image of music
- ⢠Improved MIDI output for breathe marks. After tied notes, breaths
- take time _only_ from the last note of the tie; e.g. â{ c4~ c8
- \breathe }â performs as â{ c4~ c16 r }â instead of â{ c4 r8 }â.
- This is more consistent with articulations and how humans interpret
- breaths after ties. It now also makes it easier to align
- simultaneous breathe marks over multiple parts, all with different
- note lengths.
-
- ⢠A new note head style for Tabulature has been added;
- âTabNoteHead.style = #'slashâ.
-
- ⢠Four new Clef glyphs have been added _Double G_, _Tenor G_,
- _Varpercussion_ and _varC_ and their related tessitura.
- \override Staff.Clef.full-size-change = ##t
+ ⢠LilyPond functions defined with âdefine-music-functionâ,
+ âdefine-event-functionâ, âdefine-scheme-functionâ and
+ âdefine-void-functionâ can now be directly called from Scheme as if
+ they were genuine Scheme procedures. Argument checking and
+ matching will still be performed in the same manner as when calling
+ the function through LilyPond input. This includes the insertion
+ of defaults for optional arguments not matching their predicates.
+ Instead of using â\defaultâ in the actual argument list for
+ explicitly skipping a sequence of optional arguments,
+ â*unspecified*â can be employed.
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
+ ⢠Current input location and parser are now stored in GUILE fluids
+ and can be referenced via the function calls â(*location*)â and
+ â(*parser*)â. Consequently, a lot of functions previously taking
+ an explicit âparserâ argument no longer do so.
- \break
- \override Staff.Clef.full-size-change = ##f
+ Functions defined with âdefine-music-functionâ,
+ âdefine-event-functionâ, âdefine-scheme-functionâ and
+ âdefine-void-functionâ no longer use âparserâ and âlocationâ
+ arguments.
- \clef "GG" c c c c
- \clef "tenorG" c c c c
- \clef "varC" c c c c
- \clef "altovarC" c c c c
- \clef "tenorvarC" c c c c
- \clef "baritonevarC" c c c c
- \clef "varpercussion" c c c c
- image of music
+ With those particular definitions, LilyPond will try to recognize
+ legacy use of âparserâ and âlocationâ arguments, providing
+ backwards-compatible semantics for some time.
- ⢠Isolated durations in music sequences now stand for unpitched
- notes. This may be useful for specifying rhythms to music or
- scheme functions. When encountered in the final score, the pitches
- are provided by the preceding note or chord. Here are two examples
- where this makes for readable input:
+ ⢠Scheme functions and identifiers can now be used as output
+ definitions.
- \new DrumStaff \with { \override StaffSymbol.line-count = 1 }
- \drummode {
- \time 3/4
- tambourine 8 \tuplet 3/2 { 16 16 16 }
- 8 \tuplet 3/2 { 16 16 16 } 8 8 |
- }
- image of music
+ ⢠Scheme expressions can now be used as chord constituents.
- \new Staff { r16 c'16 ~ 8 ~ 4 ~ 2 | }
- image of music
+ ⢠Music (and scheme and void) functions and markup commands that just
+ supply the final parameters to a chain of overrides, music function
+ and markup command calls can now be defined in the form of just
+ writing the expression cut short with â\etcâ.
- ⢠â\displayLilyMusicâ and its underlying Scheme functions no longer
- omit redundant note durations. This makes it easier to reliably
- recognize and format standalone durations in expressions like
- { c4 d4 8 }
+ \markup bold-red = \markup \bold \with-color #red \etc
+ highlight = \tweak font-size 3 \tweak color #red \etc
- ⢠Beaming exceptions can now be constructed using the
- â\beamExceptionsâ scheme function. One can now write
+ \markup \bold-red "text"
+ \markuplist \column-lines \bold-red { One Two }
- \time #'(2 1) 3/16
- \set Timing.beamExceptions =
- \beamExceptions { 32[ 32] 32[ 32] 32[ 32] }
- c16 c c |
- \repeat unfold 6 { c32 } |
+ { c' \highlight d' e'2-\highlight -! }
image of music
- with multiple exceptions separated with â|â bar checks (writing the
- exception pattern without pitches is convenient but not mandatory).
- Previously, setting the beam exceptions would have required writing
-
- \set Timing.beamExceptions =
- #'( ;start of alist
- (end . ;entry for end of beams
- ( ;start of alist of end points
- ((1 . 32) . (2 2 2)) ;rule for 1/32 beams -- end each 1/16
- )))
+ ⢠Dot-separated symbol lists like âFretBoard.stencilâ were already
+ supported as of version 2.18. They may now also contain unsigned
+ integers, and may alternatively be separated by commata. This
+ allows usage such as
+ { \time 2,2,1 5/8 g'8 8 8 8 8 }
+ image of music
- ⢠The most common articulations are now reflected in MIDI output.
- Accent and marcato make notes louder; staccato, staccatissimo and
- portato make them shorter. Breath marks shorten the previous note.
+ and
+ \tagGroup violin,oboe,bassoon
- This behavior is customizable through the âmidiLengthâ and
- âmidiExtraVelocityâ properties on âArticulationEventâ. See
- âscript-init.lyâ for examples.
+ ⢠Such lists may also be used in expressions for assignments, sets,
+ and overrides. This allows usage such as
+ { \unset Timing.beamExceptions
+ \set Timing.beatStructure = 1,2,1
+ g'8 8 8 8 8 8 8 8 }
+ image of music
- ⢠The PostScript functionality of stroke adjustment is no longer
- applied automatically but left to the discretion of the PostScript
- device (by default, Ghostscript uses it for resolutions up to
- 150dpi when generating raster images). When it is enabled, a more
- complex drawing algorithm designed to benefit from stroke
- adjustment is employed mostly for stems and bar lines.
+ ⢠Association list elements could previously be assigned values
+ individually (for example, paper variables like
+ âsystem-system-spacing.basic-distanceâ). They may now be also
+ referenced in this manner, as with
+ \paper {
+ \void \displayScheme \system-system-spacing.basic-distance
+ }
- Stroke adjustment can be forced by specifying the command line
- option â-dstrokeadjustâ to LilyPond. When generating âPDFâ files,
- this will usually result in markedly better looking âPDFâ previews
- but significantly larger file size. Print quality at high
- resolutions will be unaffected.
+ In combination with the previously mentioned changes, this allows
+ setting and referencing pseudovariables like âviolin.1â.
- ⢠Default text fonts have been changed from âCentury Schoolbook Lâ,
- âsans-serifâ, and âmonospaceâ.
+ ⢠The markup-list-command â\tableâ is now available. Each column may
+ be aligned differently.
+ \markuplist {
+ \override #'(padding . 2)
+ \table
+ #'(0 1 0 -1)
+ {
+ \underline { center-aligned right-aligned center-aligned left-aligned }
+ one "1" thousandth "0.001"
+ eleven "11" hundredth "0.01"
+ twenty "20" tenth "0.1"
+ thousand "1000" one "1.0"
+ }
+ }
+ image of music
- For âsvgâ backend:
- Family Default font
- -----------------------------------
- _roman_ âserifâ
- _sans_ âsans-serifâ
- _typewriter_âmonospaceâ
+ ⢠âInstrumentNameâ now supports âtext-interfaceâ.
- âserifâ, âsans-serifâ, and âmonospaceâ are âgeneric-familyâ in SVG
- and CSS specifications.
+ ⢠The âthin-kernâ property of the âBarLineâ grob has been renamed to
+ âsegno-kernâ.
- For other backends:
- Family Default font (alias) Alias definition lists
- ----------------------------------------------------------------------------
- _roman_ âLilyPond Serifâ TeX Gyre Schola, C059, Century
- SchoolBook URW, Century Schoolbook L,
- DejaVu Serif, ..., serif
- _sans_ âLilyPond Sans TeX Gyre Heros, Nimbus Sans, Nimbus
- Serifâ Sans L, DejaVu Sans, ..., sans-serif
- _typewriter_âLilyPond Monospaceâ TeX Gyre Cursor, Nimbus Mono PS,
- Nimbus Mono, Nimbus Mono L, DejaVu
- Sans Mono, ..., monospace
+ ⢠âKeyCancellationâ grobs now ignore cue clefs (like âKeySignatureâ
+ grobs do).
- âLilyPond Serifâ, âLilyPond Sans Serifâ, and âLilyPond Monospaceâ
- are font aliases defined in the LilyPond dedicated FontConfig
- configuration file â00-lilypond-fonts.confâ. Where a character
- dosenât exist in the first font listed, the next font listed will
- be used instead for that character. For details of alias
- definitions, please see to â00-lilypond-fonts.confâ under the
- installed directory.
+ ⢠Add support for â\once \unsetâ
diff --git a/VERSION b/VERSION
index 039a5f8286..39a3ccd55f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=19
-PATCH_LEVEL=65
+PATCH_LEVEL=80
MY_PATCH_LEVEL=
VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.65
+VERSION_DEVEL=2.19.80
diff --git a/configure b/configure
index 04d9515b85..7354576014 100755
--- a/configure
+++ b/configure
@@ -4419,7 +4419,7 @@ $as_echo "no" >&6; }
else
- eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)"\"`\"
+ eval "OPTIONAL"=\"`eval echo \"'$'OPTIONAL\" \""(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=91edd6ece36e84a1c6d63a1cf63a1a6d84bd443a' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)"\"`\"
fi
else
diff --git a/configure.ac b/configure.ac
index 8e3cabe01e..ead1814a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then
if test "$FCLIST" = ""; then
STEPMAKE_ADD_ENTRY(OPTIONAL,'(install the fc-list utility from FontConfig, or use --with-urwotf-dir)')
else
- STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
+ STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=91edd6ece36e84a1c6d63a1cf63a1a6d84bd443a' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
fi
else
STEPMAKE_ADD_ENTRY(OPTIONAL,'(these files are missing: $MISSING_URWOTF_FILES)')
diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 55d86c3516..50fba7cfd4 100644
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -23,9 +23,6 @@
#(read-hash-extend #\[ parse-lily-and-compute-lily-string) %{ ] %}
-#(define (lily-string->markup str)
- (make-column-markup (string-split str #\NewLine)))
-
test =
#(define-void-function (harmless strings)
((string?) pair?)
diff --git a/input/regression/markup-partial.ly b/input/regression/markup-partial.ly
index f0759d26ed..66199dde7b 100644
--- a/input/regression/markup-partial.ly
+++ b/input/regression/markup-partial.ly
@@ -8,12 +8,12 @@ command has already been supplied."
\layout { ragged-right = ##t }
-bold-red-markup = \markup \bold \with-color #red \etc
-italic-color-markup = \markup \italic \with-color \etc
-quarter-markup = \markup \note-by-number #2 \etc
+\markup bold-red = \markup \bold \with-color #red \etc
+\markup italic-color = \markup \italic \with-color \etc
+\markup quarter = \markup \note-by-number #2 \etc
\markup \bold-red "Bold red."
\markuplist \column-lines \bold-red { Bold red in a list. }
-\markup \italic-color #green "Italic green."
+\markup #(markup #:italic-color green "Italic green.")
\markuplist \column-lines \italic-color #green { Italic green in a list. }
-\markup { 3/8: \quarter #1 #UP }
+\markup { 3/8: #(make-quarter-markup 1 UP) }
diff --git a/input/regression/merge-rests-engraver.ly b/input/regression/merge-rests-engraver.ly
index 688fc31f79..35cf08917c 100644
--- a/input/regression/merge-rests-engraver.ly
+++ b/input/regression/merge-rests-engraver.ly
@@ -1,4 +1,4 @@
-\version "2.19.60"
+\version "2.19.80"
\header {
texidoc = "Test for merging rests in different voices."
@@ -69,7 +69,7 @@ voiceC = \relative {
\score {
\new Staff \with {
- \consists #Merge_rests_engraver
+ \consists "Merge_rests_engraver"
} <<
\compressFullBarRests
\new Voice { \voiceOne \voiceA }
diff --git a/input/regression/note-head-funk.ly b/input/regression/note-head-funk.ly
index ce9bcb09de..90d827cab8 100644
--- a/input/regression/note-head-funk.ly
+++ b/input/regression/note-head-funk.ly
@@ -1,6 +1,6 @@
\header {
- texidoc = "Notes can be set in the Funk (Harmonica Sacra) style."
+ texidoc = "Notes can be set in the Funk (Harmonia Sacra) style."
}
\version "2.16.0"
diff --git a/input/regression/version-seen.ly b/input/regression/version-seen.ly
new file mode 100644
index 0000000000..8e9dc44aab
--- /dev/null
+++ b/input/regression/version-seen.ly
@@ -0,0 +1,14 @@
+%% \version "2.19.80"
+
+\header {
+ texidoc = "This does not produce typeset output but checks that
+@code{\\version} statements in included files do not inhibit the
+warning in the main file when a @code{\\version} statement is missing
+there."
+}
+
+\include "deutsch.ly"
+
+#(ly:expect-warning
+ (_ "no \\version statement found, please add~afor future compatibility")
+ (format #f "\n\n\\version ~s\n\n" (lilypond-version)))
diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index ac6f85feb8..564f638841 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -988,9 +988,9 @@ Axis_group_interface::print (SCM smob)
if (Skyline_pair *s = unsmob<Skyline_pair> (me->get_property ("vertical-skylines")))
{
ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[UP].to_points (X_AXIS))
- .in_color (255, 0, 255));
+ .in_color (1.0, 0.0, 1.0));
ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[DOWN].to_points (X_AXIS))
- .in_color (0, 255, 255));
+ .in_color (0.0, 1.0, 1.0));
}
return ret.smobbed_copy ();
}
diff --git a/lily/include/lily-imports.hh b/lily/include/lily-imports.hh
index 1b63a53717..cc61ea7d9a 100644
--- a/lily/include/lily-imports.hh
+++ b/lily/include/lily-imports.hh
@@ -61,6 +61,7 @@ namespace Lily {
extern Variable chordmodifiers;
extern Variable construct_chord_elements;
extern Variable default_time_signature_settings;
+ extern Variable define_markup_command;
extern Variable drum_pitch_names;
extern Variable grob_compose_function;
extern Variable grob_offset_function;
@@ -87,6 +88,8 @@ namespace Lily {
extern Variable make_span_event;
extern Variable markup_p;
extern Variable markup_command_signature;
+ extern Variable markup_function_p;
+ extern Variable markup_list_function_p;
extern Variable markup_list_p;
extern Variable midi_program;
#if !GUILEV2
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 21d2fc1acc..7b395b3b25 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -231,8 +231,10 @@ BOM_UTF8 \357\273\277
yy_pop_state ();
- SCM top_scope = scm_car (scm_last_pair (scopes_));
- scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T);
+ if (is_main_input_ && include_stack_.size () == main_input_level_) {
+ SCM top_scope = scm_car (scm_last_pair (scopes_));
+ scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T);
+ }
if (!is_valid_version (s)) {
yylval = SCM_UNSPECIFIED;
@@ -424,8 +426,7 @@ BOM_UTF8 \357\273\277
{
yylval = sval;
int token = MARKUP_FUNCTION;
- if (scm_is_true (scm_object_property
- (sval, ly_symbol2scm ("markup-list-command"))))
+ if (scm_is_true (Lily::markup_list_function_p (sval)))
token = MARKUP_LIST_FUNCTION;
push_markup_predicates (sig);
return token;
diff --git a/lily/lily-imports.cc b/lily/lily-imports.cc
index f3cd3b1ab2..5bb4863168 100644
--- a/lily/lily-imports.cc
+++ b/lily/lily-imports.cc
@@ -55,6 +55,7 @@ namespace Lily {
Variable chordmodifiers ("chordmodifiers");
Variable construct_chord_elements ("construct-chord-elements");
Variable default_time_signature_settings ("default-time-signature-settings");
+ Variable define_markup_command ("define-markup-command");
Variable drum_pitch_names ("drumPitchNames");
Variable grob_compose_function ("grob::compose-function");
Variable grob_offset_function ("grob::offset-function");
@@ -81,6 +82,8 @@ namespace Lily {
Variable make_span_event ("make-span-event");
Variable markup_p ("markup?");
Variable markup_command_signature ("markup-command-signature");
+ Variable markup_function_p ("markup-function?");
+ Variable markup_list_function_p ("markup-list-function?");
Variable markup_list_p ("markup-list?");
Variable midi_program ("midi-program");
#if !GUILEV2
diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index a76ed9b2fa..936c3fd356 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -104,7 +104,6 @@ Lyric_hyphen::print (SCM smob)
for (int i = 0; i < n; i++)
{
Stencil m (dash_mol);
- m = m.in_color (0.0, 0.0, 0.0);
m.translate_axis (span_points[LEFT] + i * dash_period +
space_left / 2, X_AXIS);
total.add_stencil (m);
diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index bcb4804515..39a8837113 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -355,7 +355,7 @@ Paper_column::print (SCM p)
id_stencil.add_stencil (arrowhead.translated (p2));
id_stencil.add_stencil (number_stc->translated (num_off));
// use a lighter shade of blue so it will remain legible on black background.
- id_stencil = id_stencil.in_color (0.2, 0.4, 1);
+ id_stencil = id_stencil.in_color (0.2, 0.4, 1.0);
l.add_stencil (id_stencil);
}
@@ -400,7 +400,7 @@ Paper_column::print (SCM p)
id_stencil.add_stencil (arrowhead.translated (p2));
id_stencil.add_stencil (number_stc->translated (num_off));
// use a lighter shade of red so it will remain legible on black background.
- id_stencil = id_stencil.in_color (1, 0.25, 0.25);
+ id_stencil = id_stencil.in_color (1.0, 0.25, 0.25);
l.add_stencil (id_stencil);
}
t.add_stencil (l);
@@ -493,4 +493,3 @@ ADD_INTERFACE (Paper_column,
"spacing "
"used "
"when ");
-
diff --git a/lily/parser.yy b/lily/parser.yy
index f81dc69e9b..a95f44a9f2 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -672,7 +672,13 @@ header_block:
*/
assignment_id:
STRING
+ {
+ $$ = scm_string_to_symbol ($1);
+ }
| SYMBOL
+ {
+ $$ = scm_string_to_symbol ($1);
+ }
;
assignment:
@@ -681,15 +687,29 @@ assignment:
$$ = SCM_UNSPECIFIED;
}
| assignment_id '.' property_path '=' identifier_init {
- SCM path = scm_cons (scm_string_to_symbol ($1), $3);
+ SCM path = scm_cons ($1, $3);
parser->lexer_->set_identifier (path, $5);
$$ = SCM_UNSPECIFIED;
}
| assignment_id ',' property_path '=' identifier_init {
- SCM path = scm_cons (scm_string_to_symbol ($1), $3);
+ SCM path = scm_cons ($1, $3);
parser->lexer_->set_identifier (path, $5);
$$ = SCM_UNSPECIFIED;
}
+ | markup_mode_word '=' identifier_init
+ {
+ if (scm_is_false (Lily::markup_function_p ($3)))
+ {
+ parser->parser_error (@3, _ ("Not a markup function"));
+ } else {
+ scm_primitive_eval
+ (scm_list_3
+ (Lily::define_markup_command,
+ scm_string_to_symbol ($1),
+ ly_quote_scm ($3)));
+ }
+ $$ = SCM_UNSPECIFIED;
+ }
;
@@ -3155,13 +3175,15 @@ post_event_nofinger:
$$ = $1;
}
| script_dir music_function_call {
- $$ = $2;
- if (!unsmob<Music> ($2)->is_mus_type ("post-event")) {
+ Music *m = unsmob<Music> ($2);
+ if (!m->is_mus_type ("post-event")) {
parser->parser_error (@2, _ ("post-event expected"));
$$ = SCM_UNSPECIFIED;
- } else if (!SCM_UNBNDP ($1))
- {
- unsmob<Music> ($$)->set_property ("direction", $1);
+ } else {
+ m->set_spot (parser->lexer_->override_input (@$));
+ if (!SCM_UNBNDP ($1))
+ m->set_property ("direction", $1);
+ $$ = $2;
}
}
| HYPHEN {
@@ -3175,36 +3197,42 @@ post_event_nofinger:
$$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect ();
}
| script_dir direction_reqd_event {
- if (!SCM_UNBNDP ($1))
- {
- Music *m = unsmob<Music> ($2);
- m->set_property ("direction", $1);
+ if (Music *m = unsmob<Music> ($2)) {
+ m->set_spot (parser->lexer_->override_input (@$));
+ if (!SCM_UNBNDP ($1))
+ {
+ m->set_property ("direction", $1);
+ }
}
$$ = $2;
}
| script_dir direction_less_event {
+ Music *m = unsmob<Music> ($2);
+ m->set_spot (parser->lexer_->override_input (@$));
if (!SCM_UNBNDP ($1))
- {
- Music *m = unsmob<Music> ($2);
m->set_property ("direction", $1);
- }
$$ = $2;
}
| '^' fingering
{
+ Music *m = unsmob<Music> ($2);
+ m->set_spot (parser->lexer_->override_input (@$));
+ m->set_property ("direction", scm_from_int (UP));
$$ = $2;
- unsmob<Music> ($$)->set_property ("direction", scm_from_int (UP));
}
| '_' fingering
{
+ Music *m = unsmob<Music> ($2);
+ m->set_spot (parser->lexer_->override_input (@$));
+ m->set_property ("direction", scm_from_int (DOWN));
$$ = $2;
- unsmob<Music> ($$)->set_property ("direction", scm_from_int (DOWN));
}
;
post_event:
post_event_nofinger
| '-' fingering {
+ unsmob<Music> ($2)->set_spot (parser->lexer_->override_input (@$));
$$ = $2;
}
;
@@ -3244,11 +3272,11 @@ direction_reqd_event:
Music *original = unsmob<Music> (s);
if (original && original->is_mus_type ("post-event")) {
Music *a = original->clone ();
- a->set_spot (parser->lexer_->override_input (@$));
+ // origin will be set by post_event_nofinger
$$ = a->unprotect ();
} else {
parser->parser_error (@1, _ ("expecting string or post-event as script definition"));
- $$ = MY_MAKE_MUSIC ("PostEvents", @$)->unprotect ();
+ $$ = SCM_UNSPECIFIED;
}
}
}
@@ -3357,8 +3385,10 @@ gen_text_def:
Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text", $1);
$$ = t->unprotect ();
- } else
+ } else {
parser->parser_error (@1, _ ("not an articulation"));
+ $$ = SCM_UNSPECIFIED;
+ }
}
;
@@ -3893,11 +3923,33 @@ markup_mode:
}
;
+// Sort-of ugly: We need this as markup of its own as well as in
+// markup function assignments, without triggering lookahead or the
+// '=' for assignments will be parsed in markup mode and not
+// recognized. Worse: the next token following something like
+// \markup "string" would be parsed in markup mode as well.
+//
+// So we make a single production here that's used either in markup or
+// in assignment.
+
+markup_mode_word:
+ markup_mode markup_word
+ {
+ $$ = $2;
+ parser->lexer_->pop_state ();
+ }
+ ;
+
+
full_markup:
markup_mode markup_top {
$$ = $2;
parser->lexer_->pop_state ();
}
+ | markup_mode_word
+ {
+ $$ = make_simple_markup ($1);
+ }
;
partial_markup:
@@ -3917,7 +3969,7 @@ markup_top:
$$ = scm_car (MAKE_SYNTAX (composed_markup_list,
@2, $1, scm_list_1 ($2)));
}
- | simple_markup {
+ | simple_markup_noword {
$$ = $1;
}
;
@@ -4064,14 +4116,21 @@ markup_head_1_list:
}
;
+markup_word:
+ STRING
+ | SYMBOL
+ ;
+
simple_markup:
- STRING {
- $$ = make_simple_markup ($1);
- }
- | SYMBOL {
+ markup_word
+ {
$$ = make_simple_markup ($1);
}
- | SCORE {
+ | simple_markup_noword
+ ;
+
+simple_markup_noword:
+ SCORE {
parser->lexer_->push_note_state (Lily::pitchnames);
} '{' score_body '}' {
Score *sc = unsmob<Score> ($4);
diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc
index 512f970e0e..17838bcb35 100644
--- a/lily/self-alignment-interface.cc
+++ b/lily/self-alignment-interface.cc
@@ -23,6 +23,7 @@
#include "note-column.hh"
#include "paper-column.hh"
#include "pointer-group-interface.hh"
+#include "stencil.hh"
#include "warn.hh"
MAKE_SCHEME_CALLBACK (Self_alignment_interface, y_aligned_on_self, 1);
@@ -59,8 +60,12 @@ Self_alignment_interface::aligned_on_self (Grob *me, Axis a, bool pure, int star
// However, empty extent and non-empty stencil would be suspicious.
if (!ext.is_empty ())
return scm_from_double (- ext.linear_combination (scm_to_double (align)));
- else if (me->get_stencil ())
- warning (me->name () + " has empty extent and non-empty stencil.");
+ else
+ {
+ Stencil *st = me->get_stencil ();
+ if (st && !st->is_empty ())
+ warning (me->name () + " has empty extent and non-empty stencil.");
+ }
}
return scm_from_double (0.0);
}
@@ -141,8 +146,12 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
// However, empty extent and non-empty stencil would be suspicious.
if (!ext.is_empty ())
x -= ext.linear_combination (scm_to_double (self_align));
- else if (me->get_stencil ())
- warning (me->name () + " has empty extent and non-empty stencil.");
+ else
+ {
+ Stencil *st = me->get_stencil ();
+ if (st && !st->is_empty ())
+ warning (me->name () + " has empty extent and non-empty stencil.");
+ }
}
if (scm_is_number (par_align))
@@ -150,8 +159,12 @@ Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
// See comment above.
if (!he.is_empty ())
x += he.linear_combination (scm_to_double (par_align));
- else if (him->get_stencil ())
- warning (him->name () + " has empty extent and non-empty stencil.");
+ else
+ {
+ Stencil *st = him->get_stencil ();
+ if (st && !st->is_empty ())
+ warning (him->name () + " has empty extent and non-empty stencil.");
+ }
}
return scm_from_double (x);
diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index e29b8a9129..a136bfb02e 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -205,8 +205,8 @@ Separation_item::print (SCM smob)
Stencil ret;
if (Skyline_pair *s = unsmob<Skyline_pair> (me->get_property ("horizontal-skylines")))
{
- ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[LEFT].to_points (Y_AXIS)).in_color (255, 255, 0));
- ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[RIGHT].to_points (Y_AXIS)).in_color (0, 255, 255));
+ ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[LEFT].to_points (Y_AXIS)).in_color (1.0, 1.0, 0.0));
+ ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[RIGHT].to_points (Y_AXIS)).in_color (0.0, 1.0, 1.0));
}
return ret.smobbed_copy ();
}
diff --git a/lily/system.cc b/lily/system.cc
index 0551b85cbc..ecf6ffe1fa 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -625,8 +625,8 @@ System::get_paper_system ()
= Lookup::points_to_line_stencil (0.1, (*skylines)[UP].to_points (X_AXIS));
Stencil down
= Lookup::points_to_line_stencil (0.1, (*skylines)[DOWN].to_points (X_AXIS));
- sys_stencil.add_stencil (up.in_color (255, 0, 0));
- sys_stencil.add_stencil (down.in_color (0, 255, 0));
+ sys_stencil.add_stencil (up.in_color (1.0, 0.0, 0.0));
+ sys_stencil.add_stencil (down.in_color (0.0, 1.0, 0.0));
}
}
diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index bad6d50281..fc79707373 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -210,14 +210,9 @@ Text_interface::is_markup (SCM x)
{
return scm_is_string (x)
|| (scm_is_pair (x)
- && scm_is_true
- (scm_object_property (scm_car (x),
- ly_symbol2scm ("markup-signature")))
- && scm_is_false
- (scm_object_property (scm_car (x),
- ly_symbol2scm ("markup-list-command"))));
+ && scm_is_true (Lily::markup_command_signature (scm_car (x)))
+ && scm_is_false (Lily::markup_list_function_p (scm_car (x))));
}
-
bool
Text_interface::is_markup_list (SCM x)
{
diff --git a/lily/tie.cc b/lily/tie.cc
index dcc53ad44e..fd8a9591e2 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -281,7 +281,7 @@ Tie::print (SCM smob)
annotation));
tm.translate (Offset (b.control_[3][X_AXIS] + 0.5,
b.control_[0][Y_AXIS] * 2));
- tm = tm.in_color (1, 0, 0);
+ tm = tm.in_color (1.0, 0.0, 0.0);
/*
It would be nice if we could put this in a different layer,
diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 01c9490d46..a93db22171 100644
--- a/ly/Welcome-to-LilyPond-MacOS.ly
+++ b/ly/Welcome-to-LilyPond-MacOS.ly
@@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org .
%}
-\version "2.19.65" % necessary for upgrading to future LilyPond versions.
+\version "2.19.80" % necessary for upgrading to future LilyPond versions.
\header{
title = "A scale in LilyPond"
diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index a55f74ccd2..a78ba53333 100644
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -32,7 +32,7 @@ Good luck with LilyPond! Happy engraving.
%}
-\version "2.19.65" % necessary for upgrading to future LilyPond versions.
+\version "2.19.80" % necessary for upgrading to future LilyPond versions.
\header{
title = "A scale in LilyPond"
diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index acf116dd69..67821cd095 100644
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -70,7 +70,8 @@ storePredefinedDiagram =
(car (extract-named-music chord 'EventChord))))
(hash-key (cons tuning pitches))
(verbose-definition (if (string? diagram-definition)
- (parse-terse-string diagram-definition)
+ (parse-terse-string
+ (remove-whitespace diagram-definition))
diagram-definition)))
(hash-set! fretboard-table
hash-key
diff --git a/out/ChangeLog b/out/ChangeLog
index d6cab4ae8d..ffdd85136c 100644
--- a/out/ChangeLog
+++ b/out/ChangeLog
@@ -1 +1 @@
-See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/2.19.65-1
+See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/2.19.80-1
diff --git a/out/RELEASE-COMMIT b/out/RELEASE-COMMIT
index 788da860be..db4e1741bf 100644
--- a/out/RELEASE-COMMIT
+++ b/out/RELEASE-COMMIT
@@ -1,32 +1,32 @@
-commit 97a0169312a260933246ab224e4f8b0969871dd5
+commit 3957207c6d09d663b580a99fc46d4ab48524b99d
Author: Phil Holmes <mail@philholmes.net>
-Date: Sun Aug 6 11:21:05 2017 +0100
+Date: Sun Oct 15 17:42:11 2017 +0100
Release: bump Welcome versions.
diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
-index d928d6d..01c9490 100644
+index 01c9490..a93db22 100644
--- a/ly/Welcome-to-LilyPond-MacOS.ly
+++ b/ly/Welcome-to-LilyPond-MacOS.ly
@@ -23,7 +23,7 @@ That's it. For more information, visit http://lilypond.org .
%}
--\version "2.19.64" % necessary for upgrading to future LilyPond versions.
-+\version "2.19.65" % necessary for upgrading to future LilyPond versions.
+-\version "2.19.65" % necessary for upgrading to future LilyPond versions.
++\version "2.19.80" % necessary for upgrading to future LilyPond versions.
\header{
title = "A scale in LilyPond"
diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
-index 77029e7..a55f74c 100644
+index a55f74c..a78ba53 100644
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -32,7 +32,7 @@ Good luck with LilyPond! Happy engraving.
%}
--\version "2.19.64" % necessary for upgrading to future LilyPond versions.
-+\version "2.19.65" % necessary for upgrading to future LilyPond versions.
+-\version "2.19.65" % necessary for upgrading to future LilyPond versions.
++\version "2.19.80" % necessary for upgrading to future LilyPond versions.
\header{
title = "A scale in LilyPond"
diff --git a/po/lilypond.pot b/po/lilypond.pot
index 3632d0569d..5f2b06a704 100644
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: lilypond 2.19.65\n"
+"Project-Id-Version: lilypond 2.19.80\n"
"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
"lilypond.bugs\n"
-"POT-Creation-Date: 2017-08-06 11:17+0100\n"
+"POT-Creation-Date: 2017-10-15 17:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3283,124 +3283,128 @@ msgstr ""
msgid "giving up"
msgstr ""
-#: parser.yy:485 parser.yy:652 parser.yy:992 parser.yy:1073 parser.yy:1309
+#: parser.yy:485 parser.yy:652 parser.yy:1012 parser.yy:1093 parser.yy:1329
msgid "bad expression type"
msgstr ""
-#: parser.yy:905 parser.yy:1512 parser.yy:1574
+#: parser.yy:703
+msgid "Not a markup function"
+msgstr ""
+
+#: parser.yy:925 parser.yy:1532 parser.yy:1594
msgid "not a context mod"
msgstr ""
-#: parser.yy:986 parser.yy:1065 parser.yy:1217
+#: parser.yy:1006 parser.yy:1085 parser.yy:1237
msgid "need \\paper for paper block"
msgstr ""
-#: parser.yy:1099
+#: parser.yy:1119
msgid "Missing music in \\score"
msgstr ""
-#: parser.yy:1136
+#: parser.yy:1156
msgid "\\paper cannot be used in \\score, use \\layout instead"
msgstr ""
-#: parser.yy:1187
+#: parser.yy:1207
msgid "Spurious expression in \\score"
msgstr ""
-#: parser.yy:1391
+#: parser.yy:1411
msgid "music expected"
msgstr ""
-#: parser.yy:1401 parser.yy:1435
+#: parser.yy:1421 parser.yy:1455
msgid "unexpected post-event"
msgstr ""
-#: parser.yy:1443
+#: parser.yy:1463
msgid "Ignoring non-music expression"
msgstr ""
-#: parser.yy:1754 parser.yy:1775
+#: parser.yy:1774 parser.yy:1795
msgid "not a key"
msgstr ""
-#: parser.yy:2685 parser.yy:2806 parser.yy:2819 parser.yy:2828
+#: parser.yy:2705 parser.yy:2826 parser.yy:2839 parser.yy:2848
msgid "bad grob property path"
msgstr ""
-#: parser.yy:2786
+#: parser.yy:2806
msgid "only \\consists and \\remove take non-string argument."
msgstr ""
-#: parser.yy:2847
+#: parser.yy:2867
msgid "bad context property path"
msgstr ""
-#: parser.yy:2934
+#: parser.yy:2954
msgid "markup expected"
msgstr ""
-#: parser.yy:2947
+#: parser.yy:2967
msgid "simple string expected"
msgstr ""
-#: parser.yy:2960 parser.yy:2970
+#: parser.yy:2980 parser.yy:2990
msgid "symbol expected"
msgstr ""
-#: parser.yy:3110
+#: parser.yy:3130
msgid "not a rhythmic event"
msgstr ""
-#: parser.yy:3160
+#: parser.yy:3180
msgid "post-event expected"
msgstr ""
-#: parser.yy:3169 parser.yy:3174
+#: parser.yy:3191 parser.yy:3196
msgid "have to be in Lyric mode for lyrics"
msgstr ""
-#: parser.yy:3250
+#: parser.yy:3278
msgid "expecting string or post-event as script definition"
msgstr ""
-#: parser.yy:3361
+#: parser.yy:3389
msgid "not an articulation"
msgstr ""
-#: parser.yy:3427 parser.yy:3479
+#: parser.yy:3457 parser.yy:3509
msgid "not a duration"
msgstr ""
-#: parser.yy:3501
+#: parser.yy:3531
msgid "bass number expected"
msgstr ""
-#: parser.yy:3593
+#: parser.yy:3623
msgid "have to be in Note mode for notes"
msgstr ""
-#: parser.yy:3632
+#: parser.yy:3662
msgid "have to be in Chord mode for chords"
msgstr ""
-#: parser.yy:3675
+#: parser.yy:3705
msgid "markup outside of text script or \\lyricmode"
msgstr ""
-#: parser.yy:3680
+#: parser.yy:3710
#, c-format
msgid "not a note name: %s"
msgstr ""
-#: parser.yy:3685
+#: parser.yy:3715
msgid "string outside of text script or \\lyricmode"
msgstr ""
-#: parser.yy:3837 parser.yy:3846
+#: parser.yy:3867 parser.yy:3876
msgid "not an unsigned integer"
msgstr ""
-#: parser.yy:3933
+#: parser.yy:3985
msgid "not a markup"
msgstr ""
@@ -3412,86 +3416,86 @@ msgstr ""
msgid "Skipping UTF-8 BOM"
msgstr ""
-#: lexer.ll:248
+#: lexer.ll:250
#, c-format
msgid "Renaming input to: `%s'"
msgstr ""
-#: lexer.ll:265
+#: lexer.ll:267
msgid "quoted string expected after \\version"
msgstr ""
-#: lexer.ll:269
+#: lexer.ll:271
msgid "quoted string expected after \\sourcefilename"
msgstr ""
-#: lexer.ll:273
+#: lexer.ll:275
msgid "integer expected after \\sourcefileline"
msgstr ""
-#: lexer.ll:300
+#: lexer.ll:302
msgid "\\maininput not allowed outside init files"
msgstr ""
-#: lexer.ll:324
+#: lexer.ll:326
#, c-format
msgid "wrong or undefined identifier: `%s'"
msgstr ""
-#: lexer.ll:349
+#: lexer.ll:351
msgid "string expected after \\include"
msgstr ""
-#: lexer.ll:359
+#: lexer.ll:361
msgid "end quote missing"
msgstr ""
-#: lexer.ll:718
+#: lexer.ll:719
msgid "EOF found inside a comment"
msgstr ""
-#: lexer.ll:723
+#: lexer.ll:724
msgid "EOF found inside string"
msgstr ""
-#: lexer.ll:738
+#: lexer.ll:739
msgid "Unfinished main input"
msgstr ""
-#: lexer.ll:809
+#: lexer.ll:810
#, c-format
msgid "invalid character: `%s'"
msgstr ""
-#: lexer.ll:946
+#: lexer.ll:947
#, c-format
msgid "unknown escaped string: `\\%s'"
msgstr ""
-#: lexer.ll:966
+#: lexer.ll:967
#, c-format
msgid "undefined character or shorthand: %s"
msgstr ""
-#: lexer.ll:1268
+#: lexer.ll:1269
msgid "non-UTF-8 input"
msgstr ""
-#: lexer.ll:1312
+#: lexer.ll:1313
#, c-format
msgid "Invalid version string \"%s\""
msgstr ""
-#: lexer.ll:1317
+#: lexer.ll:1318
#, c-format
msgid "file too old: %s (oldest supported: %s)"
msgstr ""
-#: lexer.ll:1318
+#: lexer.ll:1319
msgid "consider updating the input with the convert-ly script"
msgstr ""
-#: lexer.ll:1324
+#: lexer.ll:1325
#, c-format
msgid "program too old: %s (file requires: %s)"
msgstr ""
@@ -3915,17 +3919,22 @@ msgstr ""
msgid "wrong type for argument ~a. Expecting ~a, found ~s"
msgstr ""
-#: markup-macros.scm:331
+#: markup-macros.scm:289
+#, scheme-format
+msgid "~S: Not a markup (list) function: ~S"
+msgstr ""
+
+#: markup-macros.scm:297
#, scheme-format
msgid "Wrong number of arguments. Expect: ~A, found ~A: ~S"
msgstr ""
-#: markup-macros.scm:337
+#: markup-macros.scm:303
#, scheme-format
msgid "Invalid argument in position ~A. Expect: ~A, found: ~S."
msgstr ""
-#: markup-macros.scm:373
+#: markup-macros.scm:339
#, scheme-format
msgid "Not a markup command: ~A"
msgstr ""
@@ -4005,39 +4014,35 @@ msgstr ""
msgid "music expected: ~S"
msgstr ""
-#: music-functions.scm:1348
+#: music-functions.scm:1352
#, scheme-format
msgid "cannot find quoted music: `~S'"
msgstr ""
-#: music-functions.scm:1485
+#: music-functions.scm:1489
msgid "Add @var{octave-shift} to the octave of @var{pitch}."
msgstr ""
-#: music-functions.scm:1548
+#: music-functions.scm:1552
#, scheme-format
msgid "Unknown octaveness type: ~S "
msgstr ""
-#: music-functions.scm:1549
+#: music-functions.scm:1553
msgid "Defaulting to 'any-octave."
msgstr ""
-#: music-functions.scm:1948
+#: music-functions.scm:1952
#, scheme-format
msgid "unknown accidental style: ~S"
msgstr ""
-#: music-functions.scm:2173
-msgid "Missing duration"
-msgstr ""
-
-#: music-functions.scm:2694
+#: music-functions.scm:2696
#, scheme-format
msgid "not a symbol list: ~a"
msgstr ""
-#: music-functions.scm:2697
+#: music-functions.scm:2699
#, scheme-format
msgid "conflicting tag group ~a"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index d95ef486ce..58f53daaad 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,2344 +1,4803 @@
-# Swedish translation of lilypond
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Martin Norbäck <d95mback@dtek.chalmers.se>, 2001, 2002, 2003.
+# Translation of LilyPond
+# Copyright (C) 1998--2015 Han-Wen Nienhuys, Jan Nieuwenhuizen.
+# This file is distributed under the same license as the LilyPond package.
+# Martin Norbäck <d95mback@dtek.chalmers.se>, 2001, 2002, 2003.
+# Josef Andersson <l10nl18nsweja@gmail.com>, 2017.
#
msgid ""
msgstr ""
-"Project-Id-Version: lilypond 1.7.26\n"
-"POT-Creation-Date: 2003-07-18 14:45+0200\n"
-"PO-Revision-Date: 2003-08-23 13:30+0200\n"
-"Last-Translator: Martin Norbäck <d95mback@dtek.chalmers.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Project-Id-Version: lilypond 2.19.54\n"
+"Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n"
+"POT-Creation-Date: 2017-01-03 14:31+0000\n"
+"PO-Revision-Date: 2017-08-06 23:02+0200\n"
+"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
-#. this is where special info is often stored
-#. ###############################################################
-#. lilylib.py -- options and stuff
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. ## subst:\(^\|[^._a-z]\)\(abspath\|identify\|warranty\|progress\|warning\|error\|exit\|getopt_args\|option_help_str\|options_help_str\|help\|setup_temp\|read_pipe\|system\|cleanup_temp\|strip_extension\|cp_to_dir\|mkdir_p\|init\) *(
-#. ## replace:\1ly.\2 (
-#. ## subst: \(help_summary\|keep_temp_dir_p\|option_definitions\|original_dir\|program_name\|pseudo_filter_p\|temp_dir\|verbose_p\)
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. lilylib globals
-#: lilylib.py:60
-msgid "lilylib module"
-msgstr "lilylib-modul"
-
-# förklaring av flaggan -h
-#: lilylib.py:63 lilypond-book.py:131 ly2dvi.py:128 midi2ly.py:100
-#: mup2ly.py:75 main.cc:111
-msgid "this help"
-msgstr "denna hjälp"
-
-#. ###############################################################
-#. Handle bug in Python 1.6-2.1
-#.
-#. there are recursion limits for some patterns in Python 1.6 til 2.1.
-#. fix this by importing pre instead. Fix by Mats.
-#. Attempt to fix problems with limited stack size set by Python!
-#. Sets unlimited stack size. Note that the resource module only
-#. is available on UNIX.
-#: lilylib.py:114 midi2ly.py:136 mup2ly.py:130 main.cc:188 main.cc:200
-#, c-format, python-format
-msgid "Copyright (c) %s by"
-msgstr "Copyright © %s av"
+#: book_base.py:26
+#, python-format
+msgid "file not found: %s"
+msgstr "filen hittades inte: â%sâ"
-#: lilylib.py:114
-msgid " 1998--2015"
-msgstr " 1998-2003"
+#: book_base.py:164
+msgid "Output function not implemented"
+msgstr "Utdatafunktionen inte implementerad"
-#: lilylib.py:118
-msgid "Distributed under terms of the GNU General Public License."
-msgstr "Distribueras under GNU General Public License."
+#: book_latex.py:174
+#, python-brace-format
+msgid "cannot find \\begin{document} in LaTeX document"
+msgstr "det går inte att hitta \\begin{document} i LaTeX-dokument"
-#: lilylib.py:120
-msgid "It comes with NO WARRANTY."
-msgstr "INGEN GARANTI ges för programmet."
+#: book_latex.py:190
+#, python-format
+msgid "Running `%s' on file `%s' to detect default page settings.\n"
+msgstr "Kör â%sâ pÃ¥ filen â%sâ för att identifiera standardinställningar för sida.\n"
-#: lilylib.py:127 midi2ly.py:150 mup2ly.py:144 input.cc:88
-msgid "warning: "
-msgstr "varning: "
+#: book_latex.py:219 book_texinfo.py:230
+msgid "Unable to auto-detect default settings:\n"
+msgstr "Kunde inte autoidentifiera standardinställningar:\n"
-#. lots of midi files use plain text for lyric events
-#. FIXME: read from stdin when files[0] = '-'
-#: lilylib.py:130 midi2ly.py:165 midi2ly.py:1018 midi2ly.py:1083 mup2ly.py:147
-#: mup2ly.py:161 input.cc:93
-msgid "error: "
-msgstr "fel: "
+#: book_latex.py:231 book_texinfo.py:242
+#, python-format
+msgid ""
+"Unable to auto-detect default settings:\n"
+"%s"
+msgstr ""
+"Kunde inte autoidentifiera standardinställningar:\n"
+"%s"
+
+#: book_latex.py:254
+msgid "cannot detect textwidth from LaTeX"
+msgstr "det går inte att identifiera textbredd från LaTeX"
-#: lilylib.py:134
+#: book_snippets.py:406
#, python-format
-msgid "Exiting (%d)..."
-msgstr "Avslutar (%d)... "
+msgid "deprecated ly-option used: %s=%s"
+msgstr "föråldrad ly-flagga använd: %s=%s"
-#: lilylib.py:194 midi2ly.py:224 mup2ly.py:220
+#: book_snippets.py:408
#, python-format
-msgid "Usage: %s [OPTION]... FILE"
-msgstr "Användning: %s [FLAGGA]... FIL"
+msgid "compatibility mode translation: %s=%s"
+msgstr "kompatibilitetsläge för översättning: %s=%s"
-#: lilylib.py:198 midi2ly.py:228 mup2ly.py:224 main.cc:166
-msgid "Options:"
-msgstr "Flaggor:"
+#: book_snippets.py:411
+#, python-format
+msgid "deprecated ly-option used: %s"
+msgstr "föråldrad ly-flagga använd: %s"
-#: lilylib.py:202 midi2ly.py:232 mup2ly.py:228 main.cc:172
-#, c-format, python-format
-msgid "Report bugs to %s"
-msgstr ""
-"Rapportera programfel till %s\n"
-"Rapportera fel i översättningen till <sv@li.org>"
+#: book_snippets.py:413
+#, python-format
+msgid "compatibility mode translation: %s"
+msgstr "kompatibilitetsläge för översättning: %s"
+
+#: book_snippets.py:530
+#, python-format
+msgid "ignoring unknown ly option: %s"
+msgstr "ignorerar okänd flagga: %s"
+
+#: book_snippets.py:621
+#, python-format
+msgid "Missing files: %s"
+msgstr "Saknar filer: %s"
+
+#: book_snippets.py:661
+#, python-format
+msgid "Could not overwrite file %s"
+msgstr "Det gick inte att skriva över filen %s"
-#: lilylib.py:228
+#: book_snippets.py:748
#, python-format
-msgid "Opening pipe `%s'"
-msgstr "Öppnar rör \"%s\"..."
+msgid "Running through filter `%s'"
+msgstr "Kör genom filter â%sâ"
-#. successful pipe close returns 'None'
-#: lilylib.py:240
+#: book_snippets.py:769
#, python-format
msgid "`%s' failed (%d)"
-msgstr "\"%s\" misslyckades (%d)"
+msgstr "â%sâ misslyckades (%d)"
-#: lilylib.py:242 lilylib.py:289 lilypond-book.py:231 ly2dvi.py:512
+#: book_snippets.py:770
msgid "The error log is as follows:"
-msgstr "Felloggen är följande:"
+msgstr "Felloggen är följande:"
-#: lilylib.py:262 midi2ly.py:260 mup2ly.py:256
+#: book_snippets.py:890
#, python-format
-msgid "Invoking `%s'"
-msgstr "Startar \"%s\""
+msgid "Converting MusicXML file `%s'...\n"
+msgstr "Konverterar MusicXML-filen â%sââ¦\n"
-#: lilylib.py:264
+#: book_snippets.py:917
#, python-format
-msgid "Running %s..."
-msgstr "Kör %s..."
+msgid ""
+"%s: duplicate filename but different contents of original file,\n"
+"printing diff against existing file."
+msgstr ""
+"%s: duplicerat filnamn men okänt innehåll för originalfil,\n"
+"skriver ut diff mot existerande fil."
-#: lilylib.py:282
+#: book_snippets.py:930
#, python-format
-msgid "`%s' failed (%s)"
-msgstr "\"%s\" misslyckades (%s)"
+msgid ""
+"%s: duplicate filename but different contents of converted lilypond file,\n"
+"printing diff against existing file."
+msgstr ""
+"%s: duplicerat filnamn men annat innehåll i konverterad lilypondfil,\n"
+"skriver ut diff mot existerande fil."
-#: lilylib.py:285 midi2ly.py:266 mup2ly.py:264
-msgid "(ignored)"
-msgstr "(ignorerat)"
+#. Work around a texi2pdf bug: if LANG=C is not given, a broken regexp is
+#. used to detect relative/absolute paths, so the absolute path is not
+#. detected as such and this command fails:
+#: book_texinfo.py:208
+#, python-format
+msgid "Running texi2pdf on file %s to detect default page settings.\n"
+msgstr "Kör texi2pdf pÃ¥ filen â%sâ för att identifiera standarinställningar för sida.\n"
-# här är det fråga om rensning av en temporärkatalog
-#: lilylib.py:299 midi2ly.py:276 mup2ly.py:274
+#: convertrules.py:13
#, python-format
-msgid "Cleaning %s..."
-msgstr "Rensar %s..."
+msgid "Not smart enough to convert %s."
+msgstr "Ej smart nog för att konvertera %s."
-#. Duh. Python style portable: cp *.EXT OUTDIR
-#. system ('cp *.%s %s' % (ext, outdir), 1)
-#. Python < 1.5.2 compatibility
-#.
-#. On most platforms, this is equivalent to
-#. `normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2*
-#. tex needs lots of memory, more than it gets by default on Debian
-#. TODO: * prevent multiple addition.
-#. * clean TEXINPUTS, MFINPUTS, TFMFONTS,
-#. as these take prevalence over $TEXMF
-#. and thus may break tex run?
-#. $TEXMF is special, previous value is already taken care of
-#. # -sOutputFile does not work with bbox?
-#. # todo:
-#. # have better algorithm for deciding when to crop page,
-#. # and when to show full page
-#: lilylib.py:458
-msgid "Removing output file"
-msgstr "Tar bort utdatafilen"
-
-#. !@PYTHON@
-#. once upon a rainy monday afternoon.
-#.
-#. ...
-#.
-#. (not finished.)
-#. ABC standard v1.6: http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt
-#.
-#. Enhancements (Roy R. Rankin)
-#.
-#. Header section moved to top of lilypond file
-#. handle treble, treble-8, alto, and bass clef
-#. Handle voices (V: headers) with clef and part names, multiple voices
-#. Handle w: lyrics with multiple verses
-#. Handle key mode names for minor, major, phrygian, ionian, locrian, aeolian,
-#. mixolydian, lydian, dorian
-#. Handle part names from V: header
-#. Tuplets handling fixed up
-#. Lines starting with |: not discarded as header lines
-#. Multiple T: and C: header entries handled
-#. Accidental maintained until next bar check
-#. Silent rests supported
-#. articulations fermata, upbow, downbow, ltoe, accent, tenuto supported
-#. Chord strings([-^]"string") can contain a '#'
-#. Header fields enclosed by [] in notes string processed
-#. W: words output after tune as abc2ps does it (they failed before)
-#. Enhancements (Laura Conrad)
-#.
-#. Barring now preserved between ABC and lilypond
-#. the default placement for text in abc is above the staff.
-#. %%LY now supported.
-#. \breve and \longa supported.
-#. M:none doesn't crash lily.
-#. Limitations
-#.
-#. Multiple tunes in single file not supported
-#. Blank T: header lines should write score and open a new score
-#. Not all header fields supported
-#. ABC line breaks are ignored
-#. Block comments generate error and are ignored
-#. Postscript commands are ignored
-#. lyrics not resynchronized by line breaks (lyrics must fully match notes)
-#. %%LY slyrics can't be directly before a w: line.
-#. ???
-#. TODO:
-#.
-#. Convert to new chord styles.
-#.
-#. UNDEF -> None
-#.
-#. uGUHGUHGHGUGH
-#. UGH
-#. treble8 is used by abctab2ps; -8va is used by barfly,
-#. and by my patch to abc2ps. If there's ever a standard
-#. about this we'll support that.
-#. find keywork
-#. assume that Q takes the form "Q:1/4=120"
-#. There are other possibilities, but they are deprecated
-#. outf.write ("\t\t\\consists Staff_margin_engraver\n")
-#. pitch manipulation. Tuples are (name, alteration).
-#. 0 is (central) C. Alteration -1 is a flat, Alteration +1 is a sharp
-#. pitch in semitones.
-#. abc to lilypond key mode names
-#. semitone shifts for key mode names
-#. latex does not like naked #'s
-#. latex does not like naked "'s
-#. break lyrics to words and put "'s around words containing numbers and '"'s
-#. escape "
-#. _ causes probs inside ""
-#. _ to ' _ '
-#. split words with -
-#. unless \-
-#. ~ to space('_')
-#. * to to space
-#. latex does not like naked #'s
-#. put numbers and " and ( into quoted string
-#. insure space between lines
-#. title
-#. strip trailing blanks
-#. Meter
-#. KEY
-#. seperate clef info
-#. there may or may not be a space
-#. between the key letter and the mode
-#. ugh.
-#. ugh.
-#. Notes
-#. Origin
-#. Reference Number
-#. Area
-#. History
-#. Book
-#. Composer
-#. Default note length
-#. Voice
-#. Words
-#. vocals
-#. tempo
-#. we use in this order specified accidental, active accidental for bar,
-#. active accidental for key
-#. (num / den) / defaultlen < 1/base
-#. return (str, num,den,dots)
-#. ignore slide
-#. ignore roll
-#. s7m2 input doesnt care about spaces
-#.
-#. remember accidental for rest of bar
-#.
-#. get accidental set in this bar or UNDEF if not set
-#. WAT IS ABC EEN ONTZETTENDE PROGRAMMEERPOEP !
-#. failed; not a note!
-#. escape '#'s
-#.
-#. |] thin-thick double bar line
-#. || thin-thin double bar line
-#. [| thick-thin double bar line
-#. :| left repeat
-#. |: right repeat
-#. :: left-right repeat
-#. |1 volta 1
-#. |2 volta 2
-#. first try the longer one
-#. bracket escape
-#. the nobarlines option is necessary for an abc to lilypond translator for
-#. exactly the same reason abc2midi needs it: abc requires the user to enter
-#. the note that will be printed, and MIDI and lilypond expect entry of the
-#. pitch that will be played.
-#.
-#. In standard 19th century musical notation, the algorithm for translating
-#. between printed note and pitch involves using the barlines to determine
-#. the scope of the accidentals.
-#.
-#. Since ABC is frequently used for music in styles that do not use this
-#. convention, such as most music written before 1700, or ethnic music in
-#. non-western scales, it is necessary to be able to tell a translator that
-#. the barlines should not affect its interpretation of the pitch.
-#. write other kinds of appending if we ever need them.
-#. add comments to current voice
-#. Try nibbling characters off until the line doesn't change.
-#. dump_global (outf)
-#. !@PYTHON@
-#.
-#. convert-ly.py -- Update old LilyPond input files (fix name?)
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. TODO
-#. use -f and -t for -s output
-#. NEWS
-#. 0.2
-#. - rewrite in python
-#. Did we ever have \mudela-version? I doubt it.
-#. lilypond_version_re_str = '\\\\version *\"(.*)\"'
-#. ###########################
-#. need new a namespace
-#. raise FatalConversionError()
-#. need new a namespace
-#. harmful to current .lys
-#. str = re.sub ('\\\\key([^;]+);', '\\\\accidentals \\1;', str)
-#. raise FatalConversionError()
-#. raise FatalConversionError()
-#. raise FatalConversionError()
-#. TODO: lots of other syntax change should be done here as well
-#. Ugh, but meaning of \stemup changed too
-#. maybe we should do \stemup -> \stemUp\slurUp\tieUp ?
-#. I don't know exactly when these happened...
-#. ugh, we loose context setting here...
-#. (lacks capitalisation slur -> Slur)
-#. # dynamic..
-#. TODO: add lots of these
-#. ugh
-#. old fix
-#. Make sure groups of more than one ; have space before
-#. them, so that non of them gets removed by next rule
-#. Only remove ; that are not after spaces, # or ;
-#. Otherwise we interfere with Scheme comments,
-#. which is badbadbad.
-#. 40 ?
-#. ###############################
-#. END OF CONVERSIONS
-#. ###############################
-#. !@PYTHON@
-#. info mostly taken from looking at files. See also
-#. http://lilypond.org/wiki/?EnigmaTransportFormat
-#. This supports
-#.
-#. * notes
-#. * rests
-#. * ties
-#. * slurs
-#. * lyrics
-#. * articulation
-#. * grace notes
-#. * tuplets
-#.
-#. todo:
-#. * slur/stem directions
-#. * voices (2nd half of frame?)
-#. * more intelligent lyrics
-#. * beams (better use autobeam?)
-#. * more robust: try entertainer.etf (freenote)
-#. * dynamics
-#. * empty measures (eg. twopt03.etf from freenote)
-#.
-#. uGUHGUHGHGUGH
-#. notename 0 == central C
-#. represent pitches as (notename, alteration), relative to C-major scale
-#. a fifth up
-#. should cache this.
-#. flag1 isn't all that interesting.
-#. 3: '>',
-#. 18: '\arpeggio' ,
-#. do grace notes.
-#. ugh.
-#. we don't attempt voltas since they fail easily.
-#. and g.repeat_bar == '|:' or g.repeat_bar == ':|:' or g.bracket:
-#. 4 layers.
-#. let's not do this: this really confuses when eE happens to be before a ^text.
-#. if last_tag and last_indices:
-#. etf_file_dict[last_tag][last_indices].append (l)
-#. # do it
-#. staff-spec
-#. should use \addlyrics ?
-#. !@PYTHON@
-#. vim: set noexpandtab:
-#. This is was the idea for handling of comments:
-#. Multiline comments, @ignore .. @end ignore is scanned for
-#. in read_doc_file, and the chunks are marked as 'ignore', so
-#. lilypond-book will not touch them any more. The content of the
-#. chunks are written to the output file. Also 'include' and 'input'
-#. regex has to check if they are commented out.
-#.
-#. Then it is scanned for 'lilypond', 'lilypond-file' and 'lilypond-block'.
-#. These three regex's has to check if they are on a commented line,
-#. % for latex, @c for texinfo.
-#.
-#. Then lines that are commented out with % (latex) and @c (Texinfo)
-#. are put into chunks marked 'ignore'. This cannot be done before
-#. searching for the lilypond-blocks because % is also the comment character
-#. for lilypond.
-#.
-#. The the rest of the rexeces are searched for. They don't have to test
-#. if they are on a commented out line.
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. if __name__ == '__main__':
-#. lilylib globals
-#. temp_dir = os.path.join (original_dir, '%s.dir' % program_name)
-#. urg
-#. # FIXME
-#. # ly2dvi: silly name?
-#. # do -P or -p by default?
-#. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: lilypond-book.py:120
-msgid "Process LilyPond snippets in hybrid html, LaTeX or texinfo document"
-msgstr "Bearbeta LilyPond-stycken i ett hybriddokument i html, LaTex eller texinfo"
-
-#. another bug in option parser: --output=foe is taken as an abbreviation
-#. for --output-format
-#: lilypond-book.py:125 main.cc:110
-msgid "EXT"
-msgstr "FMT"
-
-#: lilypond-book.py:125
-msgid "use output format EXT (texi [default], texi-html, latex, html)"
-msgstr "använd utdataformat FMT (texi [standard], texi-html, latex, html)"
-
-#: lilypond-book.py:126 lilypond-book.py:127 lilypond-book.py:129
-#: lilypond-book.py:130
-msgid "DIM"
-msgstr "DIM"
+#: convertrules.py:14
+msgid "Please refer to the manual for details, and update manually."
+msgstr "Se handboken för detaljer, uppdatera manuellt."
-#: lilypond-book.py:126
-msgid "default fontsize for music. DIM is assumed to be in points"
-msgstr "standardtypsnittsstorlek för musik. DIM anges i punkter"
+#: convertrules.py:15
+#, python-format
+msgid "%s has been replaced by %s"
+msgstr "%s har ersatts av %s"
-#: lilypond-book.py:127
-msgid "deprecated, use --default-music-fontsize"
-msgstr "föråldrad, använd --default-music-fontsize"
+#: convertrules.py:25 lilylib.py:136 warn.cc:223
+#, c-format, python-format
+msgid "warning: %s"
+msgstr "varning: %s"
-#: lilypond-book.py:128
-msgid "OPT"
-msgstr "OPT"
+# #TODO: Ask about this one
+#: convertrules.py:50 convertrules.py:95
+msgid "\\header { key = concat + with + operator }"
+msgstr "\\header { key = concat + with + operator }"
-#: lilypond-book.py:128
-msgid "pass OPT quoted to the lilypond command line"
-msgstr "skicka OPT till lilyponds kommandorad"
+#: convertrules.py:57
+#, python-format
+msgid "deprecated %s"
+msgstr "föråldrad %s"
+
+#: convertrules.py:66
+msgid "deprecated \\textstyle, new \\key syntax"
+msgstr "föråldrad \\textstyle, ny \\key-syntax"
+
+#: convertrules.py:82 convertrules.py:1856 convertrules.py:2032
+#: convertrules.py:2175 convertrules.py:2506 convertrules.py:2801
+#: convertrules.py:3151 convertrules.py:3388 convertrules.py:3700
+msgid "bump version for release"
+msgstr "stega upp versionen för utgåva"
+
+#: convertrules.py:98
+msgid "new \\header format"
+msgstr "nytt \\header-format"
+
+#: convertrules.py:125
+msgid "\\translator syntax"
+msgstr "\\translator-syntax"
+
+# #TODO: Ask about this one
+#: convertrules.py:176
+msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
+msgstr "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
+
+#: convertrules.py:206 convertrules.py:679 convertrules.py:1351
+#: convertrules.py:2318
+#, python-format
+msgid "deprecate %s"
+msgstr "föråldra %s"
-#: lilypond-book.py:129
-msgid "force fontsize for all inline lilypond. DIM is assumed be to in points"
-msgstr "tvinga typsnittsstorlek för all inbäddad lilypond. DIM anger i punkter"
+#: convertrules.py:280
+#, python-format
+msgid "deprecate %s "
+msgstr "föråldra %s"
-#: lilypond-book.py:130
-msgid "deprecated, use --force-music-fontsize"
-msgstr "föråldrad, använd --force-music-fontsize"
+#: convertrules.py:306
+msgid "new \\notenames format"
+msgstr "nett \\notenames-format"
-#: lilypond-book.py:132 ly2dvi.py:130 main.cc:113 main.cc:118
-msgid "DIR"
-msgstr "KATALOG"
+#: convertrules.py:322
+msgid "new tremolo format"
+msgstr "nytt tremolo-format"
-#: lilypond-book.py:132
-msgid "include path"
-msgstr "sökväg för inkluderade filer"
+#: convertrules.py:326
+msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
+msgstr "Staff_margin_engraver föråldrad, använd Instrument_name_engraver"
-#: lilypond-book.py:133
-msgid "write dependencies"
-msgstr "skriv beroenden"
+#: convertrules.py:377
+msgid "change property definition case (eg. onevoice -> oneVoice)"
+msgstr "ändra skiftlägeskänslighet för egenskapsdefinitioner( exempel: onevoice -> oneVoice)"
-#: lilypond-book.py:134
-msgid "PREF"
-msgstr "PREF"
+#: convertrules.py:438
+msgid "new \\textscript markup text"
+msgstr "ny \\textscript-markup-text"
-#: lilypond-book.py:134
-msgid "prepend PREF before each -M dependency"
-msgstr "lägg till PREF före varje beroende angett med -M"
+#: convertrules.py:510
+#, python-format
+msgid "identifier names: %s"
+msgstr "Identifierarnamn: %s"
-#: lilypond-book.py:135
-msgid "don't run lilypond"
-msgstr "kör inte lilypond"
+#: convertrules.py:549
+msgid "point-and-click argument changed to procedure."
+msgstr "peka-och-klickargument ändrat till procedur."
-#: lilypond-book.py:136
-msgid "don't generate pictures"
-msgstr "skapa inte bilder"
+#: convertrules.py:591
+msgid "semicolons removed"
+msgstr "semikolon borttagna"
-#: lilypond-book.py:137
-msgid "strip all lilypond blocks from output"
-msgstr "ta bort alla lilypond-block från utdata"
+#. 40 ?
+#: convertrules.py:634
+#, python-format
+msgid "%s property names"
+msgstr "egenskapsnamn för %s"
-#: lilypond-book.py:138 lilypond-book.py:139 ly2dvi.py:135 ly2dvi.py:136
-#: midi2ly.py:102 main.cc:114 main.cc:117
-msgid "FILE"
-msgstr "FIL"
+#: convertrules.py:704
+msgid "automaticMelismata turned on by default"
+msgstr "automaticMelismata på som standard"
-#: lilypond-book.py:138
-msgid "filename main output file"
-msgstr "filnamn på huvudutdatafilen"
+#: convertrules.py:709
+msgid "automaticMelismata is turned on by default since 1.5.67."
+msgstr "automaticMelismata är på som standard sedan 1.5.6.7."
-#: lilypond-book.py:139
-msgid "where to place generated files"
-msgstr "var genererade filer ska läggas"
+#: convertrules.py:943 convertrules.py:1636 convertrules.py:1890
+#: convertrules.py:2135
+#, python-format
+msgid "remove %s"
+msgstr "ta bort %s"
-#: lilypond-book.py:140 ly2dvi.py:137
-msgid "RES"
-msgstr "RES"
+#: convertrules.py:978 convertrules.py:981
+msgid "cluster syntax"
+msgstr "klustersyntax"
-#: lilypond-book.py:141 ly2dvi.py:138
-msgid "set the resolution of the preview to RES"
-msgstr "sätt resolutionen för förhandsgranskningen till RES"
+#: convertrules.py:988
+msgid "new Pedal style syntax"
+msgstr "ny Pedal-stilsyntax"
-# Förklaring till --verbose (borde vara längre)
-#: lilypond-book.py:142 ly2dvi.py:148 midi2ly.py:105 mup2ly.py:78 main.cc:126
-msgid "verbose"
-msgstr "utförlig utdata"
+#: convertrules.py:1247
+msgid ""
+"New relative mode,\n"
+"Postfix articulations, new text markup syntax, new chord syntax."
+msgstr ""
+"Nytt relativt läge,\n"
+"Postfix-artikulationer, ny textmarkup syntax, ny ackordsyntax."
-#: lilypond-book.py:143
-msgid "print version information"
-msgstr "visa versionsinformation"
+#: convertrules.py:1260
+msgid "Remove - before articulation"
+msgstr "Ta bort - innan artikulation"
-#: lilypond-book.py:144 ly2dvi.py:150 midi2ly.py:107 mup2ly.py:80 main.cc:127
-msgid "show warranty and copyright"
-msgstr "visa garanti och copyright"
+#: convertrules.py:1295
+#, python-format
+msgid "%s misspelling"
+msgstr "felstavning av %s"
-#. format specific strings, ie. regex-es for input, and % strings for output
-#. global variables
-#. lilypond_binary = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond'
-#. only use installed binary when we're installed too.
-#. only use installed binary when we're installed too.
-#. ###############################################################
-#. Dimension handling for LaTeX.
-#.
-#. Ugh. (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#: lilypond-book.py:230
-msgid "LaTeX failed."
-msgstr "LaTeX misslyckades."
-
-#. URG see ly2dvi
-#. Convert numeric values, with or without specific dimension, to floats.
-#. Keep other strings
-#. ###############################################################
-#. How to output various structures.
-#. # maybe <hr> ?
-#. Verbatim text is always finished with \n. FIXME: For HTML,
-#. this newline should be removed.
-#. Verbatim text is always finished with \n. FIXME: For HTML,
-#. this newline should be removed.
-#. # Ugh we need to differentiate on origin:
-#. # lilypond-block origin wants an extra <p>, but
-#. # inline music doesn't.
-#. # possibly other center options?
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. verbatim text is always finished with \n
-#. do some tweaking: @ is needed in some ps stuff.
-#.
-#. ugh, the <p> below breaks inline images...
-#. clumsy workaround for python 2.2 pre bug.
-#. ###############################################################
-#. Recognize special sequences in the input
-#. Warning: This uses extended regular expressions. Tread with care.
-#.
-#. legenda
-#.
-#. (?P<name>regex) -- assign result of REGEX to NAME
-#. *? -- match non-greedily.
-#. (?m) -- multiline regex: make ^ and $ match at each line
-#. (?s) -- make the dot match all characters including newline
-#. why do we have distinction between @mbinclude and @include?
-#. # we'd like to catch and reraise a more
-#. # detailed error, but alas, the exceptions
-#. # changed across the 1.5/2.1 boundary.
-#. ughUGH not original options
-#. First we want to scan the \documentclass line
-#. it should be the first non-comment line.
-#. The only thing we really need to know about the \documentclass line
-#. is if there are one or two columns to begin with.
-#. Then we add everything before \begin{document} to
-#. paperguru.m_document_preamble so that we can later write this header
-#. to a temporary file in find_latex_dims() to find textwidth.
-#. this is not bulletproof..., it checks the first 10 chunks
-#. newchunks.extend (func (m))
-#. python 1.5 compatible:
-#. we have to check for verbatim before doing include,
-#. because we don't want to include files that are mentioned
-#. inside a verbatim environment
-#. ugh fix input
-#. # Hmm, we should hash only lilypond source, and skip the
-#. # %options are ...
-#. # comment line
-#. # todo: include path, but strip
-#. # first part of the path.
-#. format == 'html'
-#. ugh rename
-#. Count sections/chapters.
-#. # TODO: do something like
-#. # this for texinfo/latex as well ?
-#. ugh
-#. fixme: be sys-independent.
-#.
-#. Ugh, fixing up dependencies for .tex generation
-#.
-#. Ugh. (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#. # There used to be code to write .tex dependencies, but
-#. # that is silly: lilypond-book has its own dependency scheme
-#. # to ensure that all lily-XXX.tex files are there
-#. # TODO: put file name in front of texidoc.
-#. #
-#. # what's this? Docme --hwn
-#. #
-#. #docme: why global?
-#. Do It.
-#. should chmod -w
-#: lilypond-book.py:1557 ly2dvi.py:673 midi2ly.py:1018
-#, python-format
-msgid "getopt says: `%s'"
-msgstr "getopt säger: \"%s\""
-
-#. HACK
-#. status = os.system ('lilypond -w')
-#: lilypond-book.py:1630 ly2dvi.py:777
-msgid "no files specified on command line"
-msgstr "inga filer angivna på kommandoraden"
+#: convertrules.py:1314
+msgid "Swap < > and << >>"
+msgstr "Byt ut < > och << >>"
-#.
-#. Petr, ik zou willen dat ik iets zinvoller deed,
-#. maar wat ik kan ik doen, het verandert toch niets?
-#. --hwn 20/aug/99
-#. !@PYTHON@
-#.
-#. ly2dvi.py -- Run LilyPond, add titles to bare score, generate printable
-#. document
-#. Invokes: lilypond, latex (or pdflatex), dvips, ps2pdf, gs
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. This is the third incarnation of ly2dvi.
-#.
-#. Earlier incarnations of ly2dvi were written by
-#. Jeffrey B. Reed<daboys@austin.rr.com> (Python version)
-#. Jan Arne Fagertun <Jan.A.Fagertun@@energy.sintef.no> (Bourne shell script)
-#.
-#. Note: gettext work best if we use ' for docstrings and "
-#. for gettextable strings.
-#. --> DO NOT USE ''' for docstrings.
-#. ###############################################################
-#. Users of python modules should include this snippet
-#. and customize variables below.
-#. We'll suffer this path init stuff as long as we don't install our
-#. python packages in <prefix>/lib/pythonx.y (and don't kludge around
-#. it as we do with teTeX on Red Hat Linux: set some environment var
-#. (PYTHONPATH) in profile)
-#. If set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. Customize these
-#. if __name__ == '__main__':
-#. lilylib globals
-#. # FIXME
-#. # ly2dvi: silly name?
-#. # do -P or -p by default?
-#. #help_summary = _ ("Run LilyPond using LaTeX for titling")
-#: ly2dvi.py:121
-msgid "Run LilyPond, add titles, generate printable document"
-msgstr "Kör LilyPond, lägg till titlar, skapa utskrivbart dokument"
-
-#: ly2dvi.py:127 main.cc:115
-msgid "write Makefile dependencies for every input file"
-msgstr "skriv Makefile-beroenden för varje indatafil"
-
-#: ly2dvi.py:129
-msgid "print even more output"
-msgstr "skriv ännu mer utdata"
-
-#: ly2dvi.py:130
-msgid "add DIR to LilyPond's search path"
-msgstr "lägg till KATALOG till LilyPonds sökväg"
-
-# %s är programmets namn
-#: ly2dvi.py:132
-#, python-format
-msgid "keep all output, output to directory %s.dir"
-msgstr "behåll all utdata, utdata till katalogen %s.dir"
-
-#: ly2dvi.py:133
-msgid "don't run LilyPond"
-msgstr "kör inte LilyPond"
-
-#: ly2dvi.py:134 main.cc:116
-msgid "produce MIDI output only"
-msgstr "skapa enbart MIDI-utdata"
-
-#: ly2dvi.py:135 midi2ly.py:102
-msgid "write ouput to FILE"
-msgstr "skriv utdata till FIL"
+#: convertrules.py:1317
+msgid "attempting automatic \\figures conversion. Check results!"
+msgstr "försöker genomföra automatisk konvertering av \\figures. Kontrollera resultatet!"
+
+#: convertrules.py:1363
+msgid "Use Scheme code to construct arbitrary note events."
+msgstr "Använd Schema-kod för att konstruera godtyckliga nothändelser."
-#: ly2dvi.py:136
-msgid "find pfa fonts used in FILE"
-msgstr "hitta pfa-typsnitt som används i FIL"
+#: convertrules.py:1370
+msgid ""
+"use symbolic constants for alterations,\n"
+"remove \\outputproperty, move ly:verbose into ly:get-option"
+msgstr ""
+"använd teckenkonstanter för alterationer,\n"
+"ta bort \\outputproperty, flytta flaggan ly:verbose till ly:get-option"
-#: ly2dvi.py:139
-msgid "generate PostScript output"
-msgstr "skapa PostScript-utdata"
+#: convertrules.py:1395
+#, python-format
+msgid ""
+"\\outputproperty found,\n"
+"Please hand-edit, using\n"
+"\n"
+" \\applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY VALUE>)\n"
+"\n"
+"as a substitution text."
+msgstr ""
+"\\outputproperty funnet,\n"
+"Redigera manuellt med\n"
+"\n"
+" \applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY VALUE>)\n"
+"\n"
+"som ersättningstext."
-#: ly2dvi.py:140
-msgid "generate PNG page images"
-msgstr "skapa PNG-sidbilder"
+#: convertrules.py:1407
+msgid ""
+"The alteration field of Scheme pitches was multiplied by 2\n"
+"to support quarter tone accidentals. You must update the following constructs manually:\n"
+"\n"
+"* calls of ly:make-pitch and ly:pitch-alteration\n"
+"* keySignature settings made with \\property\n"
+msgstr ""
+"Växlingsfältet för Schema-tonhöjd multiplicerades med 2\n"
+"för att stödja fjärdedelsnotförtecken. Du måste uppdatera följande konstruktioner manuellt:\n"
+"\n"
+"* anrop till ly:make-pitch och ly:pitch-alteration\n"
+"* keySignature-inställningar gjorda med \\property\n"
-#: ly2dvi.py:141
-msgid "generate PS.GZ"
-msgstr "skapa PS.GZ"
+#: convertrules.py:1450
+msgid "removal of automaticMelismata; use melismaBusyProperties instead."
+msgstr "ta bort automaticMelismata; använd istället melismaBusyProperties."
-#: ly2dvi.py:142
-msgid "generate PDF output"
-msgstr "skapa PDF-utdata"
+#: convertrules.py:1557
+msgid "\\partcombine syntax change to \\newpartcombine"
+msgstr "\\partcombine-syntax ändrad till \\newpartcombine"
-#: ly2dvi.py:143
-msgid "use pdflatex to generate a PDF output"
-msgstr "använd pdflatex för att generera PDF-utdata"
+#: convertrules.py:1582
+msgid ""
+"Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
+"Harmonic notes. Thread context removed. Lyrics context removed."
+msgstr ""
+"Trumnotationsändringar, tar bort \\chordmodifiers, \\notenames.\n"
+"Harmonic notes. Trådkontext borttaget. Textkontext borttaget."
-#. FIXME: preview, picture; to indicate creation of a PNG?
-#: ly2dvi.py:145
-msgid "make a picture of the first system"
-msgstr "skapa en bild av det första systemet"
+#: convertrules.py:1586
+msgid "Drums found. Enclose drum notes in \\drummode"
+msgstr "Trummor hittade. Lägg in trummor i \\drummode"
-#: ly2dvi.py:146
-msgid "make HTML file with links to all output"
-msgstr "skapa en HTML-fil som länkar till all utdata"
+#: convertrules.py:1597 convertrules.py:1604 convertrules.py:1615
+#, python-format
+msgid ""
+"\n"
+"%s found. Check file manually!\n"
+msgstr ""
+"\n"
+"%s funnen. Kontrollera filen manuellt!\n"
-#: ly2dvi.py:147
-msgid "KEY=VAL"
-msgstr "NYCKEL=VÄRDE"
+#: convertrules.py:1597
+msgid "Drum notation"
+msgstr "Trumnotation"
-#: ly2dvi.py:147
-msgid "change global setting KEY to VAL"
-msgstr "ändra global inställning NYCKEL till VÄRDE"
+#: convertrules.py:1656
+msgid "new syntax for property settings:"
+msgstr "ny syntax för egenskapsinställningar:"
-#: ly2dvi.py:149 midi2ly.py:106 mup2ly.py:79 main.cc:125
-msgid "print version number"
-msgstr "visa versionsnummer"
+#: convertrules.py:1682
+msgid "Property setting syntax in \\translator{ }"
+msgstr "Egenskapsinställningssyntax i \\translator{ }"
-#. other globals
-#. Pdftex support
-#. # yuk.
-#. lilypond_binary = 'valgrind --suppressions=%(home)s/usr/src/guile-1.6.supp --num-callers=10 %(home)s/usr/src/lilypond/lily/out/lilypond '% { 'home' : '/home/hanwen' }
-#. only use installed binary when we're installed too.
-#. init to empty; values here take precedence over values in the file
-#. # TODO: change name.
-#. for geometry v3
-#. Output formats that ly2dvi should create
-#. what a name.
-#. ly.warning (_ ("invalid value: %s") % `val`)
-#. ly.warning (_ ("invalid value: %s") % `val`)
-#: ly2dvi.py:232
-#, python-format
-msgid "no such setting: `%s'"
-msgstr "inställningen finns inte: \"%s\""
+#: convertrules.py:1721
+msgid "Scheme grob function renaming"
+msgstr "Scheme-grobfunktionsnamnändring"
-#. 2 == user interrupt.
-#: ly2dvi.py:274
+#: convertrules.py:1732 convertrules.py:2139 convertrules.py:2143
+#: convertrules.py:2709
#, python-format
-msgid "LilyPond crashed (signal %d)."
-msgstr "LilyPond kraschade (signal %d)."
+msgid "Use %s\n"
+msgstr "Använd %s\n"
-#: ly2dvi.py:275
-msgid "Please submit a bug report to bug-lilypond@gnu.org"
-msgstr "Skicka en buggrapport till bug-lilypond@gnu.org"
+#: convertrules.py:1748
+msgid "More Scheme function renaming"
+msgstr "Flera namnändringar för Scheme-funktion"
-#: ly2dvi.py:281
-#, python-format
-msgid "LilyPond failed on input file %s (exit status %d)"
-msgstr "LilyPond misslyckades på indatafilen \"%s\" (slutstatus %d)"
+#: convertrules.py:1872
+msgid ""
+"Page layout has been changed, using paper size and margins.\n"
+"textheight is no longer used.\n"
+msgstr ""
+"Sidlayout har ändrats, använd pappersstorlek och marginaler.\n"
+"textheight används inte längre.\n"
-#: ly2dvi.py:284
-#, python-format
-msgid "LilyPond failed on an input file (exit status %d)"
-msgstr "LilyPond misslyckades på en indatafil (slutstatus %d)"
+#: convertrules.py:1958
+msgid ""
+"\\foo -> \\foomode (for chords, notes, etc.)\n"
+"fold \\new FooContext \\foomode into \\foo."
+msgstr ""
+"\\foo -> \\foomode (för ackord, noter och så vidare.)\n"
+"fäll ihop \\new FooContext \\foomode till \\foo."
+
+#: convertrules.py:1996
+msgid ""
+"staff size should be changed at top-level\n"
+"with\n"
+"\n"
+" #(set-global-staff-size <STAFF-HEIGHT-IN-POINT>)\n"
+"\n"
+msgstr ""
+"notsystemsstorlek ska ändras på toppnivå\n"
+"med\n"
+"\n"
+" #(set-global-staff-size <STAFF-HEIGHT-IN-POINT>\n"
+"\n"
-#: ly2dvi.py:285
-msgid "Continuing..."
-msgstr "Fortsätter..."
+#: convertrules.py:2016
+msgid "regularize other identifiers"
+msgstr "normera andra identifierare"
-#. urg
-#: ly2dvi.py:296
+#: convertrules.py:2084
+msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
+msgstr "\\encoding: smartomkoda latin..utf-8. Ta bort ly:point-and-click"
+
+#: convertrules.py:2095
+msgid "LilyPond source must be UTF-8"
+msgstr "LilyPond-källa måste vara i UTF-8"
+
+#: convertrules.py:2098
+msgid "Try the texstrings backend"
+msgstr "Prova textstring-bakänden"
+
+#: convertrules.py:2101
#, python-format
-msgid "Analyzing %s..."
-msgstr "Analyserar %s..."
+msgid "Do something like: %s"
+msgstr "Gör något som liknar: %s"
+
+#: convertrules.py:2104
+msgid "Or save as UTF-8 in your editor"
+msgstr "Eller spara som UTF-8 i din redigerare"
+
+#: convertrules.py:2154
+msgid "warn about auto beam settings"
+msgstr "varna om autobalkinställningar"
+
+#: convertrules.py:2158
+msgid "auto beam settings"
+msgstr "autobalkinställningar"
+
+#: convertrules.py:2159
+msgid ""
+"\n"
+"Auto beam settings must now specify each interesting moment in a measure\n"
+"explicitly; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
+msgstr ""
+"\n"
+"Autobalkinställningar måste specificera varje intressant ögonblick i ett mått\n"
+"explicit; 1/4 är inte längre multiplicerat för att täcka moment 1/2 och 3/4 också.\n"
+
+#: convertrules.py:2272
+msgid "verticalAlignmentChildCallback has been deprecated"
+msgstr "verticalAlignmentChildCallback har föråldrats"
+
+#: convertrules.py:2277
+msgid "Remove callbacks property, deprecate XY-extent-callback."
+msgstr "Ta bort egenskapen callbacks, föråldra XY-extent-callback."
+
+#: convertrules.py:2298
+msgid "Use grob closures iso. XY-offset-callbacks."
+msgstr "Använd grob-closures iso. XY-offset-callbacks."
+
+#: convertrules.py:2360
+msgid "foobar -> foo-bar for \\paper, \\layout"
+msgstr "foobar -> foo-bar för \\paper, \\layout"
+
+#: convertrules.py:2470
+msgid "deprecate \\tempo in \\midi"
+msgstr "föråldra \\tempo i \\midi"
-#. search only the first 10k
-#: ly2dvi.py:354
+#: convertrules.py:2523
+msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
+msgstr "föråldra cautionary-style. Använd egenskaperna AccidentalCautionary"
+
+#: convertrules.py:2536
+msgid "Rename accidental glyphs, use glyph-name-alist."
+msgstr "Byt namn på förtecken, använd glyph-name-alist."
+
+#: convertrules.py:2591
+msgid "edge-text settings for TextSpanner"
+msgstr "edge-text-inställningar för TextSpanner"
+
+#: convertrules.py:2592
#, python-format
-msgid "no LilyPond output found for `%s'"
-msgstr "ingen LilyPond-utdata funnen för \"%s\""
+msgid ""
+"Use\n"
+"\n"
+"%s"
+msgstr ""
+"Använd\n"
+"\n"
+"%s"
+
+#: convertrules.py:2625
+msgid "Use the `alignment-offsets' sub-property of\n"
+msgstr "Använd subegenskapen âalignment-offsetsâ av\n"
-#. The final \n seems important here. It ensures that the footers and taglines end up on the right page.
-#. TODO: should set textheight (enlarge) depending on papersize.
-#: ly2dvi.py:397
+#: convertrules.py:2626
+msgid "NonMusicalPaperColumn #'line-break-system-details\n"
+msgstr "NonMusicalPaperColumn #âline-break-system-details\n"
+
+#: convertrules.py:2627
+msgid "to set fixed distances between staves.\n"
+msgstr "för att ange en fast distans mellan stavar.\n"
+
+#: convertrules.py:2639
+msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
+msgstr "Använd #'style och inte #'dash-fraction för att välja solida/streckade linjer."
+
+#: convertrules.py:2645
+msgid "all settings related to dashed lines"
+msgstr "alla inställningar relaterade till streckade linjer"
+
+#: convertrules.py:2646
+msgid "Use \\override ... #'style = #'line for solid lines and\n"
+msgstr "Använd \\override ⦠#'style = #'line för solida linjer och\n"
+
+#: convertrules.py:2647
+msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
+msgstr "\t\\override ⦠#'style = #'dashed-line för streckade linjer."
+
+#: convertrules.py:2683
+msgid ""
+"metronomeMarkFormatter uses text markup as second argument,\n"
+"fret diagram properties moved to fret-diagram-details."
+msgstr ""
+"metronomeMarkFormatter använder text-markup som ett andra argument,\n"
+"fret diagram-egenskaper flyttade till fret-diagram-details."
+
+#: convertrules.py:2689
+msgid "metronomeMarkFormatter got an additional text argument.\n"
+msgstr "metronomeMarkFormatter fick ett ytterligare text-argument.\n"
+
+#: convertrules.py:2690
#, python-format
-msgid "invalid value: `%s'"
-msgstr "ogiltigt värde: \"%s\""
-
-#. set sane geometry width (a4-width) for linewidth = -1.
-#. who the hell is 597 ?
-#. Ugh. (La)TeX writes progress and error messages on stdout
-#. Redirect to stderr
-#: ly2dvi.py:511
-msgid "LaTeX failed on the output file."
-msgstr "LaTeX misslyckades på utdatafilen."
-
-#. make a preview by rendering only the 1st line
-#. of each score
-#: ly2dvi.py:568
msgid ""
-"Trying create PDF, but no PFA fonts found.\n"
-"Using bitmap fonts instead. This will look bad."
+"The function assigned to Score.metronomeMarkFunction now uses the signature\n"
+"%s"
msgstr ""
-"Försöker skapa PDF, men inga PFA-typsnitt hittades.\n"
-"Använder punkttypsnitt istället. Det kommer att se dåligt ut."
-
-#. ugh. Different targets?
-#. Added as functionality to ly2dvi, because ly2dvi may well need to do this
-#. in future too.
-#. no ps header?
-#: ly2dvi.py:615
-#, python-format
-msgid "not a PostScript file: `%s'"
-msgstr "inte en PostScript-fil: \"%s\""
-
-#. todo
-#: ly2dvi.py:660
-#, python-format
-msgid "Writing HTML menu `%s'"
-msgstr "Skriver HTML-meny \"%s\""
-
-#. signal programming error
-#. Don't convert input files to abspath, rather prepend '.' to include
-#. path.
-#. As a neat trick, add directory part of first input file
-#. to include path. That way you can do without the clumsy -I in:
-#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly
-#: ly2dvi.py:769
-msgid "pseudo filter"
-msgstr "pseudofilter"
-
-#: ly2dvi.py:772
-msgid "pseudo filter only for single input file"
-msgstr "pseudofilter bara för enstaka indatafil"
-
-#. Ugh, maybe make a setup () function
-#. hmmm. Wish I'd 've written comments when I wrote this.
-#. now it looks complicated.
-#: ly2dvi.py:806
-#, python-format
-msgid "filename should not contain spaces: `%s'"
-msgstr "filnamnet får inte innehålla mellanslag: \"%s\""
-
-#. to be sure, add tmpdir *in front* of inclusion path.
-#. os.environ['TEXINPUTS'] = tmpdir + ':' + os.environ['TEXINPUTS']
-#. We catch all exceptions, because we need to do stuff at exit:
-#. * copy any successfully generated stuff from tempdir and
-#. notify user of that
-#. * cleanout tempdir
-#. ## ARGH. This also catches python programming errors.
-#. ## this should only catch lilypond nonzero exit status
-#. ## --hwn
-#. TODO: friendly message about LilyPond setup/failing?
-#.
-#: ly2dvi.py:845
-msgid "Running LilyPond failed. Rerun with --verbose for a trace."
-msgstr "Misslyckades med att köra LilyPond. Kör igen med --verbose för spår."
-
-#. Our LilyPond pseudo filter always outputs to 'lelie'
-#. have subsequent stages and use 'lelie' output.
-#. unless: add --tex, or --latex?
-#. TODO: friendly message about TeX/LaTeX setup,
-#. trying to run tex/latex by hand
-#: ly2dvi.py:886
-msgid "Failed to make PS file. Rerun with --verbose for a trace."
-msgstr "Misslyckades med att skapa PS-fil. Kör med --verbose för spår."
-
-#. unless: add --tex, or --latex?
-#. TODO: friendly message about TeX/LaTeX setup,
-#. trying to run tex/latex by hand
-#: ly2dvi.py:916
-msgid "Running LaTeX falied. Rerun with --verbose for a trace."
-msgstr "Misslyckades med att köra LaTeX. Kör med --verbose för spår."
-
-# här är det fråga om skrivning till en fil
-#. add DEP to targets?
-#: ly2dvi.py:926 input-file-results.cc:68
-#, c-format, python-format
-msgid "dependencies output to `%s'..."
-msgstr "beroenden skrivna till \"%s\"..."
+"Funktionen tilldelad till Score.metronomeMarkFunction använder signaturen\n"
+"%s"
-# här är det fråga om skrivning till en fil (första parametern är t.ex
-# DVI, LATEX, MIDI, TEX)
-#: ly2dvi.py:937
+#: convertrules.py:2708
#, python-format
-msgid "%s output to <stdout>..."
-msgstr "%s skrivet till <stdout>..."
+msgid "%s in fret-diagram properties"
+msgstr "%s i fret-diagram-egenskaper"
-#: ly2dvi.py:942 ly2dvi.py:968 includable-lexer.cc:57
-#: input-file-results.cc:191 input-file-results.cc:197 lily-guile.cc:86
-#, c-format, python-format
-msgid "can't find file: `%s'"
-msgstr "kan inte hitta fil: \"%s\""
+#: convertrules.py:2752
+msgid "\\put-adjacent argument order"
+msgstr "\\put-adjacent-argumentordning"
-# här är det fråga om skrivning till en fil (första parametern är t.ex
-# DVI, LATEX, MIDI, TEX)
-#. Hmm, if this were a function, we could call it the except: clauses
-#: ly2dvi.py:965
-#, python-format
-msgid "%s output to %s..."
-msgstr "%s skrivet till \"%s\"..."
+#: convertrules.py:2753
+msgid "Axis and direction now come before markups:\n"
+msgstr "Axel och riktning nu innan markup:\n"
-#. !@PYTHON@
-#.
-#. midi2ly.py -- LilyPond midi import script
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 1998--2015 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-#. Jan Nieuwenhuizen <janneke@gnu.org>
-#. ###############################################################
-#. Users of python modules should include this snippet.
-#.
-#. This soon to be removed for: import lilypond.lilylib as ly
-#. ###############################################################
-#. ###############################################################
-#. ############### CONSTANTS
-#. ###############################################################
-#. temp_dir = os.path.join (original_dir, '%s.dir' % program_name)
-#. original_dir = os.getcwd ()
-#. keep_temp_dir_p = 0
-#: midi2ly.py:94
-msgid "Convert MIDI to LilyPond source"
-msgstr "Konvertera MIDI till LilyPond"
-
-#: midi2ly.py:97
-msgid "print absolute pitches"
-msgstr "skriv absoluta tonhöjder"
+#: convertrules.py:2754
+msgid "\\put-adjacent axis dir markup markup."
+msgstr "\\put-adjacent axis dir markup markup."
-#: midi2ly.py:98 midi2ly.py:103
-msgid "DUR"
-msgstr "LÄNGD"
+#: convertrules.py:2785
+msgid "re-definition of InnerStaffGroup"
+msgstr "omdefinition av InnerStaffGroup"
-#: midi2ly.py:98
-msgid "quantise note durations on DUR"
-msgstr "kvantisera notlängder med LÄNGD"
+#: convertrules.py:2790
+msgid "re-definition of InnerChoirStaff"
+msgstr "omdefinition av InnerChoirStaff"
-#: midi2ly.py:99
-msgid "print explicit durations"
-msgstr "skriv explicita notlängder"
+#: convertrules.py:2800
+msgid "Syntax changes for \\addChordShape and \\chord-shape"
+msgstr "Syntaxändringar för \addChordShape och \\chord-shape"
-#: midi2ly.py:101
-msgid "ALT[:MINOR]"
-msgstr "TON[:MOLL]"
+#: convertrules.py:2805
+msgid "stringTuning must be added to addChordShape call.\n"
+msgstr "stringTuning måste läggas till addChordShape-anropet.\n"
-#: midi2ly.py:101
-msgid "set key: ALT=+sharps|-flats; MINOR=1"
-msgstr "sätt tonart: TON=+höjningar|-sänkningar; MOLL=1"
+#: convertrules.py:2810
+msgid "stringTuning must be added to chord-shape call.\n"
+msgstr "stringTuning måste läggas till chord-shape-andropet.\n"
-#: midi2ly.py:103
-msgid "quantise note starts on DUR"
-msgstr "kvantiser notstarter på LÄNGD"
+#: convertrules.py:2816
+msgid "Remove oldaddlyrics"
+msgstr "Ta bort oldaddlyrics"
-#: midi2ly.py:104
-msgid "DUR*NUM/DEN"
-msgstr "LÄNGD*TÄL/NÄM"
+#: convertrules.py:2820
+msgid ""
+"oldaddlyrics is no longer supported. \n"
+" Use addlyrics or lyricsto instead.\n"
+msgstr ""
+"oldaddlyrics stöds inte längre.\n"
+" Använd addlyrics eller lyricsto istället.\n"
-#: midi2ly.py:104
-msgid "allow tuplet durations DUR*NUM/DEN"
-msgstr "tillåt tupellängder LÄNGD*TÄL/DEN"
+#: convertrules.py:2826
+msgid ""
+"keySignature property not reversed any more\n"
+"MIDI 47: orchestral strings -> orchestral harp"
+msgstr ""
+"keySignature-egenskapen är inte omvänd länger\n"
+"MIDI 47: orchestral strings -> orchestral harp"
-#: midi2ly.py:108
-msgid "treat every text as a lyric"
-msgstr "tolka all text som lyrik"
+#: convertrules.py:2831
+msgid "The alist for Staff.keySignature is no longer in reversed order.\n"
+msgstr "alist för Staff.keySignature är inte längre i omvänt läge.\n"
+
+#: convertrules.py:2837
+msgid ""
+"\\bar \".\" now produces a thick barline\n"
+"ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n"
+"Dash parameters for slurs and ties are now in dash-definition"
+msgstr ""
+"\\bar â.â producerar nu ett tjockt taktstreck\n"
+"ly:hairpin::after-line-breaking -> ly:spanner::kill-zero-spanned-time\n"
+"Streck-parametrar för legatobåge aoch bindebågar finns nu i dash-definition"
-#: midi2ly.py:136 mup2ly.py:130
-msgid " 2001--2003"
-msgstr " 2001-2003"
+#: convertrules.py:2843
+msgid "\\bar \".\" now produces a thick barline.\n"
+msgstr "\\bar â.â producerar nu ett tjock taktstreck.\n"
-#: midi2ly.py:141 mup2ly.py:135
+#: convertrules.py:2849
+msgid "Dash parameters for slurs and ties are now in 'dash-definition.\n"
+msgstr "Dash-streck för legatobåge och bindebågar finns nu i 'dash-definition.\n"
+
+#: convertrules.py:2854
msgid ""
-"\n"
-"Distributed under terms of the GNU General Public License. It comes with\n"
-"NO WARRANTY."
+"Autobeaming rules have changed. override-auto-beam-setting and\n"
+"revert-auto-beam-setting have been eliminated.\n"
+"\\overrideBeamSettings has been added.\n"
+"beatGrouping has been eliminated.\n"
+"Different settings for vertical layout.\n"
+"ly:system-start-text::print -> system-start-text::print\n"
+"Beam #'thickness -> Beam #'beam-thickness\n"
+"ly:note-head::brew-ez-stencil -> note-head::brew-ez-stencil\n"
+"ly:ambitus::print -> ambitus::print\n"
+"Explicit dynamics context definition from `Piano centered dynamics'\n"
+"template replaced by new `Dynamics' context."
msgstr ""
-"\n"
-"Distribueras under GNU General Public License.\n"
-"INGEN GARANTI ges för programmet."
+"Autobalk-regler har ändrats. override-auto-beam-setting och\n"
+"revert-auto-beam-setting har tagits bort.\n"
+"\\overrideBeamSettings har lagts till.\n"
+"beatGrouping har tagits bort.\n"
+"Olika inställningar för vertikal layout.\n"
+"ly:system-start-text::print -> system-start-text::print\n"
+"Beam #'thickness -> Beam #'beam-thickness\n"
+"ly:note-head::brew-ez-stencil -> note-head::brew-ez-stencil\n"
+"ly:ambitus::print -> ambitus::print\n"
+"Explicit dynamisk kontextdefintion från `Piano centered dynamics'\n"
+"-mall ersatt av nytt `Dynamics'-kontext."
+
+#: convertrules.py:2868
+msgid " Autobeam settings are now overriden with \\overrideBeamSettings.\n"
+msgstr " Autobalkinställningar överlagras nu med \\overrideBeamSettings.\n"
+
+#: convertrules.py:2873
+msgid " Autobeam settings are now reverted with \\revertBeamSettings.\n"
+msgstr " Autobalk-inställningar återställs nu med \\revertBeamSettings.\n"
+
+#: convertrules.py:2879
+msgid ""
+" beatGrouping with a specified context must now be accomplished with\n"
+" \\overrideBeamSettings.\n"
+msgstr ""
+" beatGrouping med en specielll kontextmeny måste nu färdigställas från\n"
+" \\overrideBeamSettings.\n"
-#: midi2ly.py:166 mup2ly.py:162
-msgid "Exiting ... "
-msgstr "Avslutar... "
+#: convertrules.py:2885
+msgid "alignment-offsets has been changed to alignment-distances: you must now specify the distances between staves rather than the offset of staves.\n"
+msgstr "alignment-offsets har ändrats till alignment-distances: du måste nu specificera avståndet mellan stavar istället för förskjutningen mellan stavar.\n"
-#: midi2ly.py:264 mup2ly.py:261
-#, python-format
-msgid "command exited with value %d"
-msgstr "kommandot avslutade med värde %d"
+#: convertrules.py:2896
+msgid ""
+"Remove obsolete engravers/translators: Note_swallow_translator,\n"
+"Rest_swallow_translator, Skip_event_swallow_translator, Swallow_engraver,\n"
+"Swallow_performer and String_number_engraver.\n"
+"New vertical spacing variables."
+msgstr ""
+"Ta bort föråldrade engravers/translators: Note_swallow_translator,\n"
+"Rest_swallow_translator, Skip_event_swallow_translator, Swallow_engraver,\n"
+"Swallow_performer and String_number_engraver.\n"
+"New vertical spacing variables."
-# här är det fråga om skrivning till en fil (första parametern är t.ex
-# DVI, LATEX, MIDI, TEX)
-#. ###############################################################
-#. END Library
-#. ###############################################################
-#. hmm
-#. major scale: do-do
-#. minor scale: la-la (= + 5) '''
-#. By tradition, all scales now consist of a sequence
-#. of 7 notes each with a distinct name, from amongst
-#. a b c d e f g. But, minor scales have a wide
-#. second interval at the top - the 'leading note' is
-#. sharped. (Why? it just works that way! Anything
-#. else doesn't sound as good and isn't as flexible at
-#. saying things. In medieval times, scales only had 6
-#. notes to avoid this problem - the hexachords.)
-#. So, the d minor scale is d e f g a b-flat c-sharp d
-#. - using d-flat for the leading note would skip the
-#. name c and duplicate the name d. Why isn't c-sharp
-#. put in the key signature? Tradition. (It's also
-#. supposedly based on the Pythagorean theory of the
-#. cycle of fifths, but that really only applies to
-#. major scales...) Anyway, g minor is g a b-flat c d
-#. e-flat f-sharp g, and all the other flat minor keys
-#. end up with a natural leading note. And there you
-#. have it.
-#. John Sankey <bf250@freenet.carleton.ca>
-#.
-#. Let's also do a-minor: a b c d e f gis a
-#.
-#. --jcn
-#. as -> gis
-#. des -> cis
-#. ges -> fis
-#. g -> fisis
-#. d -> cisis
-#. a -> gisis
-#. b -> ces
-#. e -> fes
-#. f -> eis
-#. c -> bis
-#. # FIXME: compile fix --jcn
-#. TODO: move space
-#. fis cis gis dis ais eis bis
-#. bes es as des ges ces fes
-#. urg, we should be sure that we're in a lyrics staff
-#. all include ALL_NOTES_OFF
-#. ugh, must set key while parsing
-#. because Note init uses key
-#. Better do Note.calc () at dump time?
-#. last_lyric.clocks = t - last_time
-#. hmm
-#. urg, this will barf at meter changes
-#. urg LilyPond doesn't start at c4, but
-#. remembers from previous tracks!
-#. reference_note = Note (clocks_per_4, 4*12, 0)
-#. must be in \notes mode for parsing \skip
-#: midi2ly.py:1002
-#, python-format
-msgid "%s output to `%s'..."
-msgstr "%s skrivet till \"%s\"..."
+#: convertrules.py:2927
+msgid "Vertical spacing no longer depends on the Y-extent of a VerticalAxisGroup.\n"
+msgstr "Vertikalf utrymme beror inte längre på Y-extent för en VerticalAxisGroup.\n"
-#: midi2ly.py:1033
-msgid "Example:"
-msgstr "Exempel:"
+#: convertrules.py:2933
+msgid "Unify fetaNumber and fetaDynamic encodings"
+msgstr "Gör fetaNumber- fetaDynamic-kodningar enhetliga"
-#: midi2ly.py:1083
-msgid "no files specified on command line."
-msgstr "inga filer angivna på kommandoraden."
+#: convertrules.py:2938
+msgid "\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves"
+msgstr "\\RemoveEmpty*StaffContext -> \\*Staff \\RemoveEmptyStaves"
-#. !@PYTHON@
-#. mup2ly.py -- mup input converter
-#.
-#. source file of the GNU LilyPond music typesetter
-#.
-#. (c) 2001
-#. if set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source"
-msgstr "Konvertera mup till LilyPond"
-
-#: mup2ly.py:73
-msgid "debug"
-msgstr "felsökningsutdata"
-
-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
-msgstr "definiera makro NAME [valfri makroersättning EXP]"
-
-#: mup2ly.py:76 main.cc:117
-msgid "write output to FILE"
-msgstr "skriv utdata till FIL"
+#: convertrules.py:2949
+msgid "\\cresc etc. are now postfix operators"
+msgstr "\\cresc etc. är nu postfix-operatorer"
+
+#: convertrules.py:2961
+msgid ""
+"Eliminate beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings and \\revertBeamSettings.\n"
+"\"accordion.accEtcbase\" -> \"accordion.etcbass\""
+msgstr ""
+"Eliminera beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings och \\revertBeamSettings.\n"
+"âaccordion.accEtcbaseâ -> âaccordion.etcbassâ"
+
+#: convertrules.py:2979
+msgid "Use \\set beamExceptions or \\overrideTimeSignatureSettings.\n"
+msgstr "Använd \\set beamExceptions eller \\overrideTimeSignatureSettings.\n"
+
+#: convertrules.py:2983
+msgid "Use \\set beamExceptions or \\revertTimeSignatureSettings.\n"
+msgstr "Använd \\set beamExceptions eller \\revertTimeSignatureSettings.\n"
+
+#: convertrules.py:2987
+msgid "Use baseMoment, beatStructure, and beamExceptions.\n"
+msgstr "Använd baseMoment, beatStructure, och beamExceptions.\n"
+
+#: convertrules.py:2991 convertrules.py:2995
+msgid "Use baseMoment and beatStructure.\n"
+msgstr "Använd baseMoment och beatStructure.\n"
+
+#: convertrules.py:3000
+msgid ""
+"Woodwind diagrams: Move size, thickness, and graphic from argument list to properties.\n"
+"Deprecate negative dash-period for hidden lines: use #'style = #'none instead."
+msgstr ""
+"Woodwind-diagram: Flytta size, thickness, och graphic from argumentlista till egenskaper.\n"
+"Föråldrade negative dash-period för dolda linjer: use #'style = #'none istället."
+
+#: convertrules.py:3005
+msgid "Move size, thickness, and graphic to properties. Argument should be just the key list.\n"
+msgstr "Flytta size, thickness, och graphic till egenskaper. Argument ska endast vara tonartslista.\n"
+
+#: convertrules.py:3013
+msgid ""
+"Rename vertical spacing variables.\n"
+"Add fretboard-table argument to savePredefinedFretboard."
+msgstr ""
+"Byt namn på vertikala utrymmesvariabler.\n"
+"Lägg till fretboard-table-argument för savePreddefinedFretboard."
+
+#: convertrules.py:3031
+msgid "Rename vertical spacing grob properties."
+msgstr "Byt namn på egenskaper för vertikal utrymmesgrob."
+
+#: convertrules.py:3047
+msgid "Remove \\paper variables head-separation and foot-separation."
+msgstr "Ta bort \\paper-variablerna head-separationoch foot-separation."
+
+#: convertrules.py:3051
+msgid "Adjust settings for top-system-spacing instead.\n"
+msgstr "Justera inställningar för top-system-spacing istället.\n"
+
+#: convertrules.py:3055
+msgid "Adjust settings for last-bottom-spacing instead.\n"
+msgstr "Justera inställningar för last-system-spacing istället.\n"
+
+#: convertrules.py:3061
+msgid ""
+"Rename space to basic-distance in various spacing alists.\n"
+"Remove HarmonicParenthesesItem grob."
+msgstr ""
+"Ta bort utrymme till basic-distance i olika utrymmes alists.\n"
+"Ta bort HarmonicParenthesesItem.grob."
+
+#: convertrules.py:3068
+msgid "HarmonicParenthesesItem has been eliminated.\n"
+msgstr "HarmonicParenthesesItem har elimenerats.\n"
+
+#: convertrules.py:3069
+msgid "Harmonic parentheses are part of the TabNoteHead grob.\n"
+msgstr "Harmonic parentheses är en del av TabNoteHead-grob.\n"
+
+#: convertrules.py:3074
+msgid "Remove context from overrideTimeSignatureSettings and revertTimeSignatureSettings.\n"
+msgstr "Ta bort kontext från overrideTimeSignatureSettings och revertTimeSignatureSettings.\n"
+
+#: convertrules.py:3081
+msgid ""
+"Change stringTunings from a list of semitones to a list of pitches.\n"
+"Change tenor and baritone ukulele names in string tunings.\n"
+"Generate messages for manual conversion of vertical spacing if required."
+msgstr ""
+"Ãndra stringTunings frÃ¥n en lista av halvtoner till en lista av toner.\n"
+"Ãndra tenor och baritone ukulele-namn i strängstämmningar.\n"
+"Generera meddelande för manuell konvertering för vertikal utrymme om det krävs."
+
+#: convertrules.py:3124
+msgid "Vertical spacing changes might affect user-defined contexts."
+msgstr "Vertikalt utrymmes ändringar kan påverka användardefinierade kontext."
+
+#: convertrules.py:3130
+msgid "Replace bar-size with bar-extent."
+msgstr "Ersätt bar-size med bar-extent."
+
+#: convertrules.py:3142
+msgid "Woodwind diagrams: Changes to the clarinet diagram."
+msgstr "Woodwind-diagram: Ãndringar till klarinettdiagrammet."
+
+#: convertrules.py:3146
+msgid "Clarinet fingering changed to reflect actual anatomy of instrument.\n"
+msgstr "Klarinetthållning ändrad för att motsvara faktisk anatomi på instrumentet.\n"
+
+#: convertrules.py:3156
+msgid "Handling of non-automatic footnotes."
+msgstr "Hantering av icke automatiska fotstilar."
+
+#: convertrules.py:3160
+msgid "If you are using non-automatic footnotes, make sure to set footnote-auto-numbering = ##f in the paper block.\n"
+msgstr "Om du använder icke automatiska fotnoteer, försäkra dig om att ange autonumrerig av fotnot = ##f i stycker paper.\n"
+
+#: convertrules.py:3165
+msgid "Change in internal property for MultiMeasureRest"
+msgstr "Ãndring i intern egenskap för MultiMeaureRest"
+
+#: convertrules.py:3169
+msgid "This internal property has been replaced by round-up-to-longer-rest, round-up-exceptions and usable-duration-logs.\n"
+msgstr "Denna interna egenskap har ersatts med round-up-to-longer-rest, round-up-exceptions och usable-duration-logs.\n"
+
+#: convertrules.py:3174
+msgid "Creation of a Flag grob and moving of certain Stem properties to this grob"
+msgstr "Skapa en flagg-grob och flytta vissa Stem-egenskaper till denna grob"
+
+#: convertrules.py:3210
+msgid "consistent-broken-slope is now handled through the positions callback.\n"
+msgstr "consistent-broken-slope hanteras nu med återanropet positions.\n"
+
+#: convertrules.py:3211
+msgid "input/regression/beam-broken-classic.ly shows how broken beams are now handled.\n"
+msgstr "input/regression/beam-broken-classic.ly visar hur trasiga balkar nu hanteras.\n"
+
+#: convertrules.py:3372
+msgid "beamExceptions controls whole-measure beaming."
+msgstr "beamExceptions kontrollerar balk över en hel takt."
+
+#: convertrules.py:3609
+msgid "Flag.transparent and Flag.color inherit from Stem"
+msgstr "Flag.transparent och Flag.color ärvda från Stem"
+
+#: convertrules.py:3675
+msgid "Staff-padding now controls the distance to the baseline, not the nearest point."
+msgstr "Staff-padding styr nu avståndet till baslinjen, inte den närmaste punkten."
+
+#: convertrules.py:3918
+msgid "Previously the \"id\" grob property (string) was used for SVG output."
+msgstr "Tidigare användes grob-egenskapen âidâ (string) för SVG."
+
+#: convertrules.py:3919
+msgid "Now \"output-attributes\" (association list) is used instead."
+msgstr "Nu används âoutput-attributesâ (associationslista) istället."
+
+#: fontextract.py:25
+#, python-format
+msgid "Scanning %s"
+msgstr "Söker %s"
+
+#: fontextract.py:70
+#, python-format
+msgid "Extracted %s"
+msgstr "Extraherade %s"
+
+#: fontextract.py:85
+#, python-format
+msgid "Writing fonts to %s"
+msgstr "Skriver typsnitt till %s"
+
+#: lilylib.py:101
+#, python-format
+msgid "Setting loglevel to %s"
+msgstr "Sätter loggnivå till %s"
+
+#: lilylib.py:104
+#, python-format
+msgid "Unknown or invalid loglevel '%s'"
+msgstr "Okänd eller ogiltig loggnivÃ¥ â%sâ"
+
+#: lilylib.py:133 warn.cc:211
+#, c-format, python-format
+msgid "error: %s"
+msgstr "fel:%s"
+
+#: lilylib.py:190
+#, python-format
+msgid "Processing %s.ly"
+msgstr "Behandlar %s.ly"
+
+#: lilylib.py:194 lilylib.py:255
+#, python-format
+msgid "Invoking `%s'"
+msgstr "Startar â%sâ"
+
+#: lilylib.py:196 lilylib.py:257
+#, python-format
+msgid "Running %s..."
+msgstr "Kör %sâ¦"
+
+#: lilylib.py:333
+#, python-format
+msgid "Usage: %s"
+msgstr "Användning: %s"
+
+#: musicexp.py:307 musicexp.py:312
+msgid "Language does not support microtones contained in the piece"
+msgstr "Språket stöder inte mikrotoner i stycket"
+
+#: musicexp.py:601
+msgid "Tuplet brackets of curved shape are not correctly implemented"
+msgstr "Oregelbundna notvärdens klamrar för kurvade former är inte korrekt implementerad"
+
+#: musicexp.py:787
+#, python-format
+msgid "unable to set the music %(music)s for the repeat %(repeat)s"
+msgstr "kunde inte ange music %(music)s för upprepning %(repeat)s"
+
+#: musicexp.py:796
+msgid "encountered repeat without body"
+msgstr "påträffade upprepning utan innehåll"
+
+#. no self.elements!
+#: musicexp.py:1009
+#, python-format
+msgid "Grace note with no following music: %s"
+msgstr "Grace-not utan efterföljande music: %s"
+
+#: musicexp.py:1204
+#, python-format
+msgid "Invalid octave shift size found: %s. Using no shift."
+msgstr "Ogiltig oktavskiftningstorlek funnen: %s. Använder inget byte."
+
+#: musicexp.py:1803
+#, python-format
+msgid "Unable to convert alteration %s to a lilypond expression"
+msgstr "Kunde inte konvertera alteration %s till ett lilypond-uttryck"
+
+#. TODO: Handle pieces without a time signature!
+#: musicxml.py:515
+msgid "Senza-misura time signatures are not yet supported!"
+msgstr "Senza-misura-taktarter stöds inte ännu!"
+
+#: musicxml.py:533
+msgid "Unable to interpret time signature! Falling back to 4/4."
+msgstr "Kunde inte tolka taktart! Faller tillbaka till 4/4."
+
+#: musicxml.py:589
+#, python-format
+msgid "Key alteration octave given for a non-existing alteration nr. %s, available numbers: %s!"
+msgstr "Tonartalterationsoktav given för en icke existerande alteration nr. %s, tillgänglig antal: %s!"
+
+#: musicxml.py:825
+#, python-format
+msgid "Encountered note at %s without type and duration(=%s)"
+msgstr "Påträffade not vid %s utan typ och längd(=%s)"
+
+#: musicxml.py:867
+#, python-format
+msgid "drum %s type unknown, please add to instrument_drumtype_dict"
+msgstr "trum %s-typ okänd, lägg till i instrument_drumtype_dict"
+
+#: musicxml.py:888
+msgid "cannot find suitable event"
+msgstr "det går inte finna en passande händelse"
+
+#: musicxml.py:927
+#, python-format
+msgid "Unable to find instrument for ID=%s\n"
+msgstr "Kunde inte finna instrument för ID=%s\n"
+
+#: musicxml2ly_conversion.py:23
+#, python-format
+msgid "Encountered rational duration with denominator %s, unable to convert to lilypond duration"
+msgstr "Påträffade rational duration med denominator %s, kunde inte konvertera till lilypond-längd"
+
+#: musicxml2ly_conversion.py:42
+#, python-format
+msgid "Encountered unprocessed marker %s\n"
+msgstr "Påträffade ej bearbetade markörer %s\n"
+
+#: abc2ly.py:1389 convert-ly.py:85 lilypond-book.py:122 midi2ly.py:1052
+#, python-format
+msgid "%s [OPTION]... FILE"
+msgstr "%s [FLAGGA]⦠FIL"
+
+#: abc2ly.py:1390
+#, python-format
+msgid ""
+"abc2ly converts ABC music files (see\n"
+"%s) to LilyPond input.\n"
+msgstr ""
+"abc2ly konverterar ABC-musikfiler (se\n"
+"%s) till LilyPond-indata.\n"
+
+#: abc2ly.py:1398 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231
+#: midi2ly.py:1103 musicxml2ly.py:2774 main.cc:184
+msgid "show version number and exit"
+msgstr "visa versionsnummer och avsluta"
+
+#: abc2ly.py:1401 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140
+#: midi2ly.py:1070 musicxml2ly.py:2755 main.cc:163
+msgid "show this help and exit"
+msgstr "visa denna hjälp och avsluta"
+
+#: abc2ly.py:1404 etf2ly.py:1209 midi2ly.py:1079
+msgid "write output to FILE"
+msgstr "skriv utdata till FIL"
+
+#: abc2ly.py:1407
+msgid "be strict about success"
+msgstr "var strikt med vad som räknas som lyckat"
+
+#: abc2ly.py:1410
+msgid "preserve ABC's notion of beams"
+msgstr "bevara ABCs balk-notation"
+
+#: abc2ly.py:1413
+msgid "suppress progress messages"
+msgstr "dölj förloppsmeddelanden"
+
+#. Translators, please translate this string as
+#. "Report bugs in English via %s",
+#. or if there is a LilyPond users list or forum in your language
+#. "Report bugs in English via %s or in YOUR_LANG via URI"
+#: abc2ly.py:1416 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258
+#: midi2ly.py:1115 musicxml2ly.py:2917 main.cc:318
+#, c-format, python-format
+msgid "Report bugs via %s"
+msgstr ""
+"Rapportera programfel till %s\n"
+"Rapportera fel i översättningen till <tp-sv@listor.tp-sv.se>"
+
+#: convert-ly.py:47
+msgid ""
+"Update LilyPond input to newer version. By default, update from the\n"
+"version taken from the \\version command, to the current LilyPond version."
+msgstr ""
+"Uppdatera LilyPonds inmatning till en nyare version. Som standard, uppdatera från\n"
+"versionen tagen från kommandot \\version till aktuell LilyPond-version."
+
+#: convert-ly.py:50
+msgid "If FILE is `-', read from standard input."
+msgstr "Om FILE är â-â, läs frÃ¥n standard in."
+
+#: convert-ly.py:52 lilypond-book.py:82
+msgid "Examples:"
+msgstr "Exempel:"
+
+#: convert-ly.py:79 etf2ly.py:1191 lilypond-book.py:115 midi2ly.py:80
+#, python-format
+msgid "Copyright (c) %s by"
+msgstr "Copyright © %s av"
+
+#: convert-ly.py:81 etf2ly.py:1193 lilypond-book.py:117 midi2ly.py:82
+msgid "Distributed under terms of the GNU General Public License."
+msgstr "Distribueras under GNU General Public License."
+
+#: convert-ly.py:82 etf2ly.py:1194 lilypond-book.py:118 midi2ly.py:83
+msgid "It comes with NO WARRANTY."
+msgstr "INGEN GARANTI ges för programmet."
+
+#: convert-ly.py:100 convert-ly.py:141
+msgid "VERSION"
+msgstr "VERSION"
+
+#: convert-ly.py:102
+msgid "start from VERSION [default: \\version found in file]"
+msgstr "starta från VERSION [default: \\version hittad i filen]"
+
+#: convert-ly.py:105
+msgid "edit in place"
+msgstr "redigera på plats"
+
+#: convert-ly.py:109 lilypond-book.py:179 musicxml2ly.py:2811
+msgid "Print log messages according to LOGLEVEL (NONE, ERROR, WARNING, PROGRESS (default), DEBUG)"
+msgstr "Skriv ut loggmeddelanden utefter LOGLEVEL (NONE, ERROR, WARNING, PROGRESS (standard), DEBUG) "
+
+#: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181
+#: musicxml2ly.py:2813 main.cc:177
+msgid "LOGLEVEL"
+msgstr "LOGLEVEL"
+
+#: convert-ly.py:117
+msgid "do not add \\version command if missing"
+msgstr "lägg inte till \\version-kommandot om det saknas"
+
+#: convert-ly.py:123
+#, python-format
+msgid "force updating \\version number to %s"
+msgstr "tvinga uppdatering av \\version till %s"
+
+#: convert-ly.py:129
+msgid "only update \\version number if file is modified"
+msgstr "uppdatera endast \\version om filen är ändrad"
+
+#: convert-ly.py:135
+#, python-format
+msgid "show rules [default: -f 0, -t %s]"
+msgstr "visa regler [standard: -f 0, -t %s]"
+
+#: convert-ly.py:140
+#, python-format
+msgid "convert to VERSION [default: %s]"
+msgstr "konvertera till VERSION [default: %s]"
+
+#: convert-ly.py:147
+msgid "make a numbered backup [default: filename.ext~]"
+msgstr "skapa en numrerad säkerhetskopia [standard: filnamn.ext~]"
+
+#: convert-ly.py:152 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1104
+#: main.cc:186
+msgid "show warranty and copyright"
+msgstr "visa garanti och copyright"
+
+#: convert-ly.py:196
+msgid "Applying conversion: "
+msgstr "Lägger till konvertering: "
+
+#: convert-ly.py:215
+msgid "Error while converting"
+msgstr "Fel vid konvertering"
+
+#: convert-ly.py:217
+msgid "Stopping at last successful rule"
+msgstr "Stoppar vid senast lyckade regeln"
+
+#: convert-ly.py:256
+#, python-format
+msgid "Processing `%s'... "
+msgstr "Behandlar â%sâ⦠"
+
+#: convert-ly.py:366
+#, python-format
+msgid "%s: Unable to open file"
+msgstr "%s: Kunde inte öppna fil"
+
+#: convert-ly.py:372
+#, python-format
+msgid "%s: Unable to determine version. Skipping"
+msgstr "%s: Kunde inte identifiera version. Hoppar över"
+
+#: convert-ly.py:378
+#, python-format
+msgid ""
+"%s: Invalid version string `%s' \n"
+"Valid version strings consist of three numbers, separated by dots, e.g. `2.8.12'"
+msgstr ""
+"%s: Ogiltig versionssträng â%sâ\n"
+"Giltig versionsträng bestÃ¥r av tre siffror, separerade av punkter, t.ex. â2.8.12â"
+
+#: convert-ly.py:384
+#, python-format
+msgid "There was %d error."
+msgid_plural "There were %d errors."
+msgstr[0] "Det uppstod %d fel."
+msgstr[1] "Det uppstod %d fel."
+
+#: etf2ly.py:1197
+#, python-format
+msgid "%s [OPTION]... ETF-FILE"
+msgstr "%s [FLAGGA]⦠ETF-FIL"
+
+#: etf2ly.py:1198
+msgid ""
+"Enigma Transport Format is a format used by Coda Music Technology's\n"
+"Finale product. etf2ly converts a subset of ETF to a ready-to-use LilyPond file.\n"
+msgstr ""
+"Enigma Transport Format är ett format använt av produkten Coda Music Technology's\n"
+"Finale. etf2ly konverterar en delmängd av ETF till en LilyPond-fil.\n"
+
+#: etf2ly.py:1210 midi2ly.py:1075 midi2ly.py:1080 musicxml2ly.py:2867
+#: main.cc:169 main.cc:181
+msgid "FILE"
+msgstr "FIL"
+
+#: lilypond-book.py:80
+msgid "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgstr "Bearbeta LilyPond-stycken i hybrid HTML-, LaTex-, texinfo- eller DocBook-dokument."
+
+#: lilypond-book.py:87
+msgid "BOOK"
+msgstr "BOOK"
+
+#: lilypond-book.py:95
+#, python-format
+msgid "Exiting (%d)..."
+msgstr "Avslutar (%d)⦠"
+
+#: lilypond-book.py:127
+msgid "FILTER"
+msgstr "FILTER"
+
+#: lilypond-book.py:130
+msgid "pipe snippets through FILTER [default: `convert-ly -n -']"
+msgstr "skicka stycken genom FILTER [standard: âconvert-ly -n -â]"
+
+#: lilypond-book.py:134
+msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgstr "använd utdataformat FORMAT (texi [standard], texi-html, latex, html, docbook)"
+
+#: lilypond-book.py:135
+msgid "FORMAT"
+msgstr "FORMAT"
+
+#: lilypond-book.py:142
+msgid "add DIR to include path"
+msgstr "lägg till KATALOG för att inkludera sökvägen"
+
+#: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:169
+#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:168
+msgid "DIR"
+msgstr "KATALOG"
+
+#: lilypond-book.py:148
+msgid "format Texinfo output so that Info will look for images of music in DIR"
+msgstr "formatera Texinfo-utdata så att Info kommer att leta efter bilder av musik i DIR"
+
+#: lilypond-book.py:155
+msgid "PAD"
+msgstr "PAD"
+
+#: lilypond-book.py:157
+msgid "pad left side of music to align music in spite of uneven bar numbers (in mm)"
+msgstr "fyll ut vänstra sidan av music för att justera music i fall av ojämnt taktantal (i mm)"
+
+#: lilypond-book.py:162
+msgid "Print lilypond log messages according to LOGLEVEL"
+msgstr "Skriv ut lilyponds loggmeddelanden efter LOGLEVEL"
+
+#: lilypond-book.py:168
+msgid "write lily-XXX files to DIR, link into --output dir"
+msgstr "skriv lily-XXX-filer till DIR, länka till --output dir"
+
+#: lilypond-book.py:173
+msgid "Load the additional python PACKAGE (containing e.g. a custom output format)"
+msgstr "Läs in ytterligare python PACKAGE (innehållandes exempelvis ett anpassat utdataformat)"
+
+#: lilypond-book.py:174
+msgid "PACKAGE"
+msgstr "PACKAGE"
+
+#: lilypond-book.py:186
+msgid "write output to DIR"
+msgstr "skriv utdata till DIR"
+
+#: lilypond-book.py:191
+msgid "COMMAND"
+msgstr "COMMAND"
+
+#: lilypond-book.py:192
+msgid "process ly_files using COMMAND FILE..."
+msgstr "bearbeta ly_files med COMMAND_FILEâ¦"
+
+#: lilypond-book.py:197
+msgid "Redirect the lilypond output"
+msgstr "Flytta om lilyponds utdata"
+
+#: lilypond-book.py:201
+msgid "Compile snippets in safe mode"
+msgstr "Kompilera stycken i säkert läge"
+
+#: lilypond-book.py:207
+msgid "do not fail if no lilypond output is found"
+msgstr "misslyckas inte även om ingen lilypond-utdata hittas"
+
+#: lilypond-book.py:213
+msgid "do not fail if no PNG images are found for EPS files"
+msgstr "misslyckas inte även om inga PNG-bilder hittas för EPS-filer"
+
+#: lilypond-book.py:219
+msgid "write snippet output files with the same base name as their source file"
+msgstr "skriv utdatafiler för stycken med samma basnamn som deras källfil"
+
+#: lilypond-book.py:223 midi2ly.py:1098 musicxml2ly.py:2780
+msgid "be verbose"
+msgstr "var utförlig"
+
+#: lilypond-book.py:239
+msgid ""
+"run executable PROG instead of latex, or in\n"
+"case --pdf option is set instead of pdflatex"
+msgstr ""
+"kör exekverbara PROG istället för latex eller om \n"
+"flaggan --pdf är angiven istället för pdflatex"
+
+#: lilypond-book.py:241 lilypond-book.py:246
+msgid "PROG"
+msgstr "PROG"
+
+#: lilypond-book.py:245
+msgid "run executable PROG instead of texi2pdf"
+msgstr "kör exekverbart PROG istället för texi2pdf"
+
+#: lilypond-book.py:252
+msgid "create PDF files for use with PDFTeX"
+msgstr "skapa PDF-filer för användning med PDFTeX"
+
+#: lilypond-book.py:463
+msgid "Writing snippets..."
+msgstr "Skriver styckenâ¦"
+
+#: lilypond-book.py:468
+msgid "Processing..."
+msgstr "Behandlarâ¦"
+
+#: lilypond-book.py:473
+msgid "All snippets are up to date..."
+msgstr "Alla stycken är uppdateradeâ¦"
+
+#: lilypond-book.py:475
+msgid "Linking files..."
+msgstr "Länkar filerâ¦"
+
+#: lilypond-book.py:495
+#, python-format
+msgid "cannot determine format for: %s"
+msgstr "det går inte att avgöra formatet för: %s"
+
+#: lilypond-book.py:504
+#, python-format
+msgid "%s is up to date."
+msgstr "%s är den senaste versionen."
+
+#: lilypond-book.py:517
+#, python-format
+msgid "Writing `%s'..."
+msgstr "Skriver â%sââ¦"
+
+#: lilypond-book.py:580
+msgid "Output would overwrite input file; use --output."
+msgstr "Utdata skulle skriva över indatafil; använd --output."
+
+# här är det fråga om rensning av en temporärkatalog
+#: lilypond-book.py:584
+#, python-format
+msgid "Reading %s..."
+msgstr "Läser %sâ¦"
+
+#: lilypond-book.py:591
+msgid "Dissecting..."
+msgstr "Analyserarâ¦"
+
+# här är det fråga om rensning av en temporärkatalog
+#: lilypond-book.py:602
+#, python-format
+msgid "Compiling %s..."
+msgstr "Kompilerar %sâ¦"
+
+#: lilypond-book.py:610
+#, python-format
+msgid "Processing include: %s"
+msgstr "Behandlar include: %s"
+
+#: lilypond-book.py:621
+#, python-format
+msgid "Removing `%s'"
+msgstr "Tar bort â%sâ"
+
+#: lilypond-book.py:727
+#, python-format
+msgid "Setting LilyPond's loglevel to %s"
+msgstr "Ställer in LilyPonds loggnivå till %s"
+
+#: lilypond-book.py:731
+#, python-format
+msgid "Setting LilyPond's loglevel to %s (from environment variable LILYPOND_LOGLEVEL)"
+msgstr "Ställer in LilyPonds loggnivå till %s (från miljövariablen LILYPOND_LOGLEVEL)"
+
+#: lilypond-book.py:734
+msgid "Setting LilyPond's output to --verbose, implied by lilypond-book's setting"
+msgstr "Ställer in LilyPonds utdata till --verbose, implicerat av lilypond-books inställning"
+
+#: midi2ly.py:89
+msgid "warning: "
+msgstr "varning: "
+
+#: midi2ly.py:92 midi2ly.py:1132
+msgid "error: "
+msgstr "fel: "
+
+#: midi2ly.py:93
+msgid "Exiting... "
+msgstr "Avslutar⦠"
+
+#: midi2ly.py:840
+msgid "found more than 5 voices on a staff, expect bad output"
+msgstr "hittade fler än 5 röster i ett notsystem, förvänta dig dålig utdata"
+
+# här är det fråga om skrivning till en fil (första parametern är t.ex
+# DVI, LATEX, MIDI, TEX)
+#: midi2ly.py:1040
+#, python-format
+msgid "%s output to `%s'..."
+msgstr "%s skrivet till â%sââ¦"
+
+#: midi2ly.py:1053
+#, python-format
+msgid "Convert %s to LilyPond input.\n"
+msgstr ""
+"Konvertera %s till LilyPond-indata.\n"
+"\n"
+
+#: midi2ly.py:1058
+msgid "print absolute pitches"
+msgstr "skriv absoluta toner"
+
+#: midi2ly.py:1060 midi2ly.py:1088
+msgid "DUR"
+msgstr "LÃNGD"
+
+#: midi2ly.py:1061
+msgid "quantise note durations on DUR"
+msgstr "kvantisera notlängder med LÃNGD"
+
+#: midi2ly.py:1064
+msgid "debug printing"
+msgstr "felsöksningsutskrift"
+
+#: midi2ly.py:1067
+msgid "print explicit durations"
+msgstr "skriv explicita notlängder"
+
+#: midi2ly.py:1072
+msgid "prepend FILE to output"
+msgstr "lägg till fil före utdata"
+
+#: midi2ly.py:1076
+msgid "set key: ALT=+sharps|-flats; MINOR=1"
+msgstr "sätt tonart: TON=+höjningar|-sänkningar; MOLL=1"
+
+#: midi2ly.py:1077
+msgid "ALT[:MINOR]"
+msgstr "TON[:MOLL]"
+
+#: midi2ly.py:1082
+msgid "preview of first 4 bars"
+msgstr "förhandsvisning av de första 4 takterna"
+
+#: midi2ly.py:1086
+msgid "suppress progress messages and warnings about excess voices"
+msgstr "dölj förloppsmeddelanden och varningar omöverblivna röster"
+
+#: midi2ly.py:1087
+msgid "quantise note starts on DUR"
+msgstr "kvantisera notstarter pÃ¥ LÃNGD"
+
+#: midi2ly.py:1091
+msgid "use s instead of r for rests"
+msgstr "använd s istället för r för pauser"
+
+#: midi2ly.py:1093
+msgid "DUR*NUM/DEN"
+msgstr "LÃNGD*TÃL/NÃM"
+
+#: midi2ly.py:1096
+msgid "allow tuplet durations DUR*NUM/DEN"
+msgstr "tillÃ¥t tupellängder LÃNGD*TAL/DEN"
+
+#: midi2ly.py:1106
+msgid "treat every text as a lyric"
+msgstr "tolka all text som sångtext"
+
+#: midi2ly.py:1109
+msgid "Examples"
+msgstr "Exempel"
+
+#: midi2ly.py:1133
+msgid "no files specified on command line."
+msgstr "inga filer angivna på kommandoraden."
+
+#: musicxml2ly.py:260
+#, python-format
+msgid "Encountered file created by %s, containing wrong beaming information. All beaming information in the MusicXML file will be ignored"
+msgstr "Påträffade en fil skapad av %s innehållande fel balkinformation. All balkinformation i filen MusicXML kommer att ignoreras"
+
+#: musicxml2ly.py:302 musicxml2ly.py:304
+#, python-format
+msgid "Unprocessed PartGroupInfo %s encountered"
+msgstr "Obearbetad PartGroupInfo %s påträffad"
+
+#: musicxml2ly.py:792
+msgid "Unable to extract key signature!"
+msgstr "Kunde inte extrahera tonartsangivelse!"
+
+#: musicxml2ly.py:819
+#, python-format
+msgid "unknown mode %s, expecting 'major' or 'minor' or a church mode!"
+msgstr "okänt läge %s, förväntade âmajorâ, âminorâ eller church-läge!"
+
+#: musicxml2ly.py:988
+#, python-format
+msgid "unknown span event %s"
+msgstr "okänd span-händelse %s"
+
+#: musicxml2ly.py:1000
+#, python-format
+msgid "unknown span type %s for %s"
+msgstr "okänd span-typ %s för %s"
+
+#: musicxml2ly.py:1497
+msgid "Unknown metronome mark, ignoring"
+msgstr "Okänd metronommarkering, ignorerar"
+
+#. TODO: Implement the other (more complex) way for tempo marks!
+#: musicxml2ly.py:1502
+msgid "Metronome marks with complex relations (<metronome-note> in MusicXML) are not yet implemented."
+msgstr "Metronommarkering med komplexa relationer (<metronome-note> i MusicXML) är ej implementerat ännu."
+
+#: musicxml2ly.py:1653
+#, python-format
+msgid "Unable to convert chord type %s to lilypond."
+msgstr "Kunde inte konvertera ackordtypen %s till lilypond."
+
+#: musicxml2ly.py:2007
+#, python-format
+msgid "Negative skip %s (from position %s to %s)"
+msgstr "Negativt hopp %s (från position %s till %s)"
+
+#: musicxml2ly.py:2245
+#, python-format
+msgid "Negative skip found: from %s to %s, difference is %s"
+msgstr "Negativt hopp funnet: från %s till %s, skillnaden är %s"
+
+#: musicxml2ly.py:2346
+#, python-format
+msgid "unexpected %s; expected %s or %s or %s"
+msgstr "oväntat %s; förväntade sig %s eller %s eller %s"
+
+#: musicxml2ly.py:2475
+msgid "Encountered closing slur, but no slur is open"
+msgstr "Påträffade avslutande legatobåge, men ingen legatobåge är öppen"
+
+#: musicxml2ly.py:2478
+msgid "Cannot have two simultaneous (closing) slurs"
+msgstr "Det går inte ha två samtidiga legatobågar"
+
+#: musicxml2ly.py:2487
+msgid "Cannot have a slur inside another slur"
+msgstr "Det går inte att ha en legatobåge inuti en annan legatobåge"
+
+#: musicxml2ly.py:2490
+msgid "Cannot have two simultaneous slurs"
+msgstr "Det går inte att två samtidiga legatobågar"
+
+#: musicxml2ly.py:2616
+#, python-format
+msgid "cannot simultaneously have more than one mode: %s"
+msgstr "Det går inte att samtidigt ha flera lägen: %s"
+
+#: musicxml2ly.py:2735
+msgid "Converting to LilyPond expressions..."
+msgstr "Konverterar till LilyPond-uttryckâ¦"
+
+#: musicxml2ly.py:2747
+msgid "musicxml2ly [OPTION]... FILE.xml"
+msgstr "musicxml2ly [FLAGGA]⦠FIL.xml"
+
+#: musicxml2ly.py:2749
+msgid ""
+"Convert MusicXML from FILE.xml to LilyPond input.\n"
+"If the given filename is -, musicxml2ly reads from the command line.\n"
+msgstr ""
+"Konvertera MusicXML från FILE.xml till LilyPond-indata.\n"
+"Om det givna filnamnet är -, läser musicxml2ly från kommandoradslinjen.\n"
+
+#: musicxml2ly.py:2759
+#, python-format
+msgid ""
+"Copyright (c) 2005--2016 by\n"
+" Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
+" Jan Nieuwenhuizen <janneke@gnu.org> and\n"
+" Reinhold Kainhofer <reinhold@kainhofer.com>\n"
+" Patrick L. Schmidt <pls@philomelos.net>\n"
+"\n"
+"This program is free software. It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions. Invoke as `%s --warranty' for more\n"
+"information."
+msgstr ""
+"Copyright (c) 2005--2016 av\n"
+" Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
+" Jan Nieuwenhuizen <janneke@gnu.org> and\n"
+" Reinhold Kainhofer <reinhold@kainhofer.com>\n"
+" Patrick L. Schmidt <pls@philomelos.net>\n"
+"\n"
+"Det här är fri programvara. Det täcks av âGNU General Public Licenseâ,\n"
+"och du får ändra och/eller distribuera kopior av den under vissa\n"
+"villkor. Kör â%s --warrantyâ för mer information."
+
+#: musicxml2ly.py:2786
+msgid "use lxml.etree; uses less memory and cpu time"
+msgstr "använd lxml.etree; använder mindre minne och cpu-tid"
+
+#: musicxml2ly.py:2792
+msgid "input file is a zip-compressed MusicXML file"
+msgstr "infil är en zip-komprimerad MusicXML-fil"
+
+#: musicxml2ly.py:2798
+msgid "convert pitches in relative mode (default)"
+msgstr "konvertera toner i relativt läge (standard)"
+
+#: musicxml2ly.py:2803
+msgid "convert pitches in absolute mode"
+msgstr "konvertera toner i absolut läge"
+
+#: musicxml2ly.py:2806
+msgid "LANG"
+msgstr "LANG"
+
+#: musicxml2ly.py:2808
+msgid "use LANG for pitch names, e.g. 'deutsch' for note names in German"
+msgstr "använd LANG för tonnamn, t.ex. âdeutschâ för notnamn pÃ¥ tyska"
+
+#: musicxml2ly.py:2822
+msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."
+msgstr "konvertera inte riktningar (^,_ eller -) för artikulationer, dynamik ock så vidare."
+
+#: musicxml2ly.py:2828
+msgid "do not convert exact vertical positions of rests"
+msgstr "konvertera inte precisa vertikala positioner av pauser"
+
+#: musicxml2ly.py:2834
+msgid "ignore system breaks"
+msgstr "ignorera systemradbrytningar"
+
+#: musicxml2ly.py:2840
+msgid "ignore page breaks"
+msgstr "ignorera sidbryt"
+
+#: musicxml2ly.py:2846
+msgid "ignore page margins"
+msgstr "ignorerar sidmarginaler"
+
+#: musicxml2ly.py:2852
+msgid "do not convert the exact page layout and breaks (shortcut for \"--nsb --npb --npm\" options)"
+msgstr "konvertera inte exakta sidlayout och brytningar (genväg för flaggorna â.--nsb --npb --npmâ)"
+
+#: musicxml2ly.py:2858
+msgid "ignore stem directions from MusicXML, use lilypond's automatic stemming instead"
+msgstr "ignorerar riktning för notskaft från MusicXML, använd lilyponds automatiska notskaftning istället"
+
+#: musicxml2ly.py:2864
+msgid "do not convert beaming information, use lilypond's automatic beaming instead"
+msgstr "konvertera inte balkinformation, använd lilyponds automatiska balkning istället"
+
+#: musicxml2ly.py:2872
+msgid "set output filename to FILE, stdout if -"
+msgstr "ange utfilnamn till FILE, stdout if -"
+
+#: musicxml2ly.py:2878
+msgid "activate midi-block in .ly file"
+msgstr "aktivera midi-block i .ly-fil"
+
+#: musicxml2ly.py:2882
+msgid "TOPITCH"
+msgstr "TOPITCH"
+
+#: musicxml2ly.py:2885
+msgid "set pitch to transpose by the interval between pitch 'c' and TOPITCH"
+msgstr "sätt ton att transponera med intervall mellan ton âcâ och TOPITCH"
+
+#: musicxml2ly.py:2889
+msgid "BEATS/BEATTYPE"
+msgstr "BEATS/BEATTYPE"
+
+#: musicxml2ly.py:2892
+msgid "change the length|duration of notes as a function of a given time signature to make the score look faster or slower, (eg. '4/4' or '2/2')"
+msgstr "ändra längden för noter som en funktion av en given taktart för att fÃ¥ partituren att se snabbare eller lÃ¥ngsammare ut, (exempelvis. â4/4â eller â2/2â)"
+
+#: musicxml2ly.py:2896
+msgid "TABCLEFNAME"
+msgstr "TABCLEFNAME"
+
+#: musicxml2ly.py:2899
+msgid "switch between two versions of tab clefs (\"tab\" and \"moderntab\")"
+msgstr "växla mellan tvÃ¥ versioner av tab-clefs (âtabâ och âmoderntabâ)"
+
+#: musicxml2ly.py:2903
+msgid "t[rue]/f[alse]"
+msgstr "t[rue]/f[alse]"
+
+# TO-DO
+#: musicxml2ly.py:2906
+msgid "deactivate string number stencil with --string-numbers f[alse]. Default is t[rue]"
+msgstr "inaktivera strängnummer stencil med --string-numbers f[alse]. Standard är t[rue]"
+
+#: musicxml2ly.py:2913
+msgid "converts '<frame>' events to a separate FretBoards voice instead of markups"
+msgstr "konverterar â<frame>â-händelser för att separera FretBoards-röster istället för markups"
+
+#: musicxml2ly.py:2987
+#, python-format
+msgid "unknown part in part-list: %s"
+msgstr "okänd del i dellista: %s"
+
+#: musicxml2ly.py:3077
+msgid "Input is compressed, extracting raw MusicXML data from stdin"
+msgstr "Indata är komprimerat, extraherar MusicXML-data från stdin"
+
+#: musicxml2ly.py:3090
+#, python-format
+msgid "Input file %s is compressed, extracting raw MusicXML data"
+msgstr "Indatafilen %s är komprimerad, extraherar rå MusicXML-data"
+
+#: musicxml2ly.py:3120
+msgid "Reading MusicXML from Standard input ..."
+msgstr "Läser MusicXML frÃ¥n standardin â¦"
+
+#: musicxml2ly.py:3122
+#, python-format
+msgid "Reading MusicXML from %s ..."
+msgstr "Läser MusicXML frÃ¥n %s â¦"
+
+# här är det fråga om skrivning till en fil (första parametern är t.ex
+# DVI, LATEX, MIDI, TEX)
+#: musicxml2ly.py:3154
+#, python-format
+msgid "Output to `%s'"
+msgstr "Utdata till â%sâ"
+
+#: musicxml2ly.py:3180
+#, python-format
+msgid "Converting to current version (%s) notations ..."
+msgstr "Konverterar till aktuell version (%s)-notationer â¦"
+
+#: musicxml2ly.py:3254
+#, python-format
+msgid "Unable to find input file %s"
+msgstr "Kunde inte hitta indatafil %s"
+
+#: website_post.py:129
+msgid "English"
+msgstr "Engelska"
+
+#: website_post.py:132
+msgid "Other languages"
+msgstr "Andra språk"
+
+#: website_post.py:133
+#, python-format
+msgid "About <a href=\"%s\">automatic language selection</a>."
+msgstr "Om <a href=\"%s\">automatiskt språkval</a>."
+
+#: getopt-long.cc:153
+#, c-format
+msgid "option `%s' requires an argument"
+msgstr "flaggan â%sâ kräver ett argument"
+
+#: getopt-long.cc:157
+#, c-format
+msgid "option `%s' does not allow an argument"
+msgstr "flaggan â%sâ tillÃ¥ter inget argument"
+
+#: getopt-long.cc:161
+#, c-format
+msgid "unrecognized option: `%s'"
+msgstr "okänd flagga: â%sâ"
+
+#: getopt-long.cc:167
+#, c-format
+msgid "invalid argument `%s' to option `%s'"
+msgstr "ogiltigt argument â%sâ till flaggan â%sâ"
+
+#: warn.cc:56
+#, c-format
+msgid "Log level set to %d\n"
+msgstr "Loggnivå satt till %d\n"
+
+#: warn.cc:89
+#, c-format
+msgid "unknown log level `%s', using default (INFO)"
+msgstr "okänd loggnivÃ¥ â%sâ, använd standard (INFO)"
+
+#. Some expected warning was not triggered, so print out a warning.
+#: warn.cc:112
+#, c-format
+msgid "%d expected warning(s) not encountered: "
+msgstr "%d förväntade varningar inte påträffade:"
+
+#: warn.cc:183
+#, c-format
+msgid "fatal error: %s"
+msgstr "ödesdigert fel %s "
+
+#: warn.cc:192
+#, c-format
+msgid "suppressed programming error: %s"
+msgstr "undertryckte programmeringsfel: %s"
+
+#: warn.cc:197
+#, c-format
+msgid "programming error: %s"
+msgstr "programmeringsfel: %s"
+
+#: warn.cc:198
+msgid "continuing, cross fingers"
+msgstr "fortsätter, håll tummarna"
+
+#: warn.cc:207
+#, c-format
+msgid "suppressed error: %s"
+msgstr "undertryckte fel: %s"
+
+#: warn.cc:219
+#, c-format
+msgid "suppressed warning: %s"
+msgstr "undertryckte varning: %s"
+
+#: accidental-engraver.cc:180
+#, c-format
+msgid "accidental typesetting list must begin with context-name: %s"
+msgstr "typsättningslista för förtecken måste börja med kontextnamn: %s"
+
+#: accidental-engraver.cc:207
+#, c-format
+msgid "procedure or context-name expected for accidental rule, found %s"
+msgstr "procedur eller kontextnamn förväntas för förteckensregel, fann %s"
+
+#: accidental.cc:141
+#, c-format
+msgid "Could not find glyph-name for alteration %s"
+msgstr "Kunde inte hitta teckennamn för alteration %s"
+
+#: accidental.cc:157
+msgid "natural alteration glyph not found"
+msgstr "naturligt alterationstecken inte funnet"
+
+#: all-font-metrics.cc:159
+#, c-format
+msgid "cannot find font: `%s'"
+msgstr "det gÃ¥r inte att hitta typsnitt: â%sâ"
+
+#: apply-context-iterator.cc:42
+msgid "\\applycontext argument is not a procedure"
+msgstr "\applycontext-argument är inte en procedur"
+
+#: arpeggio.cc:138
+msgid "no heads for arpeggio found?"
+msgstr "inget nothuvud för arpeggio funnet?"
+
+#: audio-item.cc:139
+#, c-format
+msgid "end moment (%s) < start moment (%s)"
+msgstr "slutmoment (%s) < startmoment (%s)s"
+
+#: audio-item.cc:153
+#, c-format
+msgid "invalid start volume: %f"
+msgstr "ogiltigt startvolym: %f"
+
+#: audio-item.cc:159
+#, c-format
+msgid "invalid target volume: %f"
+msgstr "ogiltig målvolym: %f"
+
+#: audio-item.cc:174
+#, c-format
+msgid "asked to compute volume at %f for dynamic span of duration %f starting at %s"
+msgstr "frågad att beräkna volym %f för dynamisk spann av längd %f med början vid %s"
+
+#: audio-item.cc:182
+#, c-format
+msgid "asked to compute volume at +%f for dynamic span of duration %f starting at %s"
+msgstr "frågade om att beräkna volymen +%f för dynamiskt spann över tiden %f med början vid %s"
+
+#: axis-group-engraver.cc:154
+msgid "Axis_group_engraver: vertical group already has a parent"
+msgstr "Axis_group_engraver: vertikal grupp har redan en förälder"
+
+#: axis-group-engraver.cc:155
+msgid "are there two Axis_group_engravers?"
+msgstr "finns det två Axis_group_engravers?"
+
+#: axis-group-engraver.cc:156
+msgid "removing this vertical group"
+msgstr "tar bort denna vertikala grupp"
+
+#: axis-group-interface.cc:716
+#, c-format
+msgid "\"%s\" is not a valid outside-staff-placement-directive"
+msgstr "â%sâ är inte en giltig placering för utanför notsystemet"
+
+#: axis-group-interface.cc:788
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr "ett objekt utanför notsystemet ska ha en riktning, standard är upp"
+
+#: bar-check-iterator.cc:84
+#, c-format
+msgid "barcheck failed at: %s"
+msgstr "taktkontroll misslyckades vid: %s"
+
+#: beam-engraver.cc:147
+msgid "already have a beam"
+msgstr "har redan en balk"
+
+#: beam-engraver.cc:234
+msgid "unterminated beam"
+msgstr "oavslutad balk"
+
+#: beam-engraver.cc:281 chord-tremolo-engraver.cc:148
+msgid "stem must have Rhythmic structure"
+msgstr "notskaft måste ha en rytmisk struktur"
+
+#: beam-engraver.cc:292
+msgid "stem does not fit in beam"
+msgstr "notskaftet passar inte i balken"
+
+#: beam-engraver.cc:293
+msgid "beam was started here"
+msgstr "balken startades här"
+
+#. We are completely screwed.
+#: beam-quanting.cc:850
+msgid "no viable initial configuration found: may not find good beam slope"
+msgstr "ingen vettig initial konfiguration hittades: kanske inte hittar balksluttning"
+
+#: beam.cc:183
+msgid "removing beam with no stems"
+msgstr "tar bort balkar utan notskaft"
+
+#: change-iterator.cc:34
+#, c-format
+msgid "cannot change `%s' to `%s'"
+msgstr "det gÃ¥r inte ändra â%sâ till â%sâ"
+
+#. FIXME: constant error message.
+#: change-iterator.cc:67
+msgid "cannot find context to switch to"
+msgstr "hittar ej kontext att byta till"
+
+#. No enclosing context was found because the iterator's immediate
+#. context is the kind that was sought.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch.
+#.
+#. last->translator_id_string () = get_change
+#. ()->change_to_id_string ();
+#: change-iterator.cc:78
+#, c-format
+msgid "not changing to same context type: %s"
+msgstr "ändrar inte till samma kontexttyp: %s"
+
+#. FIXME: incomprehensible message
+#: change-iterator.cc:82
+msgid "none of these in my family"
+msgstr "ingen av dessa i min familj"
+
+#: chord-tremolo-engraver.cc:87
+msgid "No tremolo to end"
+msgstr "Ingen tremolo att avsluta"
+
+#: chord-tremolo-engraver.cc:108
+msgid "unterminated chord tremolo"
+msgstr "ej avslutat ackordtremolo"
+
+#: clef.cc:65
+#, c-format
+msgid "clef `%s' not found"
+msgstr "klav â%sâ hittades inte"
+
+#: cluster.cc:120
+#, c-format
+msgid "unknown cluster style `%s'"
+msgstr "okänd klusterstil: â%sâ"
+
+#: cluster.cc:157
+msgid "junking empty cluster"
+msgstr "kastar tomt kluster"
+
+#: coherent-ligature-engraver.cc:110
+#, c-format
+msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
+msgstr "Coherent_ligature_engraver: sätter âspacing-increment = 0.01â: ptr=%ul"
+
+#: constrained-breaking.cc:187 constrained-breaking.cc:206
+msgid "cannot find line breaking that satisfies constraints"
+msgstr "kan inte hitta radbrytning som tillfredsställer begränsningar"
+
+#: context-property.cc:46
+msgid "need symbol argument for \\override and \\revert"
+msgstr "behöver symbolargument för \\override och \\revert"
+
+#: context.cc:147
+#, c-format
+msgid "cannot find or create new `%s'"
+msgstr "kan inte hitta eller skapa nytt â%sâ"
+
+#: context.cc:226
+#, c-format
+msgid "cannot find or create `%s' called `%s'"
+msgstr "det gÃ¥r inte hitta eller skapa â%sâ kallad â%sâ"
+
+#: context.cc:457
+#, c-format
+msgid "cannot find or create: `%s'"
+msgstr "det gÃ¥r inte hitta eller skapa: â%sâ"
+
+#: context.cc:471
+#, c-format
+msgid "cannot find or create new Bottom = \"%s\""
+msgstr "det gÃ¥r inte hitta eller skapa nedre = â%sâ"
+
+#: custos.cc:87
+#, c-format
+msgid "custos `%s' not found"
+msgstr "custos â%sâ hittades inte"
+
+#: dispatcher.cc:82
+msgid "Event class should be a list"
+msgstr "Händelseklass bör vara en lista"
+
+#: dispatcher.cc:165
+#, c-format
+msgid "Junking event: %s"
+msgstr "Slänger händelse: %s"
+
+#: dispatcher.cc:279
+msgid "Attempting to remove nonexisting listener."
+msgstr "Försöker att ta bort ickeexisterande lyssnare."
+
+#: dispatcher.cc:305
+msgid "Already listening to dispatcher, ignoring request"
+msgstr "Lyssnar redan på dispatcher, ignorerar begäran"
+
+#: dots.cc:48
+#, c-format
+msgid "dot `%s' not found"
+msgstr "punkt â%sâ hittades inte"
+
+#: dynamic-engraver.cc:166
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."
+msgstr ""
+"okänd crescendostil: %s\n"
+"standard är hårnål."
+
+#: dynamic-engraver.cc:231 slur-engraver.cc:185
+#, c-format
+msgid "unterminated %s"
+msgstr "oavslutad %s"
+
+#: episema-engraver.cc:74
+msgid "already have an episema"
+msgstr "har redan en episema"
+
+#: episema-engraver.cc:87
+msgid "cannot find start of episema"
+msgstr "det går inte att hitta start på episema"
+
+#: episema-engraver.cc:136
+msgid "unterminated episema"
+msgstr "oavslutad episema"
+
+#: extender-engraver.cc:167 extender-engraver.cc:176
+msgid "unterminated extender"
+msgstr "oavslutad utökare"
+
+#: flag.cc:133
+#, c-format
+msgid "flag `%s' not found"
+msgstr "flaggan â%sâ hittades ej"
+
+#: flag.cc:153
+#, c-format
+msgid "flag stroke `%s' not found"
+msgstr "flaggstrecket â%sâ hittades inte"
+
+#: font-config-scheme.cc:151 font-config.cc:82
+#, c-format
+msgid "failed adding font directory: %s"
+msgstr "misslyckades med att lägga till typsnittskatalog: %s"
+
+#: font-config-scheme.cc:153 font-config.cc:84
+#, c-format
+msgid "Adding font directory: %s"
+msgstr "Lägger till typsnittskatalog: %s"
+
+#: font-config-scheme.cc:167
+#, c-format
+msgid "failed adding font file: %s"
+msgstr "misslyckades med att lägga till typsnittsfil: %s"
+
+#: font-config-scheme.cc:169
+#, c-format
+msgid "Adding font file: %s"
+msgstr "Lägger till typsnittsfil: %s"
+
+#: font-config.cc:38
+msgid "Initializing FontConfig..."
+msgstr "Initierar FontConfigâ¦"
+
+#: font-config.cc:70
+#, c-format
+msgid "failed to add fontconfig configuration file `%s'"
+msgstr "misslyckades med att lägga till fontconfig-konfigurationsfilen â%sâ"
+
+#: font-config.cc:73
+#, c-format
+msgid "Adding fontconfig configuration file: %s"
+msgstr "Lägger till fontconfig-konfigurationsfil: â%sâ"
+
+#: font-config.cc:86
+msgid "Building font database..."
+msgstr "Bygger typsnittsdatabasâ¦"
+
+#: footnote-engraver.cc:87
+msgid "Must be footnote-event."
+msgstr "Måste vara en footnote-händelse."
+
+#: general-scheme.cc:403
+#, c-format
+msgid "failed redirecting stderr to `%s'"
+msgstr "misslyckades med att ställa om stderr till â%sâ"
+
+#: general-scheme.cc:482
+msgid "Found infinity or nan in output. Substituting 0.0"
+msgstr "Hittade infinity eller nan i utdata. Ersätter med 0.0"
+
+#: general-scheme.cc:623
+#, c-format
+msgid "g_spawn_sync failed (%d): %s: %s"
+msgstr "misslyckades med g_spawn_sync (%d): %s: %s"
+
+#: glissando-engraver.cc:157
+msgid "unterminated glissando"
+msgstr "oavslutat glissando"
+
+#: global-context-scheme.cc:95 global-context-scheme.cc:113
+msgid "no music found in score"
+msgstr "ingen musik funnen i partitur"
+
+#: global-context-scheme.cc:103
+msgid "Interpreting music..."
+msgstr "Tolkar musikâ¦"
+
+#: global-context-scheme.cc:125
+#, c-format
+msgid "elapsed time: %.2f seconds"
+msgstr "tidsåtgång: %.2f sekunder"
+
+#: gregorian-ligature-engraver.cc:70
+#, c-format
+msgid "\\%s ignored"
+msgstr "\\%s ignorerat"
+
+#: gregorian-ligature-engraver.cc:75
+#, c-format
+msgid "implied \\%s added"
+msgstr "implicit \\%s tillagt"
+
+#. ligature may not start with 2nd head of pes or flexa
+#: gregorian-ligature-engraver.cc:224
+msgid "cannot apply `\\~' on first head of ligature"
+msgstr "det gÃ¥r inte att tillämpa â\\~â pÃ¥ första huvudet i fraseringsbÃ¥ge"
+
+#. (pitch == prev_pitch)
+#: gregorian-ligature-engraver.cc:236
+msgid "cannot apply `\\~' on heads with identical pitch"
+msgstr "det gÃ¥r inte att tillämpa â\\~â pÃ¥ huvuden med identisk ton"
+
+#: grob-interface.cc:68
+#, c-format
+msgid "Unknown interface `%s'"
+msgstr "Okänt gränssnitt â%sâ"
+
+#: grob-interface.cc:79
+#, c-format
+msgid "Grob `%s' has no interface for property `%s'"
+msgstr "Grob â%sâ har inget gränssnitt för egenskapen â%sâ"
+
+#: grob-property.cc:32
+#, c-format
+msgid "%d: %s"
+msgstr "%d: %s"
+
+#: grob.cc:489
+#, c-format
+msgid "ignored infinite %s-offset"
+msgstr "ignorerarde oändlig %s-förskjutning"
+
+#: hairpin.cc:60
+msgid "Asking for broken bound padding at a non-broken bound."
+msgstr "Efterfrågar bruten gränsutfyllnad vid en icke-bruten utfyllnad."
+
+#: hairpin.cc:257
+msgid "decrescendo too small"
+msgstr "diminuendo för litet"
+
+#: horizontal-bracket-engraver.cc:61
+msgid "do not have that many brackets"
+msgstr "ha inte så många klamrar"
+
+#: horizontal-bracket-engraver.cc:70
+msgid "conflicting note group events"
+msgstr "motsägande notgrupphändelser"
+
+#: hyphen-engraver.cc:103
+msgid "removing unterminated hyphen"
+msgstr "tar bort oavslutat bindestreck"
+
+#: hyphen-engraver.cc:117
+msgid "unterminated hyphen; removing"
+msgstr "oavslutat bindestreck, tar bort"
+
+#: includable-lexer.cc:71 lily-guile.cc:92 lily-parser-scheme.cc:108
+#, c-format
+msgid "cannot find file: `%s'"
+msgstr "det gÃ¥r inte att hitta fil: â%sâ"
+
+#: includable-lexer.cc:73 lily-parser-scheme.cc:100
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(sökväg: â%sâ)"
+
+#: input.cc:138 source-file.cc:180 source-file.cc:195
+msgid "position unknown"
+msgstr "okänd position"
+
+#: keep-alive-together-engraver.cc:93
+#, c-format
+msgid "unknown remove-layer value `%s'"
+msgstr "okänt remove-layer-värde â%sâ"
+
+#: key-engraver.cc:197
+msgid "Incomplete keyAlterationOrder for key signature"
+msgstr "Ickekomplett keyAlterationOrder för tonart"
+
+#: key-signature-interface.cc:77
+#, c-format
+msgid "No glyph found for alteration: %s"
+msgstr "Inget tecken funnet för alteration: %s"
+
+#: key-signature-interface.cc:87
+msgid "alteration not found"
+msgstr "alteration hittades inte"
+
+#: ligature-bracket-engraver.cc:71 ligature-engraver.cc:109
+msgid "cannot find start of ligature"
+msgstr "det går inte att hitta start på fraseringsbåge"
+
+#: ligature-bracket-engraver.cc:84 ligature-engraver.cc:136
+msgid "already have a ligature"
+msgstr "har redan en fraseringsbåge"
+
+#: ligature-engraver.cc:114
+msgid "no right bound"
+msgstr "ingen högergräns"
+
+#: ligature-engraver.cc:145
+msgid "no left bound"
+msgstr "ingen vänstergräns"
+
+#: ligature-engraver.cc:189
+msgid "unterminated ligature"
+msgstr "oavslutad fraseringsbåge"
+
+#: ligature-engraver.cc:216
+msgid "ignoring rest: ligature may not contain rest"
+msgstr "ignorerar paus; fraseringsbåge får inte innehålla paus"
+
+#: ligature-engraver.cc:217
+msgid "ligature was started here"
+msgstr "fraseringsbågen startade här"
+
+#: lily-guile.cc:94
+#, c-format
+msgid "(load path: `%s')"
+msgstr "(inläsningssökväg: â%sâ"
+
+#: lily-guile.cc:413
+#, c-format
+msgid "cannot find property type-check for `%s' (%s)."
+msgstr "det gÃ¥r inte hitta egenskapstypkontroll för â%sâ (%s)."
+
+#: lily-guile.cc:416
+msgid "perhaps a typing error?"
+msgstr "kanske ett skrivfel?"
+
+#: lily-guile.cc:423
+msgid "skipping assignment"
+msgstr "hoppar över tilldelning"
+
+#: lily-guile.cc:442
+#, c-format
+msgid "type check for `%s' failed; value `%s' must be of type `%s'"
+msgstr "typkontroll för â%sâ misslyckades; värde â%sâ mÃ¥ste ha typen â%sâ"
+
+#. Uh oh. unsmob<T> delivered 0, yet
+#. unsmob<T> delivers true. This means that unsmob<T> is a
+#. matching check from a base class of T, but var is of an
+#. incompatible derived type.
+#: lily-guile.cc:462
+msgid "Wrong kind of "
+msgstr "Fel typ av "
+
+#: lily-lexer.cc:251
+msgid "include files are not allowed in safe mode"
+msgstr "inkludera filer som inte tillåts i säker läge"
+
+#: lily-lexer.cc:278
+#, c-format
+msgid "identifier name is a keyword: `%s'"
+msgstr "identifierarnamn är ett nyckelord: â%sâ"
+
+#: lily-lexer.cc:301 lily-lexer.cc:314
+#, c-format
+msgid "%s:EOF"
+msgstr "%s:EOF"
+
+#: lily-modules.cc:81
+#, c-format
+msgid "Uninitialized variable `%s' in module (%s)"
+msgstr "Oinitierad variabel â%sâ i modul (%s)"
+
+#: lily-parser-scheme.cc:80
+#, c-format
+msgid "Changing working directory to: `%s'"
+msgstr "Ãndrar arbetskatalog till: â%sâ"
+
+#: lily-parser-scheme.cc:84
+#, c-format
+msgid "unable to change directory to: `%s'"
+msgstr "det gÃ¥r inte ändra katalog till: â%sâ"
+
+#: lily-parser-scheme.cc:99
+#, c-format
+msgid "cannot find init file: `%s'"
+msgstr "det gÃ¥r inte hitta initfil: â%sâ"
+
+#: lily-parser-scheme.cc:117
+#, c-format
+msgid "Processing `%s'"
+msgstr "Behandlar â%sâ"
+
+#: lily-parser-scheme.cc:210
+msgid "ly:parser-parse-string is only valid with a new parser. Use ly:parser-include-string instead."
+msgstr "ly:parser-parse-string är endast giltigt med en ny tolk. Använd ly:parser-include-string istället."
+
+#: lily-parser-scheme.cc:241
+msgid "ly:parse-string-expression is only valid with a new parser. Use ly:parser-include-string instead."
+msgstr "ly:parse-string-expression är endast giltig med en ny tolk. Använd istället ly:parser-include-string."
+
+#: lily-parser.cc:106
+msgid "Parsing..."
+msgstr "Tolkarâ¦"
+
+#: lookup.cc:177
+#, c-format
+msgid "Not drawing a box with negative dimension, %.2f by %.2f."
+msgstr "Ritar ej ut en box med negativa dimensioner, %.2f med %.2f."
+
+#: lyric-combine-music-iterator.cc:204
+msgid "argument of \\lyricsto should contain Lyrics context"
+msgstr "argument för \\lyricsto bör har Lyrics-innehåll"
+
+#: lyric-combine-music-iterator.cc:344
+#, c-format
+msgid "cannot find %s `%s'"
+msgstr "det gÃ¥r inte hitta %s â%sâ"
+
+#: main.cc:106
+#, c-format
+msgid ""
+"This program is free software. It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions. Invoke as `%s --warranty' for more\n"
+"information.\n"
+msgstr ""
+"Det här är fri programvara. Den täcks av GNU General Public License,\n"
+"och du får ändra och/eller distribuera kopior av den under vissa\n"
+"villkor. Kör â%s --warrantyâ för mer information.\n"
+
+#: main.cc:112
+msgid ""
+" This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as \n"
+"published by the Free Software Foundation, either version 3 of\n"
+"the License, or (at your option) any later version.\n"
+"\n"
+" This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
+"General Public License for more details.\n"
+"\n"
+" You should have received a copy of the\n"
+"GNU General Public License along with this program; if not, write to\n"
+"the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+"Boston, MA 02111-1307, USA.\n"
+msgstr ""
+" Detta program är fri programvara. Du kan distribuera det och/eller\n"
+"modifiera det under villkoren i GNU General Public License som\n"
+"publicerad av Free Software Foundation, antingen version 3 av\n"
+"licensen eller (valfritt) en senare version.\n"
+"\n"
+" Detta program distribueras i hopp om att det ska vara användbart, men\n"
+"UTAN NÃ
GON SOM HELST GARANTI, även utan underförstådd garanti om\n"
+"SÃLJBARHET eller LÃMPLIGHET FÃR NÃ
GOT SPECIELLT ÃNDAMÃ
L. Se GNU General\n"
+"Public License för ytterligare information.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
+"detta program. Om inte, skriv till Free Software Foundation, Inc.,\n"
+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#: main.cc:150
+msgid "SYM[=VAL]"
+msgstr "SYM[=VAL]"
+
+#: main.cc:151
+msgid ""
+"set Scheme option SYM to VAL (default: #t).\n"
+"Use -dhelp for help."
+msgstr ""
+"sätt Scheme-flaggan SYM till VAL (standard: #t).\n"
+"Använd -dhelp för help."
+
+#: main.cc:155
+msgid "EXPR"
+msgstr "UTTR"
+
+#: main.cc:155
+msgid "evaluate scheme code"
+msgstr "evaluera schemekod"
+
+#. Bug in option parser: --output =foe is taken as an abbreviation
+#. for --output-format.
+#: main.cc:158
+msgid "FORMATs"
+msgstr "FORMATs"
+
+#: main.cc:158
+msgid "dump FORMAT,... Also as separate options:"
+msgstr "dumpa FORMAT,⦠Också som separate flaggor:"
+
+#: main.cc:159
+msgid "generate PDF (default)"
+msgstr "skapa PDF (standard)"
+
+#: main.cc:160
+msgid "generate PNG"
+msgstr "skapa PNG"
+
+#: main.cc:161
+msgid "generate PostScript"
+msgstr "skapa PostScript"
+
+#: main.cc:162
+msgid "generate big PDF files"
+msgstr "skapa stora PDF"
+
+#: main.cc:165
+msgid "FIELD"
+msgstr "FÃLT"
+
+#: main.cc:165
+msgid ""
+"dump header field FIELD to file\n"
+"named BASENAME.FIELD"
+msgstr ""
+"skriv rubrikfält till FÃLT till filen\n"
+"benämd BASNAMN.FÃLT"
+
+#: main.cc:168
+msgid "add DIR to search path"
+msgstr "lägg till KATALOG till sökvägen"
+
+#: main.cc:169
+msgid "use FILE as init file"
+msgstr "använd FIL som init-fil"
+
+#: main.cc:172
+msgid "USER, GROUP, JAIL, DIR"
+msgstr "USER, GROUP, JAIL, DIR"
+
+#: main.cc:172
+msgid ""
+"chroot to JAIL, become USER:GROUP\n"
+"and cd into DIR"
+msgstr ""
+"chroot till JAIL, bli USER:GROUP\n"
+"och gör cd till DIR"
+
+#: main.cc:177
+msgid ""
+"print log messages according to LOGLEVEL. Possible values are:\n"
+"NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG."
+msgstr ""
+"skriv ut loggmeddelanden efter LOGLEVEL. Möjliga värden är:\n"
+"NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (standard) och DEBUG."
+
+#: main.cc:181
+msgid "write output to FILE (suffix will be added)"
+msgstr "skriv utdata till FIL (suffix kommer att läggas till)"
+
+#: main.cc:182
+msgid "relocate using directory of lilypond program"
+msgstr "reallokera med katalog av lilypond-program"
+
+#: main.cc:183
+msgid "no progress, only error messages (equivalent to loglevel=ERROR)"
+msgstr "inga framsteg, endast felmeddelanden (motsvarande loggnivå=ERROR)"
+
+#: main.cc:185
+msgid "be verbose (equivalent to loglevel=DEBUG)"
+msgstr "var utförlig (motsvarande loggnivå=DEBUG)"
+
+#. Do not update the copyright years here, run `make grand-replace'
+#: main.cc:264
+#, c-format
+msgid ""
+"Copyright (c) %s by\n"
+"%s and others."
+msgstr ""
+"Copyright © %s av\n"
+"%s och andra."
+
+#. No version number or newline here. It confuses help2man.
+#: main.cc:302
+#, c-format
+msgid "Usage: %s [OPTION]... FILE..."
+msgstr "Användning: %s [FLAGGA]⦠FILâ¦"
+
+#: main.cc:304
+msgid "Typeset music and/or produce MIDI from FILE."
+msgstr "Typsätt musik och/eller spela MIDI från FIL."
+
+#: main.cc:306
+msgid "LilyPond produces beautiful music notation."
+msgstr "LilyPond skapar vacker musiknotation."
+
+#: main.cc:308
+#, c-format
+msgid "For more information, see %s"
+msgstr "För mer information, se %s"
+
+#: main.cc:310
+msgid "Options:"
+msgstr "Flaggor:"
+
+#: main.cc:377
+#, c-format
+msgid "expected %d arguments with jail, found: %u"
+msgstr "förväntade sig %d argument med jail, fann: %u"
+
+#: main.cc:391
+#, c-format
+msgid "no such user: %s"
+msgstr "ingen sådan användare: %s"
+
+#: main.cc:393
+#, c-format
+msgid "cannot get user id from user name: %s: %s"
+msgstr "det går inte att få användarid från användarnamn: %s: %s"
+
+#: main.cc:408
+#, c-format
+msgid "no such group: %s"
+msgstr "ingen sådan grupp: %s"
+
+#: main.cc:410
+#, c-format
+msgid "cannot get group id from group name: %s: %s"
+msgstr "det går inte att få gruppid från gruppnamn: %s: %s"
+
+#: main.cc:418
+#, c-format
+msgid "cannot chroot to: %s: %s"
+msgstr "kan inte ändra chroot till:%s: %s"
+
+#: main.cc:425
+#, c-format
+msgid "cannot change group id to: %d: %s"
+msgstr "det går inte att ändra gruppid till: %d: %s"
+
+#: main.cc:431
+#, c-format
+msgid "cannot change user id to: %d: %s"
+msgstr "det går inte att ändra användarid till: %d: %s"
+
+#: main.cc:437
+#, c-format
+msgid "cannot change working directory to: %s: %s"
+msgstr "kan inte ändra arbetskatalog till: %s: %s"
+
+#: main.cc:826
+#, c-format
+msgid "exception caught: %s"
+msgstr "undantag fångat: %s"
+
+#. FIXME: constant error message.
+#: mark-engraver.cc:149
+msgid "rehearsalMark must have integer value"
+msgstr "rehersalMark måste ha ett heltalsvärde"
+
+#: mark-engraver.cc:155
+msgid "mark label must be a markup object"
+msgstr "markeringsetikett måste vara ett markup-objekt"
+
+#: mensural-ligature-engraver.cc:93
+msgid "ligature with less than 2 heads -> skipping"
+msgstr "Fraseringsbåge med mindre än 2 huvuden -> skippar"
+
+#: mensural-ligature-engraver.cc:120
+msgid "cannot determine pitch of ligature primitive -> skipping"
+msgstr "det går inte att bestämma ton för fraseringsbågeprimitiv -> skippar"
+
+#: mensural-ligature-engraver.cc:134
+msgid "single note ligature - skipping"
+msgstr "enskild not för fraseringsbåge -> skippar"
+
+#: mensural-ligature-engraver.cc:145
+msgid "prime interval within ligature -> skipping"
+msgstr "primintervall inom fraseringsbåge -> skippar"
+
+#: mensural-ligature-engraver.cc:156
+msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
+msgstr "mensural fraseringsbåge: längd ingen av Mx, L, B, S -> skippar"
+
+#: mensural-ligature-engraver.cc:199
+msgid "semibrevis must be followed by another one -> skipping"
+msgstr "semibrevis måste följas av en annan -> hoppar"
+
+#: mensural-ligature-engraver.cc:209
+msgid ""
+"semibreves can only appear at the beginning of a ligature,\n"
+"and there may be only zero or two of them"
+msgstr ""
+"helnoter kan endast visas i början på en fraseringsbåge,\n"
+"och det kan endast finns noll eller två av dem"
+
+#: mensural-ligature-engraver.cc:229
+msgid ""
+"invalid ligatura ending:\n"
+"when the last note is a descending brevis,\n"
+"the penultimate note must be another one,\n"
+"or the ligatura must be LB or SSB"
+msgstr ""
+"ogiltigt avslut på fraseringsbåge:\n"
+"när den sista noten är en tonande brevisnot,\n"
+"måste penultimatenoten vara en annan,\n"
+"eller så måste fraseringsbågen vara LB eller SSB"
+
+#: mensural-ligature-engraver.cc:389
+msgid "unexpected case fall-through"
+msgstr "föll igenom fall oväntat"
+
+#: midi-cc-announcer.cc:99
+#, c-format
+msgid "ignoring out-of-range value change for MIDI property `%s'"
+msgstr "ignorerar värdesändring utanför intervallet för MIDI-egenskapen â%sâ"
+
+#: midi-item.cc:91
+#, c-format
+msgid "no such MIDI instrument: `%s'"
+msgstr "MIDI-instrumentet finns inte: â%sâ"
+
+#: midi-item.cc:177
+msgid "Time signature with more than 255 beats. Truncating"
+msgstr "Taktart med mer än 255 takter. Trunkerar"
+
+#: midi-stream.cc:38
+#, c-format
+msgid "cannot open for write: %s: %s"
+msgstr "det går inte att öppna för skrivning: %s: %s"
+
+#: midi-stream.cc:54
+#, c-format
+msgid "cannot write to file: `%s'"
+msgstr "det gÃ¥r inte att skriva till filen: â%sâ"
+
+#. LINE BREAKING
+#: minimal-page-breaking.cc:40 one-page-breaking.cc:72 paper-score.cc:116
+msgid "Calculating line breaks..."
+msgstr "Beräknar radbrytningarâ¦"
+
+#: minimal-page-breaking.cc:44
+msgid "Calculating page breaks..."
+msgstr "Beräknar radbrytningarâ¦"
+
+#: multi-measure-rest.cc:152
+msgid "usable-duration-logs must be a non-empty list. Falling back to whole rests."
+msgstr "usable-duration-logs måste vara en icke-tom lista. Faller tillbaka till hela pauser."
+
+#: music.cc:154
+#, c-format
+msgid "octave check failed; expected \"%s\", found: \"%s\""
+msgstr "misslyckades med oktavkontroll; förväntades â%sâ, fick â%sâ"
+
+#: new-fingering-engraver.cc:113
+msgid "cannot add text scripts to individual note heads"
+msgstr "kan inte lägga till textskript till individuella nothuvuden"
+
+#: new-fingering-engraver.cc:267
+msgid "no placement found for fingerings"
+msgstr "fann ingen placering för fingrar"
+
+#: new-fingering-engraver.cc:268
+msgid "placing below"
+msgstr "placerar nedan"
+
+#: note-collision.cc:512
+msgid "this Voice needs a \\voiceXx or \\shiftXx setting"
+msgstr "denna Voice behöver en \\voiceXx- eller \\shiftXx-inställning"
+
+#: note-column.cc:150
+msgid "cannot have note heads and rests together on a stem"
+msgstr "det går inte att ha nothuvuden och pauser tillsammans på ett notskaft"
+
+#: note-head.cc:95
+#, c-format
+msgid "none of note heads `%s' or `%s' found"
+msgstr "inga nothuvuden â%sâ eller â%sâ funnet"
+
+#: note-heads-engraver.cc:75
+msgid "NoteEvent without pitch"
+msgstr "NoteEvent utan ton"
+
+#. PAGE BREAKING
+#: one-page-breaking.cc:78 optimal-page-breaking.cc:114
+msgid "Fitting music on 1 page..."
+msgstr "Passar in musik pÃ¥ 1 sidaâ¦"
+
+#: open-type-font-scheme.cc:149 open-type-font-scheme.cc:195
+#: open-type-font-scheme.cc:241 pfb-scheme.cc:60 ttf.cc:512 ttf.cc:561
+msgid "font index must be non-negative, using index 0"
+msgstr "typsnittsindex måste vara icke-negativ, använder index 0"
+
+#: open-type-font-scheme.cc:163 open-type-font-scheme.cc:209
+#: open-type-font-scheme.cc:289 pfb-scheme.cc:75 ttf.cc:480 ttf.cc:528
+#, c-format
+msgid "font index %d too large for font `%s', using index 0"
+msgstr "typsnittsindex %d för stor för typsnitt â%sâ, använder index 0"
+
+#: open-type-font-scheme.cc:251
+#, c-format
+msgid "cannot open font filename `%s'"
+msgstr "kan inte öppna typsnittsfilnamnet: â%sâ"
+
+#: open-type-font-scheme.cc:261 open-type-font-scheme.cc:277
+#: open-type-font-scheme.cc:300 open-type-font-scheme.cc:320
+#: open-type-font-scheme.cc:338 open-type-font-scheme.cc:354
+#, c-format
+msgid "cannot read %s of `%s'"
+msgstr "kan inte läsa â%sâ av â%sâ"
+
+#: open-type-font-scheme.cc:376
+#, c-format
+msgid "font `%s' index %d does not have `CFF' table"
+msgstr "typsnitt â%sâ index â%dâ har inte en âCFFâ-tabell"
+
+#: open-type-font.cc:54
+#, c-format
+msgid "cannot allocate %lu bytes"
+msgstr "det går inte att allokera %lu byte"
+
+#: open-type-font.cc:58
+#, c-format
+msgid "cannot load font table: %s"
+msgstr "kan inte öppna typsnittstabell: %s"
+
+#: open-type-font.cc:63
+#, c-format
+msgid "FreeType error: %s"
+msgstr "FreeType-fel: %s"
+
+#: open-type-font.cc:124
+#, c-format
+msgid "unsupported font format: %s"
+msgstr "typsnittformatet stöds ej: %s"
+
+#: open-type-font.cc:126
+#, c-format
+msgid "error reading font file %s: %s"
+msgstr "fel vid läsning av typsnittsfil: %s: %s"
+
+#: open-type-font.cc:141
+msgid "cannot get postscript name"
+msgstr "det går inte att hämta postscript-namn"
+
+#: open-type-font.cc:153
+#, c-format
+msgid "cannot get font %s format"
+msgstr "det går inte att hämta format för typsnitt %s"
+
+#: open-type-font.cc:176
+#, c-format
+msgid "cannot read CFF %s: %s"
+msgstr "det går inte att läsa CFF %s: %s"
+
+#. FreeType 2.6 and 2.6.1 cannot get PS name from pure-CFF.
+#. (FreeType 2.5.5 and earlier does not have this issue.
+#. FreeType 2.6.2+ has this bug fixed.)
+#. So we need direct parsing of the 'CFF' table, in this case.
+#: open-type-font.cc:193
+#, c-format
+msgid "Directly parsing 'CFF' table of font %s."
+msgstr "Direkttolkar âCFFâ-tabell för typsnitt %s."
+
+#: open-type-font.cc:232
+#, c-format
+msgid "cannot get font %s CFF name"
+msgstr "det går inte att hämta typsnitt %s CFF-namn"
+
+#: open-type-font.cc:237
+#, c-format
+msgid "Replace font name from %s to %s."
+msgstr "Ta bort typsnittsnamn från %s till %s."
+
+#: open-type-font.cc:321
+#, c-format
+msgid "FT_Get_Glyph_Name () Freetype error: %s"
+msgstr "FT_Get_Glyph_Name () Freetype-fel: %ss"
+
+#: open-type-font.cc:469 pango-font.cc:261
+#, c-format
+msgid "FT_Get_Glyph_Name () error: %s"
+msgstr "FT_Get_Glyph_Name () Freetype-fel: %s"
+
+#. find out the ideal number of pages
+#: optimal-page-breaking.cc:62
+msgid "Finding the ideal number of pages..."
+msgstr "Hitta bäst antal sidorâ¦"
+
+#: optimal-page-breaking.cc:94
+msgid "could not satisfy systems-per-page and page-count at the same time, ignoring systems-per-page"
+msgstr "det gick inte att uppfylla systems-per-page och page-count samtidigt, ignorerar systems-per-page"
+
+#: optimal-page-breaking.cc:116
+#, c-format
+msgid "Fitting music on %d pages..."
+msgstr "Passar in musik pÃ¥ %d sidorâ¦"
+
+#: optimal-page-breaking.cc:118
+#, c-format
+msgid "Fitting music on %d or %d pages..."
+msgstr "Passar in musik pÃ¥ %d eller %d sidorâ¦"
+
+#: optimal-page-breaking.cc:128 optimal-page-breaking.cc:181
+#, c-format
+msgid "trying %d systems"
+msgstr "provar %d system"
+
+#: optimal-page-breaking.cc:147 optimal-page-breaking.cc:209
+#, c-format
+msgid "best score for this sys-count: %f"
+msgstr "bästa partitur för denna sys-count: %f"
+
+#: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:249
+#: paper-score.cc:156
+msgid "Drawing systems..."
+msgstr "Ritar systemâ¦"
+
+#: output-def.cc:229
+msgid "margins do not fit with line-width, setting default values"
+msgstr "marginaler passar inte in med line-width, ställer in standardvärden"
+
+#: output-def.cc:236
+msgid "systems run off the page due to improper paper settings, setting default values"
+msgstr "systemet kör utanför sidan beroende på opassande pappersinställningar, ställer in standardvärden"
+
+#: page-breaking.cc:276
+msgid "ignoring min-systems-per-page and max-systems-per-page because systems-per-page was set"
+msgstr "ignorerar min-systems-per-page och max-systems-per-page eftersom systems-per-page var satt"
+
+#: page-breaking.cc:281
+msgid "min-systems-per-page is larger than max-systems-per-page, ignoring both values"
+msgstr "min-systems-per-page är större än max-systems-per-page, ignorerar båda värden"
+
+#: page-breaking.cc:636
+#, c-format
+msgid "page %d has been compressed"
+msgstr "sida %d har blivit komprimerad"
+
+#: page-layout-problem.cc:400
+msgid "A page layout problem has been initiated that cannot accommodate footnotes."
+msgstr "Ett problem med sidolayout har uppstÃ¥tt och medför att fotnot inte kan Ãnhysas."
+
+#: page-layout-problem.cc:729
+msgid "ragged-bottom was specified, but page must be compressed"
+msgstr "ragged-bottom angavs men sidan måste vara komprimerad"
+
+#: page-layout-problem.cc:732
+#, c-format
+msgid "compressing over-full page by %.1f staff-spaces"
+msgstr "komprimerar överfull sida med %.1f notsystemsutrymme"
+
+#: page-layout-problem.cc:1197
+msgid "staff-affinities should only decrease"
+msgstr "staff-affinities ska endast minska"
+
+#: page-turn-page-breaking.cc:169
+#, c-format
+msgid "page-turn-page-breaking: breaking from %d to %d"
+msgstr "page-turn-page-breaking: radbryter från %d till %d"
+
+#: page-turn-page-breaking.cc:218
+msgid "cannot fit the first page turn onto a single page. Consider setting first-page-number to an even number."
+msgstr "det går inte att passa in den första sidan till en enstaka sida. Fundera på att ställa in first-page-number till ett jämt nummer."
+
+#: page-turn-page-breaking.cc:231
+#, c-format
+msgid "Calculating page and line breaks (%d possible page breaks)..."
+msgstr "Beräkna sida och radbrytningar (%d möjliga sidbrytningar)â¦"
+
+#: page-turn-page-breaking.cc:301
+#, c-format
+msgid "break starting at page %d"
+msgstr "radbryt startar vid sida %d"
+
+#: page-turn-page-breaking.cc:302
+#, c-format
+msgid "\tdemerits: %f"
+msgstr "\tdemerits: %f"
+
+#: page-turn-page-breaking.cc:303
+#, c-format
+msgid "\tsystem count: %d"
+msgstr "\tSystemantal: %d"
+
+#: page-turn-page-breaking.cc:304
+#, c-format
+msgid "\tpage count: %d"
+msgstr "\tsidantal: %d"
+
+#: page-turn-page-breaking.cc:305
+#, c-format
+msgid "\tprevious break: %d"
+msgstr "\ttidigare bryt: %d"
+
+#: pango-font.cc:250
+#, c-format
+msgid "no glyph for character U+%0X in font `%s'"
+msgstr "inget tecken för tecknet U+%0X i typsnitt â%sâ"
+
+#: pango-font.cc:277
+#, c-format
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
+msgstr ""
+"Tecknet har inget namn men typsnittet stöder teckennamngivning.\n"
+"Hoppar över tecken U+%0X, fil %s"
+
+#: pango-font.cc:327
+#, c-format
+msgid "no PostScript font name for font `%s'"
+msgstr "inga PostScript-typsnittsnamn för typsnittet â%sâ"
+
+#: pango-font.cc:377
+msgid "FreeType face has no PostScript font name"
+msgstr "FreeType face har inget PostScript-typsnittsnamn"
+
+#: paper-book.cc:200
+#, c-format
+msgid "program option -dprint-pages not supported by backend `%s'"
+msgstr "programflagg -dprint-pages stöds inte av bakände â%sâ"
+
+#: paper-book.cc:219
+#, c-format
+msgid "program option -dpreview not supported by backend `%s'"
+msgstr "programflagga -dpreview stöds inte av bakände â%sâ"
+
+#: paper-column-engraver.cc:273
+msgid "forced break was overridden by some other event, should you be using bar checks?"
+msgstr "tvingat avbrott överlagrades av något annan händelse, bör du använda taktkontroller?"
+
+#: paper-outputter-scheme.cc:41
+#, c-format
+msgid "Layout output to `%s'..."
+msgstr "Layout-utdata till â%sââ¦"
+
+#: paper-score.cc:128
+#, c-format
+msgid "Element count %d (spanners %d) "
+msgstr "Elementantal %d (bryggare %d) "
+
+#: paper-score.cc:132
+msgid "Preprocessing graphical objects..."
+msgstr "Förbehandlar grafiska objektâ¦"
+
+#: parse-scm.cc:124
+msgid "GUILE signaled an error for the expression beginning here"
+msgstr "GUILE gav ett fel för uttrycket som börjar här"
+
+#: pdf-scheme.cc:65
+#, c-format
+msgid "Conversion of string `%s' to UTF-16be failed: %s"
+msgstr "Misslyckades med konvertering av strängen â%sâ till UTF-16: %s"
+
+#: percent-repeat-engraver.cc:147
+msgid "unterminated percent repeat"
+msgstr "oavslutad procentrepris"
+
+#: performance.cc:76
+msgid "Track..."
+msgstr "SpÃ¥râ¦"
+
+#: performance.cc:126
+#, c-format
+msgid "MIDI output to `%s'..."
+msgstr "MIDI-utdata till â%sââ¦"
+
+#: pfb.cc:45
+msgid "Segment header of the Type 1 (PFB) font is broken."
+msgstr "Segmentshuvud av typsnittet Type 1(PFB) är trasigt."
+
+#: pfb.cc:59
+msgid "Segment length of the Type 1 (PFB) font is too long."
+msgstr "Segmentlängden av typsnittet Type 1 (PFB) är för långt."
+
+#: pfb.cc:86
+msgid "Segment type of the Type 1 (PFB) font is unknown."
+msgstr "Segmenttypen av typsnittet Type 1 (PFB) är okänd."
+
+#: piano-pedal-engraver.cc:276
+#, c-format
+msgid "expect 3 strings for piano pedals, found: %ld"
+msgstr "förväntade sig 3 strängar för pianopedaler, fann: %ld"
+
+#: piano-pedal-engraver.cc:291 piano-pedal-engraver.cc:302
+#: piano-pedal-performer.cc:104
+#, c-format
+msgid "cannot find start of piano pedal: `%s'"
+msgstr "kan inte hitta start pÃ¥ pianopedal: â%sâ"
+
+#: piano-pedal-engraver.cc:337
+#, c-format
+msgid "cannot find start of piano pedal bracket: `%s'"
+msgstr "kan inte hitta start pÃ¥ pianopedalklammer: â%sâ"
+
+#: program-option-scheme.cc:223
+#, c-format
+msgid "no such internal option: %s"
+msgstr "ingen sådan intern flagga: %s"
+
+#: property-iterator.cc:66
+#, c-format
+msgid "not a grob name, `%s'"
+msgstr "Inte ett grob-namn, â%sâ"
+
+#: relative-octave-check.cc:49
+msgid "Failed octave check, got: "
+msgstr "Misslyckades med oktavkontroll, fick: "
+
+#: relocate.cc:56
+#, c-format
+msgid "Setting %s to %s"
+msgstr "Sätter %s till %s"
+
+#. this warning should only be printed in debug mode!
+#: relocate.cc:77
+#, c-format
+msgid "no such file: %s for %s"
+msgstr "ingen sådan fil: %s för %s"
+
+#. this warning should only be printed in debug mode!
+#. this warning should only be printed in debug mode
+#: relocate.cc:88 relocate.cc:106
+#, c-format
+msgid "no such directory: %s for %s"
+msgstr "ingen sådan katalog. %s för %s"
+
+#: relocate.cc:97
+#, c-format
+msgid "%s=%s (prepend)\n"
+msgstr "%s=%s (infoga)\n"
+
+#: relocate.cc:124
+#, c-format
+msgid "not relocating, no %s/ or current/ found under %s"
+msgstr "flyttar inte om, ingen %s/ eller aktuell/ hittad under %s"
+
+#: relocate.cc:134
+#, c-format
+msgid "Relocation: compile datadir=%s, new datadir=%s"
+msgstr "Omflyttning: kompileringsdatakat=%s, ny datakat=%s"
+
+#: relocate.cc:146
+#, c-format
+msgid "Relocation: framework_prefix=%s"
+msgstr "Omflyttning: framework_prefix=%s"
+
+#: relocate.cc:172
+#, c-format
+msgid "Relocation: is absolute: argv0=%s\n"
+msgstr "Omflyttning: är absolut: argv0=%s\n"
+
+#: relocate.cc:178
+#, c-format
+msgid "Relocation : from cwd: argv0=%s\n"
+msgstr "Omflyttning: från cwd: argv0=%s\n"
+
+#: relocate.cc:196
+#, c-format
+msgid ""
+"Relocation: from PATH=%s\n"
+"argv0=%s\n"
+msgstr ""
+"Omflyttning: från PATH=%s\n"
+"argv0=%s\n"
+
+#: relocate.cc:222
+msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
+msgstr "LILYPONDPREFIX är föråldrad, använd LILYPOND_DATADIR"
+
+#: relocate.cc:347
+#, c-format
+msgid "Relocation file: %s"
+msgstr "Omflyttningsfil: %s"
+
+#: relocate.cc:351 source-file.cc:65
+#, c-format
+msgid "cannot open file: `%s'"
+msgstr "det gÃ¥r inte att öppna fil: â%sâ"
+
+#: relocate.cc:381
+#, c-format
+msgid "Unknown relocation command %s"
+msgstr "Okänt omflyttningskommando %s"
+
+#: rest-collision.cc:154
+msgid "cannot resolve rest collision: rest direction not set"
+msgstr "kan inte lösa pauskollision: pausriktning inte satt"
+
+#: rest-collision.cc:165 rest-collision.cc:274
+msgid "too many colliding rests"
+msgstr "för många krockande pauser"
+
+#: rest.cc:239
+#, c-format
+msgid "rest `%s' not found"
+msgstr "paus â%sâ hittades inte, "
+
+#: score-engraver.cc:79
+#, c-format
+msgid "cannot find `%s'"
+msgstr "det gÃ¥r inte att hitta â%sâ"
+
+#: score-engraver.cc:81
+msgid "Music font has not been installed properly."
+msgstr "Musiktypsnitten är inte korrekt installerade."
+
+#: score-engraver.cc:83
+#, c-format
+msgid "Search path `%s'"
+msgstr "Sökväg â%sâ"
+
+#: score-engraver.cc:85
+msgid "Aborting"
+msgstr "Avbryter"
+
+#: score.cc:161
+msgid "already have music in score"
+msgstr "har redan musik i partitur"
+
+#: score.cc:163
+msgid "this is the previous music"
+msgstr "detta är tidigare musik"
+
+#: score.cc:169
+msgid "errors found, ignoring music expression"
+msgstr "fel funna, behandlar inte musikuttryck"
+
+#. FIXME:
+#: script-engraver.cc:114
+msgid "do not know how to interpret articulation:"
+msgstr "vet inte hur en artikulation ska tolkas:"
+
+#: script-engraver.cc:115
+msgid " scheme encoding: "
+msgstr " Scheme-kodning: "
+
+#: skyline-pair.cc:135
+msgid "direction must not be CENTER in ly:skyline-pair::skyline"
+msgstr "riktning måste inte vara CENTER i ly:skyline-pair::skyline"
+
+#: slur-engraver.cc:121
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr "riktning för %s ogiltig: %d"
+
+#. We already have an old slur, so give a warning
+#. and completely ignore the new slur.
+#: slur-engraver.cc:238
+#, c-format
+msgid "already have %s"
+msgstr "har redan %s"
+
+#: slur-engraver.cc:255
+#, c-format
+msgid "%s without a cause"
+msgstr "%s utan orsak"
+
+#: slur-engraver.cc:320
+#, c-format
+msgid "cannot end %s"
+msgstr "det går inte att avsluta %s"
+
+#: slur.cc:431
+#, c-format
+msgid "Ignoring grob for slur: %s. avoid-slur not set?"
+msgstr "Ignorerar grob för legatobåge: %s. avoid-slur inte satt?"
+
+#: source-file.cc:85
+#, c-format
+msgid "expected to read %d characters, got %d"
+msgstr "förväntade att läsa %d tecken, fick %d"
+
+#: staff-performer.cc:273
+msgid "MIDI channel wrapped around"
+msgstr "MIDI-kanal innesluten"
+
+#: staff-performer.cc:274
+msgid "remapping modulo 16"
+msgstr "mappar om modulo 16"
+
+#: stem-engraver.cc:100
+msgid "tremolo duration is too long"
+msgstr "tremololängd är för lång"
+
+#: stem-engraver.cc:152
+#, c-format
+msgid "adding note head to incompatible stem (type = %d/%d)"
+msgstr "Lägger till nothuvud till inkompatibelt notskaft (typ = %d/%d)"
+
+#: stem-engraver.cc:155
+msgid "maybe input should specify polyphonic voices"
+msgstr "kanske bör indata specificera polyfoniska röster"
+
+#: stem.cc:128
+msgid "weird stem size, check for narrow beams"
+msgstr "Konstig notskaftstorlek, kolla efter smala balkar"
+
+#: system.cc:195
+#, c-format
+msgid "Element count %d"
+msgstr "Elementantal %d"
+
+#: system.cc:506
+#, c-format
+msgid "Grob count %d"
+msgstr "Grob-antal %d"
+
+#. TODO: Also print the arguments of the markup!
+#: text-interface.cc:140
+#, c-format
+msgid "Markup depth exceeds maximal value of %d; Markup: %s"
+msgstr "Markup-djup överskrider högsta värde för %d; Markup: %s"
+
+#: text-spanner-engraver.cc:71
+msgid "cannot find start of text spanner"
+msgstr "kan inte hitta start på textbryggare"
+
+#: text-spanner-engraver.cc:84
+msgid "already have a text spanner"
+msgstr "har redan en textbryggare"
+
+#: text-spanner-engraver.cc:131
+msgid "unterminated text spanner"
+msgstr "oavslutad textbryggare"
-#: mup2ly.py:77
-msgid "only pre-process"
-msgstr "förbehandla enbart"
+#: tie-engraver.cc:120
+msgid "unterminated tie"
+msgstr "oavslutad bindebåge"
+
+#: tie-engraver.cc:376
+msgid "lonely tie"
+msgstr "ensam bindebåge"
-#. Duh. Python style portable: cp *.EXT OUTDIR
-#. system ('cp *.%s %s' % (ext, outdir), 1)
-#. Python < 1.5.2 compatibility
-#.
-#. On most platforms, this is equivalent to
-#. `normpath(join(os.getcwd()), PATH)'. *Added in Python version 1.5.2*
-#. if set, LILYPONDPREFIX must take prevalence
-#. if datadir is not set, we're doing a build and LILYPONDPREFIX
-#. ###############################################################
-#. END Library
#.
-#. PMX cut and paste
+#. Todo: should make typecheck?
#.
-#. if not self.entries:
-#. #return '\n'
-#. #ugh ugh
-#. return '\n%s = {}\n\n' % self.idstring ()
-#. ugh
-#. def set_clef (self, letter):
-#. clstr = clef_table[letter]
-#. self.voices[0].add_nonchord (Clef (clstr))
-#. urg
-#. maybe use import copy?
-#. for i in self.pitches:
-#. ch.pitches.append (i)
-#. for i in self.scripts:
-#. ch.scripts.append (i)
-#. http://www.arkkra.com/doc/uguide/contexts.html
-#. #self.current_staffs = []
-#. duh
-#. FIXME: 1?
-#. FIXME: does key play any role in this?
-#. ch = self.current_voices[0].last_chord ()
-#. ch.basic_duration = self.current_voices[0].last_chord ().basic_duration
-#. ugh
-#. ch = self.current_voices[0].last_chord ()
-#. `;' is not a separator, chords end with ';'
-#. mup resets default duration and pitch each bar
-#. ugh: these (and lots more) should also be parsed in
-#. context staff. we should have a class Staff_properties
-#. and parse/set all those.
-#. shortcut: set to official mup maximum (duh)
-#. self.set_staffs (40)
-#: mup2ly.py:1076
-#, python-format
-msgid "no such context: %s"
-msgstr "omgivning finns inte: %s"
-
-#. hmm
-#. dig this: mup allows ifdefs inside macro bodies
-#. don't do nested multi-line defines
-#. duh: mup is strictly line-based, except for `define',
-#. which is `@' terminated and may span several lines
-#. don't define new macros in unactive areas
-#. To support nested multi-line define's
-#. process_function and macro_name, macro_body
-#. should become lists (stacks)
-#. The mup manual is undetermined on this
-#. and I haven't seen examples doing it.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
#.
-#. don't do nested multi-line define's
-#. writes to stdout for help2man
-#. don't call
-#. identify ()
-#. sys.stdout.flush ()
-#. handy emacs testing
-#. if not files:
-#. files = ['template.mup']
-#: mup2ly.py:1300
-#, python-format
-msgid "Processing `%s'..."
-msgstr "Behandlar \"%s\"..."
-
-#: mup2ly.py:1319
-#, python-format
-msgid "Writing `%s'..."
-msgstr "Skriver \"%s\"..."
-
-#: getopt-long.cc:146
+#: time-signature-engraver.cc:94
#, c-format
-msgid "option `%s' requires an argument"
-msgstr "flaggan \"%s\" kräver ett argument"
+msgid "strange time signature found: %d/%d"
+msgstr "Hittade underlig taktart: %d/%d"
-#: getopt-long.cc:150
+#: translator-ctors.cc:70
#, c-format
-msgid "option `%s' doesn't allow an argument"
-msgstr "flaggan \"%s\" tillåter inget argument"
+msgid "unknown translator: `%s'"
+msgstr "okänd översättare: â%sâ"
-#: getopt-long.cc:154
+#: translator-group-ctors.cc:40
#, c-format
-msgid "unrecognized option: `%s'"
-msgstr "okänd flagga: \"%s\""
+msgid "fatal error. Couldn't find type: %s"
+msgstr "ödesdigert misstag. Kunde inte hitta typen %s"
-#: getopt-long.cc:161
+#: translator-group.cc:185
#, c-format
-msgid "invalid argument `%s' to option `%s'"
-msgstr "ogiltigt argument \"%s\" till flaggan \"%s\""
+msgid "cannot find: `%s'"
+msgstr "det gÃ¥r inte att hitta: â%sâ"
-#: warn.cc:25
+#: translator.cc:305
#, c-format
-msgid "warning: %s\n"
-msgstr "varning: %s\n"
+msgid "Two simultaneous %s events, junking this one"
+msgstr "Två samtidiga %s-händelser, kastar denna"
-#: warn.cc:31
+#: translator.cc:306
#, c-format
-msgid "error: %s\n"
-msgstr "fel: %s\n"
+msgid "Previous %s event here"
+msgstr "Tidigare %s-händelser här"
-#: warn.cc:44
-#, c-format
-msgid "programming error: %s (Continuing; cross thumbs)\n"
-msgstr " programmeringsfel: %s (Fortsätter, håll tummarna)\n"
+#: tuplet-engraver.cc:109
+msgid "No tuplet to end"
+msgstr "Inga oregelbundna notvärden att avsluta"
-#: accidental.cc:202 key-signature-interface.cc:137
+#: vaticana-ligature-engraver.cc:384
#, c-format
-msgid "accidental `%s' not found"
-msgstr "höjning/säkning \"%s\" hittades inte"
+msgid "ignored prefix(es) `%s' of this head according to restrictions of the selected ligature style"
+msgstr "Ignorerade prefix â%sâ för detta huvud utefter restriktioner för den valda stilen för fraseringsbÃ¥ge"
-#: accidental-engraver.cc:171 new-accidental-engraver.cc:238
-#, c-format
-msgid "Accidental typesetting list must begin with context-name: %s"
-msgstr "Lista av höjningar/säkningar måste börja med context-name: %s"
+#: vaticana-ligature-engraver.cc:450
+msgid "Ambiguous use of dots in ligature: there are multiple dotted notes with the same pitch. The ligature should be split."
+msgstr "Tvetydlig användning av punkter i fraseringsbågar: det finns flera punkterade noter med samma ton. Fraseringsbåge bör delas upp."
-#: accidental-engraver.cc:196 new-accidental-engraver.cc:263
-#, c-format
-msgid "unknown accidental typesetting: %s. Ignored"
-msgstr "okänd typsättning av höjning/sänkning: %s. Ignorered"
+#: vaticana-ligature-engraver.cc:508
+msgid "This ligature has a dotted head followed by a non-dotted head. The ligature should be split after the last dotted head before this head."
+msgstr "Denna fraseringsbåge har punkterat huvud följt av ett icke-punkterat huvud. Fraseringsbågen bör delas efter den sista prickade huvudet innan detta huvudet."
-#: accidental-engraver.cc:212 new-accidental-engraver.cc:279
+#: vaticana-ligature-engraver.cc:720
#, c-format
-msgid "Symbol is not a parent context: %s. Ignored"
-msgstr "Symbol är inte en föräldraomgivning: %s. Ignoreread"
+msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
+msgstr "Vaticana_ligature_engraver: sätter âspacing-increment = %fâ: ptr=%ul"
-#: accidental-engraver.cc:215 new-accidental-engraver.cc:282
-#, c-format
-msgid "Accidental typesetting must be pair or context-name: %s"
-msgstr "Typsättning av höjning/sänkning måste vara par eller context-name: %s"
+#: vaticana-ligature.cc:94
+msgid "flexa-height undefined; assuming 0"
+msgstr "flexa-height odefinierad; antar 0"
-#: afm.cc:66
-#, c-format
-msgid "can't find character number: %d"
-msgstr "kan inte hitta teckennummer: %d"
+#: vaticana-ligature.cc:99
+msgid "ascending vaticana style flexa"
+msgstr "ökande vatikan-stil-flexa"
-#: afm.cc:81
-#, c-format
-msgid "can't find character called: `%s'"
-msgstr "kan inte hitta tecken som heter: \"%s\""
+#: vertical-align-engraver.cc:100
+msgid "Ignoring Vertical_align_engraver in VerticalAxisGroup"
+msgstr "Ignorerar Vertical_align_engraver i VerticalAxisGroup"
-#: afm.cc:142
-#, c-format
-msgid "Error parsing AFM file: `%s'"
-msgstr "Fel vid tolkning av AFM-fil: \"%s\""
+#. fixme: be more verbose.
+#: volta-engraver.cc:110
+msgid "cannot end volta spanner"
+msgstr "det går inte att hitta voltabryggare"
-#: all-font-metrics.cc:95
-#, c-format
-msgid "checksum mismatch for font file: `%s'"
-msgstr "felaktig checksumma för typsnittsfil: \"%s\""
+#: volta-engraver.cc:120
+msgid "already have a volta spanner, ending that one prematurely"
+msgstr "har redan en reprisbryggare, stoppar den tidigare"
-#: all-font-metrics.cc:97
-#, c-format
-msgid "does not match: `%s'"
-msgstr "matchar inte: \"%s\""
+#: volta-engraver.cc:124
+msgid "also already have an ended spanner"
+msgstr "har också redan en textbryggare"
-#: all-font-metrics.cc:102
-msgid " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V to show font paths."
-msgstr " Bygg om alla .afm-filer, och ta bort alla .pk- och .tfm-filer. Kör igen med -V för att visa typsnittssökvägar."
+#: volta-engraver.cc:125
+msgid "giving up"
+msgstr "ger upp"
-#: all-font-metrics.cc:103
-msgid ""
-"A script for removing font-files is delivered with the source-code,\n"
-"in buildscripts/clean-fonts.sh"
-msgstr ""
-"Ett skript för att ta bort typsnittsfiler levereras med källkoden,\n"
-"i buildscripts/clean-fonts.sh"
+#: parser.yy:482 parser.yy:649 parser.yy:988 parser.yy:1069 parser.yy:1305
+msgid "bad expression type"
+msgstr "dålig uttryckstyp"
-#: all-font-metrics.cc:169
-#, c-format
-msgid "can't find font: `%s'"
-msgstr "kan inte hitta typsnitt: \"%s\""
+#: parser.yy:901 parser.yy:1508 parser.yy:1570
+msgid "not a context mod"
+msgstr "inte en kontextändring"
-#: all-font-metrics.cc:170
-msgid "Loading default font"
-msgstr "Läser in standardtypsnitt"
+#: parser.yy:982 parser.yy:1061 parser.yy:1213
+msgid "need \\paper for paper block"
+msgstr "behöver \\paper för pappersblock"
-#: all-font-metrics.cc:185
-#, c-format
-msgid "can't find default font: `%s'"
-msgstr "kan inte hitta standardtypsnitt: \"%s\""
+#: parser.yy:1095
+msgid "Missing music in \\score"
+msgstr "Saknar musik i \\score"
-#: all-font-metrics.cc:186 includable-lexer.cc:59 input-file-results.cc:192
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(sökväg: \"%s\")"
+#: parser.yy:1132
+msgid "\\paper cannot be used in \\score, use \\layout instead"
+msgstr "\\paper kan inte användas i \\score, använd \\layout istället"
-#: all-font-metrics.cc:187
-msgid "Giving up"
-msgstr "Ger upp"
+#: parser.yy:1183
+msgid "Spurious expression in \\score"
+msgstr "Felaktigt uttryck i \\score"
-#: auto-change-iterator.cc:43 change-iterator.cc:60
-#: part-combine-music-iterator.cc:120
-msgid "Can't switch translators, I'm there already"
-msgstr "Kan inte byta översättare, jag är redan där"
+#: parser.yy:1387
+msgid "music expected"
+msgstr "väntade music"
-#: bar-check-iterator.cc:51
-#, c-format
-msgid "barcheck failed at: %s"
-msgstr "taktkontroll misslyckades vid: %s"
+#: parser.yy:1397 parser.yy:1431
+msgid "unexpected post-event"
+msgstr "oimplementerad post-händelse"
-#: beam.cc:146
-msgid "beam has less than two visible stems"
-msgstr "balk har mindre än två synliga skaft"
+#: parser.yy:1439
+msgid "Ignoring non-music expression"
+msgstr "Ignorerar utryck som ej är musik"
-#: beam.cc:151
-msgid "Beam has less than two stems. Removing beam."
-msgstr "Balk har mindre än två skaft. Tar bort balk."
+#: parser.yy:1749 parser.yy:1768
+msgid "not a key"
+msgstr "inte en tonart"
-#: beam.cc:976
-msgid "Not sure that we can find a nice beam slope (no viable initial configuration found)."
-msgstr "Inte säker på att vi kan hitta en bra balklutning (ingen passande initialkonfiguration funnen)."
+#: parser.yy:2628 parser.yy:2746 parser.yy:2759 parser.yy:2768
+msgid "bad grob property path"
+msgstr "dålig grob-egenskapssökväg"
-#: beam-engraver.cc:176
-msgid "already have a beam"
-msgstr "har redan en balk"
+#: parser.yy:2726
+msgid "only \\consists and \\remove take non-string argument."
+msgstr "endast \\consists och \\remove tar icke-strängarguement."
-#: beam-engraver.cc:259
-msgid "unterminated beam"
-msgstr "oavslutad balk"
+#: parser.yy:2787
+msgid "bad context property path"
+msgstr "dålig kontextegenskapsökväg"
-#: beam-engraver.cc:292 chord-tremolo-engraver.cc:197
-msgid "stem must have Rhythmic structure"
-msgstr "skaft måste ha en rytmisk struktur"
+#: parser.yy:2872
+msgid "markup expected"
+msgstr "förväntade markup"
-#: beam-engraver.cc:306
-msgid "stem doesn't fit in beam"
-msgstr "skaftet passar inte i balken"
+#: parser.yy:2884
+msgid "simple string expected"
+msgstr "förväntade enkelt sträng"
-#: beam-engraver.cc:307
-msgid "beam was started here"
-msgstr "balken startade här"
+#: parser.yy:2901
+msgid "symbol expected"
+msgstr "förväntade symbol"
-#: break-align-interface.cc:173
-#, c-format
-msgid "No spacing entry from %s to `%s'"
-msgstr "Ingen avståndsdata från %s till \"%s\""
+#: parser.yy:3041
+msgid "not a rhythmic event"
+msgstr "inte en rytmisk händelse"
-#: change-iterator.cc:22
-#, c-format
-msgid "can't change `%s' to `%s'"
-msgstr "kan inte ändra \"%s\" till \"%s\""
+#: parser.yy:3091
+msgid "post-event expected"
+msgstr "förväntade post-händelse"
-#.
-#. We could change the current translator's id, but that would make
-#. errors hard to catch
-#.
-#. last->translator_id_string_ = get_change ()->change_to_id_string_;
-#.
-#: change-iterator.cc:79
-msgid "I'm one myself"
-msgstr "Jag är en själv"
+#: parser.yy:3100 parser.yy:3105
+msgid "have to be in Lyric mode for lyrics"
+msgstr "måste vara i textläge (Lyric mode) för sångtext"
-#: change-iterator.cc:82
-msgid "none of these in my family"
-msgstr "ingen av dessa i min familj"
+#: parser.yy:3181
+msgid "expecting string or post-event as script definition"
+msgstr "förväntade sträng eller post-händelse som skriptdefinition"
-#: chord-tremolo-engraver.cc:98
-#, c-format
-msgid "Chord tremolo with %d elements. Must have two elements."
-msgstr "Ackordtremolo med %d element. Måste ha två element."
+#: parser.yy:3285
+msgid "not an articulation"
+msgstr "inte en artikualtion"
-#: chord-tremolo-engraver.cc:157
-msgid "unterminated chord tremolo"
-msgstr "icke avslutat ackordtremolo"
+#: parser.yy:3351 parser.yy:3403
+msgid "not a duration"
+msgstr "inte en längd"
-#: chord-tremolo-iterator.cc:69
-msgid "no one to print a tremolos"
-msgstr "det finns ingen som kan skriva tremolon"
+#: parser.yy:3424
+msgid "bass number expected"
+msgstr "bassiffra förväntad"
-#: clef.cc:64
-#, c-format
-msgid "clef `%s' not found"
-msgstr "klav \"%s\" hittades inte"
+#: parser.yy:3516
+msgid "have to be in Note mode for notes"
+msgstr "måste vara i notläge (Note mode) för noter"
-#: cluster.cc:131
-#, c-format
-msgid "unknown cluster style `%s'"
-msgstr "okänd klusterstil: \"%s\""
+#: parser.yy:3555
+msgid "have to be in Chord mode for chords"
+msgstr "måste vara i ackordläge (Chord mode) för ackord"
-#: coherent-ligature-engraver.cc:84
-#, c-format
-msgid "gotcha: ptr=%ul"
-msgstr "fick dig: ptr=%ul"
+#: parser.yy:3598
+msgid "markup outside of text script or \\lyricmode"
+msgstr "markup utanför ett textskript eller \\lyricmode"
-#: coherent-ligature-engraver.cc:96
-#, c-format
-msgid "distance=%f"
-msgstr "avstånd=%f"
+#: parser.yy:3603
+msgid "unrecognized string, not in text script or \\lyricmode"
+msgstr "okänd sträng, inte i ett textskript eller \\lyricmode"
-#: coherent-ligature-engraver.cc:139
-#, c-format
-msgid "Coherent_ligature_engraver: setting `spacing-increment = 0.01': ptr=%ul"
-msgstr "Coherent_ligature_engraver: sätter \"spacing-increment = 0.01\": ptr=%ul"
+#: parser.yy:3755 parser.yy:3764
+msgid "not an unsigned integer"
+msgstr "inte ett osignerat heltal"
-#: custos.cc:92
-#, c-format
-msgid "custos `%s' not found"
-msgstr "custos \"%s\" hittades inte"
+#: parser.yy:3851
+msgid "not a markup"
+msgstr "inte en markup"
-#: dimensions.cc:13
-msgid "NaN"
-msgstr "-"
+#: lexer.ll:193
+msgid "stray UTF-8 BOM encountered"
+msgstr "lös UTF-8 BOM påträffades"
-#: dynamic-engraver.cc:204 span-dynamic-performer.cc:82
-msgid "can't find start of (de)crescendo"
-msgstr "kan inte hitta start på crescendo/diminuendo"
+#: lexer.ll:196
+msgid "Skipping UTF-8 BOM"
+msgstr "Hoppar över UTF-8 BOM"
-#: dynamic-engraver.cc:216
-msgid "already have a crescendo"
-msgstr "har redan ett crescendo"
+#: lexer.ll:248
+#, c-format
+msgid "Renaming input to: `%s'"
+msgstr "Byter namn till: â%sâ"
-#: dynamic-engraver.cc:217
-msgid "already have a decrescendo"
-msgstr "har redan ett diminuendo"
+#: lexer.ll:265
+msgid "quoted string expected after \\version"
+msgstr "kvoterad sträng förväntades efter \\version"
-#: dynamic-engraver.cc:220
-msgid "Cresc started here"
-msgstr "Cresc startade här"
+#: lexer.ll:269
+msgid "quoted string expected after \\sourcefilename"
+msgstr "kvoterad sträng förväntades efter \\sourcefilename"
-#: dynamic-engraver.cc:323
-msgid "unterminated (de)crescendo"
-msgstr "oavslutat crescendo/diminuendo"
+#: lexer.ll:273
+msgid "integer expected after \\sourcefileline"
+msgstr "heltal förväntades efter \\sourcefileline"
-#: event.cc:49
-#, c-format
-msgid "Transposition by %s makes alteration larger than two"
-msgstr "Transponering med %s gör ändring större än två"
+#: lexer.ll:300
+msgid "\\maininput not allowed outside init files"
+msgstr "\\maininput förbjudet utanför init-filer"
-#: event-chord-iterator.cc:76 output-property-music-iterator.cc:27
+#: lexer.ll:324
#, c-format
-msgid "Junking event: `%s'"
-msgstr "Slänger händelse: \"%s\""
+msgid "wrong or undefined identifier: `%s'"
+msgstr "felaktig eller odefinierad identifierare: â%sâ"
-#: extender-engraver.cc:94
-msgid "unterminated extender"
-msgstr "oavslutad utökare"
+#: lexer.ll:349
+msgid "string expected after \\include"
+msgstr "sträng förväntades efter \\include"
-#: extender-engraver.cc:106
-msgid "Nothing to connect extender to on the left. Ignoring extender event."
-msgstr "Det finns inget att koppla utökaren mot till vänster. Ignorerar utökarhändelse."
+#: lexer.ll:359
+msgid "end quote missing"
+msgstr "slutkvot saknas"
-#: folded-repeat-iterator.cc:88
-msgid "no one to print a repeat brace"
-msgstr "det finns ingen som kan skriva ett repristecken"
+#: lexer.ll:714
+msgid "EOF found inside a comment"
+msgstr "EOF-filslut hittat inuti en kommentar"
-#: font-interface.cc:239
-msgid "couldn't find any font satisfying "
-msgstr "kunde inte hitta något typsnitt som uppfyller "
+#: lexer.ll:719
+msgid "EOF found inside string"
+msgstr "EOF-filslut hittat inuti en sträng"
-#: glissando-engraver.cc:100
-msgid "Unterminated glissando."
-msgstr "Oavslutat glissando."
+#: lexer.ll:734
+msgid "Unfinished main input"
+msgstr "Oavslutad huvudindata"
-#: gourlay-breaking.cc:188
+#: lexer.ll:805
#, c-format
-msgid "Optimal demerits: %f"
-msgstr "Optimal demerit: %f"
+msgid "invalid character: `%s'"
+msgstr "ogiltigt tecken: â%sâ"
-#: gourlay-breaking.cc:193
-msgid "No feasible line breaking found"
-msgstr "Ingen lämplig radbrytning hittades"
+#: lexer.ll:925
+#, c-format
+msgid "unknown escaped string: `\\%s'"
+msgstr "okänd âescapedâ sträng: â\\%sâ"
-#: gregorian-ligature-engraver.cc:59
+#: lexer.ll:945
#, c-format
-msgid "\\%s ignored"
-msgstr "\\%s ignorerat"
+msgid "undefined character or shorthand: %s"
+msgstr "odefinierat tecken eller genväg som heter: %s"
-#: gregorian-ligature-engraver.cc:64
+#: lexer.ll:1236
+msgid "non-UTF-8 input"
+msgstr "ej-UTF-8-inmatning"
+
+#: lexer.ll:1280
#, c-format
-msgid "implied \\%s added"
-msgstr "implicit \\%s tillagt"
+msgid "Invalid version string \"%s\""
+msgstr "ogiltig versionssträng â%sâ"
-#.
-#. Todo: do something sensible. The grob-pq-engraver is not water
-#. tight, and stuff like tupletSpannerDuration confuses it.
-#.
-#: grob-pq-engraver.cc:130
+#: lexer.ll:1285
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
+msgstr "filen för gammal: %s (äldsta som stöds: %s)"
+
+#: lexer.ll:1286
+msgid "consider updating the input with the convert-ly script"
+msgstr "Fundera på att uppdatera indata med skriptet convert-ly"
+
+#: lexer.ll:1292
#, c-format
+msgid "program too old: %s (file requires: %s)"
+msgstr "programmet för gammalt %s (filen kräver: %s)"
+
+#: auto-beam.scm:147
+msgid "Beam end fits no pattern"
+msgstr "Balkslut passar inget mönster"
+
+#: backend-library.scm:27
+#, scheme-format
+msgid "Invoking `~a'..."
+msgstr "Startar â~aââ¦"
+
+#: backend-library.scm:31
+#, scheme-format
+msgid "`~a' failed (~a)\n"
+msgstr "â~aâ misslyckades (~a)\n"
+
+#: backend-library.scm:108
+#, scheme-format
+msgid "Converting to `~a'...\n"
+msgstr "Konverterar till â~aâ â¦\n"
+
+#. Do not try to guess the name of the png file,
+#. GS produces PNG files like BASE-page%d.png.
+#: backend-library.scm:118
+#, scheme-format
+msgid "Converting to ~a..."
+msgstr "Konverterar till ~aâ¦"
+
+#: backend-library.scm:134
+#, scheme-format
+msgid "Copying to `~a'...\n"
+msgstr "Kopierar till â~aâ â¦\n"
+
+#: backend-library.scm:200
+#, scheme-format
+msgid "Deleting `~a'...\n"
+msgstr "Tar bort â~aââ¦\n"
+
+#: backend-library.scm:219
+#, scheme-format
+msgid "Writing header field `~a' to `~a'..."
+msgstr "Skriver nothuvudfält â~aâ till â~aââ¦"
+
+#: backend-library.scm:268
+#, scheme-format
+msgid "missing stencil expression `~S'"
+msgstr "saknar stenciluttryck â~Sâ"
+
+#: bar-line.scm:142
+#, scheme-format
+msgid "Bar glyph ~a not known. Ignoring."
+msgstr "Takttecken ~a inte känt. Ignorerar."
+
+#: bar-line.scm:170
+#, scheme-format
+msgid "Annotation '~a' is allowed in the first argument of a bar line definition only."
+msgstr "Annotationen â~aâ är tillÃ¥ten i det första argumentet endast för en taktstrecksdefinition."
+
+#: bar-line.scm:178
+#, scheme-format
+msgid "Replacement '~a' is allowed in the last argument of a bar line definition only."
+msgstr "Ersättning â~aâ är endast tillÃ¥ten i sista argumentet för en taktstrecksdefinition."
+
+#: bar-line.scm:239
+#, scheme-format
+msgid "add-bar-glyph-print-procedure: glyph '~a' has to be a single ASCII character."
+msgstr "add-bar-glyph-print-procedure: teckent â~aâ mÃ¥ste vara ett enskilt ASCII-tecken."
+
+#: bar-line.scm:807
+#, scheme-format
+msgid "No span bar glyph defined for bar glyph '~a'; ignoring."
+msgstr "Inget span-taktstreckstecken definierat för takttecken â~aâ'; ignorerar."
+
+#: chord-entry.scm:57
+#, scheme-format
+msgid "Spurious garbage following chord: ~A"
+msgstr "Diskutabelt skräp efter ackord: ~A"
+
+#: define-context-properties.scm:31 define-grob-properties.scm:21
+#: define-music-properties.scm:21 lily.scm:102
+#, scheme-format
+msgid "symbol ~S redefined"
+msgstr "symbol ~S omdefinierad"
+
+#: define-event-classes.scm:74
+#, scheme-format
+msgid "unknown parent class `~a'"
+msgstr "okänd överordnad klass: â~aâ"
+
+#: define-event-classes.scm:108
+#, scheme-format
+msgid "Cannot redefine event class `~S'"
+msgstr "Kan inte omdefiniera händelseklassen â~Sâ"
+
+#: define-event-classes.scm:110
+#, scheme-format
+msgid "Undefined parent event class `~S'"
+msgstr "Odefinierad överordnad händelseklass â~Sâ"
+
+#: define-markup-commands.scm:1272
+msgid "no systems found in \\score markup, does it have a \\layout block?"
+msgstr "inga system hittade i \\score-markup, har \\layout-block?"
+
+#: define-markup-commands.scm:3122
+#, scheme-format
+msgid "Cannot find glyph ~a"
+msgstr "Det går inte att hitta tecken ~a"
+
+#: define-markup-commands.scm:3598
+#, scheme-format
+msgid "no brace found for point size ~S "
+msgstr "ingen klammer hittad för punktstorlek ~S"
+
+#: define-markup-commands.scm:3599
+#, scheme-format
+msgid "defaulting to ~S pt"
+msgstr "standard ~S pt"
+
+#: define-markup-commands.scm:3858
+#, scheme-format
+msgid "not a valid duration string: ~a"
+msgstr "inte en giltig längdsträng: ~a"
+
+#: define-markup-commands.scm:4071
+#, scheme-format
+msgid "not a valid duration string: ~a - ignoring"
+msgstr "inte en giltig längdsträng: ~a - ignorerar"
+
+#: define-music-types.scm:796
+#, scheme-format
+msgid "symbol expected: ~S"
+msgstr "symbol förväntades: ~S"
+
+#: define-music-types.scm:799
+#, scheme-format
+msgid "cannot find music object: ~S"
+msgstr "det går inte att hitta musikobjekt: ~S"
+
+#: define-music-types.scm:819
+#, scheme-format
+msgid "bad make-music argument: ~S"
+msgstr "dåligt make-music-argument: ~S"
+
+#: define-note-names.scm:1112
+msgid "Select note names language."
+msgstr "Välj notnamnsspråk."
+
+#: define-note-names.scm:1118
+#, scheme-format
+msgid "Using `~a' note names..."
+msgstr "Använd â~aâ-notnamnâ¦"
+
+#: define-note-names.scm:1121
+#, scheme-format
+msgid "Could not find language `~a'. Ignoring."
+msgstr "Det gick inte att hitta sprÃ¥k â~aâ. Ignorerar."
+
+#: document-backend.scm:135
+#, scheme-format
+msgid "pair expected in doc ~s"
+msgstr "par förväntades i doc ~s"
+
+#: document-backend.scm:202
+#, scheme-format
+msgid "cannot find interface for property: ~S"
+msgstr "det går inte hitta gränssnittet för egenskapen: ~S"
+
+#: document-backend.scm:212
+#, scheme-format
+msgid "unknown Grob interface: ~S"
+msgstr "okänt Grob-gränssnitt: ~S"
+
+#: documentation-lib.scm:61
+#, scheme-format
+msgid "Processing ~S..."
+msgstr "Behandlar ~Sâ¦"
+
+#: documentation-lib.scm:177
+#, scheme-format
+msgid "Writing ~S..."
+msgstr "Skriver ~S..."
+
+#: documentation-lib.scm:189
+#, scheme-format
+msgid "cannot find description for property `~S' (~S)"
+msgstr "det gÃ¥r inte att hitta beskrivningen för egenskapen â~Sâ (~S)"
+
+#: documentation-lib.scm:210
+#, scheme-format
+msgid "cannot find description for property ~S (~S)"
+msgstr "det går inte att hitta beskrivningen för egenskapen ~S (~S)"
+
+#: flag-styles.scm:154
+#, scheme-format
+msgid "flag stroke `~a' or `~a' not found"
+msgstr "flaggstrecket â~aâ eller â~aâ hittades inte"
+
+#: framework-eps.scm:112
+#, scheme-format
+msgid "Writing ~a..."
+msgstr "Skriver ~aâ¦"
+
+#: framework-ps.scm:265
+#, scheme-format
+msgid "CFF font `~a' already embedded, skipping."
+msgstr "CFF-typsnitt â~aâ redan inbäddat, hoppar över."
+
+#: framework-ps.scm:268
+#, scheme-format
+msgid "Different CFF fonts which have the same name `~a' has been detected. The font cannot be embedded."
+msgstr "Olika CFF-typsnitt som har samma namn â~aâ har identifierats. Typsnittet kan inte bäddas in."
+
+#: framework-ps.scm:272
+#, scheme-format
+msgid "Embedding CFF font `~a'."
+msgstr "Inbäddad CFF-typsnitt â~aâ."
+
+#: framework-ps.scm:277
+msgid "Initializing embedded CFF font list."
+msgstr "Initerar inbäddad CFF-typsnittslista."
+
+#: framework-ps.scm:331
+#, scheme-format
+msgid "Font ~a cannot be loaded via Ghostscript because its font-index (~a) is not zero."
+msgstr "Typsnittet ~a går inte att läsa in via Ghostscript eftersom dess typsnittsindex (~a) inte är noll."
+
+#: framework-ps.scm:337
+#, scheme-format
+msgid "Font ~a cannot be loaded via Ghostscript because it is an OpenType/CFF Collection (OTC) font."
+msgstr "Typsnittet ~a går inte att läsa in via Ghostscript eftersom det är en OpenType/CFF Collection (OTC)-typsnitt."
+
+#: framework-ps.scm:343
+#, scheme-format
+msgid "Font ~a cannot be used via Ghostscript because it is a TrueType font that does not have glyph names."
+msgstr "Typsnitt ~a går inte att använda via Ghostscript eftersom det är ett TrueType-typsnitt som inte har teckennamn."
+
+#: framework-ps.scm:365
+#, scheme-format
+msgid "cannot embed ~S=~S"
+msgstr "det går inte att bädda in ~S=~S"
+
+#: framework-ps.scm:408
+#, scheme-format
+msgid "cannot extract file matching ~a from ~a"
+msgstr "det går inte att extrahera filmatchning ~a från ~a"
+
+#: framework-ps.scm:427
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
+msgstr "vet inte hur man bäddar in ~S=~S"
+
+#: framework-ps.scm:452
+#, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
+msgstr "vet inte hur man bäddar in typsnitt ~s ~s ~s"
+
+#: framework-ps.scm:517
+#, scheme-format
+msgid "Font file `~a' already exists, skipping."
+msgstr "Typsnittsfilen â~aâ finns redan, hoppar över."
+
+#: framework-ps.scm:527
+#, scheme-format
+msgid "Exporting font file `~a'."
+msgstr "Exporterar typsnittsfilen â~aâ."
+
+#: framework-ps.scm:543
+#, scheme-format
+msgid "Font export directory `~a' already exists."
+msgstr "Exportkatalogen â~aâ för typsnitt existerar redan."
+
+#: framework-ps.scm:546
+#, scheme-format
+msgid "Making font export directory `~a'."
+msgstr "Skapar exportkatalog för typsnitt: â~aâ."
+
+#: framework-ps.scm:892
+msgid ""
+"\n"
+"The PostScript backend does not support the\n"
+"system-by-system output. For that, use the EPS backend instead,\n"
+"\n"
+" lilypond -dbackend=eps FILE\n"
+"\n"
+"If you have cut & pasted a lilypond fragment from a webpage, be sure\n"
+"to only remove anything before\n"
+"\n"
+" %% ****************************************************************\n"
+" %% Start cut-&-pastable-section\n"
+" %% ****************************************************************\n"
+msgstr ""
+"\n"
+"PostScript-bakänden stödjer ej\n"
+"system-för-system-utdata. För dessa fall, använd EPS-backände istället,\n"
+"\n"
+" lilypond -dbackend=eps FIL\n"
+"\n"
+"Om du har klippt och kopierat ett lilypond-fragment från en webbsida , försäkra dig om\n"
+"att du bara tar bort innan\n"
+"\n"
+" %% ****************************************************************\n"
+" %% Början på klipp-&-klistra-avsnitt\n"
+" %% ****************************************************************\n"
+
+#: framework-svg.scm:84
+#, scheme-format
+msgid "Updating font into: ~a"
+msgstr "Uppdaterar typsnitt till: ~a"
+
+#: graphviz.scm:64
+#, scheme-format
+msgid "Writing graph `~a'..."
+msgstr "Skriver diagram â~aââ¦"
+
+# TO-DO quanting...
+#: layout-beam.scm:40
+#, scheme-format
+msgid "Error in beam quanting. Expected (~S,~S) found ~S."
+msgstr "Fel i balk-quanting. Förväntade (~S, ~S), fann ~S."
+
+# TO-DO quanting...
+#: layout-beam.scm:54
+#, scheme-format
+msgid "Error in beam quanting. Expected ~S 0, found ~S."
+msgstr "Fel i balk-quanting. Förväntade ~S 0, fann ~S."
+
+#: lily-library.scm:333
+msgid "Music unsuitable for context-mod"
+msgstr "Musik opassande för context-mod"
+
+#: lily-library.scm:388
+#, scheme-format
+msgid "Cannot find context-def \\~a"
+msgstr "Det går inte hitta context-def \\~a"
+
+#: lily-library.scm:404
+msgid "Music unsuitable for output-def"
+msgstr "Music opassande för output-def"
+
+#: lily-library.scm:900
msgid ""
-"Skipped something?\n"
-"Grob %s ended before I expected it to end."
+"Find the index between @var{start} and @var{end} (an integer)\n"
+"which produces the closest match to @var{target-val} if\n"
+"applied to function @var{getter}."
msgstr ""
-"Skippade något?\n"
-"Grob %s slutade innan jag förväntade det."
+"Hitta index mellan @var{start} och @var{end} (ett heltal)\n"
+"som producerar den närmsta matchningen till @var{target-val} if\n"
+"tillämpat till funktionen @var{getter}."
+
+#: lily-library.scm:994
+#, scheme-format
+msgid "unknown unit: ~S"
+msgstr "okänd enhet: ~S"
+
+#: lily-library.scm:1019
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
+msgstr "inget uttryck \\version funnet, lägg till add~afor för framtida kompatibilitet"
+
+#: lily.scm:94
+msgid "call-after-session used after session start"
+msgstr "call-after-session använd efter sessionsstart"
+
+#: lily.scm:99
+msgid "define-session used after session start"
+msgstr "define-session använd efter sessionsstart"
+
+#: lily.scm:450
+msgid "Using (ice-9 curried-definitions) module\n"
+msgstr "Använder (ice-9 curried-definitions) modul\n"
+
+#: lily.scm:453
+msgid "Guile 1.8\n"
+msgstr "Guile 1.8\n"
+
+#: lily.scm:510
+#, scheme-format
+msgid "cannot find: ~A"
+msgstr "det går inte att hitta: ~A"
+
+#: lily.scm:940
+msgid "Success: compilation successfully completed"
+msgstr "Lyckades: kompilering färdig"
+
+#: lily.scm:941
+msgid "Compilation completed with warnings or errors"
+msgstr "Kompilering klar utan varningar eller fel"
+
+#: lily.scm:1002
+#, scheme-format
+msgid "job ~a terminated with signal: ~a"
+msgstr "job ~a avslutat med signal: ~a"
+
+#: lily.scm:1005
+#, scheme-format
+msgid ""
+"logfile ~a (exit ~a):\n"
+"~a"
+msgstr ""
+"loggfil ~a (avbryt ~a):\n"
+"~a"
+
+#: lily.scm:1027 lily.scm:1116
+#, scheme-format
+msgid "failed files: ~S"
+msgstr "misslyckade: ~S"
+
+# här är det fråga om skrivning till en fil
+#: lily.scm:1107
+#, scheme-format
+msgid "Redirecting output to ~a..."
+msgstr "Dirigerar om utdata till ~aâ¦"
+
+#: lily.scm:1126
+#, scheme-format
+msgid "Invoking `~a'...\n"
+msgstr "Startar â~aââ¦\n"
+
+#: ly-syntax-constructors.scm:27
+#, scheme-format
+msgid "~a function cannot return ~a"
+msgstr "funktionen ~a kan inte returnera ~a"
+
+#: ly-syntax-constructors.scm:60
+#, scheme-format
+msgid "wrong type for argument ~a. Expecting ~a, found ~s"
+msgstr "fel typ för argument ~a. Förväntade sig ~a, fann ~s"
+
+#: markup-macros.scm:331
+#, scheme-format
+msgid "Wrong number of arguments. Expect: ~A, found ~A: ~S"
+msgstr "Fel antal argument. Förväntade: ~A, fann ~A: ~S"
+
+#: markup-macros.scm:337
+#, scheme-format
+msgid "Invalid argument in position ~A. Expect: ~A, found: ~S."
+msgstr "Ogiltigt antal argument i position ~A. Förväntade sig ~A, fick: ~S."
+
+#: markup-macros.scm:373
+#, scheme-format
+msgid "Not a markup command: ~A"
+msgstr "Inte ett markup-kommando: ~A"
+
+#: modal-transforms.scm:38
+msgid "'from' pitch not in scale; ignoring"
+msgstr "âfromâ ton inte i skala, ignorerar"
+
+#: modal-transforms.scm:42 modal-transforms.scm:75
+msgid "'to' pitch not in scale; ignoring"
+msgstr "âfrÃ¥nâ-ton inte i skala: ignorerar"
+
+#: modal-transforms.scm:46
+msgid "pitch to be transposed not in scale; ignoring"
+msgstr "ton att transponera finns inte i skalan; ignorerar"
+
+#: modal-transforms.scm:71
+msgid "'around' pitch not in scale; ignoring"
+msgstr "âaroundâ-ton inte i skala, ignorerar"
+
+#: modal-transforms.scm:79
+msgid "pitch to be inverted not in scale; ignoring"
+msgstr "ton att invertera finns inte i skalan; ignorerar"
+
+#: modal-transforms.scm:95
+msgid "negative replication count; ignoring"
+msgstr "negativt replikeringsantal, ignorerar"
+
+#: modal-transforms.scm:287
+msgid "Dangling tie in \\retrograde"
+msgstr "Hängande bindebåge i \\retrograde"
+
+#: music-functions.scm:321
+#, scheme-format
+msgid "invalid tremolo repeat count: ~a"
+msgstr "ogiltigt tremoloupprepningsantal: ~a"
+
+#: music-functions.scm:350
+#, scheme-format
+msgid "unknown repeat type `~S': must be volta, unfold, percent, or tremolo"
+msgstr "okänd upprepningstyp â~Sâ: mÃ¥ste vara en av volta, unfold, percent eller tremolo"
+
+#: music-functions.scm:354
+msgid "More alternatives than repeats. Junking excess alternatives"
+msgstr "Fler alternativ än repriser. Slänger överblivna alternativ"
+
+#: music-functions.scm:506
+#, scheme-format
+msgid "bad grob property path ~a"
+msgstr "dålig sökväg för grobegenskap ~a"
+
+#: music-functions.scm:530
+#, scheme-format
+msgid "bad context property ~a"
+msgstr "dålig kontextegenskap ~a"
+
+#: music-functions.scm:553
+#, scheme-format
+msgid "bad music property ~a"
+msgstr "dålig musikegenskap ~a"
+
+#: music-functions.scm:861
+msgid "Bad chord repetition"
+msgstr "DÃ¥lig ackordrepetion"
+
+#: music-functions.scm:966
+#, scheme-format
+msgid "music expected: ~S"
+msgstr "förväntade music: ~S"
+
+#: music-functions.scm:1316
+#, scheme-format
+msgid "cannot find quoted music: `~S'"
+msgstr "det gÃ¥r inte att hitta typsnitt: â~Sâ"
+
+#: music-functions.scm:1453
+msgid "Add @var{octave-shift} to the octave of @var{pitch}."
+msgstr "Lägg till @var{octave-shift} till oktaven för @var{pitch}."
+
+#: music-functions.scm:1516
+#, scheme-format
+msgid "Unknown octaveness type: ~S "
+msgstr "Okänd oktavtyp: ~S"
+
+#: music-functions.scm:1517
+msgid "Defaulting to 'any-octave."
+msgstr "Ställer in till standard âany-octave."
+
+#: music-functions.scm:1916
+#, scheme-format
+msgid "unknown accidental style: ~S"
+msgstr "okänd förteckenstil: ~S"
+
+#: music-functions.scm:2141
+msgid "Missing duration"
+msgstr "Saknar längd"
+
+#: music-functions.scm:2662
+#, scheme-format
+msgid "not a symbol list: ~a"
+msgstr "inte en symbollista: ~a"
+
+#: music-functions.scm:2665
+#, scheme-format
+msgid "conflicting tag group ~a"
+msgstr "motsägande taggrupphändelser ~a"
+
+#: output-ps.scm:271 output-svg.scm:544
+#, scheme-format
+msgid "unknown line-cap-style: ~S"
+msgstr "okänd line-capstil: ~S"
+
+#: output-ps.scm:276 output-svg.scm:550
+#, scheme-format
+msgid "unknown line-join-style: ~S"
+msgstr "okänd line-join: ~S"
+
+#: output-svg.scm:153
+#, scheme-format
+msgid "cannot decypher Pango description: ~a"
+msgstr "det går inte att dechiffrera Pango-beskriving: ~a"
+
+#: output-svg.scm:233
+msgid "Glyph must have a unicode value"
+msgstr "Tecknet måste ha unicodevärde"
+
+#: output-svg.scm:285 output-svg.scm:295
+#, scheme-format
+msgid "cannot find SVG font ~S"
+msgstr "kan inte hitta SVG-typsnitt ~S"
+
+#: paper.scm:121
+msgid "set-global-staff-size: not in toplevel scope"
+msgstr "set-global-staff-size: inte på toppnivå"
+
+#: paper.scm:321
+#, scheme-format
+msgid "This is not a \\layout {} object, ~S"
+msgstr "Detta är inte \\layout {} objekt, ~S"
+
+#: paper.scm:329
+#, scheme-format
+msgid "Unknown paper size: ~a"
+msgstr "Okänd pappersstorlek: ~a"
+
+#. TODO: should raise (generic) exception with throw, and catch
+#. that in parse-scm.cc
+#: paper.scm:348
+msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
+msgstr "Måste använda #(set-paper-size .. ) inom \\paper { ⦠}"
+
+#: parser-clef.scm:154
+#, scheme-format
+msgid "unknown clef type `~a'"
+msgstr "okänd clef-typ â~aâ"
+
+#: parser-clef.scm:155
+#, scheme-format
+msgid "supported clefs: ~a"
+msgstr "klavar som stöds: ~a"
+
+#: parser-ly-from-scheme.scm:73
+msgid "error in #{ ... #}"
+msgstr "fel i #{ ⦠#}"
+
+#: part-combiner.scm:931
+#, scheme-format
+msgid "quoted music `~a' is empty"
+msgstr "kvoterad musik â~aâ är tom"
+
+#: ps-to-png.scm:74 ps-to-png.scm:77
+#, scheme-format
+msgid "Copying `~a' to `~a'..."
+msgstr "Kopierar â~aâ till â~aââ¦"
+
+#: ps-to-png.scm:79 ps-to-png.scm:81
+#, scheme-format
+msgid "Deleting `~a'..."
+msgstr "Tar bort â~aââ¦"
+
+#: to-xml.scm:190
+#, scheme-format
+msgid "assertion failed: ~S"
+msgstr "assert misslyckades: ~S"
+
+#: translation-functions.scm:379
+#, scheme-format
+msgid "Negative fret for pitch ~a on string ~a"
+msgstr "Negativt band för ton ~a på sträng ~a"
+
+#: translation-functions.scm:384
+#, scheme-format
+msgid "Missing fret for pitch ~a on string ~a"
+msgstr "Saknar band för ton ~a på sträng ~a"
+
+#: translation-functions.scm:427
+#, scheme-format
+msgid "No open string for pitch ~a"
+msgstr "Ingen öppen sträng för tonhöjd ~a"
+
+#: translation-functions.scm:450 translation-functions.scm:462
+#, scheme-format
+msgid "Requested string for pitch requires negative fret: string ~a pitch ~a"
+msgstr "Begärd sträng för ton kräver negativt band: sträng ~a ton ~a"
+
+#: translation-functions.scm:453
+msgid "Ignoring string request and recalculating."
+msgstr "Ignorerar strängbegäran och flyttar om."
+
+#: translation-functions.scm:465
+msgid "Ignoring note in tablature."
+msgstr "Ignorerar not i tabulatur."
+
+#: translation-functions.scm:490
+#, scheme-format
+msgid "No string for pitch ~a (given frets ~a)"
+msgstr "Ingen sträng för ton ~a (givet band ~a)"
+
+#: translation-functions.scm:606
+#, scheme-format
+msgid ""
+"No label for fret ~a (on string ~a);\n"
+"only ~a fret labels provided"
+msgstr ""
+"Ingen etikett för band ~a (på sträng ~a);\n"
+"endast bandetikett ~a givet"
-#: hairpin.cc:98
-msgid "decrescendo too small"
-msgstr "diminuendo för litet"
+#~ msgid "lilylib module"
+#~ msgstr "lilylib-modul"
-#: hairpin.cc:99
-msgid "crescendo too small"
-msgstr "crescendo för litet"
+# förklaring av flaggan -h
+#~ msgid "this help"
+#~ msgstr "denna hjälp"
-#: horizontal-bracket-engraver.cc:64
-msgid "Don't have that many brackets."
-msgstr "Har inte så många klamrar"
+#~ msgid " 1998--2003"
+#~ msgstr " 1998-2003"
-#: horizontal-bracket-engraver.cc:73
-msgid "Conflicting note group events."
-msgstr "Motsägande notgrupphändelser."
+#~ msgid "`%s' failed (%s)"
+#~ msgstr "â%sâ misslyckades (%s)"
-#: hyphen-engraver.cc:87
-msgid "unterminated hyphen"
-msgstr "oavslutat bindestreck"
+#~ msgid "(ignored)"
+#~ msgstr "(ignorerat)"
-#: hyphen-engraver.cc:99
-msgid "Nothing to connect hyphen to on the left. Ignoring hyphen event."
-msgstr "Det finns inget att koppla bindestrecket mot till vänster. Ignorerar bindestreckshändelse."
+#~ msgid "Removing output file"
+#~ msgstr "Tar bort utdatafilen"
-#: input.cc:99
-msgid "non fatal error: "
-msgstr "icke-fatalt fel: "
+#~ msgid "EXT"
+#~ msgstr "FMT"
-#: input.cc:107 source-file.cc:146 source-file.cc:239
-msgid "position unknown"
-msgstr "okänd position"
+#~ msgid "DIM"
+#~ msgstr "DIM"
-#: input-file-results.cc:72 source-file.cc:54 streams.cc:38
-#, c-format
-msgid "can't open file: `%s'"
-msgstr "kan inte öppna fil: \"%s\""
+#~ msgid "default fontsize for music. DIM is assumed to be in points"
+#~ msgstr "standardtypsnittsstorlek för musik. DIM anges i punkter"
-#: input-file-results.cc:132
-msgid "Score contains errors; will not process it"
-msgstr "Partitur innehåller fel; kommer inte behandla det"
+#~ msgid "deprecated, use --default-music-fontsize"
+#~ msgstr "föråldrad, använd --default-music-fontsize"
-#: input-file-results.cc:172
-#, c-format
-msgid "Now processing: `%s'"
-msgstr "Behandlar nu: \"%s\""
+#~ msgid "OPT"
+#~ msgstr "OPT"
-#: key-performer.cc:96
-msgid "FIXME: key change merge"
-msgstr "FIXA: tonartsbytessammanslagning"
+#~ msgid "pass OPT quoted to the lilypond command line"
+#~ msgstr "skicka OPT till lilyponds kommandorad"
-#: kpath.cc:76
-#, c-format
-msgid "Kpathsea couldn't find TFM file `%s'"
-msgstr "Kpathsea kan inte hitta TFML-fil \"%s\""
+#~ msgid "force fontsize for all inline lilypond. DIM is assumed be to in points"
+#~ msgstr "tvinga typsnittsstorlek för all inbäddad lilypond. DIM anger i punkter"
-#: ligature-engraver.cc:159
-msgid "can't find start of ligature"
-msgstr "kan inte hitta start på ligatur"
+#~ msgid "deprecated, use --force-music-fontsize"
+#~ msgstr "föråldrad, använd --force-music-fontsize"
-#: ligature-engraver.cc:165
-msgid "no right bound"
-msgstr "ingen högergräns"
+#~ msgid "include path"
+#~ msgstr "sökväg för inkluderade filer"
-#: ligature-engraver.cc:191
-msgid "already have a ligature"
-msgstr "har redan en ligatur"
+#~ msgid "write dependencies"
+#~ msgstr "skriv beroenden"
-#: ligature-engraver.cc:207
-msgid "no left bound"
-msgstr "ingen vänstergräns"
+#~ msgid "PREF"
+#~ msgstr "PREF"
-#: ligature-engraver.cc:258
-msgid "unterminated ligature"
-msgstr "oavslutad ligatur"
+#~ msgid "prepend PREF before each -M dependency"
+#~ msgstr "lägg till PREF före varje beroende angett med -M"
-#: ligature-engraver.cc:282
-msgid "ligature may not contain rest; ignoring rest"
-msgstr "ligatur får inte innehålla paus; ignorerar paus"
+#~ msgid "don't run lilypond"
+#~ msgstr "kör inte lilypond"
-#: ligature-engraver.cc:283
-msgid "ligature was started here"
-msgstr "ligaturen startade här"
+#~ msgid "don't generate pictures"
+#~ msgstr "skapa inte bilder"
-#: lily-guile.cc:88
-#, c-format
-msgid "(load path: `%s')"
-msgstr "(inläsningssökväg: \"%s\""
+#~ msgid "strip all lilypond blocks from output"
+#~ msgstr "ta bort alla lilypond-block från utdata"
-#: lily-guile.cc:576
-#, c-format
-msgid "Can't find property type-check for `%s' (%s)."
-msgstr "Kan inte hitta egenskapstypkontroll för \"%s\" (%s)"
+#~ msgid "where to place generated files"
+#~ msgstr "var genererade filer ska läggas"
-#: lily-guile.cc:579
-msgid "Perhaps you made a typing error?"
-msgstr "Kanske har du gjort ett skrivfel?"
+#~ msgid "RES"
+#~ msgstr "RES"
-#: lily-guile.cc:585
-msgid "Doing assignment anyway."
-msgstr "Gör tilldelningen ändå."
+#~ msgid "set the resolution of the preview to RES"
+#~ msgstr "sätt resolutionen för förhandsgranskningen till RES"
-#: lily-guile.cc:599
-#, c-format
-msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
-msgstr "Typkontroll för \"%s\" misslyckades. Värde \"%s\" måste ha typen \"%s\""
+# Förklaring till --verbose (borde vara längre)
+#~ msgid "verbose"
+#~ msgstr "utförlig utdata"
-#: lookup.cc:173
-msgid "round filled box horizontal extent smaller than blot; decreasing blot"
-msgstr "horisontell utbredning för rund fylld box mindre än blot; minskar blot"
+#~ msgid "print version information"
+#~ msgstr "visa versionsinformation"
-#: lookup.cc:178
-msgid "round filled box vertical extent smaller than blot; decreasing blot"
-msgstr "vertikal utbredning för rund fylld box mindre än blot; minskar blot"
+#~ msgid "LaTeX failed."
+#~ msgstr "LaTeX misslyckades."
-#: lyric-phrasing-engraver.cc:311
-msgid "lyrics found without any matching notehead"
-msgstr "sångtext hittad utan något matchande nothuvud"
+#~ msgid "getopt says: `%s'"
+#~ msgstr "getopt säger: â%sâ"
-#: lyric-phrasing-engraver.cc:317
-msgid "Huh? Melismatic note found to have associated lyrics."
-msgstr "Öh? Melismatisk not har tillhörande sångtext."
+#~ msgid "no files specified on command line"
+#~ msgstr "inga filer angivna på kommandoraden"
-#: main.cc:106
-msgid "EXPR"
-msgstr "UTTR"
+#~ msgid "Run LilyPond, add titles, generate printable document"
+#~ msgstr "Kör LilyPond, lägg till titlar, skapa utskrivbart dokument"
-#: main.cc:107
-msgid "set options, use -e '(ly-option-usage)' for help"
-msgstr "sätt inställningar, använd -e '(ly-option-usage)' för hjälp"
+#~ msgid "write Makefile dependencies for every input file"
+#~ msgstr "skriv Makefile-beroenden för varje indatafil"
-#: main.cc:110
-msgid "use output format EXT"
-msgstr "använd utdataformat FMT"
+#~ msgid "add DIR to LilyPond's search path"
+#~ msgstr "lägg till KATALOG till LilyPonds sökväg"
-#: main.cc:112
-msgid "FIELD"
-msgstr "FÄLT"
+# %s är programmets namn
+#~ msgid "keep all output, output to directory %s.dir"
+#~ msgstr "behåll all utdata, utdata till katalogen %s.dir"
-#: main.cc:112
-msgid "write header field to BASENAME.FIELD"
-msgstr "skriv rubrikfält till BASNAMN.FÄLT"
+#~ msgid "don't run LilyPond"
+#~ msgstr "kör inte LilyPond"
-#: main.cc:113
-msgid "add DIR to search path"
-msgstr "lägg till KATALOG till sökvägen"
+#~ msgid "produce MIDI output only"
+#~ msgstr "skapa enbart MIDI-utdata"
-#: main.cc:114
-msgid "use FILE as init file"
-msgstr "använd FIL som init-fil"
+#~ msgid "write ouput to FILE"
+#~ msgstr "skriv utdata till FIL"
-#: main.cc:118
-msgid "prepend DIR to dependencies"
-msgstr "lägg till KATALOG efter beroenden"
+#~ msgid "find pfa fonts used in FILE"
+#~ msgstr "hitta pfa-typsnitt som används i FIL"
-#.
-#. should audit again.
-#.
-#: main.cc:123
-msgid "inhibit file output naming and exporting"
-msgstr "hindra namngivning av filutdata och exportering"
+#~ msgid "use pdflatex to generate a PDF output"
+#~ msgstr "använd pdflatex för att generera PDF-utdata"
-#. No version number or newline here. It confuses help2man.
-#: main.cc:155
-#, c-format
-msgid "Usage: %s [OPTION]... FILE..."
-msgstr "Användning: %s [FLAGGA]... FIL..."
+#~ msgid "make a picture of the first system"
+#~ msgstr "skapa en bild av det första systemet"
-#: main.cc:157
-msgid "Typeset music and or play MIDI from FILE"
-msgstr "Typsätt musik och/eller spela MIDI från FIL"
+#~ msgid "make HTML file with links to all output"
+#~ msgstr "skapa en HTML-fil som länkar till all utdata"
-#: main.cc:160
-msgid ""
-"LilyPond is a music typesetter. It produces beautiful sheet music\n"
-"using a high level description file as input. LilyPond is part of \n"
-"the GNU Project.\n"
-msgstr ""
-"LilyPond är en musiktypsättare. Den producerar vackra noter från en\n"
-"högnivåbeskrivning av musiken i en fil. LilyPond är en del av\n"
-"GNU-projektet.\n"
+#~ msgid "change global setting KEY to VAL"
+#~ msgstr "ändra global inställning NYCKEL till VÃRDE"
-#: main.cc:182
-#, c-format
-msgid ""
-"This is free software. It is covered by the GNU General Public License,\n"
-"and you are welcome to change it and/or distribute copies of it under\n"
-"certain conditions. Invoke as `%s --warranty' for more information.\n"
-msgstr ""
-"Det här är fri programvara. Den täcks av \"GNU General Public License\",\n"
-"och du får ändra och/eller distribuera kopior av den under vissa\n"
-"villkor. Kör \"%s --warranty\" för mer information.\n"
+#~ msgid "LilyPond crashed (signal %d)."
+#~ msgstr "LilyPond kraschade (signal %d)."
-#: main.cc:198
-msgid "GNU LilyPond -- The music typesetter"
-msgstr "GNU Lilypond -- Musiktypsättaren"
+#~ msgid "Please submit a bug report to bug-lilypond@gnu.org"
+#~ msgstr "Skicka en buggrapport till bug-lilypond@gnu.org"
-#: main.cc:206
-msgid ""
-" This program is free software; you can redistribute it and/or\n"
-"modify it under the terms of the GNU General Public License version 2\n"
-"as published by the Free Software Foundation.\n"
-"\n"
-" This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
-"General Public License for more details.\n"
-"\n"
-" You should have received a copy (refer to the file COPYING) of the\n"
-"GNU General Public License along with this program; if not, write to\n"
-"the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-"USA.\n"
-msgstr ""
-"Detta program är fri programvara. Du kan distribuera det och/eller\n"
-"modifiera det under villkoren i GNU General Public License version 2\n"
-"publicerad av Free Software Foundation.\n"
-"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men\n"
-"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
-"Public License för ytterligare information.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
-"detta program. Om inte, skriv till Free Software Foundation, Inc.,\n"
-"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+#~ msgid "LilyPond failed on input file %s (exit status %d)"
+#~ msgstr "LilyPond misslyckades pÃ¥ indatafilen â%sâ (slutstatus %d)"
-#: mensural-ligature.cc:153
-#, c-format
-msgid "Mensural_ligature:thickness undefined on flexa %d; assuming 1.4"
-msgstr "Menural_ligature:thickness odefinierad för flexa %d; antar 1.4"
+#~ msgid "LilyPond failed on an input file (exit status %d)"
+#~ msgstr "LilyPond misslyckades på en indatafil (slutstatus %d)"
-#: mensural-ligature.cc:169
-#, c-format
-msgid "Mensural_ligature:delta-pitch undefined on flexa %d; assuming 0"
-msgstr "Menural_ligature:delta-pitch odefinierad för flexa %d; antar 0"
+#~ msgid "Continuing..."
+#~ msgstr "Fortsätterâ¦"
-#: mensural-ligature.cc:182
-#, c-format
-msgid "Mensural_ligature:flexa-width undefined on flexa %d; assuming 2.0"
-msgstr "Menural_ligature:flexa-width odefinierad för flexa %d; antar 2.0"
+#~ msgid "Analyzing %s..."
+#~ msgstr "Analyserar %sâ¦"
-#: mensural-ligature.cc:215
-msgid "Mensural_ligature:unexpected case fall-through"
-msgstr "Menural_ligature:föll igenom case oväntat"
+#~ msgid "no LilyPond output found for `%s'"
+#~ msgstr "ingen LilyPond-utdata funnen för â%sâ"
-#: mensural-ligature.cc:225
-msgid "Mensural_ligature: (join_left == 0)"
-msgstr "Mensural_ligature: (join_left == 0)"
+#~ msgid "LaTeX failed on the output file."
+#~ msgstr "LaTeX misslyckades på utdatafilen."
-#: mensural-ligature-engraver.cc:248 mensural-ligature-engraver.cc:397
-msgid "unexpected case fall-through"
-msgstr "föll igenom case oväntat"
+#~ msgid ""
+#~ "Trying create PDF, but no PFA fonts found.\n"
+#~ "Using bitmap fonts instead. This will look bad."
+#~ msgstr ""
+#~ "Försöker skapa PDF, men inga PFA-typsnitt hittades.\n"
+#~ "Använder punkttypsnitt istället. Det kommer att se dåligt ut."
-#: mensural-ligature-engraver.cc:259
-msgid "ligature with less than 2 heads -> skipping"
-msgstr "ligature med mindre än 2 huvuden -> skippar"
+#~ msgid "Writing HTML menu `%s'"
+#~ msgstr "Skriver HTML-meny â%sâ"
-#: mensural-ligature-engraver.cc:279
-msgid "can not determine pitch of ligature primitive -> skipping"
-msgstr "kan inte bestämma tonhöjd för ligaturprimitiv -> skippar"
+#~ msgid "pseudo filter"
+#~ msgstr "pseudofilter"
-#: mensural-ligature-engraver.cc:302
-msgid "prime interval within ligature -> skipping"
-msgstr "primintervall inom ligatur -> skippar"
+#~ msgid "pseudo filter only for single input file"
+#~ msgstr "pseudofilter bara för enstaka indatafil"
-#: mensural-ligature-engraver.cc:312
-msgid "mensural ligature: duration none of L, B, S -> skipping"
-msgstr "mensural ligature: längd ingen av L, B, S -> skippar"
+#~ msgid "filename should not contain spaces: `%s'"
+#~ msgstr "filnamnet fÃ¥r inte innehÃ¥lla mellanslag: â%sâ"
-#: midi-item.cc:148
-#, c-format
-msgid "no such instrument: `%s'"
-msgstr "instrumentet finns inte: \"%s\""
+#~ msgid "Running LilyPond failed. Rerun with --verbose for a trace."
+#~ msgstr "Misslyckades med att köra LilyPond. Kör igen med --verbose för spår."
-#: midi-item.cc:238
-msgid "silly duration"
-msgstr "tokig längd"
+#~ msgid "Failed to make PS file. Rerun with --verbose for a trace."
+#~ msgstr "Misslyckades med att skapa PS-fil. Kör med --verbose för spår."
-#: midi-item.cc:251
-msgid "silly pitch"
-msgstr "tokig ton"
+#~ msgid "Running LaTeX falied. Rerun with --verbose for a trace."
+#~ msgstr "Misslyckades med att köra LaTeX. Kör med --verbose för spår."
-#: music-output-def.cc:111
-#, c-format
-msgid "can't find `%s' context"
-msgstr "kan inte hitta omgivningen \"%s\""
+# här är det fråga om skrivning till en fil (första parametern är t.ex
+# DVI, LATEX, MIDI, TEX)
+#~ msgid "%s output to <stdout>..."
+#~ msgstr "%s skrivet till <stdout>â¦"
-#: my-lily-lexer.cc:169
-#, c-format
-msgid "Identifier name is a keyword: `%s'"
-msgstr "Identifierarnamn är ett nyckelord: \"%s\""
+# här är det fråga om skrivning till en fil (första parametern är t.ex
+# DVI, LATEX, MIDI, TEX)
+#~ msgid "%s output to %s..."
+#~ msgstr "%s skrivet till â%sââ¦"
-#: my-lily-lexer.cc:191
-#, c-format
-msgid "error at EOF: %s"
-msgstr "fel vid filslut: %s"
+#~ msgid "Convert MIDI to LilyPond source"
+#~ msgstr "Konvertera MIDI till LilyPond"
-#: my-lily-parser.cc:44
-msgid "Parsing..."
-msgstr "Tolkar..."
+#~ msgid " 2001--2003"
+#~ msgstr " 2001-2003"
-#: my-lily-parser.cc:54
-msgid "Braces don't match"
-msgstr "Krullparenteser matchar inte"
+#~ msgid ""
+#~ "\n"
+#~ "Distributed under terms of the GNU General Public License. It comes with\n"
+#~ "NO WARRANTY."
+#~ msgstr ""
+#~ "\n"
+#~ "Distribueras under GNU General Public License.\n"
+#~ "INGEN GARANTI ges för programmet."
-#.
-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:143
-msgid "music for the martians."
-msgstr "musik för marsianerna."
+#~ msgid "command exited with value %d"
+#~ msgstr "kommandot avslutade med värde %d"
-#: new-tie-engraver.cc:166 tie-engraver.cc:217
-msgid "lonely tie"
-msgstr "ensam båge"
+#~ msgid "debug"
+#~ msgstr "felsökningsutdata"
-#: note-collision.cc:340
-msgid "Too many clashing notecolumns. Ignoring them."
-msgstr "För många krockande notkolumner. Ignorerar dem."
+#~ msgid "define macro NAME [optional expansion EXP]"
+#~ msgstr "definiera makro NAME [valfri makroersättning EXP]"
-#: note-head.cc:127
-#, c-format
-msgid "note head `%s' not found"
-msgstr "nothuvud \"%s\" ej funnet"
+#~ msgid "only pre-process"
+#~ msgstr "förbehandla enbart"
-#: paper-def.cc:96
-#, c-format
-msgid "paper output to `%s'..."
-msgstr "pappersutdata till \"%s\"..."
+#~ msgid "programming error: %s (Continuing; cross thumbs)\n"
+#~ msgstr " programmeringsfel: %s (Fortsätter, håll tummarna)\n"
-#: paper-score.cc:78
-#, c-format
-msgid "Element count %d (spanners %d) "
-msgstr "Elementantal %d (bryggare %d) "
+#~ msgid "accidental `%s' not found"
+#~ msgstr "förtecken â%sâ hittades inte"
-#: paper-score.cc:83
-msgid "Preprocessing graphical objects..."
-msgstr "Förbehandlar grafiska objekt..."
+#~ msgid "Symbol is not a parent context: %s. Ignored"
+#~ msgstr "Symbol är inte en föräldraomgivning: %s. Ignoreras"
-#: paper-score.cc:116
-msgid "Outputting Score, defined at: "
-msgstr "Matar ut partitur, definierade vid: "
+#~ msgid "Accidental typesetting must be pair or context-name: %s"
+#~ msgstr "Typsättning av förtecken måste vara par eller context-name: %s"
-#: parse-scm.cc:79
-msgid "GUILE signaled an error for the expression begining here"
-msgstr "GUILE gave ett fel för uttrycket som börjar här"
+#~ msgid "can't find character number: %d"
+#~ msgstr "kan inte hitta teckennummer: %d"
-#.
-#. We could change the current translator's id, but that would make
-#. errors hard to catch
-#.
-#. last->translator_id_string_ = get_change ()->change_to_id_string_;
-#.
-#: part-combine-music-iterator.cc:139
-#, c-format
-msgid "I'm one myself: `%s'"
-msgstr "Jag är en själv: \"%s\""
+#~ msgid "checksum mismatch for font file: `%s'"
+#~ msgstr "felaktig checksumma för typsnittsfil: â%sâ"
-#: part-combine-music-iterator.cc:142
-#, c-format
-msgid "none of these in my family: `%s'"
-msgstr "ingen av dessa i min familj: \"%s\""
+#~ msgid "does not match: `%s'"
+#~ msgstr "matchar inte: â%sâ"
-#: percent-repeat-engraver.cc:109
-msgid "Don't know how to handle a percent repeat of this length."
-msgstr "Vet inte hur en procentrepris av denna längd ska hanteras."
+#~ msgid " Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V to show font paths."
+#~ msgstr " Bygg om alla .afm-filer, och ta bort alla .pk- och .tfm-filer. Kör igen med -V för att visa typsnittssökvägar."
-#: percent-repeat-engraver.cc:163
-msgid "unterminated percent repeat"
-msgstr "oavslutad procentrepris"
+#~ msgid ""
+#~ "A script for removing font-files is delivered with the source-code,\n"
+#~ "in buildscripts/clean-fonts.sh"
+#~ msgstr ""
+#~ "Ett skript för att ta bort typsnittsfiler levereras med källkoden,\n"
+#~ "i buildscripts/clean-fonts.sh"
-#: percent-repeat-iterator.cc:65
-msgid "no one to print a percent"
-msgstr "det finns ingen som kan skriva procent"
+#~ msgid "Loading default font"
+#~ msgstr "Läser in standardtypsnitt"
-#: performance.cc:51
-msgid "Track ... "
-msgstr "Spår... "
+#~ msgid "Can't switch translators, I'm there already"
+#~ msgstr "Kan inte byta översättare, jag är redan där"
-#: performance.cc:83
-msgid "Creator: "
-msgstr "Skapare: "
+#~ msgid "beam has less than two visible stems"
+#~ msgstr "balk har mindre än två synliga notskaft"
-#: performance.cc:103
-msgid "at "
-msgstr "vid "
+#~ msgid "Beam has less than two stems. Removing beam."
+#~ msgstr "Balk har mindre än två notskaft. Tar bort balk."
-#: performance.cc:114
-#, c-format
-msgid "from musical definition: %s"
-msgstr "från musikdefinition: %s"
+#~ msgid "Not sure that we can find a nice beam slope (no viable initial configuration found)."
+#~ msgstr "Inte säker på att vi kan hitta en bra balklutning (ingen passande initialkonfiguration funnen)."
-#: performance.cc:169
-#, c-format
-msgid "MIDI output to `%s'..."
-msgstr "MIDI-utdata till \"%s\"..."
+#~ msgid "I'm one myself"
+#~ msgstr "Jag är en själv"
-#: phrasing-slur-engraver.cc:123
-msgid "unterminated phrasing slur"
-msgstr "oavslutad fraseringsbåge"
+#~ msgid "Chord tremolo with %d elements. Must have two elements."
+#~ msgstr "Ackordtremolo med %d element. Måste ha två element."
-#: phrasing-slur-engraver.cc:141
-msgid "can't find start of phrasing slur"
-msgstr "kan inte hitta start på fraseringsbåge"
+#~ msgid "no one to print a tremolos"
+#~ msgstr "det finns ingen som kan skriva tremolon"
-#: piano-pedal-engraver.cc:235 piano-pedal-engraver.cc:250
-#: piano-pedal-engraver.cc:305 piano-pedal-performer.cc:82
-#, c-format
-msgid "can't find start of piano pedal: `%s'"
-msgstr "kan inte hitta start på pianopedal: \"%s\""
+#~ msgid "gotcha: ptr=%ul"
+#~ msgstr "fick dig: ptr=%ul"
-#: piano-pedal-engraver.cc:410
-msgid "unterminated pedal bracket"
-msgstr "oavslutad pedalklammer"
+#~ msgid "distance=%f"
+#~ msgstr "avstånd=%f"
-#: property-iterator.cc:97
-#, c-format
-msgid "Not a grob name, `%s'."
-msgstr "Inte ett grob-namn, \"%s\"."
+#~ msgid "NaN"
+#~ msgstr "-"
-#: rest.cc:139
-#, c-format
-msgid "rest `%s' not found, "
-msgstr "paus \"%s\" hittades inte, "
+#~ msgid "can't find start of (de)crescendo"
+#~ msgstr "kan inte hitta start på crescendo/diminuendo"
-#: rest-collision.cc:199
-msgid "too many colliding rests"
-msgstr "för många krockande pauser"
+#~ msgid "already have a crescendo"
+#~ msgstr "har redan ett crescendo"
-#: scm-option.cc:45
-msgid "lilypond -e EXPR means:"
-msgstr "lilypond -e UTTR betyder:"
+#~ msgid "already have a decrescendo"
+#~ msgstr "har redan ett diminuendo"
-#: scm-option.cc:47
-msgid " Evalute the Scheme EXPR before parsing any .ly files."
-msgstr " Evaluera Scheme-uttrycket UTTR innan någon .ly-fil läses in."
+#~ msgid "Cresc started here"
+#~ msgstr "Cresc startade här"
-#: scm-option.cc:49
-msgid " Multiple -e options may be given, they will be evaluated sequentially."
-msgstr " Flera -e kan ges, de kommer att evalueras i tur och ordning."
+#~ msgid "unterminated (de)crescendo"
+#~ msgstr "oavslutat crescendo/diminuendo"
-#: scm-option.cc:51
-msgid " The function ly-set-option allows for access to some internal variables."
-msgstr " Funktionen ly-set-option ger åtkomst till några interna variabler."
+#~ msgid "Transposition by %s makes alteration larger than two"
+#~ msgstr "Transponering med %s gör ändring större än två"
-#: scm-option.cc:53
-msgid "Usage: lilypond -e \"(ly-set-option SYMBOL VAL)\""
-msgstr "Användning: lilpond -e \"(ly-set-option SYMBOL VÄRDE)\""
+#~ msgid "Nothing to connect extender to on the left. Ignoring extender event."
+#~ msgstr "Det finns inget att koppla utökaren mot till vänster. Ignorerar utökarhändelse."
-#: scm-option.cc:55
-msgid "Where SYMBOL VAL pair is any of:"
-msgstr "Där paret SYMBOL VÄRDE är något av:"
+#~ msgid "no one to print a repeat brace"
+#~ msgstr "det finns ingen som kan skriva ett repristecken"
-#: scm-option.cc:128
-msgid "Unknown internal option!"
-msgstr "Okänd internt alternativ!"
+#~ msgid "couldn't find any font satisfying "
+#~ msgstr "kunde inte hitta något typsnitt som uppfyller "
-#: score.cc:85
-msgid "Interpreting music..."
-msgstr "Tolkar musik..."
+#~ msgid "No feasible line breaking found"
+#~ msgstr "Ingen lämplig radbrytning hittades"
-#: score.cc:97
-msgid "Need music in a score"
-msgstr "Behöver musik i partitur"
+#~ msgid ""
+#~ "Skipped something?\n"
+#~ "Grob %s ended before I expected it to end."
+#~ msgstr ""
+#~ "Skippade något?\n"
+#~ "Grob %s slutade innan jag förväntade det."
-#. should we? hampers debugging.
-#: score.cc:111
-msgid "Errors found/*, not processing score*/"
-msgstr "Fel funna/*, behandlar inte partitur*/"
+#~ msgid "crescendo too small"
+#~ msgstr "crescendo för litet"
-#: score.cc:118
-#, c-format
-msgid "elapsed time: %.2f seconds"
-msgstr "tidsåtgång: %.2f sekunder"
+#~ msgid "Nothing to connect hyphen to on the left. Ignoring hyphen event."
+#~ msgstr "Det finns inget att koppla bindestrecket mot till vänster. Ignorerar bindestreckshändelse."
-#: score-engraver.cc:99
-#, c-format
-msgid "can't find `%s'"
-msgstr "kan inte hitta \"%s\""
+#~ msgid "Score contains errors; will not process it"
+#~ msgstr "Partitur innehåller fel; kommer inte behandla det"
-#: score-engraver.cc:100
-msgid "Fonts have not been installed properly. Aborting"
-msgstr "Typsnitten är inte korrekt installerade. Avbryter"
+#~ msgid "Now processing: `%s'"
+#~ msgstr "Behandlar nu: â%sâ"
-#: score-engraver.cc:205
-#, c-format
-msgid "unbound spanner `%s'"
-msgstr "obunden bryggare \"%s\""
+#~ msgid "FIXME: key change merge"
+#~ msgstr "FIXA: tonartsbytessammanslagning"
-#: script-engraver.cc:90
-#, c-format
-msgid "Don't know how to interpret articulation `%s'"
-msgstr "Kan inte tolka artikulering \"%s\""
+#~ msgid "Kpathsea couldn't find TFM file `%s'"
+#~ msgstr "Kpathsea kan inte hitta TFML-fil â%sâ"
-#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:53 separation-item.cc:101
-msgid "Separation_item: I've been drinking too much"
-msgstr "Separation_item: Jag har druckit för mycket"
+#~ msgid "round filled box horizontal extent smaller than blot; decreasing blot"
+#~ msgstr "horisontell utbredning för rund fylld box mindre än blot; minskar blot"
-#: simple-spacer.cc:248
-#, c-format
-msgid "No spring between column %d and next one"
-msgstr "Ingen fjäder mellan kolumn %d och nästa"
+#~ msgid "round filled box vertical extent smaller than blot; decreasing blot"
+#~ msgstr "vertikal utbredning för rund fylld box mindre än blot; minskar blot"
-#: slur-engraver.cc:141
-msgid "unterminated slur"
-msgstr "oavslutad båge"
+#~ msgid "lyrics found without any matching notehead"
+#~ msgstr "sångtext hittad utan något matchande nothuvud"
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:159
-msgid "can't find start of slur"
-msgstr "kan inte hitta start på båge"
+#~ msgid "Huh? Melismatic note found to have associated lyrics."
+#~ msgstr "Ãh? Melismatisk not har tillhörande sÃ¥ngtext."
-#: source-file.cc:67
-#, c-format
-msgid "Huh? Got %d, expected %d characters"
-msgstr "Öh? Fick %d, väntade %d tecken"
+#~ msgid "set options, use -e '(ly-option-usage)' for help"
+#~ msgstr "sätt inställningar, använd -e '(ly-option-usage)' för hjälp"
-#: spacing-spanner.cc:379
-#, c-format
-msgid "Global shortest duration is %s\n"
-msgstr "Globalt kortaste längd är %s\n"
+#~ msgid "use output format EXT"
+#~ msgstr "använd utdataformat FMT"
-#: spring-smob.cc:32
-#, c-format
-msgid "#<spring smob d= %f>"
-msgstr "#<spring smob d= %f>"
+#~ msgid "prepend DIR to dependencies"
+#~ msgstr "lägg till KATALOG efter beroenden"
-#: staff-symbol.cc:61
-msgid "staff symbol: indentation yields beyond end of line"
-msgstr "staff symbol: indentering ger vika innan radslut"
+#~ msgid "inhibit file output naming and exporting"
+#~ msgstr "hindra namngivning av filutdata och exportering"
-#: stem.cc:118
-msgid "Weird stem size; check for narrow beams"
-msgstr "Konstig skaftstorlek; kolla efter smala balkar"
+#~ msgid ""
+#~ "LilyPond is a music typesetter. It produces beautiful sheet music\n"
+#~ "using a high level description file as input. LilyPond is part of \n"
+#~ "the GNU Project.\n"
+#~ msgstr ""
+#~ "LilyPond är en musiktypsättare. Den producerar vackra noter från en\n"
+#~ "högnivåbeskrivning av musiken i en fil. LilyPond är en del av\n"
+#~ "GNU-projektet.\n"
-#: stem.cc:611
-#, c-format
-msgid "flag `%s' not found"
-msgstr "flaggan \"%s\" hittades ej"
+#~ msgid "GNU LilyPond -- The music typesetter"
+#~ msgstr "GNU Lilypond -- Musiktypsättaren"
-#: stem.cc:624
-#, c-format
-msgid "flag stroke `%s' not found"
-msgstr "flaggstrecket \"%s\" hittades inte"
+#~ msgid "Mensural_ligature:thickness undefined on flexa %d; assuming 1.4"
+#~ msgstr "Menural_ligature:thickness odefinierad för flexa %d; antar 1.4"
-#: stem-engraver.cc:96
-msgid "tremolo duration is too long"
-msgstr "tremololängd är för lång"
+#~ msgid "Mensural_ligature:delta-pitch undefined on flexa %d; assuming 0"
+#~ msgstr "Menural_ligature:delta-pitch odefinierad för flexa %d; antar 0"
-#: stem-engraver.cc:124
-#, c-format
-msgid "Adding note head to incompatible stem (type = %d)"
-msgstr "Lägger till nothuvud till inkompatibel båge (typ = %d)"
+#~ msgid "Mensural_ligature:flexa-width undefined on flexa %d; assuming 2.0"
+#~ msgstr "Menural_ligature:flexa-width odefinierad för flexa %d; antar 2.0"
-#: stem-engraver.cc:125
-msgid "Don't you want polyphonic voices instead?"
-msgstr "Vill du ha polyfoniska stämmor istället?"
+#~ msgid "Mensural_ligature:unexpected case fall-through"
+#~ msgstr "Menural_ligature:föll igenom case oväntat"
-#: streams.cc:34
-#, c-format
-msgid "can't create directory: `%s'"
-msgstr "kan inte skapa katalog: \"%s\""
+#~ msgid "Mensural_ligature: (join_left == 0)"
+#~ msgstr "Mensural_ligature: (join_left == 0)"
-#: streams.cc:48
-msgid "Error syncing file (disk full?)"
-msgstr "Fel vid synkning av fil (disken full?)"
+#~ msgid "silly pitch"
+#~ msgstr "tokig ton"
-#: system.cc:125
-#, c-format
-msgid "Element count %d."
-msgstr "Elementantal %d."
+#~ msgid "error at EOF: %s"
+#~ msgstr "fel vid filslut: %s"
-#: system.cc:372
-#, c-format
-msgid "Grob count %d "
-msgstr "Elementantal %d "
+#~ msgid "Braces don't match"
+#~ msgstr "Krullparenteser matchar inte"
-#: system.cc:386
-msgid "Calculating line breaks..."
-msgstr "Beräknar radbrytningar..."
+#~ msgid "music for the martians."
+#~ msgstr "musik för marsianerna."
-#: text-spanner-engraver.cc:81
-msgid "can't find start of text spanner"
-msgstr "kan inte hitta start på textbryggare"
+#~ msgid "Too many clashing notecolumns. Ignoring them."
+#~ msgstr "För många krockande notkolumner. Ignorerar dem."
-#: text-spanner-engraver.cc:95
-msgid "already have a text spanner"
-msgstr "har redan en textbryggare"
+#~ msgid "paper output to `%s'..."
+#~ msgstr "pappersutdata till â%sââ¦"
-#: text-spanner-engraver.cc:164
-msgid "unterminated text spanner"
-msgstr "oavslutad textbryggare"
+#~ msgid "Outputting Score, defined at: "
+#~ msgstr "Matar ut partitur, definierade vid: "
-#: tfm.cc:83
-#, c-format
-msgid "can't find ascii character: %d"
-msgstr "kan inte hitta ASCII-tecken: %d"
+#~ msgid "I'm one myself: `%s'"
+#~ msgstr "Jag är en själv: â%sâ"
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#: tfm-reader.cc:108
-#, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr "TFM-rubrik i \"%s\" har bara %u ord"
+#~ msgid "none of these in my family: `%s'"
+#~ msgstr "ingen av dessa i min familj: â%sâ"
-#: tfm-reader.cc:142
-#, c-format
-msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr "%s: TFM-fil har %u parametrar, vilket är mer än de %u jag kan hantera"
+#~ msgid "Don't know how to handle a percent repeat of this length."
+#~ msgstr "Vet inte hur en procentrepris av denna längd ska hanteras."
-#: tie-performer.cc:159
-msgid "No ties were created!"
-msgstr "Inga bågar skapades!"
+#~ msgid "no one to print a percent"
+#~ msgstr "det finns ingen som kan skriva procent"
-#: time-scaled-music-iterator.cc:25
-msgid "no one to print a tuplet start bracket"
-msgstr "det finns ingen som kan skriva en starthake för tupel"
+#~ msgid "Creator: "
+#~ msgstr "Skapare: "
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:87
-#, c-format
-msgid "time signature symbol `%s' not found; reverting to numbered style"
-msgstr "tidssignatursymbol \"%s\" hittades inte: återgår till numrerad stil"
+#~ msgid "at "
+#~ msgstr "vid "
-#.
-#. Todo: should make typecheck?
-#.
-#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
-#.
-#: time-signature-engraver.cc:57
-#, c-format
-msgid "Found strange time signature %d/%d."
-msgstr "Hittade underlig tidssignatur %d/%d"
+#~ msgid "from musical definition: %s"
+#~ msgstr "från musikdefinition: %s"
-#: translator-ctors.cc:53
-#, c-format
-msgid "unknown translator: `%s'"
-msgstr "okänd översättare: \"%s\""
+#~ msgid "unterminated phrasing slur"
+#~ msgstr "oavslutad fraseringsbåge"
-#: translator-def.cc:105
-msgid "Program has no such type"
-msgstr "Programmet har ingen sådan typ"
+#~ msgid "can't find start of phrasing slur"
+#~ msgstr "kan inte hitta start på fraseringsbåge"
-#: translator-def.cc:111
-#, c-format
-msgid "Already contains: `%s'"
-msgstr "Innehåller redan: \"%s\""
+#~ msgid "unterminated pedal bracket"
+#~ msgstr "oavslutad pedalklammer"
-#: translator-def.cc:112
-#, c-format
-msgid "Not adding translator: `%s'"
-msgstr "Lägger inte till översättare: \"%s\""
+#~ msgid "lilypond -e EXPR means:"
+#~ msgstr "lilypond -e UTTR betyder:"
-#: translator-def.cc:229
-#, c-format
-msgid "can't find: `%s'"
-msgstr "kan inte hitta: \"%s\""
+#~ msgid " Evalute the Scheme EXPR before parsing any .ly files."
+#~ msgstr " Evaluera Scheme-uttrycket UTTR innan någon .ly-fil läses in."
-#: translator-group.cc:158
-#, c-format
-msgid "can't find or create `%s' called `%s'"
-msgstr "kan inte hitta eller skapa \"%s\" kallad \"%s\""
+#~ msgid " Multiple -e options may be given, they will be evaluated sequentially."
+#~ msgstr " Flera -e kan ges, de kommer att evalueras i tur och ordning."
-#: translator-group.cc:230
-#, c-format
-msgid "can't find or create: `%s'"
-msgstr "kan inte hitta eller skapa: \"%s\""
+#~ msgid " The function ly-set-option allows for access to some internal variables."
+#~ msgstr " Funktionen ly-set-option ger åtkomst till några interna variabler."
-#: vaticana-ligature.cc:49
-msgid "ascending vaticana style flexa"
-msgstr "ökande vatikan-stil-flexa"
+#~ msgid "Usage: lilypond -e \"(ly-set-option SYMBOL VAL)\""
+#~ msgstr "Användning: lilypond -e â(ly-set-option SYMBOL VÃRDE)â"
-#: vaticana-ligature.cc:219
-msgid "Vaticana_ligature:thickness undefined; assuming 1.4"
-msgstr "Vaticana_ligature:thickness odefinierad; antar 1.4"
+#~ msgid "Where SYMBOL VAL pair is any of:"
+#~ msgstr "Där paret SYMBOL VÃRDE är nÃ¥got av:"
-#: vaticana-ligature.cc:233
-msgid "Vaticana_ligature:x-offset undefined; assuming 0.0"
-msgstr "Vaticana_ligature:x-offset odefinierad; antar 0.0"
+#~ msgid "unbound spanner `%s'"
+#~ msgstr "obunden bryggare â%sâ"
-#: vaticana-ligature.cc:258
-msgid "Vaticana_ligature: (delta_pitch == 0)"
-msgstr "Vaticana_ligature: (delta_pitch == 0)"
+#~ msgid "Separation_item: I've been drinking too much"
+#~ msgstr "Separation_item: Jag har druckit för mycket"
-#: vaticana-ligature.cc:271
-msgid "Vaticana_ligature:delta-pitch -> ignoring join"
-msgstr "Vaticana_ligature:delta_pitch -> ignorerar join"
+#~ msgid "No spring between column %d and next one"
+#~ msgstr "Ingen fjäder mellan kolumn %d och nästa"
-#: vaticana-ligature-engraver.cc:477
-#, c-format
-msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr=%ul"
-msgstr "Vaticana_ligature_engraver: sätter `spacing-increment = %f': ptr=%ul"
+#~ msgid "can't find start of slur"
+#~ msgstr "kan inte hitta start på båge"
-#: volta-engraver.cc:112
-msgid "No volta spanner to end"
-msgstr "Ingen reprisbryggare till slutet"
+#~ msgid "Huh? Got %d, expected %d characters"
+#~ msgstr "Ãh? Fick %d, väntade %d tecken"
-#: volta-engraver.cc:123
-msgid "Already have a volta spanner. Stopping that one prematurely."
-msgstr "Har redan en reprisbryggare. Stoppar den tidigare."
+#~ msgid "Global shortest duration is %s\n"
+#~ msgstr "Globalt kortaste längd är %s\n"
-#: volta-engraver.cc:127
-msgid "Also have a stopped spanner. Giving up."
-msgstr "Har också en stoppad bryggare. Ger upp."
+#~ msgid "#<spring smob d= %f>"
+#~ msgstr "#<spring smob d= %f>"
-#: parser.yy:480
-msgid "Identifier should have alphabetic characters only"
-msgstr "Identifierare ska bara innehålla alfabetiska tecken"
+#~ msgid "staff symbol: indentation yields beyond end of line"
+#~ msgstr "staff symbol: indentering ger vika innan radslut"
-#: parser.yy:779
-msgid "More alternatives than repeats. Junking excess alternatives."
-msgstr "Fler alternativ än repriser. Slänger överblivna alternativ."
+#~ msgid "Don't you want polyphonic voices instead?"
+#~ msgstr "Vill du ha polyfoniska stämmor istället?"
-#: parser.yy:861 parser.yy:868
-msgid "pplycontext takes function argument"
-msgstr ""
+#~ msgid "Error syncing file (disk full?)"
+#~ msgstr "Fel vid synkning av fil (disken full?)"
-#: parser.yy:877
-msgid "Second argument must be a symbol"
-msgstr "Andra argumentet måste vara en symbol"
+#~ msgid "can't find ascii character: %d"
+#~ msgstr "kan inte hitta ASCII-tecken: %d"
-#: parser.yy:882
-msgid "First argument must be a procedure taking one argument"
-msgstr "Första argumentet måste vara en procedur som tar 1 argument"
+#~ msgid "TFM header of `%s' has only %u word (s)"
+#~ msgstr "TFM-rubrik i â%sâ har bara %u ord"
-#: parser.yy:1009
-msgid "pply takes function argument"
-msgstr ""
+#~ msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
+#~ msgstr "%s: TFM-fil har %u parametrar, vilket är mer än de %u jag kan hantera"
-#: parser.yy:1501
-msgid "Expecting string as script definition"
-msgstr "Väntade sträng som skriptdefinition"
+#~ msgid "No ties were created!"
+#~ msgstr "Inga bindebågar skapades!"
-#: parser.yy:1598
-msgid "Expecting musical-pitch value"
-msgstr "Väntade notvärde"
+#~ msgid "no one to print a tuplet start bracket"
+#~ msgstr "det finns ingen som kan skriva en starthake för tupel"
-#: parser.yy:1609
-msgid "Must have duration object"
-msgstr "Måste ha längdobjekt"
+#~ msgid "time signature symbol `%s' not found; reverting to numbered style"
+#~ msgstr "tidssignatursymbol â%sâ hittades inte: Ã¥tergÃ¥r till numrerad stil"
-#: parser.yy:1618 parser.yy:1626
-msgid "Have to be in Lyric mode for lyrics"
-msgstr "Måste vara i textläge (Lyric mode) för sångtext"
+#~ msgid "Program has no such type"
+#~ msgstr "Programmet har ingen sådan typ"
-#: parser.yy:1798 parser.yy:1853
-#, c-format
-msgid "not a duration: %d"
-msgstr "inte en längd: %d"
+#~ msgid "Already contains: `%s'"
+#~ msgstr "InnehÃ¥ller redan: â%sâ"
-#: parser.yy:1949
-msgid "Have to be in Note mode for notes"
-msgstr "Måste vara i notläge (Note mode) för noter"
+#~ msgid "Not adding translator: `%s'"
+#~ msgstr "Lägger inte till översättare: â%sâ"
-#: parser.yy:2032
-msgid "Have to be in Chord mode for chords"
-msgstr "Måste vara i ackordläge (Chord mode) för ackord"
+#~ msgid "Vaticana_ligature:thickness undefined; assuming 1.4"
+#~ msgstr "Vaticana_ligature:thickness odefinierad; antar 1.4"
-#: parser.yy:2171
-msgid "need integer number arg"
-msgstr "behöver heltalsargument"
+#~ msgid "Vaticana_ligature: (delta_pitch == 0)"
+#~ msgstr "Vaticana_ligature: (delta_pitch == 0)"
-#: parser.yy:2316
-msgid "Suspect duration found following this beam"
-msgstr "Misstänkt längd hittad efter denna balk"
+#~ msgid "Vaticana_ligature:delta-pitch -> ignoring join"
+#~ msgstr "Vaticana_ligature:delta_pitch -> ignorerar join"
-#: lexer.ll:186
-msgid "EOF found inside a comment"
-msgstr "filslut hittat inuti en kommentar"
+#~ msgid "Also have a stopped spanner. Giving up."
+#~ msgstr "Har också en stoppad bryggare. Ger upp."
-#: lexer.ll:200
-msgid "\\maininput disallowed outside init files"
-msgstr "\\maininput förbjudet utanför init-filer"
+#~ msgid "Identifier should have alphabetic characters only"
+#~ msgstr "Identifierare ska bara innehålla alfabetiska tecken"
-#: lexer.ll:224
-#, c-format
-msgid "wrong or undefined identifier: `%s'"
-msgstr "felaktig eller odefinierad identifierare: \"%s\""
+#~ msgid "Second argument must be a symbol"
+#~ msgstr "Andra argumentet måste vara en symbol"
-#. backup rule
-#: lexer.ll:233
-msgid "Missing end quote"
-msgstr "Saknat slutcitationstecken"
+#~ msgid "First argument must be a procedure taking one argument"
+#~ msgstr "Första argumentet måste vara en procedur som tar 1 argument"
-#. backup rule
-#: lexer.ll:255 lexer.ll:259
-msgid "white expected"
-msgstr "väntade tomrum"
+#~ msgid "Expecting musical-pitch value"
+#~ msgstr "Väntade notvärde"
-#: lexer.ll:268
-msgid "Can't evaluate Scheme in safe mode"
-msgstr "Kan inte evaluera Scheme i säkert läge"
+#~ msgid "Must have duration object"
+#~ msgstr "Måste ha längdobjekt"
-#: lexer.ll:397 lexer.ll:487
-msgid "Brace found at end of lyric. Did you forget a space?"
-msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
+#~ msgid "need integer number arg"
+#~ msgstr "behöver heltalsargument"
-#: lexer.ll:574
-#, c-format
-msgid "invalid character: `%c'"
-msgstr "ogiltigt tecken: \"%c\""
+#~ msgid "Suspect duration found following this beam"
+#~ msgstr "Misstänkt längd hittad efter denna balk"
-#: lexer.ll:651
-#, c-format
-msgid "unknown escaped string: `\\%s'"
-msgstr "okänd \"escaped\" sträng: \"\\%s\""
+#~ msgid "Missing end quote"
+#~ msgstr "Saknat slutcitationstecken"
-#: lexer.ll:742
-#, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "Felaktig lilypond-version: %s (%s, %s)"
+#~ msgid "Brace found at end of lyric. Did you forget a space?"
+#~ msgstr "Krullparentes funnen i slutet på sångtext. Glömde du ett mellanslag?"
-#: lexer.ll:743
-msgid "Consider updating the input with the convert-ly script"
-msgstr "Fundera på att uppdatera indata med skriptet \"convert-ly\""
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "Felaktig lilypond-version: %s (%s, %s)"
#~ msgid "Generate .dvi with LaTeX for LilyPond"
-#~ msgstr "Generera .dvi med LaTeX för LilyPond"
+#~ msgstr "Generera .dvi med LaTeX för LilyPond"
-# %s är programnamnet (mup2ly)
+# %s är programnamnet (mup2ly)
#~ msgid "%s is far from completed. Not all constructs are recognised."
-#~ msgstr "%s är långt ifrån färdig, och kan inte alla konstruktioner."
+#~ msgstr "%s är långt ifrån färdig, och kan inte alla konstruktioner."
#~ msgid "Fetch and rebuild from latest source package"
-#~ msgstr "Hämta och bygg om från senaste källkodspaketet"
+#~ msgstr "Hämta och bygg om från senaste källkodspaketet"
#~ msgid "unpack and build in DIR [%s]"
#~ msgstr "packa upp och bygg i DIR [%s]"
#~ msgid "execute COMMAND, subtitute:"
-#~ msgstr "kör COMMAND, ersätt:"
+#~ msgstr "kör COMMAND, ersätt:"
#~ msgid "%b: build root"
#~ msgstr "%b: byggrot"
@@ -2347,7 +4806,7 @@ msgstr "Fundera p
#~ msgstr "%n: paketnamn"
#~ msgid "%r: release directory"
-#~ msgstr "%r: programsläppskatalog"
+#~ msgstr "%r: programsläppskatalog"
#~ msgid "%t: tarball"
#~ msgstr "%t: tarboll"
@@ -2356,166 +4815,130 @@ msgstr "Fundera p
#~ msgstr "%v: paketversion"
#~ msgid "keep all output, and name the directory %s"
-#~ msgstr "behåll all utdata, och döp katalogen till %s"
+#~ msgstr "behåll all utdata, och döp katalogen till %s"
#~ msgid "upon failure notify EMAIL[,EMAIL]"
#~ msgstr "vid fel, meddela EMAIL[,EMAIL]"
#~ msgid "remove previous build"
-#~ msgstr "ta bort föregående bygge"
+#~ msgstr "ta bort föregående bygge"
#~ msgid "fetch and build URL [%s]"
-#~ msgstr "hämta och bygg URL [%s]"
-
-#~ msgid "Listing `%s'..."
-#~ msgstr "Listar \"%s\"..."
+#~ msgstr "hämta och bygg URL [%s]"
#~ msgid "latest is: %s"
-#~ msgstr "senaste är: %s"
-
-#~ msgid "relax, %s is up to date"
-#~ msgstr "lugn, %s är senaste versionen"
-
-#~ msgid "Fetching `%s'..."
-#~ msgstr "Hämtar \"%s\"..."
-
-#~ msgid "Building `%s'..."
-#~ msgstr "Bygger \"%s\"..."
+#~ msgstr "senaste är: %s"
#~ msgid "EOF in a string"
-#~ msgstr "EOF i en sträng"
+#~ msgstr "EOF i en sträng"
-# det handlar om mmap här
+# det handlar om mmap här
#~ msgid "can't map file"
-#~ msgstr "kan inte göra \"mmap\" på filen"
+#~ msgstr "kan inte göra âmmapâ pÃ¥ filen"
#~ msgid "<stdin>"
#~ msgstr "<stdin>"
-#~ msgid "programming error: "
-#~ msgstr "programmeringsfel: "
-
-#~ msgid "can't find start of beam"
-#~ msgstr "kan inte hitta start på balk"
-
#~ msgid "weird beam vertical offset"
-#~ msgstr "underligt vertikalt avstånd för balk"
-
-#~ msgid "unknown spacing pair `%s', `%s'"
-#~ msgstr "okänt avståndspar \"%s\", \"%s\""
+#~ msgstr "underligt vertikalt avstånd för balk"
#~ msgid "invalid subtraction: not part of chord: %s"
#~ msgstr "ogiltig subtraktion: inte del av ackord: %s"
-# "pitch" här ska alltså vara en ton i ett ackord
+# "pitch" här ska alltså vara en ton i ett ackord
#~ msgid "invalid inversion pitch: not part of chord: %s"
-#~ msgstr "ogiltig ton för inversion: inte del av ett ackord: %s"
+#~ msgstr "ogiltig ton för inversion: inte del av ett ackord: %s"
#~ msgid "no Grace context available"
-#~ msgstr "ingen prydnadsomgivning tillgänglig"
+#~ msgstr "ingen prydnadsomgivning tillgänglig"
#~ msgid "Unattached grace notes. Attaching to last musical column."
-#~ msgstr "Ej fastsatta prydnadsnoter. Fäster vid sista musikkolumnen."
+#~ msgstr "Ej fastsatta prydnadsnoter. Fäster vid sista musikkolumnen."
#~ msgid "This was the other key definition."
#~ msgstr "Detta var den andra tonartsdefinitionen."
#~ msgid "evalute EXPR as Scheme after .scm init is read"
-#~ msgstr "evaluera UTTR som Scheme efter .scm-init har lästs"
+#~ msgstr "evaluera UTTR som Scheme efter .scm-init har lästs"
#~ msgid "This binary was compiled with the following options:"
-#~ msgstr "Detta program kompilerades med följande alternativ:"
+#~ msgstr "Detta program kompilerades med följande alternativ:"
#~ msgid "ly_get_mus_property (): Not a Music"
-#~ msgstr "ly_get_mus_property (): Inte en \"Music\""
+#~ msgstr "ly_get_mus_property (): Inte en âMusicâ"
#~ msgid "ly_set_mus_property (): Not a symbol"
#~ msgstr "ly_set_mus_property (): inte en symbol"
#~ msgid "ly_set_mus_property (): not of type Music"
-#~ msgstr "ly_set_mus_property (): inte av typen \"Music\""
+#~ msgstr "ly_set_mus_property (): inte av typen âMusicâ"
#~ msgid "ly_make_music (): Not a string"
-#~ msgstr "ly_make_music (): Inte en sträng"
+#~ msgstr "ly_make_music (): Inte en sträng"
#~ msgid "ly_music_name (): Not a music expression"
#~ msgstr "ly_music_name (): Inte ett musikuttryck"
-#~ msgid "writing header field `%s' to `%s'..."
-#~ msgstr "skriver rubrikfält \"%s\" till \"%s\"..."
-
#~ msgid "Pitch arguments out of range"
-#~ msgstr "Tonargument utanför intervallet"
+#~ msgstr "Tonargument utanför intervallet"
#~ msgid ""
#~ "`%s' is deprecated. Use\n"
#~ " \\property %s.%s \\override #'%s = #%s"
#~ msgstr ""
-#~ "\"%s\" är föråldrat. Använd\n"
+#~ "â%sâ är förÃ¥ldrat. Använd\n"
#~ " \\property %s.%s \\override #'%s = #%s"
#~ msgid "Wrong type for property: %s, type: %s, value found: %s, type: %s"
-#~ msgstr "Fel typ för egenskap: %s, typ: %s, värde funnet: %s, typ: %s"
+#~ msgstr "Fel typ för egenskap: %s, typ: %s, värde funnet: %s, typ: %s"
#~ msgid "too many notes for rest collision"
-#~ msgstr "för många toner för pauskrock"
-
-#~ msgid "Scheme options:"
-#~ msgstr "Scheme-alternativ:"
+#~ msgstr "för många toner för pauskrock"
#~ msgid "Putting slur over rest. Ignoring."
-#~ msgstr "Sätter båge över paus. Ignorerar."
+#~ msgstr "Sätter legatobåge över paus. Ignorerar."
#~ msgid "Slur over rest?"
-#~ msgstr "Båge över paus?"
+#~ msgstr "Legatobåge över paus?"
#~ msgid "Text_spanner too small"
-#~ msgstr "Textbryggare för liten"
+#~ msgstr "Textbryggare för liten"
#~ msgid "Can't find property type-check for `%s'. Perhaps you made a typing error? Doing assignment anyway."
-#~ msgstr "Kan inte hitta egenskapstypkontroll för \"%s\". Kanske har du gjort ett typfel? Gör tilldelning i alla fall."
+#~ msgstr "Kan inte hitta egenskapstypkontroll för â%sâ. Kanske har du gjort ett typfel? Gör tilldelning i alla fall."
#~ msgid "ly-get-trans-property: expecting a Translator_group argument"
-#~ msgstr "ly-get-trans-property: väntade ett Translator_group-argument"
+#~ msgstr "ly-get-trans-property: väntade ett Translator_group-argument"
#~ msgid "Expecting %d arguments"
-#~ msgstr "Väntade %d argument"
+#~ msgstr "Väntade %d argument"
#~ msgid "Can't specify direction for this request"
-#~ msgstr "Kan inte ange riktning för denna förfrågan"
+#~ msgstr "Kan inte ange riktning för denna förfrågan"
#~ msgid "Oldest supported input version: %s"
-#~ msgstr "Äldsta indataversion som stöds: %s"
+#~ msgstr "Ãldsta indataversion som stöds: %s"
#~ msgid "#32 in quarter: %d"
-#~ msgstr "#32 i fjärdedel: %d"
-
-#~ msgid "LY output to `%s'..."
-#~ msgstr "LY-utdata till \"%s\"..."
+#~ msgstr "#32 i fjärdedel: %d"
#~ msgid "track %d:"
-#~ msgstr "spår %d:"
-
-#~ msgid "Processing..."
-#~ msgstr "Behandlar..."
-
-#~ msgid "Creating voices..."
-#~ msgstr "Skapar stämmor..."
+#~ msgstr "spår %d:"
#~ msgid "track "
-#~ msgstr "spår "
+#~ msgstr "spår "
#~ msgid "NOT Filtering tempo..."
-#~ msgstr "Filtrerar INTE tempo..."
+#~ msgstr "Filtrerar INTE tempoâ¦"
#~ msgid "NOT Quantifying columns..."
-#~ msgstr "Kvantifierar INTE kolumner..."
+#~ msgstr "Kvantifierar INTE kolumnerâ¦"
#~ msgid "Quantifying columns..."
-#~ msgstr "Kvantifierar kolumner..."
+#~ msgstr "Kvantifierar kolumnerâ¦"
#~ msgid "Settling columns..."
-#~ msgstr "Bestämmer kolumner..."
+#~ msgstr "Bestämmer kolumnerâ¦"
#~ msgid "% MIDI copyright:"
#~ msgstr "% MIDI-copyright:"
@@ -2524,10 +4947,10 @@ msgstr "Fundera p
#~ msgstr "% MIDI-instrument:"
#~ msgid "lily indent level: %d"
-#~ msgstr "indenteringsnivå för lily: %d"
+#~ msgstr "indenteringsnivå för lily: %d"
-# Kanske man inte ska översätta, men då får de ta bort _() i stället för
-# att skriva en fånig kommentar
+# Kanske man inte ska översätta, men då får de ta bort _() i stället för
+# att skriva en fånig kommentar
#~ msgid "% Creator: "
#~ msgstr "% Skapare: "
@@ -2535,19 +4958,19 @@ msgstr "Fundera p
#~ msgstr "% Automatgenererad"
#~ msgid "% from input file: "
-#~ msgstr "% från indatafil: "
+#~ msgstr "% från indatafil: "
#~ msgid "write exact durations, e.g.: a4*385/384"
-#~ msgstr "skriv exakta länger, t.ex: a4*385/384"
+#~ msgstr "skriv exakta länger, t.ex: a4*385/384"
#~ msgid "enable debugging output"
-#~ msgstr "slå på felsökningsutdata"
+#~ msgstr "slå på felsökningsutdata"
#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
-#~ msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
+#~ msgstr "mata inte ut tupler, dubbelpunkteringar eller pauser, minsta är 32"
#~ msgid "set FILE as default output"
-#~ msgstr "sätt FIL som standardutdata"
+#~ msgstr "sätt FIL som standardutdata"
#~ msgid "be quiet"
#~ msgstr "var tyst"
@@ -2556,22 +4979,19 @@ msgstr "Fundera p
#~ msgstr "mata inte ut pauser eller hopp"
#~ msgid "set smallest duration"
-#~ msgstr "ställ in minsta längd"
+#~ msgstr "ställ in minsta längd"
#~ msgid "don't timestamp the output"
-#~ msgstr "tidsstämpla inte utdata"
-
-#~ msgid "be verbose"
-#~ msgstr "var utförlig"
+#~ msgstr "tidsstämpla inte utdata"
#~ msgid "assume no double dotted notes"
#~ msgstr "anta inga dubbelpunkterade noter"
#~ msgid "Usage: %s [OPTION]... [FILE]"
-#~ msgstr "Användning: %s [FLAGGA]... [FIL]"
+#~ msgstr "Användning: %s [FLAGGA]⦠[FIL]"
#~ msgid "Translate MIDI-file to lilypond"
-#~ msgstr "Översätt MIDI-fil till lilypond"
+#~ msgstr "Ãversätt MIDI-fil till lilypond"
#~ msgid "no_double_dots: %d\n"
#~ msgstr "no_double_dots: %d\n"
@@ -2589,37 +5009,28 @@ msgstr "Fundera p
#~ msgstr "no_tuplets: %d\n"
#~ msgid "zero length string encountered"
-#~ msgstr "sträng med längd noll påträffad"
-
-#~ msgid "MIDI header expected"
-#~ msgstr "väntade MIDI-rubrik"
+#~ msgstr "sträng med längd noll påträffad"
#~ msgid "invalid header length"
-#~ msgstr "felaktig rubriklängd"
+#~ msgstr "felaktig rubriklängd"
#~ msgid "invalid MIDI format"
#~ msgstr "ogiltigt MIDI-format"
#~ msgid "invalid number of tracks"
-#~ msgstr "ogiltigt antal spår"
+#~ msgstr "ogiltigt antal spår"
#~ msgid "can't handle non-metrical time"
#~ msgstr "kan inte hantera icke-metrisk tid"
#~ msgid "Junking note-end event: channel = %d, pitch = %d"
-#~ msgstr "Slänger notslutshändelse: kanal = %d, ton = %d"
+#~ msgstr "Slänger notslutshändelse: kanal = %d, ton = %d"
#~ msgid "invalid running status"
-#~ msgstr "ogiltig körstatus"
-
-#~ msgid "unimplemented MIDI meta-event"
-#~ msgstr "oimplementerad MIDI-metahändelse"
+#~ msgstr "ogiltig körstatus"
#~ msgid "invalid MIDI event"
-#~ msgstr "ogiltig MIDI-händelse"
-
-#~ msgid "MIDI track expected"
-#~ msgstr "väntade MIDI-spår"
+#~ msgstr "ogiltig MIDI-händelse"
#~ msgid "invalid track length"
-#~ msgstr "ogiltig spårlängd"
+#~ msgstr "ogiltig spårlängd"
diff --git a/scm/chord-entry.scm b/scm/chord-entry.scm
index 23601a8dea..76897afc47 100644
--- a/scm/chord-entry.scm
+++ b/scm/chord-entry.scm
@@ -153,7 +153,7 @@ the bass specified.
;; if sus has been given neither 2 or 4, we add 4.
(if (and (eq? lead-mod sus-modifier)
(not explicit-2/4))
- (set! complete-chord (cons (ly:make-pitch 0 4 0) complete-chord)))
+ (set! complete-chord (cons (ly:make-pitch 0 3 0) complete-chord)))
(set! complete-chord (sort complete-chord ly:pitch<?))
;; If natural 11 + natural 3 is present, but not given explicitly,
;; we remove the 11.
diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index 35347ae150..bbc8939e02 100644
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -18,7 +18,7 @@
(define (doc-markup-function-properties func)
- (let ((properties (hashq-ref markup-functions-properties func))
+ (let ((properties (markup-function-properties func))
(prop-strings (list)))
(for-each (lambda (prop-spec)
(set! prop-strings
@@ -41,16 +41,17 @@
(or properties (list)))
prop-strings))
-(define (doc-markup-function func)
- (let* ((full-doc (procedure-documentation func))
+(define (doc-markup-function func-pair)
+ (let* ((f-name (symbol->string (car func-pair)))
+ (func (cdr func-pair))
+ (full-doc (procedure-documentation func))
(match-args (and full-doc (string-match "^\\([^)]*\\)\n" full-doc)))
(arg-names (if match-args
(with-input-from-string (match:string match-args) read)
(circular-list "arg")))
(doc-str (if match-args (match:suffix match-args) full-doc))
- (f-name (symbol->string (procedure-name func)))
(c-name (regexp-substitute/global #f "-markup(-list)?$" f-name 'pre "" 'post))
- (sig (object-property func 'markup-signature))
+ (sig (markup-command-signature func))
(sig-type-names (map type-name sig))
(signature-str
(string-join
@@ -73,19 +74,41 @@
(string-concatenate prop-strings)
"@end itemize\n"))))))
-(define (markup-function<? a b)
- (ly:string-ci<? (symbol->string (procedure-name a)) (symbol->string (procedure-name b))))
+(define (markup-name<? a b)
+ (ly:string-ci<? (symbol->string (car a)) (symbol->string (car b))))
+
+(define all-markup-commands '())
+(define all-markup-list-commands '())
+
+(for-each
+ (lambda (m)
+ (module-for-each (lambda (sym var)
+ (let ((val (variable-ref var)))
+ (cond ((markup-function? val)
+ (set! all-markup-commands
+ (acons sym val all-markup-commands)))
+ ((markup-list-function? val)
+ (set! all-markup-list-commands
+ (acons sym val all-markup-list-commands))))))
+ (module-public-interface m)))
+ (cons (current-module) (map resolve-module '((lily) (scm accreg)))))
+
+(set! all-markup-commands (sort! all-markup-commands markup-name<?))
+(set! all-markup-list-commands (sort! all-markup-list-commands markup-name<?))
(define (markup-category-doc-node category)
(let* ((category-string (symbol->string category))
(category-name (string-capitalize
(regexp-substitute/global
#f "-" category-string 'pre " " 'post)))
- (markup-functions (hash-fold (lambda (markup-function dummy functions)
- (cons markup-function functions))
- '()
- (hashq-ref markup-functions-by-category
- category))))
+ (markup-functions (filter
+ (lambda (fun)
+ (let ((cats (markup-function-category (cdr fun))))
+ (if (pair? cats)
+ (memq category cats)
+ (eq? category cats))))
+ all-markup-commands)))
+
(make <texi-node>
#:appendix #t
#:name category-name
@@ -93,8 +116,7 @@
#:text (string-append
"@table @asis"
(string-concatenate
- (map doc-markup-function
- (sort markup-functions markup-function<?)))
+ (map doc-markup-function markup-functions))
"\n@end table"))))
(define (markup-doc-node)
@@ -105,24 +127,26 @@
#:text "The following commands can all be used inside @code{\\markup @{ @}}."
#:children (let* (;; when a new category is defined, update `ordered-categories'
(ordered-categories '(font align graphic music instrument-specific-markup accordion-registers other))
- (raw-categories (hash-fold (lambda (category functions categories)
- (cons category categories))
- (list)
- markup-functions-by-category))
+ (raw-categories
+ (fold (lambda (next union)
+ (let ((cat (markup-function-category next)))
+ (cond ((pair? cat)
+ (lset-union eq? cat union))
+ ((symbol? cat)
+ (lset-adjoin eq? cat union))
+ (else union))))
+ '()
+ all-markup-commands))
(categories (append ordered-categories
- (filter (lambda (cat)
- (not (memq cat ordered-categories)))
- raw-categories))))
+ (sort (lset-difference eq?
+ raw-categories
+ ordered-categories)
+ symbol<?))))
(map markup-category-doc-node categories))))
(define (markup-list-doc-string)
(string-append
"@table @asis"
(string-concatenate
- (map doc-markup-function
- (sort (hash-fold (lambda (markup-list-function dummy functions)
- (cons markup-list-function functions))
- '()
- markup-list-functions)
- markup-function<?)))
+ (map doc-markup-function all-markup-list-commands))
"\n@end table"))
diff --git a/scm/markup-macros.scm b/scm/markup-macros.scm
index 6c50ec5128..46bae0c51d 100644
--- a/scm/markup-macros.scm
+++ b/scm/markup-macros.scm
@@ -47,38 +47,32 @@ The command is now available in markup mode, e.g.
;;; markup definer utilities
;; For documentation purposes
-;; category -> markup functions
-(define-public markup-functions-by-category (make-hash-table 150))
+;; markup function -> categories
+(define-public markup-function-category (make-object-property))
;; markup function -> used properties
-(define-public markup-functions-properties (make-weak-key-hash-table 151))
-;; List of markup list functions
-(define-public markup-list-functions (make-weak-key-hash-table 151))
+(define-public markup-function-properties (make-object-property))
(use-modules (ice-9 optargs))
-(defmacro*-public define-markup-command
- (command-and-args signature
- #:key (category '()) (properties '())
- #:rest body)
+(defmacro-public define-markup-command (command-and-args . definition)
"
-* Define a COMMAND-markup function after command-and-args and body,
-register COMMAND-markup and its signature,
+* Define a COMMAND-markup function after command-and-args and body
-* add COMMAND-markup to markup-functions-by-category,
+* add categories to markup-function-category,
-* sets COMMAND-markup markup-signature object property,
+* sets the markup-signature object property,
* define a make-COMMAND-markup function.
Syntax:
(define-markup-command (COMMAND layout props . arguments)
- argument-types
+ signature
[ #:properties properties ]
\"documentation string\"
...command body...)
where:
- `argument-types' is a list of type predicates for arguments
+ `signature' is a list of type predicates for arguments
`properties' a list of (property default-value) lists
The specified properties are available as let-bound variables in the
@@ -90,11 +84,11 @@ markup functions, you need to adjust `props' yourself.
The autogenerated documentation makes use of some optional
specifications that are otherwise ignored:
-After `argument-types', you may also specify
+After `signature', you may also specify
[ #:category category ]
where:
`category' is either a symbol or a symbol list specifying the
- category for this markup command in the docs.
+ categories for this markup command in the docs.
As an element of the `properties' list, you may directly use a
COMMANDx-markup symbol instead of a `(prop value)' list to indicate
@@ -102,112 +96,94 @@ that this markup command is called by the newly defined command,
adding its properties to the documented properties of the new
command. There is no protection against circular definitions.
"
- (let* ((command (car command-and-args))
- (args (cdr command-and-args))
+ (let* ((command (if (pair? command-and-args)
+ (car command-and-args)
+ command-and-args))
+ (args (and (pair? command-and-args) (cdr command-and-args)))
(command-name (string->symbol (format #f "~a-markup" command)))
(make-markup-name (string->symbol (format #f "make-~a-markup" command))))
- (while (and (pair? body) (keyword? (car body)))
- (set! body (cddr body)))
`(begin
- ;; define the COMMAND-markup function
- ,(let* ((documentation
- (format #f "~a\n~a" (cddr args)
- (if (string? (car body)) (car body) "")))
- (real-body (if (or (not (string? (car body)))
- (null? (cdr body)))
- body (cdr body))))
- `(define-public (,command-name ,@args)
+ ,(if args
+ `(define-public ,command-name (markup-lambda ,args ,@definition))
+ `(define-public ,command-name ,@definition))
+ (define-public (,make-markup-name . args)
+ (,make-markup ,command-name ,(symbol->string make-markup-name) args)))))
+
+
+(defmacro*-public markup-lambda
+ (args signature
+ #:key (category '()) (properties '())
+ #:rest body)
+ "Defines and returns an anonymous markup command. Other than
+not registering the markup command, this is identical to
+`define-markup-command`"
+ (while (and (pair? body) (keyword? (car body)))
+ (set! body (cddr body)))
+ ;; define the COMMAND-markup function
+ (let* ((documentation
+ (format #f "~a\n~a" (cddr args)
+ (if (string? (car body)) (car body) "")))
+ (real-body (if (or (not (string? (car body)))
+ (null? (cdr body)))
+ body (cdr body)))
+ (result
+ `(lambda ,args
,documentation
(let ,(map (lambda (prop-spec)
(let ((prop (car prop-spec))
- (default-value (if (null? (cdr prop-spec))
- #f
- (cadr prop-spec)))
+ (default-value (and (pair? (cdr prop-spec))
+ (cadr prop-spec)))
(props (cadr args)))
`(,prop (chain-assoc-get ',prop ,props ,default-value))))
(filter pair? properties))
- ,@real-body)))
- (set! (markup-command-signature ,command-name) (list ,@signature))
- ;; Register the new function, for markup documentation
- ,@(map (lambda (category)
- `(hashq-set!
- (or (hashq-ref markup-functions-by-category ',category)
- (let ((hash (make-weak-key-hash-table 151)))
- (hashq-set! markup-functions-by-category ',category
- hash)
- hash))
- ,command-name #t))
- (if (list? category) category (list category)))
- ;; Used properties, for markup documentation
- (hashq-set! markup-functions-properties
- ,command-name
- (list ,@(map (lambda (prop-spec)
- (cond ((symbol? prop-spec)
- prop-spec)
- ((not (null? (cdr prop-spec)))
- `(list ',(car prop-spec) ,(cadr prop-spec)))
- (else
- `(list ',(car prop-spec)))))
- (if (pair? args)
- properties
- (list)))))
- ;; define the make-COMMAND-markup function
- (define-public (,make-markup-name . args)
- (let ((sig (list ,@signature)))
- (make-markup ,command-name ,(symbol->string make-markup-name) sig args))))))
-
-(defmacro*-public define-markup-list-command
- (command-and-args signature #:key (properties '()) #:rest body)
+ ,@real-body))))
+ (define (markup-lambda-worker command signature properties category)
+ (set! (markup-command-signature command) signature)
+ ;; Register the new function, for markup documentation
+ (set! (markup-function-category command) category)
+ ;; Used properties, for markup documentation
+ (set! (markup-function-properties command) properties)
+ command)
+ `(,markup-lambda-worker
+ ,result
+ (list ,@signature)
+ (list ,@(map (lambda (prop-spec)
+ (cond ((symbol? prop-spec)
+ prop-spec)
+ ((not (null? (cdr prop-spec)))
+ `(list ',(car prop-spec) ,(cadr prop-spec)))
+ (else
+ `(list ',(car prop-spec)))))
+ properties))
+ ',category)))
+
+(defmacro-public define-markup-list-command
+ (command-and-args . definition)
"Same as `define-markup-command', but defines a command that, when
interpreted, returns a list of stencils instead of a single one"
- (let* ((command (car command-and-args))
- (args (cdr command-and-args))
+ (let* ((command (if (pair? command-and-args)
+ (car command-and-args)
+ command-and-args))
+ (args (and (pair? command-and-args) (cdr command-and-args)))
(command-name (string->symbol (format #f "~a-markup-list" command)))
(make-markup-name (string->symbol (format #f "make-~a-markup-list" command))))
- (while (and (pair? body) (keyword? (car body)))
- (set! body (cddr body)))
`(begin
- ;; define the COMMAND-markup-list function
- ,(let* ((documentation
- (format #f "~a\n~a" (cddr args)
- (if (string? (car body)) (car body) "")))
- (real-body (if (or (not (string? (car body)))
- (null? (cdr body)))
- body (cdr body))))
- `(define-public (,command-name ,@args)
- ,documentation
- (let ,(map (lambda (prop-spec)
- (let ((prop (car prop-spec))
- (default-value (if (null? (cdr prop-spec))
- #f
- (cadr prop-spec)))
- (props (cadr args)))
- `(,prop (chain-assoc-get ',prop ,props ,default-value))))
- (filter pair? properties))
- ,@real-body)))
- (set! (markup-command-signature ,command-name) (list ,@signature))
- ;; add the command to markup-list-function-list, for markup documentation
- (hashq-set! markup-list-functions ,command-name #t)
- ;; Used properties, for markup documentation
- (hashq-set! markup-functions-properties
- ,command-name
- (list ,@(map (lambda (prop-spec)
- (cond ((symbol? prop-spec)
- prop-spec)
- ((not (null? (cdr prop-spec)))
- `(list ',(car prop-spec) ,(cadr prop-spec)))
- (else
- `(list ',(car prop-spec)))))
- (if (pair? args)
- properties
- (list)))))
- ;; it's a markup-list command:
- (set-object-property! ,command-name 'markup-list-command #t)
- ;; define the make-COMMAND-markup-list function
+ ,(if args
+ `(define-public ,command-name (markup-list-lambda ,args ,@definition))
+ `(define-public ,command-name ,@definition))
(define-public (,make-markup-name . args)
- (let ((sig (list ,@signature)))
- (list (make-markup ,command-name
- ,(symbol->string make-markup-name) sig args)))))))
+ (list (,make-markup ,command-name
+ ,(symbol->string make-markup-name) args))))))
+
+(defmacro*-public markup-list-lambda
+ (arg signature #:key (properties '()) #:rest body)
+ "Same as `markup-lambda' but defines a markup list command that, when
+interpreted, returns a list of stencils instead of a single one"
+ (let () ; Guile 1.8 defmacro* workaround
+ (define (markup-lambda-listify fun)
+ (set! (markup-list-function? fun) #t)
+ fun)
+ (list markup-lambda-listify (cons* 'markup-lambda arg signature body))))
;;;;;;;;;;;;;;;
;;; Utilities for storing and accessing markup commands signature
@@ -220,29 +196,16 @@ interpreted, returns a list of stencils instead of a single one"
;;; ==> (#<primitive-procedure number?> #<procedure markup? (obj)>)
;;;
-(define-public (markup-command-signature-ref markup-command)
- "Return markup-command's signature (the 'markup-signature object property)"
- (object-property markup-command 'markup-signature))
-
-(define-public (markup-command-signature-set! markup-command signature)
- "Set markup-command's signature (as object property)"
- (set-object-property! markup-command 'markup-signature signature)
- signature)
-
-(define-public markup-command-signature
- (make-procedure-with-setter markup-command-signature-ref
- markup-command-signature-set!))
+(define-public markup-command-signature (make-object-property))
;;;;;;;;;;;;;;;;;;;;;;
;;; markup type predicates
(define-public (markup-function? x)
(and (markup-command-signature x)
- (not (object-property x 'markup-list-command))))
+ (not (markup-list-function? x))))
-(define-public (markup-list-function? x)
- (and (markup-command-signature x)
- (object-property x 'markup-list-command)))
+(define-public markup-list-function? (make-object-property))
(define-public (markup-command-list? x)
"Determine if `x' is a markup command list, ie. a list composed of
@@ -317,11 +280,14 @@ Uncovered - cheap-markup? is used."
;;
(define-public markup? cheap-markup?)
-(define-public (make-markup markup-function make-name signature args)
+(define (make-markup markup-function make-name args)
" Construct a markup object from MARKUP-FUNCTION and ARGS. Typecheck
-against SIGNATURE, reporting MAKE-NAME as the user-invoked function.
+against signature, reporting MAKE-NAME as the user-invoked function.
"
(let* ((arglen (length args))
+ (signature (or (markup-command-signature markup-function)
+ (ly:error (_ "~S: Not a markup (list) function: ~S")
+ make-name markup-function)))
(siglen (length signature))
(error-msg (if (and (> siglen 0) (> arglen 0))
(markup-argument-list-error signature args 1)
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 5bbd07ea8f..1c6f55ceda 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1087,6 +1087,10 @@ actually fully cloned."
(apply ly:input-warning ip msg rest)
(apply ly:warning msg rest))))
+(define-public (ly:music-error music msg . rest)
+ (ly:parser-error (apply format #f msg rest)
+ (ly:music-property music 'origin)))
+
(define-public (ly:event-warning event msg . rest)
(let ((ip (ly:event-property event 'origin)))
(if (ly:input-location? ip)
@@ -2170,13 +2174,11 @@ retaining only the chord articulations. Returns the modified music."
'duration dur
'articulations full-arts))
(else
- (ly:music-error m (_ "Missing duration"))
- (make-music 'NoteEvent
- 'duration (ly:make-duration 2 0 0)
- 'articulations full-arts))))))
+ ;; This is an empty chord. Ugh. We cannot really
+ ;; reduce this in any manner, so we just keep it.
+ m)))))
music))
-
(defmacro-public make-relative (variables reference music)
"The list of pitch or music variables in @var{variables} is used as
a sequence for creating relativable music from @var{music}.
diff --git a/scm/scheme-engravers.scm b/scm/scheme-engravers.scm
index b2966d79e6..07b2585108 100644
--- a/scm/scheme-engravers.scm
+++ b/scm/scheme-engravers.scm
@@ -201,3 +201,15 @@ if there were one voice."
(set! mmrests (cons curr-mmrests mmrests))))
((finalize translator)
(for-each merge-mmrests mmrests)))))
+
+(ly:register-translator
+ Merge_rests_engraver 'Merge_rests_engraver
+ '((grobs-created . ())
+ (events-accepted . ())
+ (properties-read . (suspendRestMerging))
+ (properties-written . ())
+ (description . "\
+Engraver to merge rests in multiple voices on the same staff. This works by
+gathering all rests at a time step. If they are all of the same length and
+there are at least two they are moved to the correct location as if there were
+one voice.")))
--
2.39.5