From 151f74941f70245bb74cecd356fb4452d132a1dd Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Sat, 17 May 2014 12:14:25 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20et=20cemmentaires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 songbook_core/data/latex/SongbookUtils.sty | 129 ++++++++++++---------
 songbook_core/data/latex/crepbook.sty      |   8 ++
 2 files changed, 83 insertions(+), 54 deletions(-)

diff --git a/songbook_core/data/latex/SongbookUtils.sty b/songbook_core/data/latex/SongbookUtils.sty
index 6aea62ab..126eaba0 100644
--- a/songbook_core/data/latex/SongbookUtils.sty
+++ b/songbook_core/data/latex/SongbookUtils.sty
@@ -223,12 +223,16 @@
 % End of the new informations
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Lilypond
+
 % On-the-fly compilation of lilypond files
 \iflilypondauto
     \epstopdfDeclareGraphicsRule{.ly}{pdf}{.pdf}{lilypond --format=pdf --output=\Gin@base\ETE@suffix\space #1}
     \AppendGraphicsExtensions{.ly}
 \fi
 
+% Conditional inclusion of lilypond sheet music.
 \newcommand{\lilypond}[1]{%
     \iflilypond%
     \includegraphics{\currfiledir#1}%
@@ -239,7 +243,10 @@
     \includegraphics{#1}%
     \fi%
 }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Useful commands
 \newcommand{\image}[2][]{%
     \ifpictures%
     \begin{flushright}%
@@ -276,60 +283,6 @@
     \emph{ad~lib.}%
 }%
 
-
-% Configuration of the songs package
-% Horizontal space reserved to verse number
-\setlength{\versenumwidth}{1em}
-% Modifier to the space between consecutive lines of lyrics
-\baselineadj=-6pt plus 0pt minus 2pt
-% Space between verses and chorus
-\versesep=6pt plus 2pt minus 2pt
-
-
-
-% Paragraph indentation space
-\setlength{\parindent}{0.3cm}
-
-
-\ifonesongperpage%
-\renewcommand\songcolumns[1]{%
-    \SB@cnt#1\relax%
-    \ifSB@preamble\else{\SB@clearpage}\fi%
-    \SB@numcols\SB@cnt%
-    \ifnum\SB@numcols>\z@%
-    \SB@colwidth-\columnsep%
-    \multiply\SB@colwidth\SB@numcols%
-    \advance\SB@colwidth\columnsep%
-    \advance\SB@colwidth\textwidth%
-    \divide\SB@colwidth\SB@numcols%
-    \else%
-    \ifrepchorus\SB@warnrc\fi%
-    \fi%
-}
-\fi
-
-%% \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}{%
-    \ifrepeatchords%
-    \else%
-        \CB@chordshidden%
-    \fi
-}{}%
-
-
 % Use a new framed command for bridges
 \renewcommand{\FrameCommand}[1]{
   \begin{tikzpicture}
@@ -353,6 +306,27 @@
     \end{framed}
 }
 
+%% \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}{%
+    \ifrepeatchords%
+    \else%
+        \CB@chordshidden%
+    \fi
+}{}%
+
 \def\removefirstch@r#1{}
 \newcommand{\transposition}[1]{%
     \ifrepeatchords%
@@ -365,6 +339,7 @@
     \fi%
 }%
 
+% Definition of environment "tab"
 \iftabs
     \RequirePackage{tabs}
 \else
@@ -372,6 +347,51 @@
     \newenvironment{tab}{\comment}{\endcomment}
 \fi
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Layout tweaks
+
+% Configuration of the songs package
+% Horizontal space reserved to verse number
+\setlength{\versenumwidth}{1em}
+% Modifier to the space between consecutive lines of lyrics
+\baselineadj=-6pt plus 0pt minus 2pt
+% Space between verses and chorus
+\versesep=6pt plus 2pt minus 2pt
+
+
+
+% Paragraph indentation space
+\setlength{\parindent}{0.3cm}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% One song per page?
+
+\ifonesongperpage%
+\renewcommand\songcolumns[1]{%
+    \SB@cnt#1\relax%
+    \ifSB@preamble\else{\SB@clearpage}\fi%
+    \SB@numcols\SB@cnt%
+    \ifnum\SB@numcols>\z@%
+    \SB@colwidth-\columnsep%
+    \multiply\SB@colwidth\SB@numcols%
+    \advance\SB@colwidth\columnsep%
+    \advance\SB@colwidth\textwidth%
+    \divide\SB@colwidth\SB@numcols%
+    \else%
+    \ifrepchorus\SB@warnrc\fi%
+    \fi%
+}
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% TODO: Move this stuff to crepbook.sty? -- spalax
+
 \let\@textnoteold\textnote
 \renewcommand{\textnote}[2][]{%
   \vspace{.1cm}
@@ -387,5 +407,6 @@
     \iflanguage{#1}{\@musicnoteold{#2}}{}
   }
 }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \endinput
diff --git a/songbook_core/data/latex/crepbook.sty b/songbook_core/data/latex/crepbook.sty
index 3e2c9046..c02a41cb 100644
--- a/songbook_core/data/latex/crepbook.sty
+++ b/songbook_core/data/latex/crepbook.sty
@@ -46,6 +46,7 @@
 % End of multilanguage management
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Title page
 \long\def\subtitle#1{\long\def\@subtitle{#1}}
 \def\version#1{\def\@version{#1}}
@@ -127,7 +128,9 @@
         \end{flushright}
     \end{titlepage}
 }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Fancy capo
 \iffancycapo %
     \newlength{\capoheight}
@@ -142,7 +145,9 @@
             }%
     }
 \fi
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Fonts definitions
 \def\chordfont#1{\gdef\@chordfont{#1}}
 \def\@chordfont{\small\it}
@@ -151,8 +156,10 @@
 \renewcommand{\idxauthfont}{\sffamily\bfseries}
 \renewcommand{\idxheadfont}{\sffamily\it\LARGE}
 \renewcommand{\idxrefsfont}{\bfseries}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Configuration of the songs package
 \titleprefixword{}
 \renewcommand{\stitlefont}{\LARGE\bf}
@@ -162,5 +169,6 @@
 \renewcommand{\showauthors}{%
     \hbox{\normalsize\songauthors}%
 }
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \endinput