Merge branch 'feature/glossary' into develop

Author: yurrriq

.gitignore

@@ -188,5 +188,4 @@ TSWLatexianTemp*
 
 ## Generated LaTeX files:
 *.tex
-!book.tex
-src/auto/
+src/auto/

docs/pdf/sf-idris-2016.pdf

@@ -0,0 +1,3 @@
+!book.tex
+!footer.tex
+!glossary.tex

src/.gitignore

@@ -1,8 +1,3 @@
----
-pandoc-minted:
-  language: idris
----
-
 = Basics
 
 **REMINDER**:
@@ -111,8 +106,7 @@ Type the following:
 nextWeekday : Day -> Day
 ```
 
-Then with point on `nextWeekday`, call \mintinline[]{elisp}{idris-add-clause}
-(\mintinline[]{elisp}{M-RET d} in Spacemacs).
+Then with point on `nextWeekday`, call \gls{idris-add-clause}.
 
 ```idris
 nextWeekday : Day -> Day
@@ -195,9 +189,8 @@ observing that both sides of the equality evaluate to the same thing, after some
 simplification."
 \color{black}
 
-(For simple proofs like this, you can call
-\mintinline[]{elisp}{idris-add-clause} (\mintinline[]{elisp}{M-RET d}) with the
-point on the name (`testNextWeekday`) in the type signature and then call
+(For simple proofs like this, you can call \gls{idris-add-clause} with the point
+on the name (`testNextWeekday`) in the type signature and then call
 \mintinline[]{elisp}{idris-proof-search} (\mintinline[]{elisp}{M-RET p}) with
 the point on the resultant hole to have Idris solve the proof for you.)
 

src/Basics.lidr

@@ -23,17 +23,21 @@ TEXFILES  := $(LIDRFILES:.lidr=.tex)
 .PHONY: all clean
 
 
-clean:
-	rm -rf all.{aux,log,out,toc,pdf} _minted-all $(TEXFILES)
+clean: clean-tex
+	rm -rf all.* auto _minted-all $(TEXFILES)
+
+
+clean-tex: all.tex
+	latexmk -pdf -CA all.tex
 
 
 all.pdf: all.tex
-	latexmk -xelatex -e '$$pdflatex=q/xelatex %O --shell-escape %S/' $<
+	latexmk -pdf $<
 
 
 all.tex: book.tex $(TEXFILES)
 	$(PANDOC) $(PANDOC_FLAGS) -N --toc -o $@ \
-	$(foreach texfile,$(TEXFILES),-A $(texfile)) $<
+	$(foreach texfile,$(TEXFILES),-A $(texfile)) -A footer.tex $<
 
 
 %.tex: %.lidr

src/Makefile

@@ -23,7 +23,18 @@
 papersize: b5
 geometry: margin=1in
 header-includes:
+- \makeatletter
+- \let\RequirePackage\original@RequirePackage
+- \let\usepackage\RequirePackage
+- \makeatother
+-
 - \usepackage{minted}
+- \usemintedstyle{lovelace}
+-
+- \usepackage[xindy]{glossaries}
+- \makeglossaries
+- \input{glossary}
+-
 - \usepackage{todonotes}
 include-before: \frontmatter
 ---

src/book.tex

@@ -0,0 +1 @@
+\printglossaries

src/footer.tex

@@ -0,0 +1,11 @@
+\longnewglossaryentry{idris-add-clause}{
+  name=\mintinline[]{elisp}{idris-add-clause},
+  sort=i
+}
+{
+  \mintinline[]{elisp}{(idris-add-clause PROOF)}
+
+  \mintinline[]{text}{M-RET d} in Spacemacs.
+
+  Add clauses to the declaration at point.
+}

src/glossary.tex

@@ -0,0 +1,20 @@
+$clean_ext .= ' %R.ist %R.xdy';
+$pdflatex   = q/xelatex %O --shell-escape %S/;
+
+
+add_cus_dep('glo', 'gls', 0, 'run_makeglossaries');
+add_cus_dep('acn', 'acr', 0, 'run_makeglossaries');
+
+
+sub run_makeglossaries {
+    if ( $silent ) {
+        system "makeglossaries -q '$_[0]'";
+    }
+    else {
+        system "makeglossaries '$_[0]'";
+    };
+}
+
+
+push @generated_exts, 'glo', 'gls', 'glg';
+push @generated_exts, 'acn', 'acr', 'alg';