repositories
/
mastervoorlichting16.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
41263a0
)
fix makefile and finalize presentation
author
Mart Lubbers
<mart@martlubbers.net>
Thu, 17 Nov 2016 11:43:40 +0000
(12:43 +0100)
committer
Mart Lubbers
<mart@martlubbers.net>
Thu, 17 Nov 2016 11:43:40 +0000
(12:43 +0100)
Makefile
patch
|
blob
|
history
mv.tex
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
9783c1d
..
fd319ec
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,9
+11,15
@@
all: $(DOC).pdf
%.fmt: preamble.tex
$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
%.fmt: preamble.tex
$(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
-%.pdf: %.tex %.fmt $(TEXS)
- $(LATEX) $(LATEXFLAGS) $<
+%.mlog: %.tex %.fmt $(TEXS)
$(LATEX) $(LATEXFLAGS) $<
$(LATEX) $(LATEXFLAGS) $<
+ grep -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(basename $<) || true
+ $(LATEX) $(LATEXFLAGS) $< | tee $@
+
+%.pdf: %.mlog
+ grep -qF 'Please rerun LaTeX.' $< &&\
+ $(LATEX) $(LATEXFLAGS) $(basename $<) || touch $@
clean:
clean:
- $(RM) $(addprefix $(DOC).,aux fmt log nav out pdf snm toc vrb)
+ $(RM) $(addprefix $(DOC).,\
+ aux log fmt toc bbl blg mlog run.xml out pdf -blx.bib snm nav)
diff --git
a/mv.tex
b/mv.tex
index
2ecce77
..
c4c90a3
100644
(file)
--- a/
mv.tex
+++ b/
mv.tex
@@
-1,7
+1,6
@@
%&mv
\begin{document}
\frame{\maketitle}
%&mv
\begin{document}
\frame{\maketitle}
-\frame{\tableofcontents}
\begin{frame}
\frametitle{Where did I come from?}
\begin{frame}
\frametitle{Where did I come from?}
@@
-35,7
+34,7
@@
\begin{itemize}
\item Interesting compulsory courses
\item Freedom in specialization
\begin{itemize}
\item Interesting compulsory courses
\item Freedom in specialization
- %TODO
+ \item Advanced programming, Compiler construction
\end{itemize}
\end{block}
\end{itemize}
\end{block}
@@
-52,10
+51,22
@@
\begin{frame}
\frametitle{Curriculum customization}
\begin{frame}
\frametitle{Curriculum customization}
- \begin{itemize}
- \item You can go all directions
- \item %TODO
- \end{itemize}
+ \begin{block}{Curriculum}
+ \begin{itemize}
+ \item You can go all directions
+ \item Choose what you like
+ \end{itemize}
+ \end{block}
+
+ \pause%
+
+ \begin{block}{Research Intership}
+ \begin{itemize}
+ \item IoT in iTasks
+ \item New Devices Lab
+ \item Shallow embedded DSL
+ \end{itemize}
+ \end{block}
\end{frame}
\begin{frame}
\end{frame}
\begin{frame}