louis
/
dottes
forked from CryHavoc/dottes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put tune title, image and following content into a table. 

Use tabularx to put tune title, image and any following content into
a table. This should (a) get the following content closer to the tune image,
and (b) stop LaTeX splitting them over a page.
This commit is contained in:
Jim Hague 2013-08-05 18:06:00 +01:00
parent 53b947e75a
commit f74f9cc59c
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dottes.tex
View File

@ -6,6 +6,7 @@
\usepackage[margin=0.75in]{geometry} \usepackage[margin=0.75in]{geometry}
\usepackage{graphicx} \usepackage{graphicx}
\usepackage{fancyhdr} \usepackage{fancyhdr}
\usepackage{tabularx}
\usepackage{longtable} \usepackage{longtable}
\usepackage[UKenglish]{babel} \usepackage[UKenglish]{babel}
\usepackage[UKenglish]{isodate} \usepackage[UKenglish]{isodate}
@ -49,24 +50,22 @@
% Args are tune name, tune title, tune subtitle, composer, tune graphic % Args are tune name, tune title, tune subtitle, composer, tune graphic
% filename, change name, change title, credit. % filename, change name, change title, credit.
\newcommand{\showtune}[8]{% \newcommand{\showtune}[8]{%
\vfill \phantomsection
\begin{center} \begin{tabularx}{\textwidth}{LCR}
\phantomsection \addcontentsline{toc}{section}{#2}
\addcontentsline{toc}{section}{#2}
\begin{tabular*}{\textwidth}{@{} p{0.25\textwidth} @{\extracolsep{\fill}} c >{\raggedleft\arraybackslash}p{0.25\textwidth} @{}}
& \hypertarget{#1}{\Large{#2}} & \emph{#4} \\ & \hypertarget{#1}{\Large{#2}} & \emph{#4} \\
\ifemptyarg{#3}{}{% \ifemptyarg{#3}{}{%
& #3 & \\ & #3 & \\
}% }
\end{tabular*} \multicolumn{3}{c}{%
\includegraphics[width=\textwidth,height=0.85\textheight,keepaspectratio]{#5} \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#5}%
\end{center} }\tabularnewline
\ifemptyarg{#8}{}{% \multicolumn{3}{p{\textwidth}}{%
From {#8}. \ifemptyarg{#8}{}{From {#8}. }%
}% \ifemptyarg{#6}{}{Change: \hyperlink{#6}{#7}.}%
\ifemptyarg{#6}{}{% }\tabularnewline
Change: \hyperlink{#6}{#7}. \end{tabularx}
}% \vfill
} }
% Show the tune first line. Generate table row. % Show the tune first line. Generate table row.
@ -226,7 +225,15 @@ anniversary in 2013.
\addcontentsline{toc}{chapter}{Tunes} \addcontentsline{toc}{chapter}{Tunes}
{
\newcolumntype{L}{p{0.25\textwidth}}%
\newcolumntype{R}{>{\raggedleft\arraybackslash}p{0.25\textwidth}}%
\newcolumntype{C}{>{\centering\arraybackslash}X}%
\renewcommand{\tabularxcolumn}[1]{m{#1}}%
\renewcommand{\tabcolsep}{0pt}
\input{tunes.tex} \input{tunes.tex}
}
% ----- % -----