From 44a1c4f2fe6692b4bd5a23a779f9b94a5baac17f Mon Sep 17 00:00:00 2001
From: Luthaf <luthaf@yahoo.fr>
Date: Fri, 16 May 2014 23:27:40 +0100
Subject: [PATCH] =?UTF-8?q?Utilisation=20de=20TeX=20au=20lieu=20de=20tabul?=
 =?UTF-8?q?ars=20imbriqu=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 songbook_core/data/latex/crepbook.sty | 43 ++++++++++++++++-----------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/songbook_core/data/latex/crepbook.sty b/songbook_core/data/latex/crepbook.sty
index 471bf43f..68e400d8 100644
--- a/songbook_core/data/latex/crepbook.sty
+++ b/songbook_core/data/latex/crepbook.sty
@@ -26,23 +26,20 @@
     % Default names (english)
     \def\labelversionname{Version:}
     \def\labeldatename{Date:}
-    \def\labelauthorname{aAuthors:}
+    \def\labelauthorname{Authors:}
     \def\labelwebname{Web:}
     \def\labelmailname{Email:}
     
     \IfStrEq{\mainlanguage}{french}{
         % French names
-        \def\labelversionname{Version :}
-        \def\labeldatename{Date :}
-        \def\labelauthorname{Auteurs :}
-        \def\labelwebname{Web :}
-        \def\labelmailname{Mail :}
+        \def\labelversionname{Version~:}
+        \def\labeldatename{Date~:}
+        \def\labelauthorname{Auteurs~:}
+        \def\labelwebname{Web~:}
+        \def\labelmailname{Mail~:}
     }{}
 }
 
-\def\andname{and}
-\def\lastandname{\unskip, and}
-
 
 \def\lang#1{\def\mainlanguage{#1}}
 
@@ -86,7 +83,18 @@
 \def\@titlefont{\Huge\bfseries\boldmath}
 \def\@subtitlefont{\large\bfseries\boldmath}
 
+
+\def\@getelement#1{\csname @#1\endcsname}
+\def\@labelelement#1{\csname label#1name\endcsname}
+\def\@insertelement#1{\if!\@getelement{#1}!
+                      \else %
+                      \@labelelement{#1}& %
+                      \@getelement{#1} \cr %
+                      \fi %
+                      }
+
 \def\@maketitle{
+    \def\and{\unskip,\cr&}
     \begin{titlepage}
         \thispagestyle{empty}
         \begin{center}
@@ -98,15 +106,14 @@
             {\rule{\textwidth}{1mm}}
         \end{center}
         \vfil
-        \begin{flushleft}
-            \begin{tabular}{l l}
-                \if!\@version!\else{\textbf{\labelversionname}} & \@version \\ \fi
-                \if!\@date!\else{\textbf{\labeldatename}} & \@date \\ \fi
-                \if!\@author!\else{\textbf{\labelauthorname}} & \begin{tabular}[t]{c}\@author\end{tabular} \\ \fi
-                \if!\@web!\else{\textbf{\labelwebname}} &  \url{\@web} \\ \fi
-                \if!\@mail!\else{\textbf{\labelmailname}} &  \url{\@mail} \\ \fi
-            \end{tabular}
-        \end{flushleft}
+        \ialign{
+            \bf{##} \hfil & ## \hfil \cr % Lines definition
+            \@insertelement{version} %
+            \@insertelement{date} %
+            \@insertelement{author} %
+            \@insertelement{web} %
+            \@insertelement{mail} %
+        }
         \vfil
         \begin{center}
             \includegraphics[keepaspectratio=true, width=12cm, height=12cm]{\@picture}