@iftex
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own. To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
@macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,music-glossary,Glossar}
@end macro
@macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
@end macro
@macro rlearning{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
@end macro
@macro rlearningnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
@end macro
@macro ruser{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond.de,Notationsreferenz}
@end macro
@macro rusernamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond.de,Notationsreferenz}
@end macro
@macro rprogram{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-program.de,Anwendungsbenutzung}
@end macro
@macro rprogramnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Anwendungsbenutzung}
@end macro
@macro rlsr{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-snippets,Schnipsel}
@end macro
@macro rlsrnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Schnipsel}
@end macro
@macro rinternals{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-internals,Referenz der Interna}
@end macro
@macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referenz der Interna}
@end macro
* Updating the source code::
* Sharing your changes::
* Other interesting Git commands::
+* Applying git patches::
* Git on Windows::
@end menu
* Website source code::
* Documentation translations source code::
* Other branches::
+* Other locations for git::
* Git user configuration::
@end menu
@end example
-@menu
-* Other branches::
-* Git user configuration::
-@end menu
-
@node Other branches
@subsection Other branches
@end itemize
+@node Other locations for git
+@subsection Other locations for git
+
+If you have difficulty connecting to most of the repositories
+listed in earlier sections, try:
+
+@example
+git://git.sv.gnu.org/lilypond.git
+http://git.sv.gnu.org/r/lilypond.git
+ssh://git.sv.gnu.org/srv/git/lilypond.git
+@end example
+
+
@node Git user configuration
@subsection Git user configuration
@end example
+@node Applying git patches
+@section Applying git patches
+
+Well-formed git patches should be committed with
+
+@example
+git-am
+@end example
+
+Patches created without @code{git-format-patch} should be
+committed with
+
+@example
+git-apply
+@end example
+
@node Git on Windows
@section Git on Windows
+@c Some of this may duplicate stuff in other sections
+@c Clear this up later -td
+
+@subsection Background to nomenclature
+
+Git is a system for tracking the changes made to source files by
+a distributed set of editors. It is designed to work without a
+master repository, but we have chosen to have a master respository
+for LilyPond files. Editors hold local copies of the master
+repository together with any changes they have made locally. Local
+changes are held in a local @q{branch}, of which there may be
+several. The files in the local repository always correspond to
+those on the currently @q{checked out} local branch.
+
+Files are edited on a local branch, and in that state the
+changes are said to be @q{unstaged}. When editing is complete, the
+changes are moved to being @q{staged for commit}, and finally the
+changes are @q{committed} to the local branch. Once
+committed, the changes are given a unique reference number called the
+@q{Committish} which identifies them to Git. Such committed changes
+can be sent to the master repository by @q{pushing} them (if you
+have write permission) or by sending them by email to someone who
+has, either complete or as a @q{diff} or @q{patch} (which send
+just the differences from master).
+
+@subsection Installing git
+
+Obtain Git from
+@uref{http://code.google.com/p/msysgit/downloads/list}.
+(Note, not msysGit, which is for Git developers) and
+install. Start Git by clicking on the desktop icon.
+This will bring up a command line bash shell. This will be
+unfamiliar to most Windows users, so follow these
+instructions carefully. Commands are entered at a $ prompt
+and are terminated by keying a newline.
+
+@subsection Initialising Git
+
+Decide where you wish to place your local Git repository,
+creating the folders in Windows as necessary. Here we
+call the folder to contain the repository [path]/Git.
+You will need to have space for around 150Mbytes.
+
+In the git bash shell type
+
+@example
+cd [path]/Git
+@end example
+
+to position the shell at your new Git repository.
+
+Note: if [path] contains folders with names containing
+spaces use
+
+@example
+cd "[path]/Git"
+@end example
+
+Then type
+
+@example
+git init
+@end example
+
+to initialize your Git repository.
+
+Then type (all on one line; the shell will wrap automatically)
+
+@example
+git remote add -f -t master origin git://git.sv.gnu.org/lilypond.git
+@end example
+
+to download the lilypond master files.
+
+@warning{Be patient! Even on a broadband connection this can take
+10 minutes or more. Wait for lots of [new tag] messages
+and the $ prompt.}
+
+We now need to generate a local copy of the downloaded files
+in a new local branch. Your local branch needs to have a
+name, here we call it @q{lily-local} - make up your own.
+Then, finally, type
+
+@example
+git checkout -b lily-local origin/master
+@end example
+
+to create the lily-local branch containing the local copies of the
+master files. You will be advised your local branch has been set
+up to track the remote branch.
+
+Return to Windows and look in your Git repository. You
+should see lots of folders. The LilyPond documentation
+can be found in Git/Documentation/user.
+
+Terminate the Git bash shell with the exit command.
+
+@subsection Git GUI
+
+Almost all subsequent work will use the Git Graphical User
+Interface, which avoids having to type command line
+commands. To start Git GUI first start the Git bash shell by
+clicking on the desktop icon, and type
+
+@example
+cd [path]/Git
+git gui
+@end example
+
+The Git GUI will open in a new window. It contains four panels
+and 7 pull-down menus. At this stage do not use any of the
+commands under Branch, Commit, Merge or Remote. These will
+be explained later.
+
+The two panels on the left contain the names of files which
+you are in the process of editing (Unstaged Changes),and
+files you have finished editing and have staged ready for
+committing (Staged Changes). At this stage these panels will
+be empty as your local branch is the same as the master branch.
+After a file has been edited and saved the top panel on the right
+will display the differences between the edited file selected
+from one of the left panels and the one on master. The
+final panel at bottom right is used to enter a descriptive
+message about the change before committing a file.
+
+The Git GUI is terminated by entering CNTL-Q while it is the
+active window or by clicking on the usual Windows close-window
+widget.
+
+@subsection Personalising your local git repository
+
+Open the Git GUI, click on
+
+@example
+Edit -> Options
+@end example
+
+and enter your name and email address in the
+left-hand (Git Repository) panel. Leave everything
+else unchanged and save it.
+
+@subsection Checking out a branch
+
+At this stage you have two branches in your local repository,
+both identical. To see them click on
+
+@example
+Branch -> Checkout
+@end example
+
+You should have one local branch called lily-local and one
+tracking branch called origin/master.
+
+When a particular branch is selected, i.e., checked out, the
+files visible in your repository are changed to reflect the
+changes made on that branch.
+
+@subsection Updating files from master
+
+Before starting the editing of a file ensure you have the
+latest copy from master by first clicking
+
+@example
+Remote -> Fetch from -> origin
+@end example
+
+in the Git GUI.
+
+This will place details of all the changes made by others
+into the @q{origin/master} branch of the tracking branches
+in your git repository. You can see these files by checking
+out this branch. This will not affect any files
+you have modified in any of your local branches.
+
+To merge the changed files into your local branch click on
+
+@example
+Merge -> Local Merge
+@end example
+
+and if necessary select the local branch into which the merge
+is to be made.
+
+This will update all the files in that branch to reflect the
+currect state of the origin/master branch. If any of the changes
+conflict with changes you have made yourself recently
+you will be notified of the conflict (see below).
+
+@subsection Editing files
+
+Simply edit the files in your local Git repository with
+your favourite editor and save them back there. If any file contains
+non-ASCII characters ensure you save it in UTF8 format. Git will
+detect any changes whenever you restart Git GUI
+and the file names will then be listed in the Unstaged Changes panel.
+Or you can click the Rescan button to refresh the panel
+contents at any time. You may break off and resume at
+editing any time.
+
+The changes you have made may be displayed in diff form
+in the top right-hand panel by clicking on the name in
+Git GUI.
+
+When your editing is complete, move the files from being
+Unstaged to Staged by clicking the document symbol to
+the left of each name. If you change your mind it can
+be moved back by clicking on the ticked box to the
+left of the name.
+
+If you wish to cancel your changes the original version
+may be recovered at any time before a commit is made
+by selecting Commit -> Revert changes. This will even
+recover a deleted file.
+
+Finally the changes you have made may be committed to
+your local branch by entering a brief message in
+the Commit Message box and clicking the Commit button.
+
+@subsection Sending changes to origin/master
+
+If you do not have write access to master you will
+need to send your changes by email to someone who does.
+
+First you need to create a diff or patch file containing
+your changes. To create this, the file must first be
+committed. Then terminate the Git GUI. In the
+git bash shell first cd to your Git repository with
+
+@example
+cd [path]/Git
+@end example
+
+if necessary, then produce the patch with
+
+@example
+git-format-patch -n
+@end example
+
+where n an integer, normally 1. This will create a
+patch file for all the locally committed files which
+differ from master. The patch file can be found in
+[path]/Git and will have a name formed from n and the
+commit message.
+
+@subsection Resolving merge conflicts
+
+As soon as you have committed a changed file your
+local branch has diverged from master, and will
+remain diverged until your changes have been committed
+in master. Similarly, if a new commit has been made
+to master by someone else, your branch is divergent.
+You can detect a divergent branch my clicking on
+
+@example
+Repository -> Visualise all branch history
+@end example
+
+This opens up a very useful new window called @q{gitk}.
+
+If the diagram at top left of the resulting window
+does not show your branch on a single node at the
+top your branch has diverged from master. This is
+quite normal if files you have modified yourself
+have not yet been committed to master, or if files
+have been modified and committed by others since
+your last merge.
+
+If a file being merged from master differs from
+one you have modified in a way that cannot be resolved
+automatically by git, Merge will report a Conflict
+which you must resolve by editing the file to create the
+version you wish to keep.
+
+This could happen if the person updating master
+for you has added some changes of his own before
+committing your changes to master, or if someone
+else has updated the same parent file as you at
+the same time.
+
+Open the file in your editor and look for sections which
+are delimited with
+
+[to be completed when I next have a merge conflict to be
+sure I give the right instructions -td]
@iftex
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own. To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
@macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,music-glossary,Glosario Musical}
@end macro
@macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,music-glossary,Glosario Musical}
@end macro
@macro rlearning{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje}
@end macro
@macro rlearningnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-learning.es,Manual de Aprendizaje}
@end macro
@macro ruser{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond.es,Referencia de la Notación}
@end macro
@macro rusernamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond.es,Referencia de la Notación}
@end macro
@macro rprogram{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-program.es,Utilización del Programa}
@end macro
@macro rprogramnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-program.es,Utilización del Programa}
@end macro
@macro rlsr{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
@end macro
@macro rlsrnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código}
@end macro
@macro rinternals{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
@end macro
@macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referencia de Funcionamiento Interno}
@end macro
@iftex
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own. To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
@macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,music-glossary,Glossaire}
@end macro
@macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
@end macro
@macro rlearning{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
@end macro
@macro rlearningnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation}
@end macro
@macro ruser{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
@end macro
@macro rusernamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation}
@end macro
@macro rprogram{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme}
@end macro
@macro rprogramnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme}
@end macro
@macro rlsr{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
@end macro
@macro rlsrnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
@end macro
@macro rinternals{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
@end macro
@macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
@end macro
@iftex
+@c All commands below should work in the middle of the line;
+@c we thus must not use @vindex directly since it works only if placed
+@c on a line of its own. To overcome this problem, we define a
+@c replacement macro using the internal definition of @vindex which
+@c delimits arguments in the standard way (i.e., with braces).
+
+@tex
+\gdef\lilyvindex#1{\doind{vr}{\code #1}\ignorespaces}
+@end tex
+
@macro rglos{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,music-glossary,Music Glossary}
@end macro
@macro rglosnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
@end macro
@macro rlearning{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-learning,Learning Manual}
@end macro
@macro rlearningnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
@end macro
@macro ruser{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond,Notation Reference}
@end macro
@macro rusernamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
@end macro
@macro rprogram{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-program,Application Usage}
@end macro
@macro rprogramnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
@end macro
@macro rlsr{TEXT}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-snippets,Snippets}
@end macro
@macro rlsrnamed{TEXT,DISPLAY}
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
@end macro
@macro rinternals{TEXT}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,,lilypond-internals,Internals Reference}
@end macro
@macro rinternalsnamed{TEXT,DISPLAY}
-@vindex \TEXT\
+@lilyvindex{\TEXT\}
@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
@end macro
@funindex barNumberVisibility
+@c Uncomment this after next LSR update.
+@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@c {printing-the-bar-number-for-the-first-measure.ly}
+
Bar numbers can be typeset at regular intervals instead of just at
the beginning of every line. To do this the default behavior
must be overridden to permit bar numbers to be printed at places
this, the @code{padding} property of @rinternals{BarNumber} can
be used to position the number correctly.
-Bar numbers may only be printed at bar lines; to print a bar
-number at the beginning of a piece, an empty bar line must be
-inserted there, and a value other than @code{1} must be placed
-in @code{currentBarNumber}:
-
-@lilypond[verbatim,quote,relative=1]
-\set Score.currentBarNumber = #50
-\bar ""
-c1 c c c
-c1 c c c
-\break
-@end lilypond
-
@node Bar and bar number checks
\override #'(fret-diagram-details . (
(finger-code . below-string)
(dot-radius . 0.35)
+ (string-thickness-factor . 0.3)
(dot-position . 0.5)
(fret-count . 3))) {
\fret-diagram-terse #"x;x;o;2-1;3-2;2-3;"
--- /dev/null
+\version "2.12.1"
+
+\header {
+ lsrtags = "rhythms"
+
+ texidoc = "
+By default, the first bar number in a score is suppressed if it is
+less than or equal to `1'. By setting @code{barNumberVisibility}
+to @code{all-bar-numbers-visible}, any bar number can be printed
+for the first measure and all subsequent measures. Note that an
+empty bar line must be inserted before the first note for this to
+work.
+
+"
+ doctitle = "Printing the bar number for the first measure"
+}
+
+\relative c' {
+ \set Score.barNumberVisibility = #all-bar-numbers-visible
+ \bar ""
+ c1 d e f \break
+ g1 e d c
+}
--- /dev/null
+\version "2.12.2"
+
+\header {
+ texidoc = "Adding ambitus to percussion contexts does not cause
+crashes, since the @code{Ambitus_engraver} will only
+acknowledge pitched note heads."
+}
+
+\new DrumStaff \with { \consists "Ambitus_engraver" } <<
+ \new DrumVoice \drummode { \voiceOne cymr8 cymr }
+ \new DrumVoice \drummode { \voiceTwo hhp4 }
+>>
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\revert TextScript #'fret-diagram-details #'dot-radius
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\once \override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
}
>>
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\once \override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\once \override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
}
>>
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\override TextScript #'fret-diagram-details
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
%% C major for guitar, verbose style
\revert TextScript #'fret-diagram-details #'label-dir
(place-fret 3 5 3)
(place-fret 2 5 4)
(place-fret 1 3 1)
- (barre 5 1 1))}
+ (barre 5 1 3))}
}
>>
--- /dev/null
+\version "2.12.0"
+
+\header {
+ texidoc="
+String thickness can be changed, and diagrams can have variable
+string thickness.
+"
+}
+
+\layout { ragged-right = ##t }
+
+<<
+ \chords {
+ c1 |
+ c1 |
+ c1
+ }
+
+ \new Voice {
+ \textLengthOn
+ %% C major for guitar, verbose style
+ c'1 ^\markup {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1)
+ (place-fret 4 5 2)
+ (place-fret 3 5 3)
+ (place-fret 2 5 4)
+ (place-fret 1 3 1)
+ (barre 5 1 3))}
+
+ %% C major for guitar, verbose style
+ \once \override TextScript #'thickness = #1.5
+ c'1 ^\markup {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1)
+ (place-fret 4 5 2)
+ (place-fret 3 5 3)
+ (place-fret 2 5 4)
+ (place-fret 1 3 1)
+ (barre 5 1 3))}
+
+ %% C major for guitar, verbose style
+ \once \override TextScript #'fret-diagram-details
+ #'string-thickness-factor = #0.3
+ c' ^\markup {
+ \fret-diagram-verbose #'((mute 6)
+ (place-fret 5 3 1)
+ (place-fret 4 5 2)
+ (place-fret 3 5 3)
+ (place-fret 2 5 4)
+ (place-fret 1 3 1)
+ (barre 5 1 3))}
+
+
+ }
+>>
+
+
{
public:
TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+protected:
+ DECLARE_ACKNOWLEDGER (note_head);
+
void process_music ();
- void acknowledge_note_head (Grob_info);
void stop_translation_timestep ();
virtual void finalize ();
virtual void derived_mark () const;
Ambitus_engraver::acknowledge_note_head (Grob_info info)
{
Stream_event *nr = info.event_cause ();
+ SCM p = nr->get_property ("pitch");
+ /*
+ If the engraver is added to a percussion context,
+ filter out unpitched note heads.
+ */
+ if (!unsmob_pitch (p))
+ return;
if (nr && nr->in_event_class ("note-event"))
{
- Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
+ Pitch pitch = *unsmob_pitch (p);
Drul_array<bool> expands = pitch_interval_.add_point (pitch);
if (expands[UP])
causes_[UP] = nr;
{
list<Building> result;
single_skyline (Building (boxes->front (), horizon_padding, horizon_axis, sky),
- boxes->front ()[horizon_axis][LEFT], horizon_axis, &result);
+ boxes->front ()[horizon_axis][LEFT], horizon_padding, &result);
return result;
}
@code{normal} orientation, 0.5 for @code{landscape} and
@code{opposing-landscape}.
@item
+@code{string-thickness-factor} -- Factor for changing thickness of each
+string in the fret diagram. Thickness of string @code{k} is given by
+@code{thickness}*(1+@code{string-thickness-factor})^(k-1). Default 0.
+@item
@code{top-fret-thickness} -- The thickness of the top fret line, as a multiple
of the standard thickness. Default value 3.
@item
;
;
+(define (string-x-extent start-point end-point)
+ "Return the x-extent of a string that goes from start-point
+to end-point."
+ (let ((x1 (car start-point))
+ (x2 (car end-point)))
+ (if (> x1 x2)
+ (cons x2 x1)
+ (cons x1 x2))))
+
+(define (string-y-extent start-point end-point)
+ "Return the y-extent of a string that goes from start-point
+to end-point."
+ (let ((y1 (cdr start-point))
+ (y2 (cdr end-point)))
+ (if (> y1 y2)
+ (cons y2 y1)
+ (cons y1 y2))))
+
+
(define (cons-fret new-value old-list)
"Put together a fret-list in the format desired by parse-string"
(if (eq? old-list '())
(else
(cons string-coordinate (- fret-coordinate)))))
+(define (string-thickness string thickness-factor)
+ (expt (1+ thickness-factor) (1- string)))
+
;
; Functions that create stencils used in the fret diagram
;
th thickness-factor size orientation)
"Make a stencil for @code{string}, given the fret-diagram
overall parameters."
- (let* ((string-thickness (* th (expt (1+ thickness-factor) string)))
+ (let* ((string-coordinate (- string-count string))
+ (current-string-thickness
+ (* th size (string-thickness string thickness-factor)))
+ (fret-half-thickness (* size th 0.5))
+ (half-string (* current-string-thickness 0.5))
(start-coordinates
(stencil-coordinates
- 0
- (* size (1- string))
+ (- fret-half-thickness)
+ (- (* size string-coordinate) half-string)
orientation))
(end-coordinates
(stencil-coordinates
- (* size (1+ (fret-count fret-range)))
- (* size (1- string))
+ (+ fret-half-thickness (* size (1+ (fret-count fret-range))))
+ (+ half-string (* size string-coordinate))
orientation)))
- (make-line-stencil
- string-thickness
- (car start-coordinates) (cdr start-coordinates)
- (car end-coordinates) (cdr end-coordinates))))
-
-(define (fret-stencil fret fret-range string-count th size orientation)
+ (ly:round-filled-box (string-x-extent start-coordinates end-coordinates)
+ (string-y-extent start-coordinates end-coordinates)
+ (* th size))))
+
+(define (fret-stencil fret string-count th
+ thickness-factor size orientation)
"Make a stencil for @code{fret}, given the fret-diagram overall parameters."
- (let* ((start-coordinates
+ (let* ((low-string-half-thickness
+ (* 0.5 size th (string-thickness string-count thickness-factor)))
+ (fret-half-thickness (* 0.5 size th))
+ (start-coordinates
(stencil-coordinates
(* size fret)
- 0
+ (- fret-half-thickness low-string-half-thickness)
orientation))
(end-coordinates
(stencil-coordinates
(* size (1- string-count))
orientation)))
(make-line-stencil
- th
+ (* size th)
(car start-coordinates) (cdr start-coordinates)
(car end-coordinates) (cdr end-coordinates))))
(let* ( (string-list (map 1+ (iota string-count))))
(helper string-list)))
-(define (draw-fret-lines fret-count string-count th size orientation)
+(define (draw-fret-lines fret-count string-count th
+ thickness-factor size orientation)
"Draw @var{fret-count} fret lines for a fret diagram
with @var{string-count} strings. Line thickness is given by @var{th},
fret & string spacing by @var{size}. Orientation is given by @var{orientation}"
(define (helper x)
(if (null? (cdr x))
(fret-stencil
- (car x) fret-count string-count th
+ (car x) string-count th thickness-factor
size orientation)
(ly:stencil-add
(fret-stencil
- (car x) fret-count string-count th
+ (car x) string-count th thickness-factor
size orientation)
(helper (cdr x)))))
- (let* ((fret-list (iota (1+ fret-count))))
+ (let* ( (fret-list (iota (1+ fret-count))))
(helper fret-list)))
-(define (draw-thick-zero-fret details string-count th size orientation)
+(define (draw-thick-zero-fret details string-count th
+ thickness-factor size orientation)
"Draw a thick zeroth fret for a fret diagram whose base fret is 1."
(let* ((sth (* th size))
+ (half-lowest-string-thickness
+ (* 0.5 th (string-thickness string-count thickness-factor)))
(half-thick (* 0.5 sth))
(top-fret-thick
(* sth (assoc-get 'top-fret-thickness details 3.0)))
- (start-string-coordinate (- half-thick))
+ (start-string-coordinate (- half-lowest-string-thickness))
(end-string-coordinate (+ (* size (1- string-count)) half-thick))
(start-fret-coordinate half-thick)
(end-fret-coordinate (- half-thick top-fret-thick))
(upper-right
(stencil-coordinates
end-fret-coordinate end-string-coordinate orientation)))
- (make-filled-box-stencil
+ (ly:round-filled-box
(cons (car lower-left) (car upper-right))
- (cons (cdr lower-left) (cdr upper-right)))))
+ (cons (cdr lower-left) (cdr upper-right))
+ sth)))
(define (draw-capo details string-count fret fret-count th size
(car start-point) (cdr start-point)
(car end-point) (cdr end-point))))
-(define (draw-frets fret-range string-count th size orientation)
+(define (draw-frets fret-range string-count th
+ thickness-factor size orientation)
"Draw the fret lines for a fret diagram with
@var{string-count} strings and frets as indicated in @var{fret-range}.
Line thickness is given by @var{th}, fret & string spacing by
@var{size}. Orientation is given by @var{orientation}."
(let* ((my-fret-count (fret-count fret-range)))
- (draw-fret-lines my-fret-count string-count th size orientation)))
+ (draw-fret-lines
+ my-fret-count string-count th thickness-factor size orientation)))
(define (draw-dots layout props string-count fret-count
size finger-code
1 1 1))
(make-circle-stencil
scale-dot-radius scale-dot-thick #t)))
- (positioned-dot (translate-stencil dot-stencil dot-coordinates))
+ (positioned-dot (ly:stencil-translate dot-stencil dot-coordinates))
(labeled-dot-stencil
(cond
((or (eq? finger '())(eq? finger-code 'none))
(centered-stencil
(sans-serif-stencil
layout props dot-label-font-mag finger))))
- (translate-stencil
+ (ly:stencil-translate
(ly:stencil-add
dot-stencil
(if (eq? dot-color 'white)
orientation)))
(ly:stencil-add
positioned-dot
- (translate-stencil label-stencil label-translation))))
+ (ly:stencil-translate label-stencil label-translation))))
(else ;unknown finger-code
positioned-dot))))
(if (null? restlist)
(glyph-stencil-coordinates
(stencil-coordinates 0 glyph-string-coordinate orientation))
(positioned-glyph
- (translate-stencil glyph-stencil glyph-stencil-coordinates)))
+ (ly:stencil-translate glyph-stencil glyph-stencil-coordinates)))
(if (null? restlist)
positioned-glyph
(ly:stencil-add
barre-list orientation)
"Create barre indications for a fret diagram"
(if (not (null? barre-list))
- (let* ((details (merge-details 'fret-diagram-details props '()))
- (string1 (caar barre-list))
- (string2 (cadar barre-list))
- (barre-fret (caddar barre-list))
- (top-fret (cdr fret-range))
- (low-fret (car fret-range))
- (fret (1+ (- barre-fret low-fret)))
- (barre-vertical-offset 0.5)
- (dot-center-fret-coordinate (+ (1- fret) dot-position))
- (barre-fret-coordinate
- (+ dot-center-fret-coordinate
- (* (- barre-vertical-offset 0.5) dot-radius)))
- (barre-start-string-coordinate (- string-count string1))
- (barre-end-string-coordinate (- string-count string2))
- (scale-dot-radius (* size dot-radius))
- (barre-type (assoc-get 'barre-type details 'curved))
- (barre-stencil
- (cond
- ((eq? barre-type 'straight)
- (make-straight-barre-stencil size scale-dot-radius
- barre-fret-coordinate barre-start-string-coordinate
- barre-end-string-coordinate orientation))
- ((eq? barre-type 'curved)
- (make-curved-barre-stencil size scale-dot-radius
- barre-fret-coordinate barre-start-string-coordinate
- barre-end-string-coordinate orientation)))))
-(if (not (null? (cdr barre-list)))
- (ly:stencil-add
- barre-stencil
- (draw-barre layout props string-count fret-range size finger-code
- dot-position dot-radius (cdr barre-list) orientation))
- barre-stencil ))))
+ (let* ((details (merge-details 'fret-diagram-details props '()))
+ (string1 (caar barre-list))
+ (string2 (cadar barre-list))
+ (barre-fret (caddar barre-list))
+ (top-fret (cdr fret-range))
+ (low-fret (car fret-range))
+ (fret (1+ (- barre-fret low-fret)))
+ (barre-vertical-offset 0.5)
+ (dot-center-fret-coordinate (+ (1- fret) dot-position))
+ (barre-fret-coordinate
+ (+ dot-center-fret-coordinate
+ (* (- barre-vertical-offset 0.5) dot-radius)))
+ (barre-start-string-coordinate (- string-count string1))
+ (barre-end-string-coordinate (- string-count string2))
+ (scale-dot-radius (* size dot-radius))
+ (barre-type (assoc-get 'barre-type details 'curved))
+ (barre-stencil
+ (cond
+ ((eq? barre-type 'straight)
+ (make-straight-barre-stencil
+ size scale-dot-radius
+ barre-fret-coordinate barre-start-string-coordinate
+ barre-end-string-coordinate orientation))
+ ((eq? barre-type 'curved)
+ (make-curved-barre-stencil
+ size scale-dot-radius
+ barre-fret-coordinate barre-start-string-coordinate
+ barre-end-string-coordinate orientation)))))
+ (if (not (null? (cdr barre-list)))
+ (ly:stencil-add
+ barre-stencil
+ (draw-barre layout props string-count fret-range size finger-code
+ dot-position dot-radius (cdr barre-list) orientation))
+ barre-stencil ))))
(define (label-fret layout props string-count fret-range size orientation)
"Label the base fret on a fret diagram"
(label-half-width
(stencil-fretboard-offset label-stencil 'string orientation))
(label-outside-diagram (+ label-space label-half-width)))
- (translate-stencil
+ (ly:stencil-translate
label-stencil
(stencil-coordinates
(1+ (* size label-vertical-offset))
(ly:stencil-add
(draw-strings
string-count fret-range th thickness-factor size orientation)
- (draw-frets fret-range string-count th size orientation))))
+ (draw-frets
+ fret-range string-count th thickness-factor size orientation))))
(if (and (not (null? barre-list))
(not (eq? 'none barre-type)))
(set! fret-diagram-stencil
(ly:stencil-add
fret-diagram-stencil
(draw-thick-zero-fret
- details string-count th size orientation))))
+ details string-count th
+ thickness-factor size orientation))))
(if (not (null? xo-list))
(let* ((diagram-fret-top
(car (stencil-fretboard-extent
(set! fret-diagram-stencil
(ly:stencil-add
fret-diagram-stencil
- (translate-stencil
+ (ly:stencil-translate
xo-stencil
(stencil-coordinates
(- diagram-fret-top
(define-public (first-bar-number-invisible barnum) (> barnum 1))
+(define-public (all-bar-numbers-visible barnum) #t)
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; percent repeat counters
;;;;
;;;; (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
-(define-public (translate-stencil stencil coordinate-pair)
- "Translate @code{stencil} by the distances specified in
-@code{coordinate-pair}."
- (ly:stencil-translate-axis
- (ly:stencil-translate-axis stencil (cdr coordinate-pair) Y)
- (car coordinate-pair) X))
-
(define-public (stack-stencils axis dir padding stils)
"Stack stencils STILS in direction AXIS, DIR, using PADDING."
(cond
(interval-widen xext (/ width 2))
(interval-widen yext (/ width 2)))))
-(define-public (make-round-filled-box-stencil xext yext blot-diameter)
- "Make a filled rounded box."
-
- (ly:make-stencil
- (list 'round-filled-box (- (car xext)) (cdr xext)
- (- (car yext)) (cdr yext) blot-diameter)
- xext yext))
(define-public (make-filled-box-stencil xext yext)
"Make a filled box."
projects / lilypond.git / commitdiff