diff --git a/clean.bat b/clean.bat new file mode 100644 index 00000000..2448317f --- /dev/null +++ b/clean.bat @@ -0,0 +1,2 @@ +Rem manually performs "make clean" +del *.aux *.d *.toc *.out *.log *.nav *.snm *.sbx *.sxd diff --git a/img/Mousey_Band_by_Duffzilla.jpg b/img/Mousey_Band_by_Duffzilla.jpg new file mode 100644 index 00000000..f1b821c3 Binary files /dev/null and b/img/Mousey_Band_by_Duffzilla.jpg differ diff --git a/make.bat b/make.bat new file mode 100644 index 00000000..14188e5b --- /dev/null +++ b/make.bat @@ -0,0 +1,12 @@ +Rem build tex file from songbook file +songbook.py --songbook=%1.sb --output=%1.tex + +Rem 1st pdf compilation +pdflatex %1.tex + +Rem build indexes +songbook-makeindex.py %1_title.sxd > %1_title.sbx +songbook-makeindex.py %1_auth.sxd > %1_auth.sbx + +Rem 2nd compilation to include indexes +pdflatex %1.tex diff --git a/makefile b/makefile index 852efa4f..3f59b6b7 100644 --- a/makefile +++ b/makefile @@ -39,11 +39,8 @@ else LILYFILE=$(LILY_SRC:%.ly=%.pdf) endif -ifeq ($(shell grep ubuntu.tmpl $(SONGBOOKS)),) - LATEX=pdflatex $(LATEX_OPTIONS) -else - LATEX=xelatex $(LATEX_OPTIONS) -endif + +LATEX=pdflatex $(LATEX_OPTIONS) ############################################################ ### Targets diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 75d30410..87fa18db 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.2.7"}, +%%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index a73581a8..9d70dd8c 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.2.7"}, +%%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index cd53d0ca..4e4e5a64 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.2.7"}, +%%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/ubuntu.tmpl b/templates/ubuntu.tmpl deleted file mode 100644 index 59263abb..00000000 --- a/templates/ubuntu.tmpl +++ /dev/null @@ -1,93 +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":"Recueil de chansons pour guitare", "mandatory":true}, -%%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, -%%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.2.7"}, -%%: {"name":"subtitle", "description":"Subtitle", "default":"ubuntu version"}, -%%: {"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":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, -%%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#FCAF3E"}, -%%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#BABDB6"}, -%%: {"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"#BABDB6"} -%%:] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% begin document -\documentclass[\getbooktype,\getbookoptions,\getmainfontsize]{crepbook} - -\usepackage{xltxtra} -\setmainfont[Mapping=tex-text]{Ubuntu} -\usepackage[spanish,english,french]{babel} - -\title{\gettitle} -\author{\getauthor} -\subtitle{\getsubtitle} -\version{\getversion} -\mail{\getmail} -\web{\getweb} -\picture{\getpicture} -\picturecopyright{\getpicturecopyright} -\footer{\getfooter} -\licence{\getlicense} - -\newindex{titleidx}{\getname_title} -\newauthorindex{authidx}{\getname_auth} - -\graphicspath{ {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{Index des chansons}{titleidx} -\showindex{Index des auteurs}{authidx} - -\songsection{Liste des chansons} -\begin{songs}{titleidx,authidx} - \getsongslist -\end{songs} - -\end{document} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% end document diff --git a/utils/latex-preprocessing.py b/utils/latex-preprocessing.py index b614521a..7a8eba30 100755 --- a/utils/latex-preprocessing.py +++ b/utils/latex-preprocessing.py @@ -17,7 +17,10 @@ word_dic = { "noeud": "nœud", "oeil": "œil", "voeu": "vœu", +"oeuf": "œuf", "oe{}": "œ", +##: Contractions +"ptit": "p'tit", ##: Punctuation "’": "'", "Ca ": "Ça ", diff --git a/utils/typo.sh b/utils/typo.sh index e12577da..dd841e52 100755 --- a/utils/typo.sh +++ b/utils/typo.sh @@ -4,14 +4,21 @@ #Date: 27/10/2010 #Description: fix typographic mistakes, some depending on language +FILES=songs/*/*.sg + +if [ $# -gt 0 ] ; then + FILES=$@ +fi + # remove trailing space and double space sed -i \ -e 's/\s*$//g' \ + -e 's/[,\.]$//g' \ -e '/\s*%/! s/\([^ ]\)\s\+/\1 /g' \ - $@ + $FILES # formating rules depending on language -for song in $@; +for song in $FILES; do if grep -q "selectlanguage{english}" $song then diff --git a/volume-3.sb b/volume-3.sb new file mode 100644 index 00000000..c6bf25fb --- /dev/null +++ b/volume-3.sb @@ -0,0 +1,84 @@ +{ +"template" : "patacrep.tmpl", +"bookoptions" : [ + "diagram", + "lilypond", + "pictures" + ], +"booktype" : "chorded", +"picture" : "Mousey_Band_by_Duffzilla", +"picturecopyright" : "duffzilla @ deviantart.com", +"subtitle" : "Tome 3", +"songs" : [ + "Alain_Souchon/L_amour_a_la_machine.sg", + "Alex_Beaupain/As_tu_deja_aime.sg", + "Alex_Beaupain/De_bonnes_raisons.sg", + "Alex_Beaupain/Les_yeux_au_ciel.sg", + "Alex_Beaupain/Ma_memoire_sale.sg", + "Barbara/L_aigle_noir.sg", + "Bobby_McFerrin/Don_t_worry_be_happy.sg", + "Boby_Lapointe/Framboise.sg", + "Boby_Lapointe/Meli-Melodie.sg", + "Bruce_Springsteen/Mrs_McGrath.sg", + "Bruce_Springsteen/Old_Dan_Tucker.sg", + "Charles_Aznavour/Les_comediens.sg", + "Crep/Bioman.sg", + "Crep/Calimero.sg", + "Crep/Encore.sg", + "Crep/Fichu_doctorat.sg", + "Crep/iScream.sg", + "Crep/Kartopo.sg", + "Crep/Les_ptits_chemins.sg", + "Crep/Melancolie.sg", + "Crep/Nostalgeek.sg", + "Crep/Soiree_pepere.sg", + "Debout_Sur_Le_Zinc/Le_tanticide.sg", + "Dropkick_Murphys/Dirty_glass.sg", + "Eddie_Vedder/Guaranteed.sg", + "Fools_Garden/Lemon_tree.sg", + "Gipsy_Kings/Baila_me.sg", + "Gipsy_Kings/Bamboleo.sg", + "Gogol_Bordello/Alcohol.sg", + "Gogol_Bordello/Supertheory_of_supereverything.sg", + "Graeme_Allwright/Le_jour_de_clarte.sg", + "Hugues_Aufray/Alouette.sg", + "Hugues_Aufray/Hasta_luego.sg", + "Hugues_Aufray/L_epervier.sg", + "Jean-Jacques_Goldman/Le_coureur.sg", + "Karpatt/Fan_de_maman.sg", + "Karpatt/Histoires_de_famille.sg", + "Karpatt/Lino.sg", + "Karpatt/Souleve_ta_jupe.sg", + "La_Maison_Tellier/La_chambre_rose.sg", + "La_Rue_Ketanou/Les_tontons.sg", + "La_tete_a_toto/Les_projets.sg", + "La_tete_a_toto/Petit_bonhomme.sg", + "Les_Amis_D_Ta_Femme/Laisse_tomber_gros.sg", + "Les_Booze_Brothers/I_want_sex.sg", + "Les_Fatals_Picards/Goldorak_est_mort.sg", + "Les_Ogres_de_Barback/Comment_je_suis_devenu_voyageur.sg", + "Les_Ogres_de_Barback/L_ennui_et_le_jour.sg", + "Les_Ogres_de_Barback/Ma_fille.sg", + "Les_VRP/Ramon_Perez.sg", + "Lylloo/Ma_soiree_msn.sg", + "Matmatah/L_apologie.sg", + "Mes_souliers_sont_rouges/Cahin_Caha.sg", + "Mes_souliers_sont_rouges/L_arbre_est_dans_ses_feuilles.sg", + "Mes_souliers_sont_rouges/Sortis_du_bois.sg", + "Mon_cote_punk/Youssef.sg", + "Noir_Desir/Le_vent_nous_portera.sg", + "Noir_Desir/L_homme_presse.sg", + "Philippe_Lavil/Il_tape_sur_des_bambous.sg", + "Pierre_Perret/Les_jolies_colonies_de_vacances.sg", + "Renaud/C_est_quand_qu_on_va_ou.sg", + "Renaud/La_blanche.sg", + "Renaud/Salut_manouche.sg", + "The_Beautiful_Girls/La_Mar.sg", + "The_Connells/74_75.sg", + "The_Innocence_Mission/The_lakes_of_Canada.sg", + "The_Nightwatchman/California_s_dark.sg", + "The_Pogues/The_Irish_Rover.sg", + "The_Rolling_Stones/You_cant_always_get_what_you_want.sg", + "Tri_Yann/Kiss_the_cildren_for_me_Mary.sg", + "Tri_Yann/Les_filles_de_Redon.sg"] +}