diff --git a/.gitignore b/.gitignore index 0f61e1c..b0c96e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pdf +*~ *.*~ out/* pdf/* diff --git a/Makefile b/Makefile index a3e001f..9cd4a72 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,11 @@ OUTDIR=out PDFDIR=pdf FILE = sheet-music_tinwhistle LILY_PDF = lilypond-book --pdf -o $(OUTDIR) -PDF=cd $(OUTDIR) && pdflatex $(FILE).tex +PDF=cd $(OUTDIR) && pdflatex --enable-pipes --shell-escape $(FILE).tex INDEX=cd $(OUTDIR) && makeindex $(FILE).tex -# The suffixes used in this Makefile. .SUFFIXES: .lytex .tex .ly .pdf -# Input and output files are searched in the directories listed in -# the VPATH variable. All of them are subdirectories of the current -# directory (given by the GNU make variable `CURDIR'). VPATH = \ $(CURDIR)/lyrics \ $(CURDIR)/notes \ @@ -18,8 +14,7 @@ VPATH = \ all: book -book: $(OUTDIR) $(PDFDIR) - cp gitHeadInfo.gin $(OUTDIR)/ +book: $(OUTDIR) $(PDFDIR) cp headfoot.tex $(OUTDIR)/ cp settings.tex $(OUTDIR)/ cp -r license/ $(OUTDIR)/ diff --git a/sheet-music_tinwhistle.lytex b/sheet-music_tinwhistle.lytex index b2975bf..a471a48 100644 --- a/sheet-music_tinwhistle.lytex +++ b/sheet-music_tinwhistle.lytex @@ -6,7 +6,6 @@ \usepackage{geometry} \usepackage{xmpincl} \usepackage{hyperref} -\usepackage[grumpy]{gitinfo} \input{settings.tex} \input{headfoot.tex} diff --git a/title.tex b/title.tex index 9778174..6c38d25 100644 --- a/title.tex +++ b/title.tex @@ -15,8 +15,8 @@ \end{minipage} \begin{minipage}{0.4\textwidth} \begin{flushright} \large - \emph{Version:} \\ - \textsc{\gitAbbrevHash} + \emph{Git Revision:} \\ + \textsc{\input{|"git log -1 --oneline --no-notes | cut -d ' ' -f1"}} \end{flushright} \end{minipage} \vfill