From 2867aa3aa2600ec0225b84a52e80655701b1c73a Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 14 May 2014 13:38:47 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Proposition=20de=20r=C3=A9solution=20de=20#?= =?UTF-8?q?34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songbook_core/data/latex/chords.sty | 430 +++++++++++++------------- songbook_core/data/latex/crepbook.cls | 1 + 2 files changed, 211 insertions(+), 220 deletions(-) diff --git a/songbook_core/data/latex/chords.sty b/songbook_core/data/latex/chords.sty index b4f5e10a..b3d045bf 100644 --- a/songbook_core/data/latex/chords.sty +++ b/songbook_core/data/latex/chords.sty @@ -1,6 +1,7 @@ % Chords package for patacrep songbook % define commands for chord display : guitar chords (\gtab) and ukulele chords (\utab) \ProvidesPackage{chords} +\RequirePackage{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}} @@ -9,39 +10,28 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Multilanguage management +\newcommand{\chordnameAsharp}{\printnoteA{}\Sharp = \printnoteB{}\Flat} +\newcommand{\chordnameA}{\printnoteA{}} +\newcommand{\chordnameB}{\printnoteB{}} +\newcommand{\chordnameCsharp}{\printnoteC{}\Sharp = \printnoteD{}\Flat} +\newcommand{\chordnameC}{\printnoteC{}} +\newcommand{\chordnameDsharp}{\printnoteD{}\Sharp = \printnoteE{}\Flat} +\newcommand{\chordnameD}{\printnoteD{}} +\newcommand{\chordnameE}{\printnoteE{}} +\newcommand{\chordnameFsharp}{\printnoteF{}\Sharp = \printnoteG{}\Flat} +\newcommand{\chordnameF}{\printnoteF{}} +\newcommand{\chordnameGsharp}{\printnoteG{}\Sharp = \printnoteA{}\Flat} +\newcommand{\chordnameG}{\printnoteG{}} + \AtBeginDocument{ % Default names (english) \newcommand{\guitarchordsname}{Guitar chords} \newcommand{\ukulelechordsname}{Ukulele chords} - \newcommand{\chordnameAsharp}{A\Sharp = B\Flat} - \newcommand{\chordnameA}{A} - \newcommand{\chordnameB}{B} - \newcommand{\chordnameCsharp}{C\Sharp = D\Flat} - \newcommand{\chordnameC}{C} - \newcommand{\chordnameDsharp}{D\Sharp = E\Flat} - \newcommand{\chordnameD}{D} - \newcommand{\chordnameE}{E} - \newcommand{\chordnameFsharp}{F\Sharp = G\Flat} - \newcommand{\chordnameF}{F} - \newcommand{\chordnameGsharp}{G\Sharp = A\Flat} - \newcommand{\chordnameG}{G} \IfStrEq{\mainlanguage}{french}{ % French names \renewcommand{\guitarchordsname}{Accords de guitare} \renewcommand{\ukulelechordsname}{Accords de ukulélé} - \renewcommand{\chordnameAsharp}{La\Sharp = Si\Flat} - \renewcommand{\chordnameA}{La} - \renewcommand{\chordnameB}{Si} - \renewcommand{\chordnameCsharp}{Do\Sharp = Ré\Flat} - \renewcommand{\chordnameC}{Do} - \renewcommand{\chordnameDsharp}{Ré\Sharp = Mi\Flat} - \renewcommand{\chordnameD}{Ré} - \renewcommand{\chordnameE}{Mi} - \renewcommand{\chordnameFsharp}{Fa\Sharp = Sol\Flat} - \renewcommand{\chordnameF}{Fa} - \renewcommand{\chordnameGsharp}{Sol\Sharp = La\Flat} - \renewcommand{\chordnameG}{Sol} }{} } @@ -61,151 +51,151 @@ \ifguitar \beginsong{\guitarchordsname} \chordname{\chordnameC} - \gtab{C}{~:X32010} - \gtab{C7}{~:X32310} - \gtab{Cm}{3:X02210} - \gtab{Cm7}{3:X02010} + \gtab{\printnoteC{}}{~:X32010} + \gtab{\printnoteC{}7}{~:X32310} + \gtab{\printnoteC{}m}{3:X02210} + \gtab{\printnoteC{}m7}{3:X02010} \hspace{1cm} - \gtab*{C7M}{~:332000} - \gtab*{C4}{~:X32011} - \gtab*{C7}{1:X2120X} - \gtab*{C6}{~:XX2213} + \gtab*{\printnoteC{}7M}{~:332000} + \gtab*{\printnoteC{}4}{~:X32011} + \gtab*{\printnoteC{}7}{1:X2120X} + \gtab*{\printnoteC{}6}{~:XX2213} \chordrule \chordname{\chordnameCsharp} - \gtab{C\#}{4:X02220} - \gtab{C\#7}{4:X02020} - \gtab{C\#m}{4:X02210} - \gtab{C\#m7}{5:XX2213} + \gtab{\printnoteC{}\#}{4:X02220} + \gtab{\printnoteC{}\#7}{4:X02020} + \gtab{\printnoteC{}\#m}{4:X02210} + \gtab{\printnoteC{}\#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} + \gtab*{\printnoteC{}\#7M}{1:X32000} + \gtab*{\printnoteC{}\#4}{2:X21000} + \gtab*{\printnoteC{}\#7}{2:X2120X} + \gtab*{\printnoteC{}\#6}{1:X02010} \chordrule \chordname{\chordnameD} - \gtab{D}{~:XX0232} - \gtab{D7}{~:XX0212} - \gtab{Dm}{~:XX0231} - \gtab{Dm7}{~:XX0211} + \gtab{\printnoteD{}}{~:XX0232} + \gtab{\printnoteD{}7}{~:XX0212} + \gtab{\printnoteD{}m}{~:XX0231} + \gtab{\printnoteD{}m7}{~:XX0211} \hspace{1cm} - \gtab*{D7M}{~:X00222} - \gtab*{D4}{~:X00233} - \gtab*{D7}{3:X2120X} - \gtab*{D6}{~:X00202} + \gtab*{\printnoteD{}7M}{~:X00222} + \gtab*{\printnoteD{}4}{~:X00233} + \gtab*{\printnoteD{}7}{3:X2120X} + \gtab*{\printnoteD{}6}{~:X00202} \chordrule \chordname{\chordnameDsharp} - \gtab{D\#}{6:X02220} - \gtab{D\#7}{6:X02020} - \gtab{D\#m}{6:X02210} - \gtab{D\#m7}{~:XX1322} + \gtab{\printnoteD{}\#}{6:X02220} + \gtab{\printnoteD{}\#7}{6:X02020} + \gtab{\printnoteD{}\#m}{6:X02210} + \gtab{\printnoteD{}\#m7}{~:XX1322} \hspace{1cm} - \gtab*{D\#7M}{3:022010} - \gtab*{D\#4}{4:X21000} - \gtab*{D\#7}{4:X2120X} - \gtab*{D\#6}{1:X00202} + \gtab*{\printnoteD{}\#7M}{3:022010} + \gtab*{\printnoteD{}\#4}{4:X21000} + \gtab*{\printnoteD{}\#7}{4:X2120X} + \gtab*{\printnoteD{}\#6}{1:X00202} \chordrule \chordname{\chordnameE} - \gtab{E}{~:022100} - \gtab{E7}{~:020100} - \gtab{Em}{~:022000} - \gtab{Em7}{~:022030} + \gtab{\printnoteE{}}{~:022100} + \gtab{\printnoteE{}7}{~:020100} + \gtab{\printnoteE{}m}{~:022000} + \gtab{\printnoteE{}m7}{~:022030} \hspace{1cm} - \gtab*{E7M}{~:021100} - \gtab*{E4}{~:02220} - \gtab*{E7}{5:X2120X} - \gtab*{E6}{~:022120} + \gtab*{\printnoteE{}7M}{~:021100} + \gtab*{\printnoteE{}4}{~:02220} + \gtab*{\printnoteE{}7}{5:X2120X} + \gtab*{\printnoteE{}6}{~:022120} \chordrule \chordname{\chordnameF} - \gtab{F}{1:022100} - \gtab{F7}{1:020100} - \gtab{Fm}{1:022000} - \gtab{Fm7}{1:020000} + \gtab{\printnoteF{}}{1:022100} + \gtab{\printnoteF{}7}{1:020100} + \gtab{\printnoteF{}m}{1:022000} + \gtab{\printnoteF{}m7}{1:020000} \hspace{1cm} - \gtab*{F7M}{~:XX3210} - \gtab*{F4}{1:022200} - \gtab*{F7}{6:X2120X} - \gtab*{F6}{~:XX0211} + \gtab*{\printnoteF{}7M}{~:XX3210} + \gtab*{\printnoteF{}4}{1:022200} + \gtab*{\printnoteF{}7}{6:X2120X} + \gtab*{\printnoteF{}6}{~:XX0211} \chordrule \chordname{\chordnameFsharp} - \gtab{F\#}{2:022100} - \gtab{F\#7}{2:020100} - \gtab{F\#m}{2:022000} - \gtab{F\#m7}{2:020000} + \gtab{\printnoteF{}\#}{2:022100} + \gtab{\printnoteF{}\#7}{2:020100} + \gtab{\printnoteF{}\#m}{2:022000} + \gtab{\printnoteF{}\#m7}{2:020000} \hspace{1cm} - \gtab*{F\#7M}{~:XX4321} - \gtab*{F\#4}{2:022200} - \gtab*{F\#7}{7:X2120X} - \gtab*{F\#6}{~:XX1322} + \gtab*{\printnoteF{}\#7M}{~:XX4321} + \gtab*{\printnoteF{}\#4}{2:022200} + \gtab*{\printnoteF{}\#7}{7:X2120X} + \gtab*{\printnoteF{}\#6}{~:XX1322} \chordrule \chordname{\chordnameG} - \gtab{G}{~:320003} - \gtab{G7}{~:320001} - \gtab{Gm}{3:022000} - \gtab{Gm7}{3:020000} + \gtab{\printnoteG{}}{~:320003} + \gtab{\printnoteG{}7}{~:320001} + \gtab{\printnoteG{}m}{3:022000} + \gtab{\printnoteG{}m7}{3:020000} \hspace{1cm} - \gtab*{G7M}{~:XX0002} - \gtab*{G4}{3:022200} - \gtab*{G7}{3:020200} - \gtab*{G6}{~:320000} + \gtab*{\printnoteG{}7M}{~:XX0002} + \gtab*{\printnoteG{}4}{3:022200} + \gtab*{\printnoteG{}7}{3:020200} + \gtab*{\printnoteG{}6}{~:320000} \chordrule \chordname{\chordnameGsharp} - \gtab{G\#}{4:022100} - \gtab{G\#7}{4:020100} - \gtab{G\#m}{4:022000} - \gtab{G\#m7}{4:020000} + \gtab{\printnoteG{}\#}{4:022100} + \gtab{\printnoteG{}\#7}{4:020100} + \gtab{\printnoteG{}\#m}{4:022000} + \gtab{\printnoteG{}\#m7}{4:020000} \hspace{1cm} - \gtab*{G\#7M}{3:XX4321} - \gtab*{G\#4}{4:022200} - \gtab*{G\#7}{~:XX1122} - \gtab*{G\#6}{~:XX1111} + \gtab*{\printnoteG{}\#7M}{3:XX4321} + \gtab*{\printnoteG{}\#4}{4:022200} + \gtab*{\printnoteG{}\#7}{~:XX1122} + \gtab*{\printnoteG{}\#6}{~:XX1111} \chordrule \chordname{\chordnameA} - \gtab{A}{~:X02220} - \gtab{A7}{~:X02020} - \gtab{Am}{~:X02210} - \gtab{Am7}{~:X02213} + \gtab{\printnoteA{}}{~:X02220} + \gtab{\printnoteA{}7}{~:X02020} + \gtab{\printnoteA{}m}{~:X02210} + \gtab{\printnoteA{}m7}{~:X02213} \hspace{1cm} - \gtab*{A7M}{~:X02120} - \gtab*{A4}{~:X02230} - \gtab*{A7}{~:X02233} - \gtab*{A6}{~:XX2222} + \gtab*{\printnoteA{}7M}{~:X02120} + \gtab*{\printnoteA{}4}{~:X02230} + \gtab*{\printnoteA{}7}{~:X02233} + \gtab*{\printnoteA{}6}{~:XX2222} \chordrule \chordname{\chordnameAsharp} - \gtab{A\#}{1:X02220} - \gtab{A\#7}{1:X02020} - \gtab{A\#m}{1:X02210} - \gtab{A\#m7}{1:X02010} + \gtab{\printnoteA{}\#}{1:X02220} + \gtab{\printnoteA{}\#7}{1:X02020} + \gtab{\printnoteA{}\#m}{1:X02210} + \gtab{\printnoteA{}\#m7}{1:X02010} \hspace{1cm} - \gtab*{A\#7M}{1:X02120} - \gtab*{A\#4}{1:X02230} - \gtab*{A\#7}{~:XX3344} - \gtab*{A\#6}{~:XX3333} + \gtab*{\printnoteA{}\#7M}{1:X02120} + \gtab*{\printnoteA{}\#4}{1:X02230} + \gtab*{\printnoteA{}\#7}{~:XX3344} + \gtab*{\printnoteA{}\#6}{~:XX3333} \chordrule \chordname{\chordnameB} - \gtab{B}{2:X02220} - \gtab{B7}{X21202} - \gtab{Bm}{2:X02210} - \gtab{Bm7}{~:X00202} + \gtab{\printnoteB{}}{2:X02220} + \gtab{\printnoteB{}7}{X21202} + \gtab{\printnoteB{}m}{2:X02210} + \gtab{\printnoteB{}m7}{~:X00202} \hspace{1cm} - \gtab*{B7M}{2:X02120} - \gtab*{B4}{2:X02230} - \gtab*{B7}{~:X22202} - \gtab*{B6}{~:XX4444} + \gtab*{\printnoteB{}7M}{2:X02120} + \gtab*{\printnoteB{}4}{2:X02230} + \gtab*{\printnoteB{}7}{~:X22202} + \gtab*{\printnoteB{}6}{~:XX4444} \begin{verse*} - \musicnote[french]{Accordage standard : {\nolyrics \[E A D G B E]}} - \musicnote[english]{Standard tuning: {\nolyrics \[E A D G B E]}} + \musicnote[french]{Accordage standard : {\nolyrics \[\printnoteE{} \printnoteA{} \printnoteD{} \printnoteG{} \printnoteB{} \printnoteE{}]}} + \musicnote[english]{Standard tuning: {\nolyrics \[\printnoteE{} \printnoteA{} \printnoteD{} \printnoteG{} \printnoteB{} \printnoteE{}]}} \end{verse*} \endsong @@ -215,151 +205,151 @@ \beginsong{\ukulelechordsname} \chordname{\chordnameC} - \utab{C}{~:0003} - \utab{C7}{~:0001} - \utab{Cm}{~:0333} - \utab{Cm7}{3:0000} + \utab{\printnoteC{}}{~:0003} + \utab{\printnoteC{}7}{~:0001} + \utab{\printnoteC{}m}{~:0333} + \utab{\printnoteC{}m7}{3:0000} \hspace{1cm} - \utab*{C7M}{~:0002} - \utab*{C6}{~:0000} - \utab*{Caug}{~:1003} - \utab*{Cdim}{2:3101} + \utab*{\printnoteC{}7M}{~:0002} + \utab*{\printnoteC{}6}{~:0000} + \utab*{\printnoteC{}aug}{~:1003} + \utab*{\printnoteC{}dim}{2:3101} \chordrule \chordname{\chordnameCsharp} - \utab{C\#}{1:0003} - \utab{C\#7}{1:0001} - \utab{C\#m}{~:1104} - \utab{C\#m7}{4:0000} + \utab{\printnoteC{}\#}{1:0003} + \utab{\printnoteC{}\#7}{1:0001} + \utab{\printnoteC{}\#m}{~:1104} + \utab{\printnoteC{}\#m7}{4:0000} \hspace{1cm} - \utab*{C\#7M}{1:0002} - \utab*{C\#6}{1:0000} - \utab*{C\#aug}{~:2110} - \utab*{C\#dim}{~:0104} + \utab*{\printnoteC{}\#7M}{1:0002} + \utab*{\printnoteC{}\#6}{1:0000} + \utab*{\printnoteC{}\#aug}{~:2110} + \utab*{\printnoteC{}\#dim}{~:0104} \chordrule \chordname{\chordnameD} - \utab{D}{~:2220} - \utab{D7}{2:0001} - \utab{Dm}{~:2210} - \utab{Dm7}{1:1102} + \utab{\printnoteD{}}{~:2220} + \utab{\printnoteD{}7}{2:0001} + \utab{\printnoteD{}m}{~:2210} + \utab{\printnoteD{}m7}{1:1102} \hspace{1cm} - \utab*{D7M}{2:0002} - \utab*{D6}{2:0000} - \utab*{Daug}{1:2110} - \utab*{Ddim}{1:0104} + \utab*{\printnoteD{}7M}{2:0002} + \utab*{\printnoteD{}6}{2:0000} + \utab*{\printnoteD{}aug}{1:2110} + \utab*{\printnoteD{}dim}{1:0104} \chordrule \chordname{\chordnameDsharp} - \utab{D\#}{1:2220} - \utab{D\#7}{3:0001} - \utab{D\#m}{1:2210} - \utab{D\#m7}{2:1102} + \utab{\printnoteD{}\#}{1:2220} + \utab{\printnoteD{}\#7}{3:0001} + \utab{\printnoteD{}\#m}{1:2210} + \utab{\printnoteD{}\#m7}{2:1102} \hspace{1cm} - \utab*{D\#7M}{3:0002} - \utab*{D\#6}{3:0000} - \utab*{D\#aug}{~:0332} - \utab*{D\#dim}{~:2320} + \utab*{\printnoteD{}\#7M}{3:0002} + \utab*{\printnoteD{}\#6}{3:0000} + \utab*{\printnoteD{}\#aug}{~:0332} + \utab*{\printnoteD{}\#dim}{~:2320} \chordrule \chordname{\chordnameE} - \utab{E}{2:2220} - \utab{E7}{~:1202} - \utab{Em}{~:0432} - \utab{Em7}{~:0202} + \utab{\printnoteE{}}{2:2220} + \utab{\printnoteE{}7}{~:1202} + \utab{\printnoteE{}m}{~:0432} + \utab{\printnoteE{}m7}{~:0202} \hspace{1cm} - \utab*{E7M}{~:1302} - \utab*{E6}{~:1102} - \utab*{Eaug}{1:0000} - \utab*{Edim}{1:2320} + \utab*{\printnoteE{}7M}{~:1302} + \utab*{\printnoteE{}6}{~:1102} + \utab*{\printnoteE{}aug}{1:0000} + \utab*{\printnoteE{}dim}{1:2320} \chordrule \chordname{\chordnameF} - \utab{F}{~:2010} - \utab{F7}{~:2310} - \utab{Fm}{~:1013} - \utab{Fm7}{1:0202} + \utab{\printnoteF{}}{~:2010} + \utab{\printnoteF{}7}{~:2310} + \utab{\printnoteF{}m}{~:1013} + \utab{\printnoteF{}m7}{1:0202} \hspace{1cm} - \utab*{F7M}{1:1302} - \utab*{F6}{1:1102} - \utab*{Faug}{~:2110} - \utab*{Fdim}{2:2320} + \utab*{\printnoteF{}7M}{1:1302} + \utab*{\printnoteF{}6}{1:1102} + \utab*{\printnoteF{}aug}{~:2110} + \utab*{\printnoteF{}dim}{2:2320} \chordrule \chordname{\chordnameFsharp} - \utab{F\#}{1:2010} - \utab{F\#7}{1:2310} - \utab{F\#m}{~:2120} - \utab{F\#m7}{2:0202} + \utab{\printnoteF{}\#}{1:2010} + \utab{\printnoteF{}\#7}{1:2310} + \utab{\printnoteF{}\#m}{~:2120} + \utab{\printnoteF{}\#m7}{2:0202} \hspace{1cm} - \utab*{F\#7M}{2:1302} - \utab*{F\#6}{~:0202} - \utab*{F\#aug}{1:2110} - \utab*{F\#dim}{~:2020} + \utab*{\printnoteF{}\#7M}{2:1302} + \utab*{\printnoteF{}\#6}{~:0202} + \utab*{\printnoteF{}\#aug}{1:2110} + \utab*{\printnoteF{}\#dim}{~:2020} \chordrule \chordname{\chordnameG} - \utab{G}{~:0232} - \utab{G7}{~:0212} - \utab{Gm}{~:0231} - \utab{Gm7}{~:0211} + \utab{\printnoteG{}}{~:0232} + \utab{\printnoteG{}7}{~:0212} + \utab{\printnoteG{}m}{~:0231} + \utab{\printnoteG{}m7}{~:0211} \hspace{1cm} - \utab*{G7M}{~:0222} - \utab*{G6}{~:0202} - \utab*{Gaug}{~:0332} - \utab*{Gdim}{~:0131} + \utab*{\printnoteG{}7M}{~:0222} + \utab*{\printnoteG{}6}{~:0202} + \utab*{\printnoteG{}aug}{~:0332} + \utab*{\printnoteG{}dim}{~:0131} \chordrule \chordname{\chordnameGsharp} - \utab{G\#}{3:2010} - \utab{G\#7}{1:0212} - \utab{G\#m}{1:0231} - \utab{G\#m7}{1:0211} + \utab{\printnoteG{}\#}{3:2010} + \utab{\printnoteG{}\#7}{1:0212} + \utab{\printnoteG{}\#m}{1:0231} + \utab{\printnoteG{}\#m7}{1:0211} \hspace{1cm} - \utab*{G\#7M}{1:0222} - \utab*{G\#6}{1:0202} - \utab*{G\#aug}{~:1003} - \utab*{G\#dim}{1:0131} + \utab*{\printnoteG{}\#7M}{1:0222} + \utab*{\printnoteG{}\#6}{1:0202} + \utab*{\printnoteG{}\#aug}{~:1003} + \utab*{\printnoteG{}\#dim}{1:0131} \chordrule \chordname{\chordnameA} - \utab{A}{~:2100} - \utab{A7}{~:0100} - \utab{Am}{~:2000} - \utab{Am7}{~:0000} + \utab{\printnoteA{}}{~:2100} + \utab{\printnoteA{}7}{~:0100} + \utab{\printnoteA{}m}{~:2000} + \utab{\printnoteA{}m7}{~:0000} \hspace{1cm} - \utab*{A7M}{~:1100} - \utab*{A6}{2:0202} - \utab*{Aaug}{~:2110} - \utab*{Adim}{2:0131} + \utab*{\printnoteA{}7M}{~:1100} + \utab*{\printnoteA{}6}{2:0202} + \utab*{\printnoteA{}aug}{~:2110} + \utab*{\printnoteA{}dim}{2:0131} \chordrule \chordname{\chordnameAsharp} - \utab{A\#}{1:2100} - \utab{A\#7}{1:0100} - \utab{A\#m}{1:2000} - \utab{A\#m7}{1:0000} + \utab{\printnoteA{}\#}{1:2100} + \utab{\printnoteA{}\#7}{1:0100} + \utab{\printnoteA{}\#m}{1:2000} + \utab{\printnoteA{}\#m7}{1:0000} \hspace{1cm} - \utab*{A\#7M}{1:1100} - \utab*{A\#6}{~:0211} - \utab*{A\#aug}{1:2110} - \utab*{A\#dim}{~:3101} + \utab*{\printnoteA{}\#7M}{1:1100} + \utab*{\printnoteA{}\#6}{~:0211} + \utab*{\printnoteA{}\#aug}{1:2110} + \utab*{\printnoteA{}\#dim}{~:3101} \chordrule \chordname{\chordnameB} - \utab{B}{2:2100} - \utab{B7}{2:0100} - \utab{Bm}{2:2000} - \utab{Bm7}{2:0000} + \utab{\printnoteB{}}{2:2100} + \utab{\printnoteB{}7}{2:0100} + \utab{\printnoteB{}m}{2:2000} + \utab{\printnoteB{}m7}{2:0000} \hspace{1cm} - \utab*{B7M}{2:1100} - \utab*{B6}{1:0211} - \utab*{Baug}{~:0332} - \utab*{Bdim}{1:3101} + \utab*{\printnoteB{}7M}{2:1100} + \utab*{\printnoteB{}6}{1:0211} + \utab*{\printnoteB{}aug}{~:0332} + \utab*{\printnoteB{}dim}{1:3101} \begin{verse*} - \musicnote[french]{Accordage standard : {\nolyrics \[G C E A]}} - \musicnote[english]{Standard tuning: {\nolyrics \[G C E A]}} + \musicnote[french]{Accordage standard : {\nolyrics \[\printnoteG{} \printnoteC{} \printnoteE{} \printnoteA{}]}} + \musicnote[english]{Standard tuning: {\nolyrics \[\printnoteG{} \printnoteC{} \printnoteE{} \printnoteA{}]}} \end{verse*} \endsong diff --git a/songbook_core/data/latex/crepbook.cls b/songbook_core/data/latex/crepbook.cls index 78681d12..060378fa 100644 --- a/songbook_core/data/latex/crepbook.cls +++ b/songbook_core/data/latex/crepbook.cls @@ -116,6 +116,7 @@ \IfStrEq{\mainlanguage}{french}{ % French names + \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol} \renewcommand{\songlistname}{Liste des chansons}{} \renewcommand{\labelversionname}{version :} \renewcommand{\labeldatename}{date :} From aa1860cbc1c255939bd7fc31a40721172abbbacb Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 14 May 2014 16:27:20 +0200 Subject: [PATCH 2/4] Suppression de lignes inutiles --- songbook_core/data/templates/default.tex | 4 ---- 1 file changed, 4 deletions(-) diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex index a13fa507..821e305f 100644 --- a/songbook_core/data/templates/default.tex +++ b/songbook_core/data/templates/default.tex @@ -106,10 +106,6 @@ (* block index *) \showindex{\songindexname}{titleidx} \showindex{\authorindexname}{authidx} - (* if lang==french *) - \notenamesin{A}{B}{C}{D}{E}{F}{G} - \notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol} - (* endif *) (* endblock *) (* block chords *) From 121a8f83ff88ce090f55a02463a6d9ed27b07cd7 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Wed, 14 May 2014 22:41:53 +0100 Subject: [PATCH 3/4] Deplacement de la traduction dans les templates et ajout d'une option. --- songbook_core/data/latex/crepbook.cls | 1 - songbook_core/data/templates/default.tex | 11 ++++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/songbook_core/data/latex/crepbook.cls b/songbook_core/data/latex/crepbook.cls index 060378fa..78681d12 100644 --- a/songbook_core/data/latex/crepbook.cls +++ b/songbook_core/data/latex/crepbook.cls @@ -116,7 +116,6 @@ \IfStrEq{\mainlanguage}{french}{ % French names - \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol} \renewcommand{\songlistname}{Liste des chansons}{} \renewcommand{\labelversionname}{version :} \renewcommand{\labeldatename}{date :} diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex index 821e305f..bf4282fc 100644 --- a/songbook_core/data/templates/default.tex +++ b/songbook_core/data/templates/default.tex @@ -58,7 +58,11 @@ "authwords": {"description": {"english": "Set of options to process author string (LaTeX commands authsepword, authignoreword, authbyword)", "french": "Options pour traiter les noms d'auteurs (commandes LaTeX authsepword, authignoreword, authbyword)"}, "default": {"default": {}} - } + }, +"alphascale": {"description": {"english": "Use alphabetic notes names (A B C ...) in french songbooks", + "french": "Utiliser la notation anglo-saxonne (A B C ...) pour les accords"}, + "default": {"default": false} + } } (* endvariables *) @@ -97,6 +101,11 @@ (* endif *) (* endfor *) (* endfor*) + + %! lang is defined in layout.tex + (* if lang=="french" and not alphascale *) + \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol} + (* endif *) (* endblock *) (* block title *) From d124942de6743a29a8f3ee2f1c89da4d387ae146 Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 15 May 2014 10:49:31 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Choix=20des=20notes=20moins=20li=C3=A9=20?= =?UTF-8?q?=C3=A0=20la=20langue=20fran=C3=A7aise?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songbook_core/data/templates/default.tex | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex index bf4282fc..3a413cf0 100644 --- a/songbook_core/data/templates/default.tex +++ b/songbook_core/data/templates/default.tex @@ -59,9 +59,9 @@ "french": "Options pour traiter les noms d'auteurs (commandes LaTeX authsepword, authignoreword, authbyword)"}, "default": {"default": {}} }, -"alphascale": {"description": {"english": "Use alphabetic notes names (A B C ...) in french songbooks", - "french": "Utiliser la notation anglo-saxonne (A B C ...) pour les accords"}, - "default": {"default": false} +"notenamesout": {"description": {"english": "Note names. Can be 'solfedge' (Do, Re, Mi...) or 'alphascale' (A, B, C...).", + "french": "Nom des notes : 'solfedge' (Do, Ré, Mi...) ou 'alphascale' (A, B, C...)."}, + "default": {"default": "alphascale", "french": "solfedge"} } } (* endvariables *) @@ -102,8 +102,9 @@ (* endfor *) (* endfor*) - %! lang is defined in layout.tex - (* if lang=="french" and not alphascale *) + (* if notenamesout=="alphascale" *) + \notenamesout{A}{B}{C}{D}{E}{F}{G} + (* else *) \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol} (* endif *) (* endblock *)