diff --git a/NEWS b/NEWS index 148620c8..beb2918e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,20 @@ +version 3.6.1 + +Romain Goffe: + Le Donjon de Naheulbeuk - Chicken quest + Le Donjon de Naheulbeuk - Crom + Le Donjon de Naheulbeuk - Hé, la petite dame + Le Donjon de Naheulbeuk - La hache Durandil + Le Donjon de Naheulbeuk - Le petit gobelin + Le Donjon de Naheulbeuk - Tralala du nain + Les Amis d'ta femme - Le tango du viagra +olivier desrobert: + Thomas Fersen - Au café de la paix + Thomas Fersen - Saint-Jean-du-Doigt + Renan Luce - Le Lacrymal Circus + Les Wriggles - Petit bonhomme + version 3.6.0 Romain Goffe: diff --git a/books/naheulbeuk.sb b/books/naheulbeuk.sb index aca84e50..ecf0dbc6 100644 --- a/books/naheulbeuk.sb +++ b/books/naheulbeuk.sb @@ -8,7 +8,7 @@ ], "booktype" : "chorded", "footer" : "Musique du Naheulband: \\url{http://www.penofchaos.com/warham/donjon-groupe.htm}", -"license" : "\\input{license-nb.tex}", +"license" : "license-nb.tex", "picture" : "nb_cover", "picturecopyright" : "Personnages par \\emph{Pen Of Chaos} / Illustrations par \\emph{Marion Poinsot}", "subtitle" : "Recueil de chansons non-officiel", @@ -19,6 +19,12 @@ "Belyscendre/Mon_pere_veut_me_marier.sg", "Belyscendre/Prends_garde_au_loup.sg", "Le_Donjon_de_Naheulbeuk/10_sous_dans_ma_poche.sg", + "Le_Donjon_de_Naheulbeuk/Chicken_quest.sg", + "Le_Donjon_de_Naheulbeuk/Crom.sg", + "Le_Donjon_de_Naheulbeuk/La_hache_Durandil.sg", + "Le_Donjon_de_Naheulbeuk/Le_petit_gobelin.sg", + "Le_Donjon_de_Naheulbeuk/He_la_petite_dame.sg", + "Le_Donjon_de_Naheulbeuk/Tralala_du_nain.sg", "Le_Donjon_de_Naheulbeuk/Bugger_off.sg", "Le_Donjon_de_Naheulbeuk/La_biere_du_donjon.sg", "Le_Donjon_de_Naheulbeuk/La_compagnie_du_chien_rugissant.sg", diff --git a/books/volume-5.sb b/books/volume-5.sb index 2fa73f30..72b07844 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -41,13 +41,21 @@ "Jean-Jacques_Goldman/On_ira.sg", "La_Rue_Ketanou/Sao_loucas.sg", "Le_clandestin/Rue_Grenelle.sg", + "Le_Donjon_de_Naheulbeuk/Chicken_quest.sg", + "Le_Donjon_de_Naheulbeuk/Crom.sg", + "Le_Donjon_de_Naheulbeuk/He_la_petite_dame.sg", + "Le_Donjon_de_Naheulbeuk/La_hache_Durandil.sg", + "Le_Donjon_de_Naheulbeuk/Le_petit_gobelin.sg", "Le_Donjon_de_Naheulbeuk/Maitre_du_donjon.sg", + "Le_Donjon_de_Naheulbeuk/Tralala_du_nain.sg", + "Les_Amis_D_Ta_Femme/le_tango_du_viagra.sg", "Les_Booze_Brothers/Fields_of_Athenry.sg", "Les_Cowboys_Fringants/8_secondes.sg", "Les_Cowboys_Fringants/Ces_temps_ci.sg", "Les_Cowboys_Fringants/Hannah.sg", "Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg", "Les_Ogres_de_Barback/Rue_Mazarine.sg", + "Les_Wriggles/petit_bonhomme.sg", "Maxime_Le_Forestier/Passer_ma_route.sg", "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", "Noir_Desir/Toujours_etre_ailleurs.sg", @@ -55,10 +63,12 @@ "Patrick_Coutin/J_aime_regarder_les_filles.sg", "Phil_Barney/Un_enfant_de_toi.sg", "Razorlight/America.sg", + "Renan_Luce/le_lacrymal_circus.sg", "Roch_Voisine/Helene.sg", "Telephone/Le_jour_s_est_leve.sg", "The_Bloody_Irish_Boys/Drunk_tonight.sg", "The_Dubliners/The_wild_rover.sg", + "Thomas_Fersen/au_cafe_de_la_paix.sg", "Thomas_Fersen/Bambi.sg", "Thomas_Fersen/Croque.sg", "Thomas_Fersen/Irene.sg", @@ -67,6 +77,7 @@ "Thomas_Fersen/L_histoire_d_une_heure.sg", "Thomas_Fersen/Louise.sg", "Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg", + "Thomas_Fersen/saint_jean_du_doigt.sg", "Tournee_Generale/Avancer_mes_grolles.sg", "U2/One.sg", "Yves_Simon/Les_bateaux_du_metro.sg"] diff --git a/img/internet.png b/img/internet.png new file mode 100644 index 00000000..43299f17 Binary files /dev/null and b/img/internet.png differ diff --git a/img/src/internet.svg b/img/src/internet.svg new file mode 100644 index 00000000..aeec764a --- /dev/null +++ b/img/src/internet.svg @@ -0,0 +1,216 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/clean.sh b/macos/clean.sh index 69261044..0cda9a79 100755 --- a/macos/clean.sh +++ b/macos/clean.sh @@ -2,3 +2,5 @@ # echo "manually performs 'make clean'" rm -rf *.aux *.d *.toc *.out *.log *.nav *.snm *.sbx *.sxd +echo "remove temporary covers" +rm -rf covers/ diff --git a/makefile b/makefile index 653ea021..2c02e7e2 100644 --- a/makefile +++ b/makefile @@ -61,6 +61,7 @@ clean: $(TARGETS:%=%.nav) $(TARGETS:%=%.snm) @rm -f *.sbx *.sxd *.sxc @rm -f *.pyc + @rm -rf covers/ cleanall: clean @rm -f $(PDF) diff --git a/songbook.py b/songbook.py index 59504d42..1645d454 100755 --- a/songbook.py +++ b/songbook.py @@ -8,8 +8,21 @@ import glob import re import json import locale -import sortindex import shutil +import locale + +reTitle = re.compile('(?<=beginsong\\{)(.(? 0: out.write(formatDefinition('songslist', songslist(songs))) out.write('\\makeatother\n') diff --git a/sortindex.py b/sortindex.py index 344b02bb..dd3d5d50 100644 --- a/sortindex.py +++ b/sortindex.py @@ -9,6 +9,8 @@ replacePattern = { '`A': 'À', '`a': 'à', '^a': 'â', + "'a": 'á', + "~a": 'ã', 'oe': 'Å“', "'e" : 'é', "`e" : 'è', @@ -21,6 +23,9 @@ replacePattern = { r'"\i' : 'i', r'^\i' : 'i', '"u' : 'ü', + '`u' : 'ù', + '`u' : 'ù', + '~n' : 'ñ', "c C" : 'Ç', "c c" : 'ç', } diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index d0c8a8d5..a0fe6920 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -19,7 +19,7 @@ % The latest version of this program can be obtained from % http://songs.sourceforge.net. % -% Modified to serve personnal purposes. Newer versions can be +% Modified to serve personnal purposes. Newer versions can be % obtained from http://www.lohrun.net. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Template parameters @@ -31,14 +31,14 @@ %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.6.0"}, +%%: {"name":"version", "description":"Version", "default":"3.6.1"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, %%: {"name":"picture", "description":"Picture", "type":"file", "default":"feel-the-music"}, %%: {"name":"picturecopyright", "description":"Copyright", "default":"foxygamergirl@deviantart.com"}, %%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, -%%: {"name":"license", "description":"License", "default":"\\input{license.tex}"}, +%%: {"name":"license", "description":"License", "type":"file", "default":"license.tex"}, %%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, %%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#FFFDB3"}, @@ -46,7 +46,8 @@ %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % begin document -\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize]{tex/crepbook} +\makeatletter\def\input@path{{tex/}} +\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize]{crepbook} \usepackage[utf8]{inputenc} \usepackage[portuguese,english,spanish,french]{babel} \usepackage[T1]{fontenc} @@ -78,18 +79,25 @@ \renewcommand{\idxbgcolor}{IndexBgColor} \renewcommand{\printchord}[1]{\mdseries\ttfamily\upshape#1} + \pagestyle{empty} \begin{document} \maketitle +% licence +\newpage +\input{\getlicense} +\newpage + \showindex{Index des chansons}{titleidx} \notenamesin{A}{B}{C}{D}{E}{F}{G} \notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol} -\songsection{Liste des chansons} +\phantomsection +\addcontentsline{toc}{section}{Liste des chansons} \begin{songs}{titleidx,authidx} \getsongslist \end{songs} diff --git a/templates/minimal.tmpl b/templates/minimal.tmpl index 11ed5b16..3e9e2d6f 100644 --- a/templates/minimal.tmpl +++ b/templates/minimal.tmpl @@ -19,7 +19,7 @@ % The latest version of this program can be obtained from % http://songs.sourceforge.net. % -% Modified to serve personnal purposes. Newer versions can be +% Modified to serve personnal purposes. Newer versions can be % obtained from http://www.lohrun.net. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Template parameters @@ -33,7 +33,8 @@ %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % begin document -\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize,noshading]{tex/crepbook} +\makeatletter\def\input@path{{tex/}} +\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize,noshading]{crepbook} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{lmodern} diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl deleted file mode 100644 index 95a1f831..00000000 --- a/templates/patacrep-en.tmpl +++ /dev/null @@ -1,96 +0,0 @@ -% Copyright (C) 2009-2010 Romain Goffe, Alexandre Dupas -% Copyright (C) 2008 Kevin W. Hamlen -% -% This program is free software; you can redistribute it and/or -% modify it under the terms of the GNU General Public License -% as published by the Free Software Foundation; either version 2 -% of the License, or (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program; if not, write to the Free Software -% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -% MA 02110-1301, USA. -% -% The latest version of this program can be obtained from -% http://songs.sourceforge.net. -% -% Modified to serve personnal purposes. Newer versions can be -% obtained from http://www.lohrun.net. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Template parameters -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%:[ -%%: {"name":"title", "description":"Title", "default":"Patacrep Songbook", "mandatory":true}, -%%: {"name":"author", "description":"Author", "default":"Crep (R. Goffe) \\and Lohrun (A. Dupas)", "mandatory":true}, -%%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"lang", "description":"Language", "default":"english"}, -%%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.6.0"}, -%%: {"name":"subtitle", "description":"Subtitle"}, -%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, -%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, -%%: {"name":"picture", "description":"Picture", "type":"file", "default":"Music_by_Katie8594"}, -%%: {"name":"picturecopyright", "description":"Copyright", "default":"Katie8594 @ deviantart.com"}, -%%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, -%%: {"name":"license", "description":"License", "default":"\\input{license-en.tex}"}, -%%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, -%%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, -%%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"}, -%%: {"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"#D1E4AE"} -%%:] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% begin document -\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize]{tex/crepbook} -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{lmodern} -\usepackage[portuguese,spanish,french,english]{babel} - -\title{\gettitle} -\author{\getauthor} -\subtitle{\getsubtitle} -\version{\getversion} -\mail{\getmail} -\web{\getweb} -\picture{\getpicture} -\picturecopyright{\getpicturecopyright} -\footer{\getfooter} -\licence{\getlicense} -\lang{\getlang} - -\newindex{titleidx}{\getname_title} -\newauthorindex{authidx}{\getname_auth} - -\graphicspath{ {covers/}, {img/} } - -\definecolor{SongNumberBgColor}{HTML}{\getsongnumberbgcolor} -\definecolor{NoteBgColor}{HTML}{\getnotebgcolor} -\definecolor{IndexBgColor}{HTML}{\getindexbgcolor} - -\renewcommand{\snumbgcolor}{SongNumberBgColor} -\renewcommand{\notebgcolor}{NoteBgColor} -\renewcommand{\idxbgcolor}{IndexBgColor} - -\pagestyle{empty} - -\begin{document} - -\maketitle - -\showindex{Songs Index}{titleidx} -\showindex{Authors Index}{authidx} - -\songsection{List of Songs} -\begin{songs}{titleidx,authidx} - \getsongslist -\end{songs} - -\end{document} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% end document diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 952ec424..6698323f 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -19,7 +19,7 @@ % The latest version of this program can be obtained from % http://songs.sourceforge.net. % -% Modified to serve personnal purposes. Newer versions can be +% Modified to serve personnal purposes. Newer versions can be % obtained from http://www.lohrun.net. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Template parameters @@ -31,14 +31,14 @@ %%: {"name":"lang", "description":"Language", "default":"french"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.6.0"}, +%%: {"name":"version", "description":"Version", "default":"3.6.1"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, %%: {"name":"picture", "description":"Picture", "type":"file", "default":"feel-the-music"}, %%: {"name":"picturecopyright", "description":"Copyright", "default":"foxygamergirl@deviantart.com"}, %%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, -%%: {"name":"license", "description":"License", "default":"\\input{license.tex}"}, +%%: {"name":"license", "description":"License", "type":"file", "default":"license.tex"}, %%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, %%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"}, @@ -46,7 +46,8 @@ %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % begin document -\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize]{tex/crepbook} +\makeatletter\def\input@path{{tex/}} +\documentclass[\getbooktype,\getinstruments,\getbookoptions,\getmainfontsize]{crepbook} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{lmodern} @@ -81,17 +82,54 @@ \begin{document} +% translate default title +\IfStrEq{\gettitle}{Recueil de chansons pour guitare}{ + \IfStrEq{\getlang}{english}{\title{Patacrep songbook}}{} +}{} + \maketitle -\showindex{Index des chansons}{titleidx} -\showindex{Index des auteurs}{authidx} +% licence +\newpage +\input{\getlicense} +\newpage + +% indexes +\IfStrEq{\getlang}{english}{ + \showindex{Songs Index}{titleidx} +}{ + \showindex{Index des chansons}{titleidx} +} +\IfStrEq{\getlang}{english}{ + \showindex{Authors Index}{authidx} +}{ + \showindex{Index des auteurs}{authidx} +} -\notenamesin{A}{B}{C}{D}{E}{F}{G} -\notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol} +% chords notation +\IfStrEq{\getlang}{french}{ + \notenamesin{A}{B}{C}{D}{E}{F}{G} + \notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol} +}{} +% list of chords +\ifchorded +\phantomsection +\IfStrEq{\getlang}{english}{ + \addcontentsline{toc}{section}{Chords list} +}{ + \addcontentsline{toc}{section}{Liste des accords} +} \include{tex/chords} +\fi -\songsection{Liste des chansons} +% songs +\phantomsection +\IfStrEq{\getlang}{english}{ + \addcontentsline{toc}{section}{Songs list} +}{ + \addcontentsline{toc}{section}{Liste des chansons} +} \begin{songs}{titleidx,authidx} \getsongslist \end{songs} diff --git a/tex/chords.tex b/tex/chords.tex index 9037b5eb..60bbf769 100644 --- a/tex/chords.tex +++ b/tex/chords.tex @@ -1,140 +1,321 @@ -\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}[2]{\makebox[3cm]{\raisebox{.5cm}{\large \textbf{\IfStrEq{\getlang}{english}{#1}{#2}}}}} +\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}{Do} + \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}{Do\Sharp = Ré\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}{Ré} + \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}{Ré\Sharp = Mi\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}{Mi} + \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}{Fa} + \gtab{F}{1:022100} + \gtab{F7}{1:020100} + \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}{Fa\Sharp = Sol\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}{Sol} + \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}{Sol\Sharp = La\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}{La} + \gtab{A}{~:X02220} + \gtab{A7}{~:X02020} + \gtab{Am}{~:X02210} + \gtab{Am7}{~:X02213} + \hspace{1cm} + \gtab*{A7M}{~:X02120} + \gtab*{A4}{~:X02230} + \gtab*{A7}{~:X02233} + \gtab*{A6}{~:XX2222} + \chordrule + + \chordname{A\Sharp = B\Flat}{La\Sharp = Si\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}{Si} + \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} + + \begin{verse*} + \musicnote[french]{Accordage standard : {\nolyrics \[E A D G B E]}} + \musicnote[english]{Standard tuning: {\nolyrics \[E A D G B E]}} + \end{verse*} - \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} \endsong + \fi + + \ifukulele + \IfStrEq{\getlang}{english}{\beginsong{Ukulele chords}}{\beginsong{Accords de ukulélé}} + + \chordname{C}{Do} + \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}{Do\Sharp = Ré\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}{Ré} + \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}{Ré\Sharp = Mi\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}{Mi} + \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}{Fa} + \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}{Fa\Sharp = Sol\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}{Sol} + \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}{Sol\Sharp = La\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}{La} + \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}{La\Sharp = Si\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 + + \chordname{B}{Si} + \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} + + \begin{verse*} + \musicnote[french]{Accordage standard : {\nolyrics \[G C E A]}} + \musicnote[english]{Standard tuning: {\nolyrics \[G C E A]}} + \end{verse*} - \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} \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 diff --git a/tex/crepbook.cls b/tex/crepbook.cls index be5fc699..d69df6c5 100644 --- a/tex/crepbook.cls +++ b/tex/crepbook.cls @@ -64,12 +64,15 @@ \definecolor{tango-blue-3}{HTML}{204a87} \RequirePackage[bookmarks, bookmarksopen, + hyperfigures=true, colorlinks=true, linkcolor=tango-green-3, urlcolor=tango-blue-3]{hyperref} \RequirePackage{tikz} \RequirePackage{licence} \RequirePackage{xstring} +\RequirePackage{ifthen} +\RequirePackage{framed} \iflyric% \tabsfalse% @@ -189,9 +192,6 @@ \@footer \thispagestyle{empty} - \newpage - \@licence - \newpage } \makeatletter @@ -204,6 +204,8 @@ \newcommand{\songalbum}{} \newsongkey{cov}{\let\songcover\@empty}{\def\songcover{#1}} \newsongkey{album}{\let\songalbum\@empty}{\def\songalbum{#1}} +\newsongkey{url}{\let\songurl\@empty}{\def\songurl{#1}} +\newsongkey{original}{\let\songoriginal\@empty}{\def\songoriginal{#1}} \newcommand\cover{% \ifpictures% \ifx\songcover\@empty\else% @@ -215,6 +217,23 @@ \fi% } +% display album in song header +\renewcommand{\extendprelude}{ + {\bfseries\showauthors} + {\footnotesize\it\songalbum} + \IfStrEq{\songurl}{}{}{ + \href{\songurl}{\includegraphics[width=.3cm]{internet}} + } +} +\renewcommand{\extendpostlude}{ + {\footnotesize% + \IfStrEq{\songoriginal}{}{}{ + \IfStrEq{\@lang}{english}{Original song:}{Chanson originale :} + \songoriginal + } + } +} + \newlength{\capoheight} \setlength{\capoheight}{1.5cm} \renewcommand\capo[1]{% @@ -338,10 +357,10 @@ % Horizontal space reserved to verse number \setlength{\versenumwidth}{1em} % Modifier to the space between consecutive lines of lyrics -\baselineadj=-2pt plus 1pt minus 1pt +\baselineadj=-6pt plus 0pt minus 2pt % Space between verses and chorus \versesep=6pt plus 2pt minus 2pt -%lyrics font +% lyrics font \renewcommand{\lyricfont}{\normalfont\normalsize} @@ -429,38 +448,41 @@ \fi% %% End of tabs.sty file -\newcommand{\Intro}{ - \IfStrEq{\@lang}{english}{intro}{} - \IfStrEq{\@lang}{french}{intro}{} -} -\newcommand{\Outro}{ - \IfStrEq{\@lang}{english}{outro}{} - \IfStrEq{\@lang}{french}{outro}{} -} -\newcommand{\Bridge}{ - \IfStrEq{\@lang}{english}{bridge}{} - \IfStrEq{\@lang}{french}{pont}{} -} -\newcommand{\Chorus}{ - \IfStrEq{\@lang}{english}{chorus}{} - \IfStrEq{\@lang}{french}{refrain}{} -} -\newcommand{\Verse}{ - \IfStrEq{\@lang}{english}{verse}{} - \IfStrEq{\@lang}{french}{couplet}{} -} -\newcommand{\Solo}{ - \IfStrEq{\@lang}{english}{solo}{} - \IfStrEq{\@lang}{french}{solo}{} -} -\newcommand{\Pattern}{ - \IfStrEq{\@lang}{english}{pattern}{} - \IfStrEq{\@lang}{french}{motif}{} -} -\newcommand{\Rythm}{ - \IfStrEq{\@lang}{english}{rythm}{} - \IfStrEq{\@lang}{french}{rythme}{} -} +\newcommand*{\Intro}{% + \IfStrEq{\@lang}{english}{intro}{}% + \IfStrEq{\@lang}{french}{intro}{}% +}% +\newcommand*{\Outro}{% + \IfStrEq{\@lang}{english}{outro}{}% + \IfStrEq{\@lang}{french}{outro}{}% +}% +\newcommand*{\Bridge}{% + \IfStrEq{\@lang}{english}{bridge}{}% + \IfStrEq{\@lang}{french}{pont}{}% +}% +\newcommand*{\Chorus}{% + \IfStrEq{\@lang}{english}{chorus}{}% + \IfStrEq{\@lang}{french}{refrain}{}% +}% +\newcommand*{\Verse}{% + \IfStrEq{\@lang}{english}{verse}{}% + \IfStrEq{\@lang}{french}{couplet}{}% +}% +\newcommand*{\Solo}{% + \IfStrEq{\@lang}{english}{solo}{}% + \IfStrEq{\@lang}{french}{solo}{}% +}% +\newcommand*{\Pattern}{% + \IfStrEq{\@lang}{english}{pattern}{}% + \IfStrEq{\@lang}{french}{motif}{}% +}% +\newcommand*{\Rythm}{% + \IfStrEq{\@lang}{english}{rythm}{}% + \IfStrEq{\@lang}{french}{rythme}{}% +}% +\newcommand*{\Adlib}{% + \emph{ad~lib.}% +}% \let\musicnoteORIG\musicnote \renewcommand{\musicnote}[2][]{% @@ -478,12 +500,25 @@ } } +\renewcommand{\FrameCommand}[1]{ + \begin{tikzpicture} + \node[rectangle] (rect) { + \begin{minipage}{.8\textwidth} + #1 + \end{minipage} + }; + \draw[very thick, dashed] (rect.north west) -- (rect.south west); + \end{tikzpicture} +} + \newenvironment{bridge}{% - \musicnote{\Bridge}% - \vspace{-.3cm}% - \begin{verse*}% -}{% - \end{verse*} + \begin{framed} + \vspace{-.4cm} + \begin{verse*} +}{ + \end{verse*} + \vspace{-.2cm} + \end{framed} } %% \SB@chordsoff with a greater for the line spacing @@ -522,4 +557,18 @@ \fi% } \fi + +\def\removefirstch@r#1{} +\newcommand{\transposition}[1]{% + \ifnorepeatchords% + \musicnote{% + \IfStrEq{\@lang}{english}{transposition:~}{}% + \IfStrEq{\@lang}{french}{transposition~:~}{}% + \ifthenelse{#1>0}{#1$\Uparrow$}{\removefirstch@r#1$\Downarrow$}% + }% + \else% + \transpose{#1} + \fi% +}% + \makeatother diff --git a/tex/license-en.tex b/tex/license-en.tex deleted file mode 100644 index 5f59602f..00000000 --- a/tex/license-en.tex +++ /dev/null @@ -1,77 +0,0 @@ -%Licence Creative Commons -\begin{center} - \textbf{\LARGE{Creative Commons\footnote{ This work is licensed - under the Creative Commons Attribution-ShareAlike 3.0 Unported - License. To view a copy of this license, visit - \url{http://creativecommons.org/licenses/by-sa/3.0/} or send a - letter to Creative Commons, 171 Second Street, Suite 300, San - Francisco, California, 94105, USA.} Legal Code} } -\end{center} -\vspace{1cm} - -%------------------------------------------------------------------------------- -\begin{lblock}{You are free to:} - - \begin{pictonote}{share} - \lcondition{Share} copy, distribute and transmit the work; - \end{pictonote} - - \begin{pictonote}{remix} - \lcondition{Remix} adapt the work; - \end{pictonote} - -\end{lblock} -%------------------------------------------------------------------------------- -\begin{lblock}{Under the following conditions:} - - \begin{pictonote}{by} - \lcondition{Attribution} You must attribute the work in the manner - specified by the author or licensor (but not in any way that - suggests that they endorse you or your use of the work); - \end{pictonote} - - \begin{pictonote}{sa} - \lcondition{Share Alike} If you alter, transform, or build upon - this work, you may distribute the resulting work only under the - same or similar license to this one. - \end{pictonote} - -\end{lblock} -%------------------------------------------------------------------------------- -\begin{lblock}{With the understanding that:} - - \hspace{0.4cm} - \parbox{15cm}{ - \paragraph{Waiver --} - Any of the above conditions can be waived if you get permission - from the copyright holder. - - \paragraph{Public Domain --} - Where the work or any of its elements is in the public domain - under applicable law, that status is in no way affected by the - license. - - \paragraph{Other Rights --} - In no way are any of the following rights affected by the license: - \begin{itemize} - \item your fair dealing or fair use rights, or other applicable - copyright exceptions and limitations; - \item apart from the remix rights granted under this license, - the author's moral rights; - \item rights other persons may have either in the work itself - or in how the work is used, such as publicity or privacy rights. - \end{itemize} - } - - \begin{center} - \includegraphics[width=4cm]{license} - \end{center} - -\end{lblock} -%------------------------------------------------------------------------------- -\paragraph{Songs \LaTeX~Package} -This document is written in \LaTeX, from the Songs -Project\footnote{\url{http://songs.sourceforge.net/}}. - -%------------------------------------------------------------------------------- -% End of Licence diff --git a/tex/license-nb.tex b/tex/license-nb.tex index 57b41869..197d5b02 100644 --- a/tex/license-nb.tex +++ b/tex/license-nb.tex @@ -1,5 +1,7 @@ +\phantomsection +\addcontentsline{toc}{section}{Licence} %Licence Creative Commons -\begin{center} +\begin{center} \textbf{\LARGE{Creative Commons\footnote{ Ce document est mis à disposition selon le Contrat Attribution-ShareAlike 3.0 Unported disponible en ligne @@ -24,7 +26,7 @@ \end{lblock} %------------------------------------------------------------------------------- \begin{lblock}{Selon les conditions suivantes~:} - + \begin{pictonote}{by} \lcondition{Paternité} Vous devez citer le nom de l'auteur original de la manière indiquée par l'auteur de l'Å“uvre ou le @@ -32,30 +34,30 @@ d'une manière qui suggérerait qu'ils vous soutiennent ou approuvent votre utilisation de l'Å“uvre)~; \end{pictonote} - + \begin{pictonote}{sa} \lcondition{Partage des Conditions Initiales à l'Identique} Si vous modifiez, transformez ou adaptez cette création, vous n'avez le droit de distribuer la création qui en résulte que sous un contrat identique a celui-ci~; \end{pictonote} - + \end{lblock} %------------------------------------------------------------------------------- \begin{lblock}{Informations complémentaires~:} - + \hspace{0.4cm} \parbox{15cm}{ - \paragraph{Dérogation --} + \paragraph{Dérogation --} Chacune des conditions optionnelles peut être levée après l'autorisation du titulaire des droits. - - \paragraph{Utilisation --} + + \paragraph{Utilisation --} À chaque réutilisation ou distribution de cette création, vous devez faire apparaître clairement au public les conditions contractuelles de sa mise à disposition. - \paragraph{Équité --} + \paragraph{Équité --} La licence n'interfère avec aucun des droits ci-dessous~: \begin{itemize} \item votre bon usage de ce document~; @@ -64,11 +66,11 @@ présenté ou utilisé. \end{itemize} } - + \begin{center} \includegraphics[width=5cm]{license} \end{center} - + \end{lblock} %------------------------------------------------------------------------------- \begin{itemize} diff --git a/tex/license.tex b/tex/license.tex index 255680d4..3f272e85 100644 --- a/tex/license.tex +++ b/tex/license.tex @@ -1,89 +1,170 @@ %Licence Creative Commons -\begin{center} - \textbf{\LARGE{Creative Commons\footnote{ Cette création est mise à - disposition selon le Contrat Attribution-ShareAlike 3.0 - Unported disponible en ligne - \url{http://creativecommons.org/licenses/by-sa/3.0/} ou par - courrier postal à Creative Commons, 171 Second Street, Suite - 300, San Francisco, California 94105, USA.} Legal Code} } -\end{center} -\vspace{1cm} +\IfStrEq{\getlang}{english}{ + \phantomsection + \addcontentsline{toc}{section}{License} + \begin{center} + \textbf{\LARGE{Creative Commons\footnote{ This work is licensed + under the Creative Commons Attribution-ShareAlike 3.0 Unported + License. To view a copy of this license, visit + \url{http://creativecommons.org/licenses/by-sa/3.0/} or send a + letter to Creative Commons, 171 Second Street, Suite 300, San + Francisco, California, 94105, USA.} Legal Code} } + \end{center} + \vspace{1cm} -%------------------------------------------------------------------------------- -\begin{lblock}{Vous êtes libres~:} + %------------------------------------------------------------------------------- + \begin{lblock}{You are free to:} - \begin{pictonote}{share} - de reproduire, distribuer et communiquer cette création au - public~; - \end{pictonote} + \begin{pictonote}{share} + \lcondition{Share} copy, distribute and transmit the work; + \end{pictonote} - \begin{pictonote}{remix} - de modifier cette création~; - \end{pictonote} + \begin{pictonote}{remix} + \lcondition{Remix} adapt the work; + \end{pictonote} -\end{lblock} -%------------------------------------------------------------------------------- -\begin{lblock}{Selon les conditions suivantes~:} - - \begin{pictonote}{by} - \lcondition{Paternité} Vous devez citer le nom de l'auteur - original de la manière indiquée par l'auteur de l'Å“uvre ou le - titulaire des droits qui vous confère cette autorisation (mais pas - d'une manière qui suggérerait qu'ils vous soutiennent ou - approuvent votre utilisation de l'Å“uvre)~; - \end{pictonote} - - \begin{pictonote}{sa} - \lcondition{Partage des Conditions Initiales à l'Identique} Si - vous modifiez, transformez ou adaptez cette création, vous n'avez - le droit de distribuer la création qui en résulte que sous un - contrat identique a celui-ci~; - \end{pictonote} - -\end{lblock} -%------------------------------------------------------------------------------- -\begin{lblock}{Informations complémentaires~:} - - \hspace{0.4cm} - \parbox{15cm}{ - \paragraph{Dérogation --} - Chacune des conditions optionnelles peut être levée après - l'autorisation du titulaire des droits. - - \paragraph{Utilisation --} - À chaque réutilisation ou distribution de cette création, vous - devez faire apparaître clairement au public les conditions - contractuelles de sa mise à disposition. - - \paragraph{Équité --} - La licence n'interfère avec aucun des droits ci-dessous~: - \begin{itemize} - \item votre bon usage de ce document~; - \item les droits moraux des auteurs~; - \item les droits des personnes tierces dont le travail est - présenté ou utilisé. - \end{itemize} - } + \end{lblock} + %------------------------------------------------------------------------------- + \begin{lblock}{Under the following conditions:} + + \begin{pictonote}{by} + \lcondition{Attribution} You must attribute the work in the manner + specified by the author or licensor (but not in any way that + suggests that they endorse you or your use of the work); + \end{pictonote} + + \begin{pictonote}{sa} + \lcondition{Share Alike} If you alter, transform, or build upon + this work, you may distribute the resulting work only under the + same or similar license to this one. + \end{pictonote} + \end{lblock} + %------------------------------------------------------------------------------- + \begin{lblock}{With the understanding that:} + + \hspace{0.4cm} + \parbox{15cm}{ + \paragraph{Waiver --} + Any of the above conditions can be waived if you get permission + from the copyright holder. + + \paragraph{Public Domain --} + Where the work or any of its elements is in the public domain + under applicable law, that status is in no way affected by the + license. + + \paragraph{Other Rights --} + In no way are any of the following rights affected by the license: + \begin{itemize} + \item your fair dealing or fair use rights, or other applicable + copyright exceptions and limitations; + \item apart from the remix rights granted under this license, + the author's moral rights; + \item rights other persons may have either in the work itself + or in how the work is used, such as publicity or privacy rights. + \end{itemize} + } + + \begin{center} + \includegraphics[width=4cm]{license} + \end{center} + + \end{lblock} + %------------------------------------------------------------------------------- + \paragraph{Songs \LaTeX~Package} + This document is written in \LaTeX, from the Songs + Project\footnote{\url{http://songs.sourceforge.net/}}. +}{ + \phantomsection + \addcontentsline{toc}{section}{Licence} \begin{center} - \includegraphics[width=4cm]{license} + \textbf{\LARGE{Creative Commons\footnote{ Cette création est mise à + disposition selon le Contrat Attribution-ShareAlike 3.0 + Unported disponible en ligne + \url{http://creativecommons.org/licenses/by-sa/3.0/} ou par + courrier postal à Creative Commons, 171 Second Street, Suite + 300, San Francisco, California 94105, USA.} Legal Code} } \end{center} + \vspace{1cm} -\end{lblock} -%------------------------------------------------------------------------------- -\paragraph{Songs \LaTeX~Package} -Ce document est écrit en \LaTeX, d'après le style du projet -Songs\footnote{\url{http://songs.sourceforge.net/}}. - -\paragraph{Note des auteurs} -Ces tablatures sont des représentations d'interprétations personnelles -et approximatives de chansons potentiellement protégées par droits -d'auteurs. Ce recueil de chansons n'a absolument aucune vocation -commerciale et joue sur l'autorisation tacite des auteurs et des -ayant-droits, pensant que la publication de ces tablatures représente -une publicité positive à leur égard. Si un auteur ou une société -accréditée pense que ces tablatures sont utilisées d'une manière -susceptible de porter atteinte à ses droits et désire s'opposer à leur -publication, merci de nous contacter à \url{crep@team-on-fire.com}. + %------------------------------------------------------------------------------- + \begin{lblock}{Vous êtes libres~:} + + \begin{pictonote}{share} + de reproduire, distribuer et communiquer cette création au + public~; + \end{pictonote} + + \begin{pictonote}{remix} + de modifier cette création~; + \end{pictonote} + + \end{lblock} + %------------------------------------------------------------------------------- + \begin{lblock}{Selon les conditions suivantes~:} + + \begin{pictonote}{by} + \lcondition{Paternité} Vous devez citer le nom de l'auteur + original de la manière indiquée par l'auteur de l'Å“uvre ou le + titulaire des droits qui vous confère cette autorisation (mais pas + d'une manière qui suggérerait qu'ils vous soutiennent ou + approuvent votre utilisation de l'Å“uvre)~; + \end{pictonote} + + \begin{pictonote}{sa} + \lcondition{Partage des Conditions Initiales à l'Identique} Si + vous modifiez, transformez ou adaptez cette création, vous n'avez + le droit de distribuer la création qui en résulte que sous un + contrat identique a celui-ci~; + \end{pictonote} + + \end{lblock} + %------------------------------------------------------------------------------- + \begin{lblock}{Informations complémentaires~:} + + \hspace{0.4cm} + \parbox{15cm}{ + \paragraph{Dérogation --} + Chacune des conditions optionnelles peut être levée après + l'autorisation du titulaire des droits. + + \paragraph{Utilisation --} + À chaque réutilisation ou distribution de cette création, vous + devez faire apparaître clairement au public les conditions + contractuelles de sa mise à disposition. + + \paragraph{Équité --} + La licence n'interfère avec aucun des droits ci-dessous~: + \begin{itemize} + \item votre bon usage de ce document~; + \item les droits moraux des auteurs~; + \item les droits des personnes tierces dont le travail est + présenté ou utilisé. + \end{itemize} + } + + \begin{center} + \includegraphics[width=4cm]{license} + \end{center} + + \end{lblock} + %------------------------------------------------------------------------------- + \paragraph{Songs \LaTeX~Package} + Ce document est écrit en \LaTeX, d'après le style du projet + Songs\footnote{\url{http://songs.sourceforge.net/}}. + + \paragraph{Note des auteurs} + Ces tablatures sont des représentations d'interprétations personnelles + et approximatives de chansons potentiellement protégées par droits + d'auteurs. Ce recueil de chansons n'a absolument aucune vocation + commerciale et joue sur l'autorisation tacite des auteurs et des + ayant-droits, pensant que la publication de ces tablatures représente + une publicité positive à leur égard. Si un auteur ou une société + accréditée pense que ces tablatures sont utilisées d'une manière + susceptible de porter atteinte à ses droits et désire s'opposer à leur + publication, merci de nous contacter à \url{crep@team-on-fire.com}. + %------------------------------------------------------------------------------- +} %------------------------------------------------------------------------------- -% Fin de la Licence +% End of Licence diff --git a/utils/header-english b/utils/header-english index 297aa71a..41c2ec54 100644 --- a/utils/header-english +++ b/utils/header-english @@ -1,5 +1,5 @@ { -"template" : "patacrep-en.tmpl", +"template" : "patacrep.tmpl", "lang" : "english", "bookoptions" : [ "diagram", diff --git a/utils/rules.py b/utils/rules.py index ea84b8e8..5ccc6345 100755 --- a/utils/rules.py +++ b/utils/rules.py @@ -31,6 +31,7 @@ word_dic = { ##: Punctuation "’": "'", "‘": "'", +"´": "'", "Ca ": "Ça ", "...": "{\\dots}", "…": "{\\dots}", @@ -168,6 +169,8 @@ def language_rules(string): string = re.sub("(?P\S)(?P[!?;:])","\g \g", string) #... except for gtabs macros with capos string = re.sub("(?Ptab.?{.*)\s:","\g:", string) + #... and for urls + string = re.sub("http\s:","http:", string) #and apply a second time for cases like \gtab{Gm}{10:X02210:} string = re.sub("(?Ptab.?{.*)\s:","\g:", string) #ensure no spaces after symbols ( diff --git a/windows/clean.bat b/windows/clean.bat index 2448317f..7eee1339 100644 --- a/windows/clean.bat +++ b/windows/clean.bat @@ -1,2 +1,4 @@ Rem manually performs "make clean" -del *.aux *.d *.toc *.out *.log *.nav *.snm *.sbx *.sxd +FOR %%A IN (*.aux *.d *.toc *.out *.log *.nav *.snm *.sbx *.sxd) DO DEL %%A +Rem remove temporary covers +FOR %%A IN (covers\*.*) DO DEL %%A diff --git a/windows/cleanall.bat b/windows/cleanall.bat index ee0255b1..02df9ca2 100644 --- a/windows/cleanall.bat +++ b/windows/cleanall.bat @@ -1,3 +1,4 @@ +Rem remove pdf files +FOR %%A IN (*.pdf) DO DEL %%A Rem manually performs "make cleanall" windows\\clean.bat -del *.pdf