summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/latex4musicians/Figures
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex/latex4musicians/Figures')
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/Makefile.sb19
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/chords.tex11
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/fellow.abc2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/gcschemes.tex48
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/glyphs.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/gtrcrd.tex4
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/guitartabs.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/jingle.ly20
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/leadsheets.tex15
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/lilyglyphs.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/lilytab.ly6
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/musicography.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/pdfcrop.sh38
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-abc-all.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-latexmtx.ltx12
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lilybook.lytex14
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lyluatex.tex14
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mlatex.tex (renamed from Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex.tex)2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtex.tex19
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.mtx2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.pmx2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.tex2
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtab.tex11
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex-tab.tex24
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.orig.tex141
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.tex112
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/shave.ly17
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/songbook.tex8
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/songs.tex3
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/verses-chords.tex49
-rw-r--r--Master/texmf-dist/doc/latex/latex4musicians/Figures/warm.abc7
31 files changed, 464 insertions, 148 deletions
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/Makefile.sb b/Master/texmf-dist/doc/latex/latex4musicians/Figures/Makefile.sb
index 7b29db6cdf1..2d0155370ba 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/Makefile.sb
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/Makefile.sb
@@ -1,6 +1,6 @@
-# Makefile for songbook.tex
+# Makefile for sample-songbook
-FIGURES = fellow.pdf happyb.pdf twinkle.pdf
+FIGURES = fellow.pdf happyb.pdf warm.pdf
sample-songbook: sample-songbook.tex $(FIGURES)
pdflatex sample-songbook.tex; \
@@ -9,21 +9,18 @@ sample-songbook: sample-songbook.tex $(FIGURES)
fellow.pdf: fellow.abc
abcm2ps -c -O= fellow.abc; \
- ps2pdf fellow.ps; \
- pdfcrop fellow.pdf; \
+ ps2pdf fellow.ps; pdfcrop fellow.pdf; \
/bin/mv -f fellow-crop.pdf fellow.pdf
happyb.pdf: happyb.abc
abcm2ps -O= happyb.abc; \
- ps2pdf happyb.ps; \
- pdfcrop happyb.pdf; \
+ ps2pdf happyb.ps; pdfcrop happyb.pdf; \
/bin/mv -f happyb-crop.pdf happyb.pdf
-twinkle.pdf: twinkle.abc
- abcm2ps -O= twinkle.abc; \
- ps2pdf twinkle.ps; \
- pdfcrop twinkle.pdf; \
- /bin/mv -f twinkle-crop.pdf twinkle.pdf
+warm.pdf: warm.abc
+ abcm2ps -O= warm.abc; \
+ ps2pdf warm.ps; pdfcrop warm.pdf; \
+ /bin/mv -f warm-crop.pdf warm.pdf
clean:
/bin/rm -f .*~ *~ *aux *bak *lo? *to? *out *tmp *bbl *ps
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/chords.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/chords.tex
new file mode 100644
index 00000000000..b23b02f8bf4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/chords.tex
@@ -0,0 +1,11 @@
+\documentclass[12pt]{article}
+\usepackage[minimal]{leadsheets}
+\useleadsheetslibraries{chords}
+\thispagestyle{empty}
+
+\begin{document}
+
+Let's typeset some chords: \writechord{Bb7(#9)} \writechord{Bbb6}
+\writechord{C#7(b9)} \writechord{C##13}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/fellow.abc b/Master/texmf-dist/doc/latex/latex4musicians/Figures/fellow.abc
index 940be47b225..b8cf3866864 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/fellow.abc
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/fellow.abc
@@ -6,7 +6,7 @@ K: CMaj
%
G | "C"E2E EDE | F3 E2 E | \
w:For he's a jol-ly good fel-low, for
-"G"D2D DCD | "C"E3 C2 C | E2E EDE | \
+"G"D2D DCD | "C"E3 C2 C | "C7"E2E EDE | \
w:he's a jo-ly good fel-low, for he's a jol-ly good
"F"F3 HA2 A | "C"GAG "G"F2 D| "C"C3 z3 |]
w:fel-low, which no-bo-dy can de-ny!
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/gcschemes.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/gcschemes.tex
index 5c3588a139f..2f0ad7f03f6 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/gcschemes.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/gcschemes.tex
@@ -4,22 +4,38 @@
\begin{document}
+% general parameters
+\setchordscheme{
+ rotate=-90,
+ x-unit=2.5mm, % chord size, x
+ y-unit=3mm, % chord size, y
+ name-format=\bfseries, % chord name font
+ finger-format=\bfseries%
+ \footnotesize % fingering font
+}
+
+\newsavebox{\Gstd}
+\savebox{\Gstd}{
+\chordscheme[ % define the chord
+ name = G (Sol), % chord name
+ position = 1, % first fret position
+ finger = {2/5:2} , % fret, string, finger
+ finger = {3/6:3} , % fret, string, finger
+ finger = {3/1:4} , % fret, string, finger
+ ring = {2,3,4} % open strings
+]}
+
+\newsavebox{\Gbarre}
+\savebox{\Gbarre}{
\chordscheme[
-name = G (Sol), % chord name
-position = 1, % first fret position
-finger = {2/5:2} , % fret, string, finger
-finger = {3/6:3} , % fret, string, finger
-finger = {3/1:4} , % fret, string, finger
-ring = {2,3,4} % open strings
-]
-%
-\chordscheme[
-name = G (Sol) barre,
-position = 3,
-barre = 1/1-6, % fret, string range
-finger = {2/3:2},
-finger = {3/5:3},
-finger = {3/4:4},
-]
+ name = G (Sol) barre,
+ position = 3,
+ barre = 1/1-6, % fret, string range
+ finger = {2/3:2},
+ finger = {3/5:3},
+ finger = {3/4:4}
+]}
+
+\usebox{\Gstd}\usebox{\Gbarre}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/glyphs.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/glyphs.tex
index fed562e2681..efde1e7fd23 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/glyphs.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/glyphs.tex
@@ -1,11 +1,13 @@
\documentclass{article}
\usepackage[minimal]{leadsheets}
\useleadsheetslibraries{musicsymbols}
+\useleadsheetslibraries{chords}
\thispagestyle{empty}
\begin{document}
\large
\sharp\ \flat\ \trebleclef\ \altoclef\ \bassclef\ \meterC\
+\writechord{Bb7(#9)}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/gtrcrd.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/gtrcrd.tex
index 08d61357c88..b721a927a5f 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/gtrcrd.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/gtrcrd.tex
@@ -3,8 +3,8 @@
\usepackage{gtrcrd}
\setlength{\crdheight}{2ex} % reduce spacing
-\def\crdfont{\footnotesize \itshape \sffamily} % chord font
-\setlength{\parindent}{0pt}
+\def\crdfont{\footnotesize \itshape \sffamily} % st chord font
+\setlength{\parindent}{0pt} % no indentation
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/guitartabs.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/guitartabs.tex
index 7a49de50868..d9c49f8ef16 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/guitartabs.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/guitartabs.tex
@@ -24,7 +24,7 @@
\notel{3}{3}{2}{0}{4}
% bar 4
\nextbar
- \notel{1}{3}{5}{3}{2}
+ \notel{1}{3}{2}{1}{2}
% rests
\restquarter{2}{3}
\restquarter{3}{3}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/jingle.ly b/Master/texmf-dist/doc/latex/latex4musicians/Figures/jingle.ly
new file mode 100644
index 00000000000..cf3fc0fee0e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/jingle.ly
@@ -0,0 +1,20 @@
+% Twelfth Street Rag
+
+\version "2.18.2"
+\header { tagline = "" } % no footer
+\paper { left-margin = 0\cm }
+
+music = \relative c' {
+ \time 2/4 \key ees \major
+ bes16 a bes c bes8-. r8 | bes16 a bes c bes8-. r8 |
+ bes16 bes8 bes16 c8 d | ees4-. r4 |
+}
+
+\score {
+ <<
+ \new Staff { \clef "G_8" \music } % sheet music
+ \new TabStaff { \tabFullNotation \music } % tablature
+ >>
+ \layout { }
+ \midi { \tempo 4 = 128 }
+}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/leadsheets.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/leadsheets.tex
index c6e15843006..f70ccbdea35 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/leadsheets.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/leadsheets.tex
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage[full]{leadsheets}
+\usepackage[songs]{leadsheets}
\thispagestyle{empty}
\begin{document}
@@ -7,13 +7,14 @@
\begin{song}{title={Imagine}, music={John Lennon}}
\begin{verse}
- \chord{C}Imagine there's \chord{Cmaj7}no \chord{F}heaven
+ Intro, $\times$ 2\\
+ \chord{C}~ \chord{Cmaj7}~ \chord{F}~
- \chord{C}It's easy if \chord{Cmaj7}you \chord{F}try
-
- \chord{C}No hell \chord{Cmaj7}below \chord{F}us
-
- \chord{C}Above us \chord{Cmaj7}only \chord{F}sky
+ % The ^ character is a shortcut for \chord
+ \chord{C}Imagine there's ^{Cmaj7}no ^{F}heaven \\
+ ^{C}It's easy if ^{Cmaj7}you ^{F}try \\
+ ^{C}No hell ^{Cmaj7}below ^{F}us \\
+ ^{C}Above us ^{Cmaj7}only ^{F}sky \\
\end{verse}
\end{song}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilyglyphs.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilyglyphs.tex
index a6b9576a8a9..580f4f107b3 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilyglyphs.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilyglyphs.tex
@@ -1,7 +1,7 @@
\documentclass{article}
\usepackage{fontspec}
\usepackage{lilyglyphs}
-\thispagestyle{empty} % no page number
+\thispagestyle{empty}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilytab.ly b/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilytab.ly
index 9bfb546ac9e..5c667755e4d 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilytab.ly
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/lilytab.ly
@@ -4,12 +4,12 @@
music = {
\time 3/4
- c4 d e f g a b a b c'2 r4
+ c4 d e f g a b a b c'2 r4 \bar "|."
}
\score {
<<
- \new Staff { \clef "G_8" \music }
- \new TabStaff { \music }
+ \new Staff { \clef "G_8" \music } % sheet music
+ \new TabStaff { \tabFullNotation \music } % tablature
>>
}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/musicography.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/musicography.tex
index e2924cd7bd0..4ac88892ea4 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/musicography.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/musicography.tex
@@ -1,6 +1,6 @@
\documentclass{article}
\usepackage{musicography}
-\thispagestyle{empty}
+\thispagestyle{empty} % no page number
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/pdfcrop.sh b/Master/texmf-dist/doc/latex/latex4musicians/Figures/pdfcrop.sh
new file mode 100644
index 00000000000..87430839bf2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/pdfcrop.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# pdfcrop.sh
+# Guido Gonzato, PhD. GPL 2 or later.
+
+MYSELF=$(basename $0)
+
+if [ $# -eq 0 ] ; then
+ printf "Usage: ${MYSELF} <file.pdf>\n"
+ printf "This script uses 'gs' to crop a one-page pdf file.\n\n"
+ exit 1
+fi
+
+# GhostScript for Windows must be installed in C:\Gs
+# GS=/c/gs/gs9.26/bin/gswin64c.exe
+# GNU/Linux and others:
+GS=/usr/bin/gs
+
+INPUT=$1
+PDF=$(basename $1 .pdf)
+OUTPUT=$PDF-crop.pdf
+GSOPTS="-q -sDEVICE=bbox -dBATCH -dNOPAUSE"
+
+# find out the bounding box
+$GS $GSOPTS $INPUT 2>&1 | grep "%%B" > $PDF.bbox
+
+# read bbox coordinates in variables
+read tmp X1 Y1 X2 Y2 < $PDF.bbox
+
+# write the output, cropped to bbox
+$GS -q -o $OUTPUT \
+ -sDEVICE=pdfwrite \
+ -c "[ /CropBox [$X1 $Y1 $X2 $Y2] /PAGES pdfmark" \
+ -f $INPUT
+
+/bin/rm -f $PDF.bbox
+
+echo "$INPUT cropped to $OUTPUT"
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-abc-all.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-abc-all.tex
index 525fda65be9..505c2cf9ffd 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-abc-all.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-abc-all.tex
@@ -54,7 +54,7 @@ uses \texttt{abc.sty} and defines new environments.
This is a short piece, typeset by M-Tx:
\begin{mtx}
-Title: Music sample in M-Tx
+Title: \bigtype Music sample in M-Tx
Style: Solo
Meter: C
Width: 160mm
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-latexmtx.ltx b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-latexmtx.ltx
index c001d0fc2c2..8dcd97c4935 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-latexmtx.ltx
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-latexmtx.ltx
@@ -9,10 +9,10 @@
\begin{document}
-This \LaTeX\ document includes music written in M-Tx. The \texttt{mus}
-environment includes music inline: \begin{mus} \input{scale.tex}
-\end{mus} , while the \texttt{excerpts} environment is used for longer
-excerpts:
+This \LaTeX\ document includes music written in M-Tx. The
+\texttt{mus} environment includes music inline:
+\begin{mus} \input{scale.tex} \end{mus} , while the
+\texttt{excerpts} environment is used for longer excerpts:
\medskip
@@ -20,8 +20,4 @@ excerpts:
\input{sample-mtx.tex}
\end{excerpts}
-\medskip
-
-End of document.
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lilybook.lytex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lilybook.lytex
index 435f6131a64..61c64df4675 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lilybook.lytex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lilybook.lytex
@@ -13,14 +13,12 @@ environment:
\begin{lilypond}
\score {
- <<
- \relative c' {
- \time 4/4
- \clef treble
- c4 d8 e f8 g a b | c4 b8 a g8 f e d |
- c8 g' e g c,8 g' e g | c,4 e c r \bar "|."
- }
- >>
+ \relative c' {
+ \time 4/4
+ \clef treble
+ c4 d8 e f8 g a b | c4 b8 a g8 f e d |
+ c8 g' e g c,8 g' e g | c,4 e c r \bar "|."
+ }
} % end of score
\end{lilypond}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lyluatex.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lyluatex.tex
index 596d8ff3b27..410380d6e4b 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lyluatex.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-lyluatex.tex
@@ -14,14 +14,12 @@ environment:
\begin{lilypond}
\score {
- <<
- \relative c' {
- \time 4/4
- \clef treble
- c4 d8 e f8 g a b | c4 b8 a g8 f e d |
- c8 g' e g c,8 g' e g | c,4 e c r \bar "|."
- }
- >>
+ \relative c' {
+ \time 4/4
+ \clef treble
+ c4 d8 e f8 g a b | c4 b8 a g8 f e d |
+ c8 g' e g c,8 g' e g | c,4 e c r \bar "|."
+ }
} % end of score
\end{lilypond}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mlatex.tex
index 0d7f5851ba9..2837c85069d 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mlatex.tex
@@ -35,6 +35,4 @@ A short music excerpt in MusiX\TeX:
\end{music}
-End of the excerpt.
-
\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtex.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtex.tex
new file mode 100644
index 00000000000..3cffaf028f0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtex.tex
@@ -0,0 +1,19 @@
+% bare MusiXTeX example
+
+\input musixtex
+\nopagenumbers
+
+\setstaffs1{1} % a single stave
+\setclef1{\treble} % with a treble clef
+\generalmeter{\meterC} % common time
+\nobarnumbers % what it says
+\startextract % a short music piece
+ % \qu = quarter note, stem up;
+ % \ql = quarter note, stem down;
+ % \Notes, \en = start and end of note line
+ \Notes \qu c \qu d \qu e \qu f \en
+ \bar
+ \Notes \qu g \qu{'a} \ql b \ql c \en
+\endextract
+
+\end
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.mtx b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.mtx
index 13e88d39e41..ea8ac90b9bc 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.mtx
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.mtx
@@ -1,6 +1,6 @@
% music sample in M-Tx notation
-Title: Music sample in M-Tx
+Title: \bigtype Music sample in M-Tx
Style: Solo
Meter: C
Width: 160mm
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.pmx b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.pmx
index c9b98737250..068d63542f4 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.pmx
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.pmx
@@ -2,7 +2,7 @@
\def\mtxversion{0.63a}
\def\mtxdate{<8 April 2018>}
\input mtx
-\mtxTitleLine{Music sample in M-Tx}
+\mtxTitleLine{\bigtype Music sample in M-Tx}
---
1 -1 1 4 4 0 6 0.00000 0 1 1 20 0
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.tex
index bcb74fd5a99..abfccd70419 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-mtx.tex
@@ -6,7 +6,7 @@
\def\mtxversion{0.63a}
\def\mtxdate{<8 April 2018>}
\input mtx
-\mtxTitleLine{Music sample in M-Tx}
+\mtxTitleLine{\bigtype Music sample in M-Tx}
\input musixtex
\input pmx
\setmaxslurs{24}\setmaxinstruments{24}%
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtab.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtab.tex
deleted file mode 100644
index 4a2ef3b9bf5..00000000000
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtab.tex
+++ /dev/null
@@ -1,11 +0,0 @@
-\input musixtex
-\input musixps
-\input musixtab
-
-\setlines16
-\setsize1\largevalue
-
-\setclefsymbol1{\tabclefsymbolsmall}
-
-% \str{4}{4}
-
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex-tab.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex-tab.tex
new file mode 100644
index 00000000000..29471a6b7f3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-musixtex-tab.tex
@@ -0,0 +1,24 @@
+% bare MusiXTeX example
+
+\input musixtex
+\nopagenumbers
+
+This is a MusiXTeX tablature example:
+
+\setlines16 % six lines
+\setstaffs1{1}
+\setclefsymbol1{\tabclef} % and a TAB clef
+\nobarnumbers
+\let\extractline\leftline % left aligned
+
+\startextract
+ \Notes \tab{5}{3} \tab{4}{0} \tab{4}{2} \en
+ \bar
+ \Notes \tab{4}{3} \tab{3}{0} \tab{3}{2} \en
+ \bar
+ \Notes \tab{2}{0} \tab{3}{2} \tab{2}{0} \en
+ \bar
+ \Notes \tab{2}{1} \qp \qp \en
+\endextract
+
+\end
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.orig.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.orig.tex
new file mode 100644
index 00000000000..39d6b4c0577
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.orig.tex
@@ -0,0 +1,141 @@
+\documentclass[11pt]{article}
+\usepackage{graphicx}
+\usepackage{gchords}
+\usepackage{guitar}
+
+\begin{document}
+
+\title{A Minimal Songbook}
+\author{Guido Gonzato}
+
+\maketitle
+
+\tableofcontents
+
+\bigskip
+\hrule
+
+% -----
+
+\section{For He's a Jolly Good Fellow}
+
+According to the 1998 Guinness World Records, this is the second most
+recognized song in the English language.
+
+\smallchords
+
+\def\numfrets{4}
+\chords{
+\chord{t}{n,p3,p2,n,p1,n}{C}
+\chord{t}{p3,p2,n,n,n,p3}{G}
+\chord{t1}{n,p2,p2,p1,n,n}{F}
+}
+
+\medskip
+
+\includegraphics[width=\textwidth]{fellow}
+
+% -----
+
+\section{Happy Birthday To You}
+
+According to the 1998 Guinness World Records, it is the most
+recognized song in the English language, followed by ``For He's a
+Jolly Good Fellow''.
+
+\def\numfrets{4}
+\chords{
+\chord{t1}{n,p2,p2,p1,n,n}{F}
+\chord{t}{n,p3,p2,n,p1,n}{C}
+\chord{t}{n,p3,p2,p3,p1,n}{C7}
+\chord{t1}{n,n,p2,p2,p2,n}{Bb}
+}
+
+\medskip
+
+\includegraphics[width=\textwidth]{happyb}
+
+% -----
+
+\section{Twinkle, Twinkle Little Star}
+
+This is a popular English lullaby.
+
+\def\numfrets{4}
+\chords{
+\chord{t}{n,p3,p2,n,p1,n}{C}
+\chord{t1}{n,p2,p2,p1,n,n}{F}
+\chord{t}{x,n,n,p2,p3,p1}{Dm}
+\chord{t}{p3,p2,n,n,n,p3}{G}
+}
+
+\includegraphics[width=\textwidth]{twinkle}
+
+\medskip
+
+\begin{guitar}
+
+[C]Twinkle, twinkle, [F]little [C]star,
+[Dm]How I [C]wonder [G]what you [C]are!
+[C]Up a[Dm]bove the [C]world so [G]high,
+[C]Like a [Dm]diamond [C]in the [G]sky.
+Twinkle{\ldots}
+
+[C]When this blazing [F]sun is [C]gone,
+[Dm]When he [C]nothing [G]shines u[C]pon,
+[C]Then you [Dm]show your [C]little [G]light,
+[C]Twinkle, [Dm]twinkle, [C]through the night.
+Twinkle{\ldots}
+
+[C]Then the [F]traveller in the [C]dark
+[Dm]Thanks you [C]for your [G]tiny [C]spark;
+[C]He could [Dm]not see [C]where to [G]go,
+[C]If you [Dm]did not [C]twinkle [G]so.
+Twinkle{\ldots}
+
+[C]In the dark blue [F]sky you [C]keep,
+And [Dm]often [C]through my [G]curtains [C]peep,
+[C]For you [Dm]never [C]shut your [G]eye
+[C]Till the [Dm]sun is [C]in the [G]sky.
+Twinkle{\ldots}
+
+[C]As your bright and [F]tiny [C]spark
+[Dm]Lights the [C]traveller [G]in the [C]dark,
+[C]Though I [Dm]know not [C]what you [G]are,
+[C]Twinkle, [Dm]twinkle, [C]little [G]star.
+Twinkle{\ldots}
+
+\end{guitar}
+
+% -----
+
+\section{Warm Kitty}
+
+No need to introduce this lullaby!
+
+\def\numfrets{4}
+\chords{
+\chord{t1}{n,n,p2,p2,p2,n}{Bb}
+\chord{t1}{n,p2,p2,p1,n,n}{F}
+\chord{t1}{n,p2,n,p1,n,n}{F7}
+}
+
+\medskip
+
+\includegraphics[width=\textwidth]{happyb}
+
+\medskip
+
+\begin{guitar}
+
+[Bb]Soft kitty, [F]warm kitty
+
+[Bb]Little ball of [F]fur [F7]
+
+[Bb]Happy kitty, [F]sleepy kitty
+
+[Bb]Purr, [F]purr, [Bb]purr
+
+\end{guitar}
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.tex
index 10d2ae9a202..ec55cb3e02c 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/sample-songbook.tex
@@ -2,112 +2,106 @@
\usepackage{graphicx}
\usepackage{gchords}
\usepackage{guitar}
-% \thispagestyle{empty}
-% \pagestyle{empty}
\begin{document}
\title{A Minimal Songbook}
\author{Guido Gonzato}
+\date{\today}
\maketitle
-
\tableofcontents
-\bigskip
-\hrule
-
% -----
\section{For He's a Jolly Good Fellow}
-According to the 1998 Guinness World Records, this is the second most
-recognized song in the English language.
+% Typically sung to congratulate somebody.
\smallchords
\def\numfrets{4}
-\chords{
-\chord{t}{n,p3,p2,n,p1,n}{C}
-\chord{t}{p3,p2,n,n,n,p3}{G}
-\chord{t1}{n,p2,p2,p1,n,n}{F}
+\begin{minipage}[c]{\linewidth} % use less space
+ \chords{
+ \chord{t}{n,p3,p2,n,p1,n}{C}
+ \chord{t}{p3,p2,n,n,n,p3}{G}
+ \chord{t}{n,p3,p2,p3,p1,n}{C7}
+ \chord{t1}{n,p2,p2,p1,n,n}{F}
}
+\end{minipage}
\medskip
\includegraphics[width=\textwidth]{fellow}
+\bigskip
+
+\begin{guitar}
+
+For [C]he's a jolly good fellow,
+For [G]he's a jolly good [C]fellow,
+For [C7]he's a jolly good [F]fellow,
+Which [C]nobody [G]can [C]deny.
+
+\end{guitar}
+
% -----
\section{Happy Birthday To You}
-According to the 1998 Guinness World Records, it is the most
-recognized song in the English language, followed by ``For He's a
-Jolly Good Fellow''.
+% Sung to remind somebody they're growing old.
\def\numfrets{4}
-\chords{
-\chord{t1}{n,p2,p2,p1,n,n}{F}
-\chord{t}{n,p3,p2,n,p1,n}{C}
-\chord{t}{n,p3,p2,p3,p1,n}{C7}
-\chord{t1}{n,n,p2,p2,p2,n}{B$\flat$}
+\begin{minipage}[c]{\linewidth}
+ \chords{
+ \chord{t1}{n,p2,p2,p1,n,n}{F}
+ \chord{t}{n,p3,p2,n,p1,n}{C}
+ \chord{t}{n,p3,p2,p3,p1,n}{C7}
+ \chord{t1}{n,n,p2,p2,p2,n}{Bb}
}
+\end{minipage}
\medskip
\includegraphics[width=\textwidth]{happyb}
+\bigskip
+
+\begin{guitar}
+Happy [F]birthday to [C]you,
+Happy [C7]birthday to [F]you,
+Happy birthday dear [Bb]Guido,
+Happy [F]birthday [C]to [F]you!
+\end{guitar}
+
% -----
-\section{Twinkle, Twinkle Little Star}
+\section{Warm Kitty}
-This is a popular English lullaby.
+% No need to introduce this lullaby!
\def\numfrets{4}
+\begin{minipage}[c]{\linewidth}
\chords{
-\chord{t}{n,p3,p2,n,p1,n}{C}
-\chord{t1}{n,p2,p2,p1,n,n}{F}
-\chord{t}{x,n,n,p2,p3,p1}{Dm}
-\chord{t}{p3,p2,n,n,n,p3}{G}
+ \chord{t}{n,n,p2,p2,p2,n}{A}
+ \chord{t}{n,p2,p2,p1,n,n}{E}
+ \chord{t}{n,p2,p2,p1,p3,n}{E7}
}
+\end{minipage}
-\includegraphics[width=\textwidth]{twinkle}
+\medskip
-\medskip
+\includegraphics[width=\textwidth]{warm}
+
+\bigskip
\begin{guitar}
-[C]Twinkle, twinkle, [F]little [C]star,
-[Dm]How I [C]wonder [G]what you [C]are!
-[C]Up a[Dm]bove the [C]world so [G]high,
-[C]Like a [Dm]diamond [C]in the [G]sky.
-Twinkle{\ldots}
-
-[C]When this blazing [F]sun is [C]gone,
-[Dm]When he [C]nothing [G]shines u[C]pon,
-[C]Then you [Dm]show your [C]little [G]light,
-[C]Twinkle, [Dm]twinkle, [C]through the night.
-Twinkle{\ldots}
-
-[C]Then the [F]traveller in the [C]dark
-[Dm]Thanks you [C]for your [G]tiny [C]spark;
-[C]He could [Dm]not see [C]where to [G]go,
-[C]If you [Dm]did not [C]twinkle [G]so.
-Twinkle{\ldots}
-
-[C]In the dark blue [F]sky you [C]keep,
-And [Dm]often [C]through my [G]curtains [C]peep,
-[C]For you [Dm]never [C]shut your [G]eye
-[C]Till the [Dm]sun is [C]in the [G]sky.
-Twinkle{\ldots}
-
-[C]As your bright and [F]tiny [C]spark
-[Dm]Lights the [C]traveller [G]in the [C]dark,
-[C]Though I [Dm]know not [C]what you [G]are,
-[C]Twinkle, [Dm]twinkle, [C]little [G]star.
-Twinkle{\ldots}
+[A]Soft kitty, [E]warm kitty
+[A]Little ball of [E]fur [E7]~
+[A]Happy kitty, [E]sleepy kitty
+[A]Purr, [E]purr, [A]purr
\end{guitar}
-
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/shave.ly b/Master/texmf-dist/doc/latex/latex4musicians/Figures/shave.ly
new file mode 100644
index 00000000000..d45e17f22ea
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/shave.ly
@@ -0,0 +1,17 @@
+% shave.ly
+
+\version "2.18.2"
+\header { tagline = "" } % no footer
+\paper { left-margin = 0\cm }
+
+music = \relative c' {
+ \time 4/4
+ c4^"Scherzando" g8 g aes4 g | r4 b4-> c-> r4 |
+}
+
+\score {
+ <<
+ \new Staff { \clef "G_8" \music }
+ \new TabStaff { \music }
+ >>
+}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/songbook.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/songbook.tex
index 0fda4063ff4..685de434169 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/songbook.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/songbook.tex
@@ -12,12 +12,12 @@
\Ch{C}~ \Ch{Cmaj7}~ \Ch{F}~
- \Ch{C}{Imagine} there's \Ch{Cmaj7}{no} \Ch{F}heaven
+\Ch{C}{Imagine} there's \Ch{Cmaj7}{no} \Ch{F}heaven
- \Ch{C}{It's} easy if \Ch{Cmaj7}{you} \Ch{F}{try}
+\Ch{C}{It's} easy if \Ch{Cmaj7}{you} \Ch{F}{try}
- \Ch{C}No hell \Ch{Cmaj7}{below} \Ch{F}us
+\Ch{C}No hell \Ch{Cmaj7}{below} \Ch{F}us
- \Ch{C}{Above} us \Ch{Cmaj7}{only} \Ch{F}{sky}
+\Ch{C}{Above} us \Ch{Cmaj7}{only} \Ch{F}{sky}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/songs.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/songs.tex
index 066eb66d44b..e2f48fdb80a 100644
--- a/Master/texmf-dist/doc/latex/latex4musicians/Figures/songs.tex
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/songs.tex
@@ -4,9 +4,10 @@
\begin{document}
-\renewcommand{\stitlefont}{\rm\large}
\renewcommand{\lyricfont}{\small}
\renewcommand{\printchord}{\it\small}
+\afterpreludeskip=-18pt
+\beforepostludeskip=-8pt
\begin{songs}{}
\beginsong{Imagine}[by={John Lennon}]
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/verses-chords.tex b/Master/texmf-dist/doc/latex/latex4musicians/Figures/verses-chords.tex
new file mode 100644
index 00000000000..875b4058bf3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/verses-chords.tex
@@ -0,0 +1,49 @@
+\documentclass{article}
+\usepackage{guitar}
+\usepackage{gchords}
+\thispagestyle{empty}
+
+\newcommand{\C}{\hspace{-0.8em}\chord{t}{n,p3,p2,n,p1,n}{C}}
+\newcommand{\CmajVII}{\hspace{-0.8em}\chord{t}{n,p3,p2,n,n,n}{Cmaj7}}
+\newcommand{\F}{\hspace{-0.8em}\chord{t1}{n,p2,p2,p1,n,n}{F}}
+
+\def\chordsize{1.5mm}
+\def\numfrets{3}
+\def\namefont{\it}
+
+\begin{document}
+
+\noindent
+We can typeset verses and guitar chord grids in a \texttt{guitar}
+environment:
+
+\bigskip
+
+\begin{minipage}[c]{\linewidth} % to avoid indentation
+ \begin{guitar}
+
+ \textbf{Imagine (John Lennon)}
+ \emph{Intro, $\times$ 2}
+ [\C] \hspace{2em} [\CmajVII] \hspace{2em} [\F] \hspace{2em}
+ [\C]Imagine there's [\CmajVII|]{no} ~ [\F]heaven
+ [\C]It's easy if [\CmajVII|]{you} ~ [\F]try
+
+ \end{guitar}
+\end{minipage}
+
+\noindent
+{\ldots}and so on. But we could just use the \verb|\upchord| command,
+provided by \texttt{gchords}:
+
+\begin{verse}
+
+ \upchord{\C}Imagine there's \upchord{\CmajVII}no \qquad
+ \upchord{\F}heaven
+
+ \upchord{\C}It's easy if \upchord{\CmajVII}you \qquad
+ \upchord{\F}try
+
+\end{verse}
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/latex4musicians/Figures/warm.abc b/Master/texmf-dist/doc/latex/latex4musicians/Figures/warm.abc
new file mode 100644
index 00000000000..3298ae87e32
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/latex4musicians/Figures/warm.abc
@@ -0,0 +1,7 @@
+X:1
+M:2/4
+L:1/8
+K:Amaj
+%
+"A"e2 cc | "E"d2 BB | "A"AB cd | "E"e2 "E7"z2 |
+"A"e2 cc | "E"d2 BB | "A"A2 "E"B2 | "A"A2 z2 |]