Small update in makefile and content

- Cleaner makefile
- Small fix in preamble about listings
- Small addition in presentation

diff --git a/Makefile b/Makefile
index fcf83c7..9ef0328 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ TEX:=pdflatex
 
 .PHONY: clean clobber images
 
 
 .PHONY: clean clobber images
 

-git.pdf: git.tex preamble.fmt images
+git.pdf: git.tex preamble.fmt

        $(TEX) $< 
        grep -q "rerunfilecheck Warning:.*$(basename $<).out" $(basename $<).log &&\
        $(TEX) $< 
        grep -q "rerunfilecheck Warning:.*$(basename $<).out" $(basename $<).log &&\

-               $(TEX) $<
+               $(TEX) $< || true

 
 preamble.fmt: preamble.tex vc.tex
        $(TEX) -ini -jobname="$(basename $@)" "&$(TEX) $<\dump"
 
 preamble.fmt: preamble.tex vc.tex
        $(TEX) -ini -jobname="$(basename $@)" "&$(TEX) $<\dump"


@@ -22,4 +22,4 @@ clean:
        $(RM) -v $(addprefix *.,vrb eps aux fmt bbl blg dvi log out toc nav snm) vc.tex
 
 clobber: clean
        $(RM) -v $(addprefix *.,vrb eps aux fmt bbl blg dvi log out toc nav snm) vc.tex
 
 clobber: clean

-       $(RM) -v *.pdf 1.png
+       $(RM) -v *.pdf $(addsuffix .png,1 2)

diff --git a/git.tex b/git.tex
index 4269738..9cbbe7f 100644 (file)
--- a/git.tex
+++ b/git.tex
@@ -71,10 +71,10 @@
 \begin{frame}[fragile]
        \begin{block}{{\Large\Smiley\Smiley} Linux}
                Depending on the distribution you may have to do:\\
 \begin{frame}[fragile]
        \begin{block}{{\Large\Smiley\Smiley} Linux}
                Depending on the distribution you may have to do:\\

-               \lstinline{# apt-get install git}\\
-               \lstinline{# pacman -S git}\\
-               \lstinline{# yum install git}\\
-               \lstinline{# emerge --ask dev-vcs/git}\\
+               \texttt{\# apt-get install git}\\
+               \texttt{\# pacman -S git}\\
+               \texttt{\# yum install git}\\
+               \texttt{\# emerge --ask dev-vcs/git}\\

                Etc\ldots
        \end{block}
                
                Etc\ldots
        \end{block}
                


@@ -92,7 +92,7 @@
 \subsection{Getting started}
 \begin{frame}[fragile]
        \frametitle{Getting started}
 \subsection{Getting started}
 \begin{frame}[fragile]
        \frametitle{Getting started}

-       \begin{block}{Check GIT version in (git) bash}
+       \begin{block}{Check GIT version in (GIT) bash}

                \begin{lstlisting}
 frobnicator@frobmachine:~\$ git --version
 git version 1.7.10.4
                \begin{lstlisting}
 frobnicator@frobmachine:~\$ git --version
 git version 1.7.10.4


@@ -141,7 +141,7 @@ refs/
 \begin{frame}[fragile]
        \frametitle{Add and commit}
        \begin{lstlisting}
 \begin{frame}[fragile]
        \frametitle{Add and commit}
        \begin{lstlisting}

-frobnicator@frobmachine:~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile
+frobnicator@frobmachine :~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile

 
 frobnicator@frobmachine:~/projects/myfirstproject\$ git status
 On branch master
 
 frobnicator@frobmachine:~/projects/myfirstproject\$ git status
 On branch master


@@ -179,7 +179,10 @@ frobnicator@frobmachine:~/projects/myfirstproject\$ git commit
 \end{frame}
 
 \begin{frame}
 \end{frame}
 
 \begin{frame}

-       \frametitle{Push}
+       \frametitle{Log \& Checkout}
+       \begin{block}{\texttt{\$ git log}}
+
+       \end{block}

 \end{frame}
 
 \begin{frame}
 \end{frame}
 
 \begin{frame}

diff --git a/preamble.tex b/preamble.tex
index cd887ce..02b7731 100644 (file)
--- a/preamble.tex
+++ b/preamble.tex
@@ -27,7 +27,8 @@
        showspaces=false,
        showstringspaces=false,
        columns=flexible,
        showspaces=false,
        showstringspaces=false,
        columns=flexible,

-       morekeywords={frobnicator,frobmachine}
+       emph={frobnicator@frobmachine},
+       emphstyle=\bfseries

 }
 
 \AtBeginSection[]
 }
 
 \AtBeginSection[]