From 936a12ee091875a131703c365dd0b28789b11e8c Mon Sep 17 00:00:00 2001 From: Alexandre Dupas Date: Fri, 20 Mar 2009 10:25:45 +0100 Subject: [PATCH] Revert "New version for main documents" This reverts commit 890060994e3be930c6489dc2cf8c3bfb2d1433e2. --- chordbook.tex | 67 +++++++++++++++++++++++---------------------------- lyricbook.tex | 67 +++++++++++++++++++++------------------------------ 2 files changed, 58 insertions(+), 76 deletions(-) diff --git a/chordbook.tex b/chordbook.tex index ca2a7ea9..8944cdc3 100644 --- a/chordbook.tex +++ b/chordbook.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2009 Romain Goffe, Alexandre Dupas +% Copyright (C) 2008 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen % % This program is free software; you can redistribute it and/or @@ -22,16 +22,32 @@ % Modified to serve personnal purposes. Newer versions can be % obtained from http://www.lohrun.net. -\documentclass[a4paper]{article} - -% Packages +\documentclass[letterpaper]{article} \usepackage[bookmarks,bookmarksopen]{hyperref} \usepackage[chorded]{songs} + +%my packages \usepackage[utf8]{inputenc} -\usepackage[pdftex]{graphicx} -\usepackage[english,french]{babel} +\usepackage[pdftex]{graphicx, color} +%\usepackage[english,french]{babel} +\usepackage{palatino} \usepackage{fancybox} +\setlength{\oddsidemargin}{0in} +\setlength{\evensidemargin}{0in} +\setlength{\textwidth}{6.5in} +\setlength{\topmargin}{0in} +\setlength{\topskip}{0in} +\setlength{\headheight}{0in} +\setlength{\headsep}{0in} +\setlength{\textheight}{9.1in} +\settowidth{\versenumwidth}{1.\ } +\addtolength{\voffset}{-1cm} +\pagestyle{empty} + +\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]{} @@ -41,57 +57,33 @@ {img/} } -% Songs selection +%my renew %\includeonlysongs{1} - -% Customization of the song package \titleprefixword{} \renewcommand{\stitlefont}{\LARGE\bf} \renewcommand{\printchord}[1]{\small{\it#1}} \renewcommand{\chorusfont}{\it} \renewcommand{\showauthors}{\normalsize\songauthors} -\renewcommand{\idxtitlefont}{\sffamily\bfseries} -\renewcommand{\idxauthfont}{\sffamily\bfseries} -\renewcommand{\idxheadfont}{\sffamily\it\LARGE} -\renewcommand{\idxrefsfont}{\bfseries} - -% Customization of the page appearance -\setlength{\topmargin}{0cm} -\setlength{\oddsidemargin}{0cm} -\setlength{\evensidemargin}{0cm} -\setlength{\textwidth}{15.5cm} -\setlength{\textheight}{24.5cm} -% header -\setlength{\topskip}{0cm} -\setlength{\headheight}{0cm} -\setlength{\headsep}{0cm} -% column -\setlength{\colminheight}{9cm} - -\settowidth{\versenumwidth}{1.\ } -\addtolength{\voffset}{-1cm} - +%\renewcommand{\everychorus}{\textnote{Refrain:}} \baselineadj=-2.5pt plus 1pt minus 0pt \versesep=8pt plus 2pt minus 2pt -\pagestyle{empty} - -% Indexes -\newindex{titleidx}{cbtitle} -\newauthorindex{authidx}{cbauth} \input{title.tex} \begin{document} \maketitle - \thispagestyle{empty} +\setcounter{page}{0} \newpage \input{license.tex} -\showindex{Index des chansons}{titleidx} +\newpage +\setlength{\colminheight}{9.5in} +\setlength{\textheight}{9.7in} +\showindex{Index des chansons}{titleidx} \showindex{Index des auteurs}{authidx} \songsection{Chansons} @@ -100,3 +92,4 @@ \end{songs} \end{document} + diff --git a/lyricbook.tex b/lyricbook.tex index 0eca4542..1a66351d 100644 --- a/lyricbook.tex +++ b/lyricbook.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2009 Romain Goffe, Alexandre Dupas +% Copyright (C) 2008 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen % % This program is free software; you can redistribute it and/or @@ -22,16 +22,31 @@ % Modified to serve personnal purposes. Newer versions can be % obtained from http://www.lohrun.net. -\documentclass[a4paper]{article} - -% Packages +\documentclass[letterpaper]{article} \usepackage[bookmarks,bookmarksopen]{hyperref} \usepackage[lyric]{songs} + +%my packages \usepackage[utf8]{inputenc} -\usepackage[pdftex]{graphicx} +\usepackage[pdftex]{graphicx, color} \usepackage[english,french]{babel} \usepackage{fancybox} +\setlength{\oddsidemargin}{0in} +\setlength{\evensidemargin}{0in} +\setlength{\textwidth}{6.5in} +\setlength{\topmargin}{0in} +\setlength{\topskip}{0in} +\setlength{\headheight}{0in} +\setlength{\headsep}{0in} +\setlength{\textheight}{9.1in} +\settowidth{\versenumwidth}{1.\ } +\addtolength{\voffset}{-1cm} +\pagestyle{empty} + +\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]{} @@ -41,58 +56,32 @@ {img/} } -% Songs selection +%my renew %\includeonlysongs{1} - -% Customization of the song package \titleprefixword{} \renewcommand{\stitlefont}{\LARGE\bf} \renewcommand{\printchord}[1]{\small{\it#1}} \renewcommand{\chorusfont}{\it} \renewcommand{\showauthors}{\normalsize\songauthors} -\renewcommand{\idxtitlefont}{\sffamily\bfseries} -\renewcommand{\idxauthfont}{\sffamily\bfseries} -\renewcommand{\idxheadfont}{\sffamily\it\LARGE} -\renewcommand{\idxrefsfont}{\bfseries} - -% Customization of the page appearance -\setlength{\topmargin}{0cm} -\setlength{\oddsidemargin}{0cm} -\setlength{\evensidemargin}{0cm} -\setlength{\textwidth}{15.5cm} -\setlength{\textheight}{24.5cm} -% header -\setlength{\topskip}{0cm} -\setlength{\headheight}{0cm} -\setlength{\headsep}{0cm} -% column -\setlength{\colminheight}{9cm} - -\settowidth{\versenumwidth}{1.\ } -\addtolength{\voffset}{-1cm} - +%\renewcommand{\everychorus}{\textnote{Refrain:}} \baselineadj=-2.5pt plus 1pt minus 0pt \versesep=8pt plus 2pt minus 2pt -\pagestyle{empty} - -% Indexes -\newindex{titleidx}{lbtitle} -\newauthorindex{authidx}{lbauth} \input{title.tex} \begin{document} \maketitle - -\thispagestyle{empty} - \newpage + \input{license.tex} +\newpage -\showindex{Index des chansons}{titleidx} +\setlength{\colminheight}{9.5in} +\setlength{\textheight}{9.7in} -\showindex{Index des auteurs}{authidx} +\showindex{Index par titre des chansons}{titleidx} +\showindex{Index par titre des auteurs}{authidx} \songsection{Chansons} \begin{songs}{titleidx,authidx}