From 94c06cd2b1fbdb33d860a70b9843ca999e7d5776 Mon Sep 17 00:00:00 2001
From: Romain Goffe <romain.goffe@gmail.com>
Date: Wed, 13 Jun 2012 20:20:21 +0200
Subject: [PATCH] display the list of ukulele diagrams

 - merge chords_uku in chords
 - rework layout for better presentation
 - shorter names for diagrams to ensure it fits in one page
---
 tex/chords.tex     | 424 +++++++++++++++++++++++++++++++--------------
 tex/chords_uku.tex | 140 ---------------
 2 files changed, 296 insertions(+), 268 deletions(-)
 delete mode 100644 tex/chords_uku.tex

diff --git a/tex/chords.tex b/tex/chords.tex
index 9037b5eb..00e44278 100644
--- a/tex/chords.tex
+++ b/tex/chords.tex
@@ -1,140 +1,308 @@
-\ifchorded
-\songsection{Liste des accords}
-\begin{songs}{}
+\newcommand*{\Sharp}{\nolinebreak\hspace{-.05em}\raisebox{.6ex}{\,\small\bf \#}}
+\newcommand*{\Flat}{\nolinebreak\hspace{-.05em}\raisebox{.6ex}{\,\small$\mathbf{\flat}$}}
+\newcommand*{\chordrule}{\mbox{\hspace{1cm}\rule[0.5cm]{15cm}{0.02cm}}\vspace{-.4cm}}
+\newcommand*{\chordname}[1]{\makebox[3cm]{\raisebox{.5cm}{\large \textbf{#1}}}}
 
+\begin{songs}{}
   %hide song number
   \definecolor{SongNumberBgColor}{HTML}{FFFFFF}
   \renewcommand{\snumbgcolor}{SongNumberBgColor}
   \renewcommand{\printsongnum}[1]{}
   \setlength{\songnumwidth}{0.1cm}
+  \songcolumns{1}
+
+  \ifguitar
+  \IfStrEq{\getlang}{english}{\beginsong{Guitar chords}}{\beginsong{Accords de guitare}}
+  \chordname{C}
+  \gtab{C}{~:X32010}
+  \gtab{C7}{~:X32310}
+  \gtab{Cm}{3:X02210}
+  \gtab{Cm7}{3:X02010}
+  \hspace{1cm}
+  \gtab{C7M}{~:332000}
+  \gtab{C4}{~:X32011}
+  \gtab{C7}{1:X2120X}
+  \gtab{C6}{~:XX2213}
+  \chordrule
+
+  \chordname{C\Sharp = D\Flat}
+  \gtab{C#}{4:X02220}
+  \gtab{C#7}{4:X02020}
+  \gtab{C#m}{4:X02210}
+  \gtab{C#m7}{5:XX2213}
+  \hspace{1cm}
+  \gtab{C#7M}{1:X32000}
+  \gtab{C#4}{2:X21000}
+  \gtab{C#7}{2:X2120X}
+  \gtab{C#6}{1:X02010}
+  \chordrule
+
+  \chordname{D}
+  \gtab{D}{~:XX0232}
+  \gtab{D7}{~:XX0212}
+  \gtab{Dm}{~:XX0231}
+  \gtab{Dm7}{~:XX0211}
+  \hspace{1cm}
+  \gtab{D7M}{~:X00222}
+  \gtab{D4}{~:X00233}
+  \gtab{D7}{3:X2120X}
+  \gtab{D6}{~:X00202}
+  \chordrule
+
+  \chordname{D\Sharp = E\Flat}
+  \gtab{D#}{6:X02220}
+  \gtab{D#7}{6:X02020}
+  \gtab{D#m}{6:X02210}
+  \gtab{D#m7}{~:XX1322}
+  \hspace{1cm}
+  \gtab{D#7M}{3:022010}
+  \gtab{D#4}{4:X21000}
+  \gtab{D#7}{4:X2120X}
+  \gtab{D#6}{1:X00202}
+  \chordrule
+
+  \chordname{E}
+  \gtab{E}{~:022100}
+  \gtab{E7}{~:020100}
+  \gtab{Em}{~:022000}
+  \gtab{Em7}{~:022030}
+  \hspace{1cm}
+  \gtab{E7M}{~:021100}
+  \gtab{E4}{~:02220}
+  \gtab{E7}{5:X2120X}
+  \gtab{E6}{~:022120}
+  \chordrule
+
+  \chordname{F}
+  \gtab{F}{1:022100}
+  \gtab{F7}{1:02010}
+  \gtab{Fm}{1:022000}
+  \gtab{Fm7}{1:020000}
+  \hspace{1cm}
+  \gtab{F7M}{~:XX3210}
+  \gtab{F4}{1:022200}
+  \gtab{F7}{6:X2120X}
+  \gtab{F6}{~:XX0211}
+  \chordrule
+
+  \chordname{F\Sharp = G\Flat}
+  \gtab{F#}{2:022100}
+  \gtab{F#7}{2:020100}
+  \gtab{F#m}{2:022000}
+  \gtab{F#m7}{2:020000}
+  \hspace{1cm}
+  \gtab{F#7M}{~:XX4321}
+  \gtab{F#4}{2:022200}
+  \gtab{F#7}{7:X2120X}
+  \gtab{F#6}{~:XX1322}
+  \chordrule
+
+  \chordname{G}
+  \gtab{G}{~:320003}
+  \gtab{G7}{~:320001}
+  \gtab{Gm}{3:022000}
+  \gtab{Gm7}{3:020000}
+  \hspace{1cm}
+  \gtab{G7M}{~:XX0002}
+  \gtab{G4}{3:022200}
+  \gtab{G7}{3:020200}
+  \gtab{G6}{~:320000}
+  \chordrule
+
+  \chordname{G\Sharp = A\Flat}
+  \gtab{G#}{4:022100}
+  \gtab{G#7}{4:020100}
+  \gtab{G#m}{4:022000}
+  \gtab{G#m7}{4:020000}
+  \hspace{1cm}
+  \gtab{G#7M}{3:XX4321}
+  \gtab{G#4}{4:022200}
+  \gtab{G#7}{~:XX1122}
+  \gtab{G#6}{~:XX1111}
+  \chordrule
+
+  \chordname{A}
+  \gtab{A}{~:X02220}
+  \gtab{A7}{~:022100}
+  \gtab{Am}{~:XX0232}
+  \gtab{Am7}{~:X02213}
+  \hspace{1cm}
+  \gtab{A7M}{~:X02120}
+  \gtab{A4}{~:X02230}
+  \gtab{A7}{~:X02233}
+  \gtab{A6}{~:XX2222}
+  \chordrule
 
-  \beginsong{Accords usuels}
-    %\musicnote[french]{Accords usuels}
-    %\musicnote[english]{Standard chords}
-    \gtab{C}{X32010}
-    \gtab{C7}{X32310}
-    \gtab{Cm}{3:X02210}
-    \gtab{Cm7}{3:X02010}
-    
-    \gtab{C#=D&}{4:X02220}
-    \gtab{C#7=D&7}{4:X02020}
-    \gtab{C#m=D&m}{4:X02210}
-    \gtab{C#m7=D&m7}{5:XX2213}
-    
-    \gtab{D}{XX0232}
-    \gtab{D7}{XX0212}
-    \gtab{Dm}{XX0231}
-    \gtab{Dm7=F6}{XX0211}
-    
-    \gtab{D#=E&}{6:X02220}
-    \gtab{D#7=E&7}{6:X02020}
-    \gtab{D#m=E&m}{6:X02210}
-    \gtab{D#m7=E&m7}{XX1322}
-    
-    \gtab{E}{022100}
-    \gtab{E7}{020100}
-    \gtab{Em}{022000}
-    \gtab{Em7}{022030}
-    
-    \gtab{F}{1:022100}
-    \gtab{F7}{1:02010}
-    \gtab{Fm}{1:022000}
-    \gtab{Fm7=A&6}{1:020000}
-    
-    \gtab{F#=G&}{2:022100}
-    \gtab{F#7=G&7}{2:020100}
-    \gtab{F#m=G&m}{2:022000}
-    \gtab{F#m7=A6}{2:020000}
-    
-    \gtab{G}{320003}
-    \gtab{G7}{320001}
-    \gtab{Gm}{3:022000}
-    \gtab{Gm7=B&6}{3:020000}
-    
-    \gtab{G#=A&}{4:022100}
-    \gtab{G#7=A&7}{4:020100}
-    \gtab{G#m=A&m}{4:022000}
-    \gtab{G#m7=B6}{4:020000}
-    
-    \gtab{A}{X02220}
-    \gtab{A7}{022100}
-    \gtab{Am}{XX0232}
-    \gtab{Am7}{X02213}
-    
-    \gtab{A#=B&}{1:X02220}
-    \gtab{A#7=B&7}{1:X02020}
-    \gtab{A#m=B&m}{1:X02210}
-    \gtab{A#m7=B&m7}{1:X02010}
-    
-    \gtab{B}{2:X02220}
-    \gtab{B7}{X21202}
-    \gtab{Bm}{2:X02210}
-    \gtab{Bm7=D6}{X00202}
+  \chordname{A\Sharp = B\Flat}
+  \gtab{A#}{1:X02220}
+  \gtab{A#7}{1:X02020}
+  \gtab{A#m}{1:X02210}
+  \gtab{A#m7}{1:X02010}
+  \hspace{1cm}
+  \gtab{A#7M}{1:X02120}
+  \gtab{A#4}{1:X02230}
+  \gtab{A#7}{~:XX3344}
+  \gtab{A#6}{~:XX3333}
+  \chordrule
+
+  \chordname{B}
+  \gtab{B}{2:X02220}
+  \gtab{B7}{X21202}
+  \gtab{Bm}{2:X02210}
+  \gtab{Bm7}{~:X00202}
+  \hspace{1cm}
+  \gtab{B7M}{2:X02120}
+  \gtab{B4}{2:X02230}
+  \gtab{B7}{~:X22202}
+  \gtab{B6}{~:XX4444}
   \endsong
+  \fi
+
+  \ifukulele
+  \IfStrEq{\getlang}{english}{\beginsong{Ukulele chords}}{\beginsong{Accords de ukulélé}}
+  \chordname{C}
+  \utab{C}{~:0003}
+  \utab{C7}{~:0001}
+  \utab{Cm}{~:0333}
+  \utab{Cm7}{3:0000}
+  \hspace{1cm}
+  \utab{C7M}{~:0002}
+  \utab{C6}{~:0000}
+  \utab{Caug}{~:1003}
+  \utab{Cdim}{2:3101}
+  \chordrule
+
+  \chordname{C\Sharp = D\Flat}
+  \utab{C#}{1:0003}
+  \utab{C#7}{1:0001}
+  \utab{C#m}{~:1104}
+  \utab{C#m7}{4:0000}
+  \hspace{1cm}
+  \utab{C#7M}{1:0002}
+  \utab{C#6}{1:0000}
+  \utab{C#aug}{~:2110}
+  \utab{C#dim}{~:0104}
+  \chordrule
+
+  \chordname{D}
+  \utab{D}{~:2220}
+  \utab{D7}{2:0001}
+  \utab{Dm}{~:2210}
+  \utab{Dm7}{1:1102}
+  \hspace{1cm}
+  \utab{D7M}{2:0002}
+  \utab{D6}{2:0000}
+  \utab{Daug}{1:2110}
+  \utab{Ddim}{1:0104}
+  \chordrule
+
+  \chordname{D\Sharp = E\Flat}
+  \utab{D#}{1:2220}
+  \utab{D#7}{3:0001}
+  \utab{D#m}{1:2210}
+  \utab{D#m7}{2:1102}
+  \hspace{1cm}
+  \utab{D#7M}{3:0002}
+  \utab{D#6}{3:0000}
+  \utab{D#aug}{~:0332}
+  \utab{D#dim}{~:2320}
+  \chordrule
+
+  \chordname{E}
+  \utab{E}{2:2220}
+  \utab{E7}{~:1202}
+  \utab{Em}{~:0432}
+  \utab{Em7}{~:0202}
+  \hspace{1cm}
+  \utab{E7M}{~:1302}
+  \utab{E6}{~:1102}
+  \utab{Eaug}{1:0000}
+  \utab{Edim}{1:2320}
+  \chordrule
+
+  \chordname{F}
+  \utab{F}{~:2010}
+  \utab{F7}{~:2310}
+  \utab{Fm}{~:1013}
+  \utab{Fm7}{1:0202}
+  \hspace{1cm}
+  \utab{F7M}{1:1302}
+  \utab{F6}{1:1102}
+  \utab{Faug}{~:2110}
+  \utab{Fdim}{2:2320}
+  \chordrule
+
+  \chordname{F\Sharp = G\Flat}
+  \utab{F#}{1:2010}
+  \utab{F#7}{1:2310}
+  \utab{F#m}{~:2120}
+  \utab{F#m7}{2:0202}
+  \hspace{1cm}
+  \utab{F#7M}{2:1302}
+  \utab{F#6}{~:0202}
+  \utab{F#aug}{1:2110}
+  \utab{F#dim}{~:2020}
+  \chordrule
+
+  \chordname{G}
+  \utab{G}{~:0232}
+  \utab{G7}{~:0212}
+  \utab{Gm}{~:0231}
+  \utab{Gm7}{~:0211}
+  \hspace{1cm}
+  \utab{G7M}{~:0222}
+  \utab{G6}{~:0202}
+  \utab{Gaug}{~:0332}
+  \utab{Gdim}{~:0131}
+  \chordrule
+
+  \chordname{G\Sharp = A\Flat}
+  \utab{G#}{3:2010}
+  \utab{G#7}{1:0212}
+  \utab{G#m}{1:0231}
+  \utab{G#m7}{1:0211}
+  \hspace{1cm}
+  \utab{G#7M}{1:0222}
+  \utab{G#6}{1:0202}
+  \utab{G#aug}{~:1003}
+  \utab{G#dim}{1:0131}
+  \chordrule
+
+  \chordname{A}
+  \utab{A}{~:2100}
+  \utab{A7}{~:0100}
+  \utab{Am}{~:2000}
+  \utab{Am7}{~:0000}
+  \hspace{1cm}
+  \utab{A7M}{~:1100}
+  \utab{A6}{2:0202}
+  \utab{Aaug}{~:2110}
+  \utab{Adim}{2:0131}
+  \chordrule
+
+  \chordname{A\Sharp = B\Flat}
+  \utab{A#}{1:2100}
+  \utab{A#7}{1:0100}
+  \utab{A#m}{1:2000}
+  \utab{A#m7}{1:0000}
+  \hspace{1cm}
+  \utab{A#7M}{1:1100}
+  \utab{A#6}{~:0211}
+  \utab{A#aug}{1:2110}
+  \utab{A#dim}{~:3101}
+  \chordrule
 
-  \beginsong{Accords avancés}
-    %\musicnote[french]{Accords avancés}
-    %\musicnote[english]{Advanced chords}
-    \gtab{C7M}{332000}
-    \gtab{C4}{X32011}
-    \gtab{C7}{1:X2120X}
-    \gtab{C6}{XX2213}
-    
-    \gtab{C#7M=D&7M}{1:X32000}
-    \gtab{C#4=D&4}{2:X21000}
-    \gtab{C#7=D&7}{2:X2120X}
-    \gtab{C#6=D&6}{1:X02010}
-    
-    \gtab{D7M}{X00222}
-    \gtab{D4}{X00233}
-    \gtab{D7}{3:X2120X}
-    \gtab{D6}{X00202}
-    
-    \gtab{D#7M=E&7M}{3:022010}
-    \gtab{D#4=E&4}{4:X21000}
-    \gtab{D#7=E&7}{4:X2120X}
-    \gtab{D#6=E&6}{1:X00202}
-    
-    \gtab{E7M}{021100}
-    \gtab{E4}{02220}
-    \gtab{E7}{5:X2120X}
-    \gtab{E6}{022120}
-    
-    \gtab{F7M}{XX3210}
-    \gtab{F4}{1:022200}
-    \gtab{F7}{6:X2120X}
-    \gtab{F6}{XX0211}
-    
-    \gtab{F#7M=G&7M}{XX4321}
-    \gtab{F#4=G&4}{2:022200}
-    \gtab{F#7=G&7}{7:X2120X}
-    \gtab{F#6=G&6}{XX1322}
-    
-    \gtab{G7M}{XX0002}
-    \gtab{G4}{3:022200}
-    \gtab{G7}{3:020200}
-    \gtab{G6}{320000}
-    
-    \gtab{G#7M=A&7M}{3:XX4321}
-    \gtab{G#4=A&4}{4:022200}
-    \gtab{G#7=A&7}{XX1122}
-    \gtab{G#6=A&6}{XX1111}
-    
-    \gtab{A7M}{X02120}
-    \gtab{A4}{X02230}
-    \gtab{A7}{X02233}
-    \gtab{A6}{XX2222}
-    
-    \gtab{A#7M=B&7M}{1:X02120}
-    \gtab{A#4=B&4}{1:X02230}
-    \gtab{A#7=B&7}{XX3344}
-    \gtab{A#6=B&6}{XX3333}
-    
-    \gtab{B7M}{2:X02120}
-    \gtab{B4}{2:X02230}
-    \gtab{B7}{X22202}
-    \gtab{B6}{XX4444}
+  \chordname{B}
+  \utab{B}{2:2100}
+  \utab{B7}{2:0100}
+  \utab{Bm}{2:2000}
+  \utab{Bm7}{2:0000}
+  \hspace{1cm}
+  \utab{B7M}{2:1100}
+  \utab{B6}{1:0211}
+  \utab{Baug}{~:0332}
+  \utab{Bdim}{1:3101}
   \endsong
+  \fi
 
 \end{songs}
-\fi
diff --git a/tex/chords_uku.tex b/tex/chords_uku.tex
deleted file mode 100644
index 7073e9e0..00000000
--- a/tex/chords_uku.tex
+++ /dev/null
@@ -1,140 +0,0 @@
-\ifchorded
-\songsection{Liste des accords}
-\begin{songs}{}
-
-  %hide song number
-  \definecolor{SongNumberBgColor}{HTML}{FFFFFF}
-  \renewcommand{\snumbgcolor}{SongNumberBgColor}
-  \renewcommand{\printsongnum}[1]{}
-  \setlength{\songnumwidth}{0.1cm}
-
-  \beginsong{Accords usuels}
-    %\musicnote[french]{Accords usuels}
-    %\musicnote[english]{Standard chords}
-    \utab{C}{0003}
-    \utab{C7}{0001}
-    \utab{Cm}{0333}
-    \utab{Cm7}{3:0000}
-    
-    \utab{C#=D&}{1:0003}
-    \utab{C#7=D&7}{1:0001}
-    \utab{C#m=D&m}{1104}
-    \utab{C#m7=D&m7}{4:0000}
-    
-    \utab{D}{2220}
-    \utab{D7}{2:0001}
-    \utab{Dm}{2210}
-    \utab{Dm7}{1:1102}
-   
-    \utab{D#=E&}{1:2220}
-    \utab{D#7=E&7}{3:0001}
-    \utab{D#m=E&m}{1:2210}
-    \utab{D#m7=E&m7}{2:1102}
-
-    \utab{E}{2:2220}
-    \utab{E7}{1202}
-    \utab{Em}{0432}
-    \utab{Em7}{0202}
-    
-    \utab{F}{2010}
-    \utab{F7}{2310}
-    \utab{Fm}{1013}
-    \utab{Fm7}{1:0202}
-
-    \utab{F#=G&}{1:2010}
-    \utab{F#7=G&7}{1:2310}
-    \utab{F#m=G&m}{2120}
-    \utab{F#m7=G&m7}{2:0202}
-    
-    \utab{G}{0232}
-    \utab{G7}{0212}
-    \utab{Gm}{0231}
-    \utab{Gm7}{0211}
-    
-    \utab{G#=A&}{3:2010}
-    \utab{G#7=A&7}{1:0212}
-    \utab{G#m=A&m}{1:0231}
-    \utab{G#m7=A&m7}{1:0211}
-    
-    \utab{A}{2100}
-    \utab{A7}{0100}
-    \utab{Am}{2000}
-    \utab{Am7}{0000}
-    
-    \utab{A#=B&}{1:2100}
-    \utab{A#7=B&7}{1:0100}
-    \utab{A#m=B&m}{1:2000}
-    \utab{A#m7=B&m7}{1:0000}
-    
-    \utab{B}{2:2100}
-    \utab{B7}{2:0100}
-    \utab{Bm}{2:2000}
-    \utab{Bm7}{2:0000}
-  \endsong
-
-  \beginsong{Accords avancés}
-    %\musicnote[french]{Accords avancés}
-    %\musicnote[english]{Advanced chords}
-    \utab{C7M}{0002}
-    \utab{C6}{0000}
-    \utab{Caug}{1003}
-    \utab{Cdim}{2:3101}
-    
-    \utab{C#7M=D&7M}{1:0002}
-    \utab{C#6=D&6}{1:0000}
-    \utab{C#aug=D&aug}{2110}
-    \utab{C#dim=D&dim}{0104}
-    
-    \utab{D7M}{2:0002}
-    \utab{D6}{2:0000}
-    \utab{Daug}{1:2110}
-    \utab{Ddim}{1:0104}
-    
-    \utab{D#7M=E&7M}{3:0002}
-    \utab{D#6=E&6}{3:0000}
-    \utab{D#aug=E&aug}{0332}
-    \utab{D#dim=E&dim}{2320}
-    
-    \utab{E7M}{1302}
-    \utab{E6}{1102}
-    \utab{Eaug}{1:0000}
-    \utab{Edim}{1:2320}
-    
-    \utab{F7M}{1:1302}
-    \utab{F6}{1:1102}
-    \utab{Faug}{2110}
-    \utab{Fdim}{2:2320}
-   
-    \utab{F#7M=G&7M}{2:1302}
-    \utab{F#6=G&6}{0202}
-    \utab{F#aug=G&aug}{1:2110}
-    \utab{F#dim=G&dim}{2020}
-    
-    \utab{G7M}{0222}
-    \utab{G6}{0202}
-    \utab{Gaug}{0332}
-    \utab{Gdim}{0131}
-    
-    \utab{G#7M=A&7M}{1:0222}
-    \utab{G#6=A&6}{1:0202}
-    \utab{G#aug=A&aug}{1003}
-    \utab{G#dim=A&dim}{1:0131}
-    
-    \utab{A7M}{1100}
-    \utab{A6}{2:0202}
-    \utab{Aaug}{2110}
-    \utab{Adim}{2:0131}
-    
-    \utab{A#7M=B&7M}{1:1100}
-    \utab{A#6=B&6}{0211}
-    \utab{A#aug=B&aug}{1:2110}
-    \utab{A#dim=B&dim}{3101}
-    
-    \utab{B7M}{2:1100}
-    \utab{B6}{1:0211}
-    \utab{Baug}{0332}
-    \utab{Bdim}{1:3101}
-  \endsong
-
-\end{songs}
-\fi