diff --git a/.gitignore b/.gitignore index a8410ab5..d913a000 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ staging/ utils/release.sh utils/tarball.sh utils/send.sh +*~ *.aux *.sbd *.sbx diff --git a/books/matteo.sb b/books/matteo.sb new file mode 100644 index 00000000..1ab21334 --- /dev/null +++ b/books/matteo.sb @@ -0,0 +1,23 @@ +{ +"template" : "patacrep-improved.tmpl", +"lang" : "french", +"bookoptions" : [ + "importantdiagramonly", + "lilypond", + "pictures" + ], +"booktype" : "chorded", +"subtitle" : "Matteo's songs", +"songs" : [ + "Hubert-Felix_Thiefaine/Sentiments_numeriques_revisites.sg", + "Jean_Leloup/Promeneur.sg", + "Maxime_Le_Forestier/Parachutiste.sg", + "Yves_Simon/Les_bateaux_du_metro.sg", + "Soldat_Louis/Du_rhum_des_femmes.sg", + "Soldat_Louis/Tirer_des_caisses.sg", + "Soldat_Louis/Savannah.sg", + "Leonard_Cohen/Winter_lady.sg", + "Leonard_Cohen/A_bunch_of_lonesome_heroes.sg", + "Leonard_Cohen/The_old_revolution.sg", + "Jacques_Higelin/Je_ne_peux_plus_dire_je_t_aime.sg"] +} diff --git a/templates/patacrep-improved.tmpl b/templates/patacrep-improved.tmpl new file mode 100644 index 00000000..f3e48ae3 --- /dev/null +++ b/templates/patacrep-improved.tmpl @@ -0,0 +1,100 @@ +% 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":"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":"french"}, +%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, +%%: {"name":"version", "description":"Version", "default":"3.4.7"}, +%%: {"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":"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,\getbookoptions,\getmainfontsize]{tex/crepbook} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage[portuguese,spanish,english,french]{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{ + {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} + +\notenamesin{A}{B}{C}{D}{E}{F}{G} +\notenamesout{La}{Si}{Do}{Ré}{Mi}{Fa}{Sol} + +\songsection{Liste des chansons} +\begin{songs}{titleidx,authidx} + \getsongslist +\end{songs} + +\end{document} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% end document diff --git a/tex/crepbook.cls b/tex/crepbook.cls index 98b3d00e..33d3bb10 100644 --- a/tex/crepbook.cls +++ b/tex/crepbook.cls @@ -2,7 +2,7 @@ % for LaTeX2e % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesClass{crepbook}[2009/11/12 v0.4.2 LaTeX document class for Crep +\ProvidesClass{crepbook}[2012/02/19 v0.5.0 LaTeX document class for Crep Books] \makeatletter\def\input@path{{tex/}} @@ -10,12 +10,16 @@ \newif{\iftabs} \newif{\iflilypond} \newif{\ifnodiagram} +\newif{\ifimportantdiagramonly} \newif{\ifpictures} +\newif{\ifnorepeatchords} \tabsfalse \lilypondfalse \nodiagramtrue \picturesfalse +\importantdiagramonlyfalse +\norepeatchordstrue % Options \DeclareOption{tabs}{\tabstrue} @@ -24,8 +28,11 @@ \DeclareOption{nolilypond}{\lilypondfalse} \DeclareOption{nodiagram}{\nodiagramtrue} \DeclareOption{diagram}{\nodiagramfalse} +\DeclareOption{importantdiagramonly}{\importantdiagramonlytrue\nodiagramfalse} \DeclareOption{pictures}{\picturestrue} \DeclareOption{nopictures}{\picturesfalse} +\DeclareOption{norepeatchords}{\norepeatchordstrue} +\DeclareOption{repeatchords}{\norepeatchordsfalse} \DeclareOption{10pt}{\PassOptionsToClass{\CurrentOption}{article}} \DeclareOption{11pt}{\PassOptionsToClass{\CurrentOption}{article}} @@ -217,8 +224,25 @@ \fi% }% +\let\gtab@Original\gtab +\newcommand{\gtab@Hidden}[2]{}% \ifnodiagram% - \renewcommand{\gtab}[2]{}% +\renewcommand{\gtab}{\@ifstar + \gtab@Hidden% + \gtab@Hidden% +} +\else% +\ifimportantdiagramonly% +\renewcommand{\gtab}{\@ifstar + \gtab@Original% + \gtab@Hidden% +} +\else% +\renewcommand{\gtab}{\@ifstar + \gtab@Original% + \gtab@Original% +} +\fi% \fi% \newcommand{\lilypond}[1]{% @@ -414,4 +438,24 @@ \end{verse*} } +%% \SB@chordsoff with a greater for the line spacing +\newcommand{\CB@chordshidden}{% + \def\SB@bracket##1]{\ignorespaces}% + \let\SB@rechord\relax% + \let\SB@ch\SB@ch@off% + \ifSB@measurespec% + \ifmeasures\SB@measureson\else\SB@measuresoff\fi% + \else% + \SB@measuresoff% + \fi% + \ifSB@preamble\let\colbotglue{\z@\@plus.5\textheight}\fi% + \SB@setbaselineskip% +} + +\newenvironment{repeatedchords}{% + \ifnorepeatchords% + \CB@chordshidden% + \fi +}{}% + \makeatother