From 12f4063139a2ebf97e137019ada3280cef49e3e6 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Thu, 8 May 2014 22:48:45 +0100 Subject: [PATCH] Nettoyage et finalisation de la page de titre --- songbook_core/data/latex/crepbook.sty | 19 +++++++++++++------ songbook_core/data/templates/default.tex | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/songbook_core/data/latex/crepbook.sty b/songbook_core/data/latex/crepbook.sty index 5e2362d4..f2d317d9 100644 --- a/songbook_core/data/latex/crepbook.sty +++ b/songbook_core/data/latex/crepbook.sty @@ -59,10 +59,11 @@ \def\picturecopyright#1{\def\@picturecopyright{#1}} \def\footer#1{\def\@footer{#1}} +\long\def\author#1{\long\def\@author{#1}} \def\clearheadinfo{ - \author{No Author Given}% - \title{No Title Given}% + \author{}% + \title{No title}% \subtitle{}% \version{}% \web{}% @@ -90,19 +91,19 @@ \def\@maketitle{ \begin{titlepage} \thispagestyle{empty} - \hfil% + \begin{center} {\rule{\textwidth}{1mm}} {\@titlefont\@title\par} \if!\@subtitle!\else {\hfil\@subtitlefont\@subtitle\par} \fi {\rule{\textwidth}{1mm}} - \hfil% + \end{center} \vfil \begin{flushleft} \begin{tabular}{l l} \if!\@version!\else{\textbf{\labelversionname}} & \@version \\ \fi - \if!\@date!\else{\textbf{\labeldatename}} & \@date \\ \fi + \if!\@date!\else{\textbf{\labeldatename}} & \@date \\ \fi \if!\@author!\else{\textbf{\labelauthorname}} & \@author \\ \fi \if!\@web!\else{\textbf{\labelwebname}} & \url{\@web} \\ \fi \if!\@mail!\else{\textbf{\labelmailname}} & \url{\@mail} \\ \fi @@ -111,10 +112,16 @@ \vfil \begin{center} \includegraphics[keepaspectratio=true, width=12cm, height=12cm]{\@picture} - {\hfil \small \@picturecopyright} + \vskip1em + {\hfil\hbox{\small \@picturecopyright}} \end{center} + \begin{flushright} + \vfil + {\hfil\rule{.4\textwidth}{.75pt}\par} \@footer + \end{flushright} \end{titlepage} + \newpage } % Fancy capo diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex index a13fa507..31c2c020 100644 --- a/songbook_core/data/templates/default.tex +++ b/songbook_core/data/templates/default.tex @@ -49,7 +49,7 @@ "default": {"default": "Dbolton \\url{http://commons.wikimedia.org/wiki/User:Dbolton}"} }, "footer": {"description": {"english": "Footer", "french": "Pied de page"}, - "default": {"default": "\\begin{flushright}Generated using Songbook (\\url{http://www.patacrep.com})\\end{flushright}"} + "default": {"default": "Generated using Songbook (\\url{http://www.patacrep.com})"} }, "titleprefixwords": {"description": {"english": "Ignore some words in the beginning of song titles", "french": "Ignore des mots dans le classement des chansons"},