Use the new songbook package to replace old gtab and image handling.

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}

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/}
 }