# todo: add latex.
PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
-# this prevents aux files from being reused for translated docs
-TEXI2PDF_FLAGS = --tidy
MAIN_INFO_DOC = lilypond
INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
+++ /dev/null
-
-@node Full Grob interface list
-@unnumbered Full Grob interface list
-
-The automatic documentation failed to build.
-Visit @uref{http://@/www@/.lilypond@/.nl/@doc/@/v2.5,prebuilt LilyPond Documentation online}.
@node Fretted string instruments
@section Fretted string instruments
-@c @node Guitar
-@c @section Guitar
@cindex tablature
@cindex guitar tablature
@menu
-* Guitar sections::
+* Common notation for fretted strings::
+* Guitar::
+* Banjo::
@end menu
-@node Guitar sections
-@subsection Guitar sections
+@node Common notation for fretted strings
+@subsection Common notation for fretted strings
@menu
-* String number indications::
-* Tablatures basic::
-* Non-guitar tablatures::
-* Banjo tablatures::
-* Fret diagrams::
-* Right hand fingerings::
-* Other guitar issues::
+* References for fretted strings::
+* String number indications::
+* Default tablatures::
+* Custom tablatures::
+* Fret diagrams::
+* Right hand fingerings::
@end menu
+@node References for fretted strings
+@subsubsection References for fretted strings
+
+@c TODO Add refs
+TBC
+
@node String number indications
@subsubsection String number indications
@c @lsr{guitar/,string-number.ly}.
-@node Tablatures basic
-@subsubsection Tablatures basic
-@cindex Tablatures basic
+@node Default tablatures
+@subsubsection Default tablatures
+@cindex Tablatures, basic
+@cindex Tablatures, default
Tablature notation is used for notating music for plucked string
instruments. Pitches are not denoted with note heads, but by
@end lilypond
-@node Non-guitar tablatures
-@subsubsection Non-guitar tablatures
-@cindex Non-guitar tablatures
+@node Custom tablatures
+@subsubsection Custom tablatures
+@cindex Tablatures, custom
You can change the tuning of the strings. A string tuning is given as
a Scheme list with one integer number for each string, the number
-@node Banjo tablatures
-@subsubsection Banjo tablatures
-@cindex Banjo tablatures
-
-LilyPond has basic support for five stringed banjo. When making tablatures
-for five stringed banjo, use the banjo tablature format function to get
-correct
-fret numbers for the fifth string:
-
-@lilypond[quote,ragged-right,fragment,verbatim]
-\new TabStaff <<
- \set TabStaff.tablatureFormat = #fret-number-tablature-format-banjo
- \set TabStaff.stringTunings = #banjo-open-g-tuning
- {
- \stemDown
- g8 d' g'\5 a b g e d' |
- g4 d''8\5 b' a'\2 g'\5 e'\2 d' |
- g4
- }
->>
-@end lilypond
-
-A number of common tunings for banjo are predefined in LilyPond:
-@code{banjo-c-tuning} (gCGBD), @code{banjo-modal-tuning} (gDGCD),
-@code{banjo-open-d-tuning} (aDF#AD) and @code{banjo-open-dm-tuning}
-(aDFAD).
-
-These tunings may be converted to four string banjo tunings using the
-@code{four-string-banjo} function:
-
-@example
-\set TabStaff.stringTunings = #(four-string-banjo banjo-c-tuning)
-@end example
-
-@seealso
-
-The file @file{scm/@/output@/-lib@/.scm} contains predefined banjo tunings.
-
-
@node Fret diagrams
@subsubsection Fret diagrams
@cindex fret diagrams
#(define RH rightHandFinger)
@end example
-@cindex fingerings, right hand, for guitar
+@cindex fingerings, right hand, for guitar
@cindex right hand fingerings for guitar
-
+
@snippets
You may exercise greater control over right handing fingerings by
#(define RH rightHandFinger)
{
\set strokeFingerOrientations = #'(right)
- \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@")
+ \override StrokeFinger #'digit-names = ##("x" "y" "z" "!" "@")
<c-\RH #5 >4
- <c-\RH "@">4
+ <c-\RH "@">4
}
@end lilypond
Internals Reference: @internalsref{StrokeFinger}
+@node Guitar
+@subsection Guitar
+
+@menu
+* Guitar tablatures::
+* Indicating position and barring::
+@end menu
+
+@node Guitar tablatures
+@subsubsection Guitar tablatures
+
+@c TODO Add text
+TBC
-@node Other guitar issues
-@subsubsection Other guitar issues
+@node Indicating position and barring
+@subsubsection Indicating position and barring
This example demonstrates how to include guitar position and
barring indications.
demonstrated in @ref{Special note heads}.
+@node Banjo
+@subsection Banjo
+
+@menu Banjo tablatures
+* Banjo tablatures::
+@end menu
+
+@node Banjo tablatures
+@subsubsection Banjo tablatures
+@cindex Banjo tablatures
+
+LilyPond has basic support for five stringed banjo. When making tablatures
+for five stringed banjo, use the banjo tablature format function to get
+correct
+fret numbers for the fifth string:
+
+@lilypond[quote,ragged-right,fragment,verbatim]
+\new TabStaff <<
+ \set TabStaff.tablatureFormat = #fret-number-tablature-format-banjo
+ \set TabStaff.stringTunings = #banjo-open-g-tuning
+ {
+ \stemDown
+ g8 d' g'\5 a b g e d' |
+ g4 d''8\5 b' a'\2 g'\5 e'\2 d' |
+ g4
+ }
+>>
+@end lilypond
+
+A number of common tunings for banjo are predefined in LilyPond:
+@code{banjo-c-tuning} (gCGBD), @code{banjo-modal-tuning} (gDGCD),
+@code{banjo-open-d-tuning} (aDF#AD) and @code{banjo-open-dm-tuning}
+(aDFAD).
+
+These tunings may be converted to four string banjo tunings using the
+@code{four-string-banjo} function:
+
+@example
+\set TabStaff.stringTunings = #(four-string-banjo banjo-c-tuning)
+@end example
+
+@seealso
+
+The file @file{scm/@/output@/-lib@/.scm} contains predefined banjo tunings.
+
@item
@code{TabStaff} creates by default a tablature with six strings in
-standard guitar tuning. See @ref{Tablatures basic}.
+standard guitar tuning. See @ref{Guitar tablatures}.
@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
\new TabStaff { c d e f }
Music Glossary: @rglos{staff}, @rglos{staves}.
Notation Reference: @ref{Percussion staves},
-@ref{Tablatures basic}, @ref{Gregorian Chant contexts},
+@ref{Guitar tablatures}, @ref{Gregorian Chant contexts},
@ref{Mensural contexts}.
Snippets: @lsrdir{Staff,Staff-notation}.
MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
-TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
+TEXI2PDF_FLAGS += --batch --command '@set version $(TOPLEVEL_VERSION)'
TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
TELY_FILES = $(call src-wildcard,*.tely)
# symlinks, see replace_symlinks_urls in
# buildscripts/add_html_footer.py.
-ifneq ($(INFO_IMAGES_DIR),'')
-
# make dereferences symlinks, and $(INFO_IMAGES_DIR) is a symlink
# to $(outdir), so we can't use directly $(INFO_IMAGES_DIR) as a
# prerequisite, otherwise %.info are always outdated (because older
# than $(outdir), hence this .dep file
-$(outdir)/%.info-images-dir.dep: $(outdir)/%.texi
- rm -f $*
- ln -s $(outdir) $*
- mkdir -p $(outdir)/$*
- find $(outdir)/$*/ -name '*'.png | xargs rm -f
- (cd $(outdir)/$*/ ; ln -sf ../*.png . )
- touch $@
-
-else
-
-$(outdir)/.info-images-dir.dep:
- touch $@
-
+$(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep: $(INFO_DOCS:%=$(outdir)/%.texi)
+ifneq ($(INFO_IMAGES_DIR),)
+ rm -f $(INFO_IMAGES_DIR)
+ ln -s $(outdir) $(INFO_IMAGES_DIR)
+ mkdir -p $(outdir)/$(INFO_IMAGES_DIR)
+ rm -f $(outdir)/$(INFO_IMAGES_DIR)/[a-f0-9][a-f0-9]
+ cd $(outdir)/$(INFO_IMAGES_DIR) && $(PYTHON) $(top-src-dir)/buildscripts/mass-link.py symbolic .. . [a-f0-9][a-f0-9]
endif
+ touch $@
$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep
$(MAKEINFO) -I$(outdir) --output=$@ $<
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2008-03-31.10}
+\def\texinfoversion{2008-04-09.09}
%
% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
-% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
+% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
%
% \argremovec might leave us with trailing space, e.g.,
% @end itemize @c foo
% to get _exactly_ the rest of the line, we had to prevent such situation.
% We prepended an \empty token at the very beginning and we expand it now,
% just before passing the control to \argtorun.
-% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
+% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
% either the null string, or it ends with \^^M---thus there is no danger
% that a pair of braces would be stripped.
%
% used to check whether the current environment is the one expected.
%
% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
-% are not treated as enviroments; they don't open a group. (The
+% are not treated as environments; they don't open a group. (The
% implementation of @end takes care not to call \endgroup in this
% special case.)
-% At runtime, environments start with this:
+% At run-time, environments start with this:
\def\startenvironment#1{\begingroup\def\thisenv{#1}}
% initialize
\let\thisenv\empty
\fi
}
-% Evironment mismatch, #1 expected:
+% Environment mismatch, #1 expected:
\def\badenverr{%
\errhelp = \EMsimple
\errmessage{This command can appear only \inenvironment\temp,
\pushthisfilestack
\def\thisfile{#1}%
{%
- \makevalueexpandable % we want to expand any @value in FILE.
+ \makevalueexpandable % we want to expand any @value in FILE.
\turnoffactive % and allow special characters in the expansion
\edef\temp{\noexpand\input #1 }%
%
}
}
-% @bullet and @minus need the same treatment as @math, just above.
+% Some math mode symbols.
\def\bullet{$\ptexbullet$}
-\def\minus{$-$}
+\def\geq{\ifmmode \ge\else $\ge$\fi}
+\def\leq{\ifmmode \le\else $\le$\fi}
+\def\minus{\ifmmode -\else $-$\fi}
% @dots{} outputs an ellipsis using the current font.
% We do .5em per period so that it has the same spacing in the cm
%
% A straightforward implementation would start like this:
% \def\entry#1#2{...
-% But this frozes the catcodes in the argument, and can cause problems to
+% But this freezes the catcodes in the argument, and can cause problems to
% @code, which sets - active. This problem was fixed by a kludge---
% ``-'' was active throughout whole index, but this isn't really right.
%
\def\Edefun{\endgraf\medbreak}
% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
-% the only thing remainnig is to define \deffnheader.
+% the only thing remaining is to define \deffnheader.
%
\def\makedefun#1{%
\expandafter\let\csname E#1\endcsname = \Edefun
% In case a @footnote appears in a vbox, save the footnote text and create
% the real \insert just after the vbox finished. Otherwise, the insertion
% would be lost.
-% Similarily, if a @footnote appears inside an alignment, save the footnote
+% Similarly, if a @footnote appears inside an alignment, save the footnote
% text to a box and make the \insert when a row of the table is finished.
% And the same can be done for other insert classes. --kasal, 16nov03.
projects / lilypond.git / commitdiff