From ae021f6b8ea185730dbdd9a1c07074ed68e699c3 Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Sat, 9 May 2009 16:54:44 +0200
Subject: [PATCH] Use the new songbook package to replace old gtab and image
 handling.

---
 chordbook.tex | 13 ++++++-------
 lyricbook.tex |  7 ++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/chordbook.tex b/chordbook.tex
index 37793a34..df2a1519 100644
--- a/chordbook.tex
+++ b/chordbook.tex
@@ -30,16 +30,13 @@
 \usepackage[english,french]{babel}
 \usepackage{fancybox}
 
+\usepackage{songbook}
+
 \newindex{titleidx}{cbtitle}
 \newauthorindex{authidx}{cbauth}
 
-%Remove comment to include pictures in the songbook
-\newcommand{\image}[2]{\begin{flushright} \includegraphics[width=#2cm]{#1}\end{flushright}}
-%\newcommand{\image}[2]{}
-%\renewcommand{\gtab}[2]{}
-
 \graphicspath{
-  {img/}
+  {img/},
 }
 
 %\includeonlysongs{1}
@@ -47,7 +44,9 @@
 \renewcommand{\stitlefont}{\LARGE\bf}
 \renewcommand{\printchord}[1]{\small{\it#1}}
 \renewcommand{\chorusfont}{\it}
-\renewcommand{\showauthors}{\normalsize\songauthors}
+\renewcommand{\showauthors}{%
+  \hbox{\normalsize\songauthors}%
+}
 \renewcommand{\idxtitlefont}{\sffamily\bfseries}
 \renewcommand{\idxauthfont}{\sffamily\bfseries}
 \renewcommand{\idxheadfont}{\sffamily\it\LARGE}
diff --git a/lyricbook.tex b/lyricbook.tex
index 1a66351d..36c348a6 100644
--- a/lyricbook.tex
+++ b/lyricbook.tex
@@ -32,6 +32,8 @@
 \usepackage[english,french]{babel}
 \usepackage{fancybox}
 
+\usepackage{songbook}
+
 \setlength{\oddsidemargin}{0in}
 \setlength{\evensidemargin}{0in}
 \setlength{\textwidth}{6.5in}
@@ -47,11 +49,6 @@
 \newindex{titleidx}{lbtitle}
 \newauthorindex{authidx}{lbauth}
 
-%Remove comment to include pictures in the songbook
-\newcommand{\image}[2]{\begin{flushright} \includegraphics[width=#2cm]{#1}\end{flushright}}
-%\newcommand{\image}[2]{}
-\renewcommand{\gtab}[2]{}
-
 \graphicspath{
   {img/}
 }