### Web site idiosyncrases
-$(outdir)/web/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
-$(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
+# now all handled by the init file.
+
### bad hack for badly-integrated roadmap.
$(outdir)/ROADMAP:
@item
@@var - Use for variables.
+@item
+@@version@{@} - Return the current LilyPond version string
+
@item
@@warning@{@} - produces a "Note: " box. Use for important messages.
@menu
* Organizing pieces with variables::
-* Version number::
* Adding titles::
* Absolute note names::
* After the tutorial::
@end example
-@node Version number
-@subsection Version number
-
-@cindex versioning
-@cindex version
-@cindex version number
-@cindex upgrades
-@cindex future upgrades
-@cindex updating files
-@cindex files, updating
-
-@funindex \version
-@funindex version
-@funindex convert-ly
-
-The @code{\version} statement records the version of LilyPond that
-was used to write the file:
-
-@example
-\version @w{"@version{}"}
-@end example
-
-@noindent
-By convention, this is placed at the top of your LilyPond file.
-
-These annotations make future upgrades of LilyPond go more
-smoothly. Changes in the syntax are handled with a special
-program, @command{convert-ly}, and it uses @code{\version} to
-determine what rules to apply. For details, see
-@rprogram{Updating files with convert-ly}.
-
-
@node Adding titles
@subsection Adding titles
This example shows a simple input file:
@example
+\version "@w{@version{}}"
@{
c' e' g' e'
@}
@subheading Producing output
-@c TODO: move index entries
@cindex PDF file
@cindex viewing music
@cindex text editors
-@cindex running LilyPond under MacOS X
-@cindex MacOS X, running LilyPond
-@cindex running LilyPond under Windows
-@cindex Windows, running LilyPond
-@cindex running LilyPond under Unix
-@cindex Unix, running LilyPond
The method of producing output depends on your operating system
and the program(s) you use.
minute or two because all of the system fonts have to be analyzed
first. After this, LilyPond will be much faster!}
+@cindex running LilyPond under MacOS X
+@cindex MacOS X, running LilyPond
@node MacOS X
@subsection MacOS X
from a previous compilation open, then any further compilations
may fail to generate an update PDF until you close the original.
+@cindex running LilyPond under Windows
+@cindex Windows, running LilyPond
@node Windows
@subsection Windows
PDF if you wish to make a new compilation as it may fail to create
the new PDF while it is still being viewed.
+@cindex running LilyPond under Unix
+@cindex Unix, running LilyPond
@node Command-line
@subsection Command-line
Create a text file called @file{test.ly} and enter:
@example
+\version "@w{@version{}}"
@{
c' e' g' e'
@}
@subsubheading Step 2. Compile (with command-line)
-To process @file{test.ly}, proceed as follows:
+To process @file{test.ly}, type the following at the command prompt:
@example
lilypond test.ly
You will see something resembling:
@example
-lilypond test.ly
GNU LilyPond @version{}
Processing `test.ly'
Parsing...
Interpreting music...
Preprocessing graphical objects...
-Finding the ideal number of pages...
-Fitting music on 1 page...
+Solving 1 page-breaking chunks...[1: 1 pages]
Drawing systems...
Layout output to `test.ps'...
-Converting to `test.pdf'...
+Converting to `./test.pdf'...
@end example
@subsubheading Step 3. View output
@cindex case sensitive
@cindex whitespace insensitive
@cindex expressions
+@cindex versioning
+@cindex version
+@cindex version number
+@funindex \version
@funindex { ... }
@funindex %
@funindex %@{ ... %@}
LilyPond input files are similar to source files in many common
-programming languages. They are case sensitive, and white-space
+programming languages. They contain a version statement,
+are case sensitive, and white-space
is generally ignored. Expressions are formed with curly braces
@{ @}, and comments are denoted with @code{%} or
@w{@code{%@{ ... %@}}}.
@itemize
+@item
+@strong{Version statement}:
+Every LilyPond file should contain a version statement. A version
+statement is a line that describes the version of LilyPond for which
+the file was written, as in the following example:
+
+@example
+\version "@w{@version{}}"
+@end example
+
+By convention, the version statement is placed at the top of the
+LilyPond file.
+
+The version statement is important for at least two reasons. First,
+it allows automatic updating of the input file as LilyPond syntax
+changes. Second, it describes the version of LilyPond needed to
+compile the file.
+
+If the version statement is omitted from an input file, LilyPond will print
+a warning during the compilation of the file.
+
@item
@strong{Case sensitive}:
it matters whether you enter a letter in lower case (e.g.
online version.
@menu
-* Omitting braces::
+* Omitted material::
* Clickable examples::
* Keyboard navigation::
* Overview of manuals::
@end menu
-@node Omitting braces
-@subsection Omitting braces
+@node Omitted material
+@subsection Omitted material
@cindex how to read the manual
own. Most people want to add material to an existing piece, so we
format the manual this way.
+Also, remember that every LilyPond file should have a @code{@bs{}version}
+statement. Because the examples in the manuals are snippets, not files,
+the @code{@bs{}version} statement is omitted. But you should make a
+practice of including them in your files.
@node Clickable examples
@subsection Clickable examples
printable area (ie. the top of the bottom margin).
See @var{after-title-spacing}.
-@item foot-separation
-@funindex foot-separation
-
-Distance between the bottom-most music system and the page
-footer. Default: @code{4\mm}.
-
@item top-title-spacing
@funindex top-title-spacing
like a staff. Conversely, setting @var{staff-affinity} for a staff will
cause it to be treated like a non-staff.
-@c FIXME: is it possible to have @example inside @warning?
-@c @warning{ Adjacent non-staff lines should have non-increasing
-@c @var{staff-affinity} from top-to-bottom. For example, the behavior of
-@c @example
-@c <<
-@c \new Staff c
-@c \new Lyrics \with @{ \override VerticalAxisGroup #'staff-affinity = #DOWN @}
-@c \new Lyrics \with @{ \override VerticalAxisGroup #'staff-affinity = #UP @}
-@c \new Staff c
-@c >>
-@c @end example
-@c is undefined.
-@c }
-
-@warning{A non-staff line at the bottom of a system should have
-@var{staff-affinity} set to @code{UP}. Similarly, a non-staff
-line at the top of a system should have @var{staff-affinity} set
-to @code{DOWN}.
-}
-
Non-staff lines admit three properties to control their spacing. Each
of the these properties is an alist of the same format as
@var{next-staff-spacing}, above.
@rinternals{VerticalAlignment},
@rinternals{Axis_group_engraver}.
-
-@node Vertical spacing between systems
-@subsection Vertical spacing between systems
-
-Space between systems are controlled by four @code{\paper} variables,
-
+@knownissues
+Adjacent non-staff lines should have non-increasing
+@var{staff-affinity} from top-to-bottom. For example, the behavior of
@example
-\paper @{
- between-system-space = 1.5\cm
- between-system-padding = #1
- ragged-bottom=##f
- ragged-last-bottom=##f
-@}
+<<
+ \new Staff c
+ \new Lyrics \with @{ \override VerticalAxisGroup #'staff-affinity = #DOWN @}
+ \new Lyrics \with @{ \override VerticalAxisGroup #'staff-affinity = #UP @}
+ \new Staff c
+>>
@end example
+is undefined.
-When only a couple of flat systems are placed on a page, the resulting
-vertical spacing may be non-elegant: one system at the top of the page,
-and the other at the bottom, with a huge gap between them. To avoid this
-situation, the space added between the systems can be limited. This
-feature is activated by setting to @code{#t} the
-@code{page-limit-inter-system-space} variable in the @code{\paper}
-block. The paper variable @code{page-limit-inter-system-space-factor}
-determines how much the space can be increased: for instance, the value
-@code{1.3} means that the space can be 30% larger than what it would be
-on a ragged-bottom page.
-
-In the following example, if the inter system space were not limited,
-the second system of page 1 would be placed at the page bottom. By
-activating the space limitation, the second system is placed closer to
-the first one. By setting @code{page-limit-inter-system-space-factor} to
-@code{1}, the spacing would the same as on a ragged-bottom page, like
-the last one.
+A non-staff line at the bottom of a system should have
+@var{staff-affinity} set to @code{UP}. Similarly, a non-staff
+line at the top of a system should have @var{staff-affinity} set
+to @code{DOWN}.
-@lilypond[verbatim]
-#(set-default-paper-size "a6")
-\book {
- \paper {
- page-limit-inter-system-space = ##t
- page-limit-inter-system-space-factor = 1.3
-
- oddFooterMarkup = \markup "page bottom"
- evenFooterMarkup = \markup "page bottom"
- oddHeaderMarkup = \markup \fill-line {
- "page top" \fromproperty #'page:page-number-string }
- evenHeaderMarkup = \markup \fill-line {
- "page top" \fromproperty #'page:page-number-string }
- }
- \new Staff << \repeat unfold 4 { g'4 g' g' g' \break }
- { s1*2 \pageBreak } >>
-}
-@end lilypond
+@node Vertical spacing between systems
+@subsection Vertical spacing between systems
+The mechanisms that control spacing between systems are similar to those
+that control spacing between staves within a system (see
+@ref{Vertical spacing inside a system}). The main difference is that
+the variables to control spacing between systems are set in the
+@code{\paper} block, rather than as grob properties. These paper block
+variables are @var{between-system-spacing},
+@var{between-scores-system-spacing}, @var{after-title-spacing},
+@var{before-title-spacing}, @var{between-title-spacing},
+@var{top-system-spacing}, @var{top-system-spacing},
+@var{top-title-spacing} and @var{bottom-system-spacing}. Note that
+these variables ignore non-staff lines. For example,
+@var{between-system-spacing} controls the spacing from the middle staff
+line of the bottom staff from one system to the middle staff line of the
+top staff of the next system, whether or not there are lyrics below the
+upper system. See @ref{Vertical dimensions} for a description of each
+of these variables.
+
+There are two more @code{\paper} block variables that affect vertical
+spacing: if @var{ragged-bottom} is set to @code{##t} then no pages will
+be stretched (which means that neither the space between systems nor the
+space within systems will be stretched). If @var{ragged-last-bottom}
+is set to @code{##t} then the last page will not be stretched.
@seealso
Snippets:
vertical positions on the page.
@code{NonMusicalPaperColumn #'line-break-system-details} accepts an associative
-list of five different settings:
+list of three different settings:
@itemize
@item @code{X-offset}
@item @code{Y-offset}
-@item @code{alignment-offsets}
-@item @code{alignment-extra-space}
-@item @code{fixed-alignment-extra-space}
+@item @code{alignment-distances}
@end itemize
Grob overrides, including the overrides for @code{NonMusicalPaperColumn}
#'line-break-system-details #'((X-offset . 20) (Y-offset . 40))
\overrideProperty NonMusicalPaperColumn
- #'line-break-system-details #'((alignment-offsets . (0 -15)))
+ #'line-break-system-details #'((alignment-distances . (15)))
\overrideProperty NonMusicalPaperColumn
#'line-break-system-details #'((X-offset . 20) (Y-offset . 40)
- (alignment-offsets . (0 -15)))
+ (alignment-distances . (15)))
@end example
To understand how each of these different settings work, we begin
position on the page at which each new system will render.
Now that we have set the vertical startpoint of each system
-explicitly, we can also set the vertical startpoint of each staff
-within each system manually. We do this using the @code{alignment-offsets}
+explicitly, we can also set the vertical distances between staves
+within each system manually. We do this using the @code{alignment-distances}
subproperty of @code{line-break-system-details}.
@lilypond[quote]
\new Voice {
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 20)
- (alignment-offsets . (0 -15)))
+ (alignment-distances . (15)))
s1*5 \break
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 60)
- (alignment-offsets . (0 -15)))
+ (alignment-distances . (15)))
s1*5 \break
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 100)
- (alignment-offsets . (0 -15)))
+ (alignment-distances . (15)))
s1*5 \break
}
\new Voice { \repeat unfold 15 { c'4 c' c' c' } }
@code{line-break-system-details} attribute alist accepts many
additional spacing parameters (including, for example, a corresponding
@code{X-offset} pair), we need only set the @code{Y-offset} and
-@code{alignment-offsets} pairs to control the vertical startpoint of
-every system and every staff. Finally, note that @code{alignment-offsets}
+@code{alignment-distances} pairs to control the vertical startpoint of
+every system and every staff. Finally, note that @code{alignment-distances}
specifies the vertical positioning of staves but not of staff groups.
@lilypond[quote]
\new Voice {
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 0)
- (alignment-offsets . (0 -30 -40)))
+ (alignment-distances . (30 10)))
s1*5 \break
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 60)
- (alignment-offsets . (0 -10 -20)))
+ (alignment-distances . (10 10)))
s1*5 \break
\overrideProperty #"Score.NonMusicalPaperColumn"
#'line-break-system-details #'((Y-offset . 100)
- (alignment-offsets . (0 -10 -40)))
+ (alignment-distances . (10 30)))
s1*5 \break
}
\new Voice { \repeat unfold 15 { c'4 c' c' c' } }
Some points to consider:
@itemize
-@item When using @code{alignment-offsets}, lyrics count as a staff.
+@item When using @code{alignment-distances}, lyrics and other non-staff lines
+do not count as a staff.
@item The units of the numbers passed to @code{X-offset},
-@code{Y-offset} and @code{alignment-offsets} are interpreted as multiples
+@code{Y-offset} and @code{alignment-distances} are interpreted as multiples
of the distance between adjacent staff lines. Positive values move staves
and lyrics up, negative values move staves and lyrics down.
@item
@sourceimage{logo-fedora,,,}
-@uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447
-Fedora: LilyPond 2.12.0}
+@uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447,
+Fedora: LilyPond 2.12.2}
@item
@sourceimage{logo-ubuntu,,,}
@item
@sourceimage{logo-suse,,,}
-@uref{http://download.opensuse.org/repositories/openSUSE:/Factory:/Contrib/standard/
+@uref{http://download.opensuse.org/repositories/openSUSE:/Factory:/Contrib/standard/,
openSUSE: LilyPond 2.12.2}
@end itemize
" or bottom to top. For vertical alignments of staves, the"
" @code{break-system-details} of the left"
" @rinternals{NonMusicalPaperColumn} may be set to tune"
- " vertical spacing. Set @code{alignment-extra-space} to add"
- " extra space for staves. Set"
- " @code{fixed-alignment-extra-space} to force staves in"
- " @code{PianoStaff}s further apart.",
+ " vertical spacing.",
/* properties */
"align-dir "
#include "context.hh"
#include "stream-event.hh"
#include "translator.icc"
-// #include "international.hh"
-#include <deque>
+#include <list>
-struct Head_event_tuple
+struct Head_audio_event_tuple
{
Audio_element_info head_;
- Moment moment_;
- Head_event_tuple () { }
- Head_event_tuple (Audio_element_info h, Moment m)
+ // The end moment of the note, so we can calculate a skip and check whether
+ // the note still goes on
+ Moment end_moment_;
+ Head_audio_event_tuple () {}
+ Head_audio_event_tuple (Audio_element_info h, Moment m)
{
head_ = h;
- moment_ = m;
+ end_moment_ = m;
}
};
class Tie_performer : public Performer
{
Stream_event *event_;
- // We don't really need a deque here. A vector would suffice. However,
- // for some strange reason, using vectors always leads to memory
- // corruption in the STL templates! (i.e. after the first
- // now_heads_.push_back (inf_mom), the now_heads_.size() will be
- // something like 3303820998 :(
- deque<Head_event_tuple> now_heads_;
- deque<Head_event_tuple> now_tied_heads_;
- deque<Head_event_tuple> heads_to_tie_;
+ list<Head_audio_event_tuple> now_heads_;
+ list<Head_audio_event_tuple> now_tied_heads_; // new tied notes
+ list<Head_audio_event_tuple> heads_to_tie_; // heads waiting for closing tie
protected:
void stop_translation_timestep ();
{
if (Audio_note *an = dynamic_cast<Audio_note *> (inf.elem_))
{
-// message (_f ("acknowledge_audio_element, Size of now_heads_=%d", now_heads_.size ()));
- Head_event_tuple inf_mom (inf, now_mom ());
+ // for each tied note, store the info and its end moment, so we can
+ // later on check whether (1) the note is still ongoing and (2) how
+ // long the skip is with tieWaitForNote
+ Head_audio_event_tuple inf_mom (inf, now_mom () + an->length_mom_);
if (an->tie_event_)
now_tied_heads_.push_back (inf_mom);
else
now_heads_.push_back (inf_mom);
-// message (_f ("acknowledge_audio_element, added, Size of now_heads_=%d", now_heads_.size ()));
// Find a previous note that ties to the current note. If it exists,
// remove it from the heads_to_tie vector and create the tie
- deque<Head_event_tuple>::iterator it;
+ list<Head_audio_event_tuple>::iterator it;
bool found = false;
Stream_event *right_mus = inf.event_;
- for ( it = heads_to_tie_.begin() ; (!found) && (it < heads_to_tie_.end()); it++ )
- {
+ for (it = heads_to_tie_.begin ();
+ !found && (it != heads_to_tie_.end());
+ it++)
+ {
Audio_element_info et = (*it).head_;
Audio_note *th = dynamic_cast<Audio_note *> (et.elem_);
Stream_event *left_mus = et.event_;
left_mus->get_property ("pitch")))
{
found = true;
- Moment skip = now_mom() - (*it).moment_ - th->length_mom_;
+ // (*it).moment_ already stores the end of the tied note!
+ Moment skip = now_mom() - (*it).end_moment_;
an->tie_to (th, skip);
// this invalidates the iterator, we are leaving the loop anyway
heads_to_tie_.erase (it);
ly_bool2scm (heads_to_tie_.size ()));
}
+// a predicate implemented as a class, used to delete all tied notes with end
+// moment in the past:
+class end_moment_passed
+{
+protected:
+ Moment now;
+public:
+ end_moment_passed (Moment mom) : now (mom) {}
+ bool operator() (const Head_audio_event_tuple &value) {
+ return (value.end_moment_ <= now);
+ }
+};
+
void
Tie_performer::stop_translation_timestep ()
{
- // We might have dangling open ties like c~ d. Close them, unless we have
- // tieWaitForNote set...
+ // We might have dangling open ties like c~ d. Close them, unless the first
+ // note is still ongoing or we have we have tieWaitForNote set...
if (!to_boolean (get_property ("tieWaitForNote")))
{
- heads_to_tie_.clear ();
+ heads_to_tie_.remove_if (end_moment_passed (now_mom ()));
}
+ // Append now_heads_ and now_tied_heads to heads_to_tie_ for the next time step
if (event_)
{
- for (vsize i = now_heads_.size (); i--;)
- heads_to_tie_.push_back (now_heads_[i]);
+ heads_to_tie_.splice (heads_to_tie_.end (), now_heads_);
}
-
- for (vsize i = now_tied_heads_.size (); i--;)
- heads_to_tie_.push_back (now_tied_heads_[i]);
+ heads_to_tie_.splice (heads_to_tie_.end (), now_tied_heads_);
event_ = 0;
now_heads_.clear ();
blank-after-score-page-force = 2
blank-page-force = 5
- %%
- %% To limit space between systems on a page with a lot of space left
- %%
- page-limit-inter-system-space = ##f
- page-limit-inter-system-space-factor = 1.4
-
#(define font-defaults
'((font-family . feta) (font-encoding . fetaMusic)))
TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
-WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
-TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
-
-$(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\
- TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
-$(XREF_MAPS_DIR)/web.$(ISOLANG).xref-map:\
- XREF_MAP_FLAGS += --split=node
+TEXI2HTML_SPLIT = --prefix=index --split=section
TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT)
"version taken from the \\version command, to the current LilyPond version."
msgstr ""
"Actualiseer LilyPond invoer naar nieuwere versie. Standaard, actualiseer\n"
-"vanaf versie uit de \\versie uitdrukking, naar de huidige LilyPond versie."
+"vanaf versie uit het \\version commando, naar de huidige LilyPond versie."
#: convert-ly.py:34 lilypond-book.py:59
msgid "Examples:"
msgstr "toon garantie en auteursrechten"
#: lilypond-book.py:57
-msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
+msgid "Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook document."
msgstr ""
"Verwerk LilyPond snippers in hybride HTML, LaTeX, texinfo of DocBook "
"document."
msgstr "pijp snippers door FILTER [convert-ly -n -]"
#: lilypond-book.py:120
-msgid ""
-"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgid "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
msgstr ""
"gebruik uitvoerformat FORMAT (texi [standaard], texi-html, latex, html, "
"docbook)"
#: lilypond-book.py:1400
msgid "The error log is as follows:"
-msgstr "De foutlog is als volgend:"
+msgstr "De foutlog is als volgt:"
#: lilypond-book.py:1472
msgid "cannot find \\begin{document} in LaTeX document"
#: midi2ly.py:891
msgid "treat every text as a lyric"
-msgstr "behandel elke tekst als liedtekts"
+msgstr "behandel elke tekst als liedtekst"
#: midi2ly.py:894
msgid "Examples"
#: align-interface.cc:322
msgid "tried to get a translation for something that is no child of mine"
-msgstr ""
-"probeerde een verplaatsing te verkrijgen voor iets wat geen kind van mij is"
+msgstr "probeerde een verplaatsing te verkrijgen voor iets wat geen kind van mij is"
#: all-font-metrics.cc:143
#, c-format
msgid "no viable initial configuration found: may not find good beam slope"
msgstr ""
"geen werkbare initiële configuratie gevonden: kan wellicht geen goede "
-"waardestreephelling kunnen vinden"
+"waardestreephelling vinden"
#: break-alignment-interface.cc:195
#, c-format
#: dispatcher.cc:71
msgid "Event class should be a symbol"
-msgstr "Gebeurtenis klasse zou hoort een symbool te zijn"
+msgstr "Gebeurtenis klasse hoort een symbool te zijn"
#: dispatcher.cc:78
#, c-format
#: glissando-engraver.cc:94
msgid "unterminated glissando"
-msgstr "onbeëindigde glissando"
+msgstr "onbeëindigd glissando"
#: global-context-scheme.cc:87 global-context-scheme.cc:105
msgid "no music found in score"
#: main.cc:342
#, c-format
msgid "cannot change user id to: %d: %s"
-msgstr "kan kan gebruiker id niet veranderen in: %d: %s"
+msgstr "kan gebruiker id niet veranderen in: %d: %s"
#: main.cc:348
#, c-format
#: mensural-ligature-engraver.cc:150
msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
-msgstr "mensural ligature: lengte geen van Mx, L, S -> overslaan"
+msgstr "mensurale ligatuur: lengte geen van Mx, L, S -> overslaan"
#: mensural-ligature-engraver.cc:198
msgid "semibrevis must be followed by another one -> skipping"
#: new-fingering-engraver.cc:96
msgid "cannot add text scripts to individual note heads"
-msgstr "can tekstscripts niet toevoegen aan individuele notenbolletjes"
+msgstr "kan tekstscripts niet toevoegen aan individuele notenbolletjes"
#: new-fingering-engraver.cc:239
msgid "no placement found for fingerings"
-msgstr "geen plaatsing gevonden voor vingers"
+msgstr "geen plaatsing gevonden voor vingerzetting"
#: new-fingering-engraver.cc:240
msgid "placing below"
#: open-type-font.cc:33
#, c-format
msgid "cannot allocate %lu bytes"
-msgstr "kan geen %lu bytes alloceren"
+msgstr "kan geen %lu bytes toewijzen"
#: open-type-font.cc:37
#, c-format
#: rest-collision.cc:145
msgid "cannot resolve rest collision: rest direction not set"
-msgstr "kan rust bosting niet oplossen: richting van de rust is niet gezet"
+msgstr "kan rust botsing niet oplossen: richting van de rust is niet gezet"
#: rest-collision.cc:159 rest-collision.cc:204
msgid "too many colliding rests"
#: vaticana-ligature-engraver.cc:714
#, c-format
msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
-msgstr ""
-"Vaticana_ligature_engraver: instelling `spacing-increment = %f': ptr=%ul"
+msgstr "Vaticana_ligature_engraver: instelling `spacing-increment = %f': ptr=%ul"
#: vaticana-ligature.cc:84
msgid "flexa-height undefined; assuming 0"
#: music-functions.scm:228
msgid "More alternatives than repeats. Junking excess alternatives"
-msgstr ""
-"Meer alternatieven dan herhalingen. Verschroten van overtollige "
-"alternatieven"
+msgstr "Meer alternatieven dan herhalingen. Verschroten van overtollige alternatieven"
#: music-functions.scm:250
#, scheme-format
#: output-ps.scm:276
msgid "utf-8-string encountered in PS backend"
-msgstr "utf-8-string tegengekomen in in PS achtereinde"
+msgstr "utf-8-string tegengekomen in in PS backend"
#: output-svg.scm:42
#, scheme-format
TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
-WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
-TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
+TEXI2HTML_SPLIT = --prefix=index --split=section
TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
projects / lilypond.git / commitdiff