graphics, listings en algorithmen toegevoegd

diff --git a/.gitignore b/.gitignore
index 85b9c3b..46f672c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.snm
 *.toc
 *.vrb
+*.png

diff --git a/Makefile b/Makefile
index 1c78c2c..89d989d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,21 @@
 LATEX:=pdflatex
 DOCUMENT:=lat
+IMGS:=tux.png
+MISC:=broncode.c broncode.tex
 
-.SECONDARY: $(DOCUMENT).fmt
+.SECONDARY: $(DOCUMENT).fmt $(addsuffix .png,$(basename $(IMGS)))
 
 all: $(DOCUMENT).pdf
 
-%.pdf: %.tex %.fmt
+%.pdf: %.tex %.fmt $(IMGS) $(MISC)
        $(LATEX) $(basename $@)
        $(LATEX) $(basename $@)
 
 %.fmt: pre.tex
        $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
+%.png: %.svg
+       convert $< $@
+
 clean:
-       $(RM) -v $(addprefix $(DOCUMENT).,fmt aux bbl blg dvi log out toc pdf snm nav vrb)
+       $(RM) -v $(addprefix $(DOCUMENT).,fmt aux bbl blg dvi log out toc pdf snm nav vrb) $(IMGS)

diff --git a/broncode.c b/broncode.c
new file mode 100644 (file)
index 0000000..8c12aa6
--- /dev/null
+++ b/broncode.c
@@ -0,0 +1,4 @@
+int i; // Nu zet ik i op 0
+for(i=0; i<CONSTANTE; i++){
+       printf("i: %d", i);
+}

diff --git a/broncode.tex b/broncode.tex
new file mode 100644 (file)
index 0000000..68d1d8e
--- /dev/null
+++ b/broncode.tex
@@ -0,0 +1,6 @@
+\begin{lstlisting}
+int i; // Nu zet ik i op 0
+for(i=0; i<CONSTANTE; i++){
+       printf("i: %d", i);
+}
+\end{lstlisting}

diff --git a/lat.tex b/lat.tex
index cfb3a27..e711cbe 100644 (file)
--- a/lat.tex
+++ b/lat.tex
@@ -340,18 +340,112 @@ document
 
 \section{Uitbreidingspakketten}
 \subsection{Plaatjes}
+\begin{frame}[fragile]
+       \frametitle{Plaatjes invoegen}
+       \framesubtitle{preamble,document}
+       \begin{lstlisting}[caption=preamble]
+\usepackage{graphicx}
+       \end{lstlisting}
+       \begin{lstlisting}[caption=document]
+\includegraphics[width=80px]{tux.png}
+       \end{lstlisting}
+       \includegraphics[width=80px]{tux.png}
+\end{frame}
+
+\begin{frame}[fragile]
+       \frametitle{Figuren}
+       \framesubtitle{document}
+       \begin{lstlisting}
+\begin{figure}[h]
+       \centering
+       \includegraphics[width=80px]{tux.png}
+       \caption{Dit is tux}
+\end{figure}
+       \end{lstlisting}
+       \begin{figure}[h]
+               \centering
+               \includegraphics[width=80px]{tux.png}
+               \caption{Dit is tux}
+       \end{figure}
+\end{frame}
 
 \subsection{Broncode}
+\begin{frame}[fragile]
+       \frametitle{Broncode}
+       \framesubtitle{preamble,document}
+       \begin{lstlisting}
+\usepackage{listings}
+       \end{lstlisting}
+       \lstinputlisting[caption=document]{broncode.tex}
+       \lstinputlisting[language=c,caption=uitvoer]{broncode.c}
+\end{frame}
 
-\subsection{Presentaties}
+\begin{frame}
+       \frametitle{Nog meer broncode}
+       \begin{itemize}
+               \item\texttt{\textbackslash lstinputlisting}
+               \item\texttt{\textbackslash lstset}
+               \item\texttt{breaklines}
+               \item\texttt{numbers=left}
+               \item\texttt{frame=L}
+               \item\texttt{minted}
+               \item\ldots
+       \end{itemize}
+\end{frame}
+
+\subsection{Algorithmen}
+\begin{frame}[fragile]
+       \frametitle{Algorithmen}
+       \framesubtitle{preamble,document}
+       \begin{lstlisting}
+\usepackage{algorithm2e}
+       \end{lstlisting}
+       \begin{lstlisting}
+\begin{algorithm}[H]
+\SetKwProg{Def}{def}{:}{end}
+\Def{replace\_or\_register\_dawg(state)}{
+  child := last\_child(state)\;
+  \If{has\_children(child)}{
+    replace\_or\_register(child)\;
+  }
+  \eIf{\exists q': q\equiv q'}{
+    last\_child(state)\;
+    delete(child)\;
+  }{
+    register.add(child)\;
+  }
+}
+\end{algorithm}
+       \end{lstlisting}
+\end{frame}
+
+\begin{frame}
+       \frametitle{Algorithmen deel twee}
+       \begin{algorithm}[H]
+       \SetKwProg{Def}{def}{:}{end}
+       \Def{replace\_or\_register\_dawg(state)}{%
+               child := last\_child(state)\;
+               \If{has\_children(child)}{%
+                       replace\_or\_register(child)\;
+               }
+               \eIf{$\exists q': q\equiv q'$}{%
+                       last\_child(state)\;
+                       delete(child)\;
+               }{%
+                       register.add(child)\;
+               }
+       }
+       \end{algorithm}
+\end{frame}
 
 \subsection{En nog veel meer\ldots}
 \begin{frame}
        \frametitle{En nog veel meer\ldots}
        \begin{itemize}[<+->]
-               \item Algorithmen
+               \item Presentaties
                \item Bibliografie\"en
                \item Diagrammen
+               \item Tabellen
                \item Chemische structuurformules
                \item Linguistische symbolen
                \item Precompiled preamble

diff --git a/pre.tex b/pre.tex
index 61d6854..09321f8 100644 (file)
--- a/pre.tex
+++ b/pre.tex
@@ -4,6 +4,7 @@
 \usepackage[labelformat=empty]{caption}
 \usepackage{booktabs}
 \usepackage{color}
+\usepackage{algorithm2e}
 \usepackage{listings}
 \usepackage{textgreek}
 
@@ -19,7 +20,10 @@
        language=[LaTeX]tex,
        basicstyle=\small,
        breaklines=true,
-       commentstyle=\color{mygreen}
+       commentstyle=\color{mygreen},
+       keepspaces=true,
+       columns=flexible,
+       tabsize=2
 }
 
 \AtBeginSubsection[]

diff --git a/tux.svg b/tux.svg
new file mode 100644 (file)
index 0000000..a6ad537
--- /dev/null
+++ b/tux.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="779.52753"
+   height="1169.2913"
+   id="svg3007"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="Linux-Shirt.svg">
+  <defs
+     id="defs3009" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="375"
+     inkscape:cy="634.28571"
+     inkscape:document-units="px"
+     inkscape:current-layer="text2999"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1142"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     units="cm" />
+  <metadata
+     id="metadata3012">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,116.93238)">
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:309;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       d="m 407.78259,-63.885865 c -5.50873,-0.01007 -11.25467,0.221097 -17.24663,0.698832 -151.44034,12.19639 -111.27731,172.185293 -113.52498,225.760433 -2.76559,39.17912 -10.7093,70.05493 -37.65515,108.35728 -31.65734,37.64621 -76.22729,98.57709 -97.34124,162.00402 -9.96481,29.93478 -14.70669,60.44635 -10.32746,89.32352 -1.3718,1.22846 -2.67777,2.51556 -3.91957,3.84127 -9.29459,9.92281 -16.16224,21.94573 -23.81454,30.04053 -7.149273,7.13157 -17.335189,9.84418 -28.528667,13.86011 -11.197757,4.01773 -23.49204,9.94102 -30.954745,24.26137 0,0 0,0.005 -0.005,0.007 -0.01218,0.0238 -0.02547,0.0461 -0.03816,0.0703 l 0,0 c -6.755617,12.61799 -4.747277,27.1486 -2.684066,40.61093 2.063272,13.46217 4.152016,26.18346 1.379482,34.81434 -8.862262,24.22286 -9.993724,40.9783 -3.754978,53.13208 6.252047,12.17909 19.106775,17.55476 33.635407,20.58924 29.057347,6.06892 68.408607,4.56076 99.421957,20.99815 l 2.66563,-5.02968 -2.63804,5.04467 c 33.2013,17.35854 66.86088,23.52414 93.71531,17.39039 19.4699,-4.44703 35.27484,-16.04026 43.39171,-33.87948 21.00445,-0.10329 44.05315,-8.9992 80.97431,-11.03212 25.04734,-2.01755 56.33588,8.8946 92.32544,6.89621 0.94075,3.90462 2.30228,7.66025 4.166,11.22902 0.0191,0.0367 0.037,0.073 0.0565,0.10928 13.95143,27.89813 39.87419,40.65877 67.49992,38.47853 27.66216,-2.18303 57.07262,-18.49393 80.84647,-46.78632 l -4.35833,-3.6627 4.39165,3.62239 c 22.66004,-27.47602 60.27198,-38.86926 85.21172,-53.91132 12.46992,-7.52124 22.58833,-16.93894 23.37012,-30.61751 0.78137,-13.6717 -7.24514,-28.99303 -25.70186,-49.48067 0,0 -0.005,-0.005 -0.005,-0.005 -0.007,-0.009 -0.0144,-0.017 -0.0216,-0.0255 -6.06426,-6.85303 -8.95726,-19.55446 -12.06623,-33.08031 -3.10684,-13.51762 -6.57481,-28.09935 -17.67261,-37.54916 l 0,0 c -0.0222,-0.0196 -0.0446,-0.0371 -0.0668,-0.0565 0,0 0,0 0,0 -4.41677,-3.84869 -9.00656,-6.46081 -13.62872,-8.21572 15.42945,-45.75986 9.37563,-91.32556 -6.19944,-132.50113 -19.115,-50.53385 -52.48693,-94.56634 -77.97362,-124.68843 -28.5282,-35.98392 -56.43129,-70.14776 -55.88163,-120.60662 0.84975,-77.011218 8.47096,-219.826209 -127.04556,-220.011161 z m 18.34628,118.643307 c 7.68981,0 14.25742,2.25397 21.0038,7.15062 6.85352,4.97429 11.79099,11.20136 15.77046,19.89724 3.90574,8.47479 5.78493,16.765228 5.96918,26.603428 0,0.25793 0,0.47896 0.0737,0.7369 0.0737,10.096 -1.65808,18.68131 -5.49019,27.45088 -2.18659,5.00397 -4.69769,9.20386 -7.70326,12.83995 -1.02037,-0.48987 -2.08011,-0.96088 -3.17921,-1.41285 l 0,0 c -7.61844,-3.263 -13.4627,-5.33952 -18.33357,-7.02968 1.76566,-2.12238 3.23589,-4.63951 4.52871,-7.78619 1.95288,-4.75319 2.9109,-9.39599 3.09513,-14.92295 0,-0.22114 0.0737,-0.40539 0.0737,-0.66331 0.1105,-5.30584 -0.58955,-9.83807 -2.13711,-14.4808 -1.62126,-4.86374 -3.6847,-8.364138 -6.66927,-11.275048 -2.98459,-2.91102 -5.96917,-4.2374 -9.54336,-4.34805 -0.16756,-0.0101 -0.33463,-0.0101 -0.49969,-0.0101 -3.36198,0.0101 -6.28124,1.16298 -9.30153,3.6916 -3.16882,2.65307 -5.527,6.042818 -7.47993,10.759258 -1.95287,4.71634 -2.9109,9.39585 -3.09508,14.95979 -0.037,0.22114 -0.037,0.40539 -0.037,0.62643 -0.0637,3.05835 0.13058,5.86005 0.6022,8.58065 -6.87909,-3.42776 -13.36178,-5.76468 -19.44586,-7.21275 -0.34682,-2.63091 -0.54743,-5.34583 -0.61148,-8.18451 l 0,-0.77387 c -0.11056,-10.05921 1.54757,-18.681298 5.4165,-27.450778 3.86894,-8.76959 8.65901,-15.07045 15.40197,-20.19214 6.74295,-5.12168 13.37535,-7.47985 21.22375,-7.55355 0.12265,0 0.24528,0 0.36733,0 z m -105.25063,8.33313 c 5.10126,0.0121 9.66594,1.71632 14.38753,5.48676 5.1217,4.08989 8.99062,9.32212 12.23314,16.69153 3.24251,7.3694 4.97432,14.738698 5.45331,23.434588 l 0,0.0732 c 0.23218,3.65219 0.20379,7.09001 -0.0841,10.41947 -1.00892,0.28676 -1.99763,0.59704 -2.96615,0.93048 -5.50045,1.89336 -10.34796,4.47365 -14.57292,7.26346 0.41314,-2.91831 0.47463,-5.87927 0.15775,-9.18071 -0.0371,-0.18425 -0.0371,-0.33162 -0.0371,-0.51578 -0.44217,-4.38478 -1.36333,-8.06945 -2.91089,-11.79101 -1.65808,-3.86877 -3.50045,-6.59553 -5.93236,-8.69586 -2.20386,-1.903278 -4.28619,-2.777298 -6.57714,-2.759988 -0.23701,0 -0.47671,0.0131 -0.71849,0.0332 -2.57929,0.2209 -4.7164,1.47368 -6.743,3.942498 -2.02656,2.46871 -3.35302,5.52702 -4.31104,9.58008 -0.95803,4.05318 -1.21596,8.03266 -0.81066,12.6016 0,0.18416 0.0371,0.33171 0.0371,0.51586 0.44211,4.42167 1.32645,8.10626 2.91088,11.82791 1.62126,3.83204 3.50045,6.55868 5.93236,8.65891 0.40727,0.35174 0.81019,0.6677 1.21129,0.94998 -2.52954,1.94681 -3.7374,2.84435 -5.81024,4.36747 -1.32948,0.97552 -2.91286,2.13703 -4.75322,3.49357 -4.01343,-3.75973 -7.14438,-8.48491 -9.8819,-14.70649 -3.24251,-7.36927 -4.97432,-14.73871 -5.49018,-23.4346 l 0,-0.0732 c -0.47899,-8.69577 0.36847,-16.17572 2.76352,-23.913518 2.39505,-7.73789 5.60075,-13.33852 10.2434,-17.94451 4.6427,-4.60579 9.32229,-6.92711 14.95985,-7.2218 0.44042,-0.0242 0.87692,-0.0352 1.30918,-0.0332 z m 47.86748,60.328528 c 11.85658,-0.0458 26.12439,3.84137 43.39749,14.94721 10.60991,6.89962 18.8657,7.47626 37.87621,15.61839 l 0.0228,0.0101 0.0233,0.009 c 9.14674,3.75287 14.51541,8.64454 17.13839,13.7956 2.62293,5.15116 2.68708,10.73707 0.49165,16.61331 -4.39072,11.75274 -18.40589,24.12121 -38.07313,30.2628 l -0.0186,0.008 -0.0175,0.008 c -9.58965,3.11567 -17.95175,9.9961 -27.81012,15.63339 -9.85808,5.63699 -21.01325,10.1836 -36.18123,9.30614 0,-8e-5 0,0 0,0 -12.91279,-0.75261 -20.63157,-5.1363 -27.61094,-10.74548 -6.97955,-5.60927 -13.0616,-12.65611 -21.96762,-17.88568 l -0.0228,-0.0137 -0.0233,-0.0137 c -14.34552,-8.10836 -22.1775,-17.48651 -24.63551,-25.6166 -2.45809,-8.13013 -0.15126,-15.06986 6.96633,-20.40398 8.00219,-5.99706 13.56097,-10.07641 17.26382,-12.79381 3.67848,-2.69928 5.2089,-3.71141 6.3803,-4.8362 0.006,-0.009 0.0123,-0.0128 0.0185,-0.0183 0,0 0.005,-0.009 0.005,-0.009 6.01265,-5.69136 15.59728,-16.06039 30.04507,-21.0337 4.97264,-1.71177 10.52135,-2.81616 16.73192,-2.8407 z m 82.90989,49.03512 c -5.1165,0.30507 -10.47514,2.93936 -16.71458,6.42286 -6.2395,3.48341 -13.25602,7.9394 -20.85995,12.32752 -15.20781,8.77624 -32.71394,17.16948 -50.11162,17.16948 -17.42471,0 -31.34606,-8.04745 -41.78774,-16.32197 -5.22086,-4.13728 -9.52984,-8.30459 -12.97238,-11.52842 -1.72127,-1.61201 -3.21407,-2.98586 -4.60701,-4.05895 -1.39268,-1.07307 -2.52631,-2.1371 -4.85688,-2.1371 l -0.11168,4.89716 c -0.16687,1.63864 -0.33834,1.58812 -0.27059,1.63278 0.10871,0.0714 0.64946,0.25783 1.28044,0.74386 1.02404,0.78889 2.44551,2.07487 4.13257,3.65474 3.37415,3.15979 7.85768,7.50416 13.37774,11.87851 11.04,8.7486 26.39345,17.72443 45.81553,17.72443 19.44908,0 37.8502,-9.0906 53.3542,-18.03767 7.75193,-4.47357 14.79245,-8.93912 20.77931,-12.28148 5.98655,-3.34245 11.02348,-5.43837 13.93957,-5.61227 l -0.38693,-6.47348 z m 17.28809,23.27447 c 12.91771,50.92115 42.9627,124.47072 62.27343,160.36425 10.26433,19.04333 30.68512,59.50377 39.50787,108.25133 5.59046,-0.17127 11.74615,0.64098 18.33819,2.32708 23.06771,-59.80219 -19.56113,-124.2171 -39.0542,-142.15612 -7.86992,-7.63655 -8.2482,-11.05804 -4.34675,-10.8963 21.14919,18.70291 48.91343,56.32043 59.01476,98.78056 4.60604,19.36109 5.58806,39.71497 0.64599,59.80235 2.41794,1.00448 4.87363,2.09659 7.36243,3.27477 37.02795,18.03073 50.72215,33.70986 44.13786,55.109 -2.16863,-0.0761 -4.30183,-0.0675 -6.38252,-0.0175 -0.19419,0.005 -0.38692,0.0101 -0.58039,0.0148 5.36205,-16.9624 -6.5167,-29.47308 -38.16979,-43.79469 -32.83054,-14.44394 -58.99175,-13.00693 -63.41335,16.28631 -0.28298,1.53469 -0.51061,3.09853 -0.68399,4.68414 -2.45279,0.85176 -4.91893,1.93925 -7.39125,3.29204 -15.41611,8.43525 -23.8304,23.7408 -28.51025,42.51314 -4.67608,18.75716 -6.01663,41.43346 -7.30717,66.92419 0,0.005 0,0.009 0,0.0132 -0.78851,12.81759 -6.05827,30.15383 -11.40294,48.5158 -53.78147,38.36325 -128.42502,54.98431 -191.80023,11.73339 -4.29494,-6.79423 -9.2218,-13.52602 -14.29316,-20.16546 -3.2385,-4.23996 -6.56524,-8.454 -9.87265,-12.60867 6.5058,0.005 12.03576,-1.06037 16.50509,-3.08692 5.55787,-2.52017 9.46294,-6.56804 11.39488,-11.76454 3.86384,-10.39316 -0.0169,-25.0546 -12.38629,-41.79711 -12.36863,-16.74135 -33.31667,-35.63553 -64.09851,-54.51358 0,0 -0.005,0 -0.005,-0.005 -22.61406,-14.0691 -35.26118,-31.31359 -41.18086,-50.03678 -5.92024,-18.72483 -5.09014,-38.97245 -0.52737,-58.96299 8.7578,-38.3711 31.25988,-75.69006 45.61747,-99.10986 3.86549,-2.8442 1.38107,5.27944 -14.5349,34.83522 -14.26425,27.02229 -40.93131,89.38371 -4.41932,138.06271 0.97573,-34.64244 9.24887,-69.97344 23.13748,-103.02138 20.22983,-45.85661 62.54332,-125.37763 65.90401,-188.75699 1.73273,1.25821 7.68701,5.27572 10.34013,6.78451 0.005,0.008 0.0117,0.008 0.017,0.009 7.76249,4.57119 13.59244,11.25324 21.14318,17.32153 7.5657,6.0803 17.01729,11.33203 31.29675,12.16406 l 0,0 c 16.66707,0.96445 29.36983,-4.19787 39.77727,-10.14905 10.39178,-5.94216 18.69349,-12.51837 26.55852,-15.08535 0.0123,-0.008 0.0239,-0.008 0.0355,-0.0113 16.61951,-5.19718 29.83377,-14.39595 37.35342,-25.12494 z m 105.55922,291.52274 c 6.73161,-0.0312 14.88609,2.21313 23.81226,6.20638 24.02409,11.09092 31.54084,20.59739 24.98213,34.56235 -5.527,10.53819 -29.18268,27.30348 -45.39528,22.88189 -16.54418,-4.27423 -24.61366,-28.11415 -21.92387,-46.1322 1.44083,-12.23549 8.36135,-17.47091 18.52476,-17.51842 z m -27.18143,32.9261 c 1.35802,22.03362 12.25934,44.50549 31.53855,49.36899 21.09753,5.55873 51.51581,-12.54314 64.35873,-27.3081 2.56085,-0.1025 5.06453,-0.22799 7.49602,-0.28668 11.26569,-0.27202 20.71453,0.37107 30.36871,8.81438 l 0.0334,0.0286 0.0344,0.0286 c 7.419,6.28553 10.9455,18.16389 14.0041,31.47065 3.05844,13.3068 5.50422,27.79937 14.67654,38.12376 l 0.0137,0.0148 0.0127,0.0148 c 17.63401,19.56838 23.30213,32.7951 22.81967,41.23729 -0.48253,8.44241 -6.59507,14.70976 -17.88217,21.51734 -22.56443,13.60962 -62.54539,25.44424 -88.08231,56.37684 -22.17411,26.3884 -49.21298,40.88134 -73.02578,42.76074 -23.81279,1.87925 -44.35761,-8.00399 -56.47007,-32.31472 l -0.0276,-0.0551 -0.0286,-0.0542 c -7.51419,-14.29408 -4.38399,-36.85208 1.94594,-60.64633 6.33007,-23.79442 15.42469,-48.2261 16.64212,-68.08383 l 0,-0.0312 0,-0.0302 c 1.28789,-25.44312 2.71199,-47.66251 6.98596,-64.80656 4.27391,-17.14405 11.00373,-28.75506 22.92793,-35.27967 0.55528,-0.3038 1.10651,-0.59044 1.65463,-0.8613 z m -387.22543,1.66273 c 1.77975,0.007 3.66318,0.1558 5.66981,0.45944 13.49768,2.04462 25.26814,11.48208 36.60841,26.86358 11.34037,15.38173 21.89234,36.37883 32.73959,59.67004 l 0.0138,0.0286 0.0127,0.0276 c 8.71684,18.1933 27.11081,38.19813 42.69857,58.60595 15.58768,20.4078 27.65156,40.89263 26.08057,56.57134 l -0.007,0.0681 -0.005,0.0679 c -2.03222,26.7408 -17.11654,41.2982 -40.27247,46.58714 -23.14903,5.28718 -54.53105,0.017 -85.87605,-16.36472 -0.009,-0.005 -0.0186,-0.009 -0.0276,-0.0148 -34.67886,-18.36731 -75.93364,-16.54296 -102.397339,-22.07006 -13.235445,-2.76443 -21.871626,-6.92036 -25.835367,-14.64216 -3.964013,-7.72153 -4.052482,-21.19325 4.370898,-44.16301 l 0.03705,-0.1014 0.03333,-0.10255 c 4.165689,-12.84964 1.082883,-26.9091 -0.939592,-40.10545 -2.022476,-13.19641 -3.011543,-25.1997 1.494601,-33.56614 l 0.02074,-0.0382 0.02054,-0.0392 c 5.769358,-11.12094 14.231783,-15.09641 24.734594,-18.86442 10.502751,-3.76822 22.956785,-6.72755 32.791335,-16.58338 l 0.0509,-0.052 0.0508,-0.053 c 9.09167,-9.59117 15.92092,-21.61352 23.91357,-30.14646 6.7438,-7.19963 13.49253,-11.97133 23.66489,-12.04201 0.1177,0 0.236,0 0.35465,0 z"
+       id="path154" />
+    <g
+       transform="matrix(0.91159133,0,0,0.91159133,-140.97298,1091.3033)"
+       style="font-size:429.75283813px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text2999">
+      <path
+         style="font-family:Linux Libertine O;-inkscape-font-specification:Linux Libertine O"
+         d="M 36.03125 929.96875 L 35.4375 930.5625 L 35.4375 936.46875 C 35.4375 938.07999 36.232695 938.87519 37.84375 938.875 L 46.15625 939.46875 C 52.197667 939.9724 56.482704 941.18082 59 943.09375 C 61.617926 944.90637 62.906223 948.03854 62.90625 952.46875 L 62.90625 1107.875 C 62.906223 1113.1109 61.920037 1116.5452 59.90625 1118.1562 C 57.892408 1119.6666 53.662935 1120.6841 47.21875 1121.1875 L 37.84375 1121.7812 C 36.232695 1121.7813 35.4375 1122.5765 35.4375 1124.1875 L 35.4375 1130.0938 L 36.03125 1130.6875 C 55.363841 1130.2847 68.465492 1130.0938 75.3125 1130.0938 L 141.46875 1130.0938 C 147.00662 1130.0937 159.28182 1130.2847 178.3125 1130.6875 C 179.31926 1116.1881 181.98264 1098.9681 186.3125 1079.0312 L 177.09375 1077.5312 C 175.38187 1083.6734 173.54492 1088.9447 171.53125 1093.375 C 169.61798 1097.8054 167.14558 1102.0349 164.125 1106.0625 C 161.20483 1109.9895 157.52401 1112.955 153.09375 1114.9688 C 148.76393 1116.9826 143.76358 1118 138.125 1118 L 102.5 1118 C 98.069539 1118 94.524149 1116.6562 91.90625 1113.9375 C 89.288233 1111.1182 87.999936 1107.3262 88 1102.5938 L 88 952.46875 C 87.999936 948.13924 89.263927 945.00706 91.78125 943.09375 C 94.298445 941.08012 98.718918 939.8717 105.0625 939.46875 L 113.0625 938.875 C 114.67346 938.87519 115.46866 938.07999 115.46875 936.46875 L 115.46875 930.5625 L 114.875 929.96875 C 95.542317 930.37172 82.360797 930.5627 75.3125 930.5625 C 68.465492 930.5627 55.363841 930.37172 36.03125 929.96875 z M 234.03125 938.875 C 230.00358 938.87519 226.54501 940.38572 223.625 943.40625 C 220.70495 946.32646 219.24997 949.78505 219.25 953.8125 C 219.24997 957.8403 220.70495 961.33014 223.625 964.25 C 226.54501 967.1702 230.00358 968.62517 234.03125 968.625 C 238.05883 968.62517 241.54867 967.1702 244.46875 964.25 C 247.48941 961.33014 248.99995 957.8403 249 953.8125 C 248.99995 949.78505 247.48941 946.32646 244.46875 943.40625 C 241.54867 940.38572 238.05883 938.87519 234.03125 938.875 z M 247.03125 993.40625 C 239.88217 996.32641 225.38109 999.4829 203.53125 1002.9062 L 204.125 1010.3125 L 217.4375 1011.6562 C 219.85406 1011.9584 221.55556 1013.4447 222.5625 1016.0625 C 223.67007 1018.6806 224.21872 1023.5941 224.21875 1030.8438 L 224.21875 1107.875 C 224.21872 1112.4061 223.31241 1115.6494 221.5 1117.5625 C 219.68754 1119.3749 216.17339 1120.5834 210.9375 1121.1875 L 205.03125 1121.7812 C 203.42019 1122.0833 202.62499 1122.8785 202.625 1124.1875 L 202.625 1130.0938 L 203.21875 1130.6875 C 219.73201 1130.2847 230.47237 1130.0938 235.40625 1130.0938 C 240.94419 1130.0937 251.95541 1130.2847 268.46875 1130.6875 L 269.09375 1130.0938 L 269.09375 1124.1875 C 269.09367 1122.9792 268.1318 1122.184 266.21875 1121.7812 L 260.46875 1121.1875 C 255.63554 1120.6841 252.23249 1119.4756 250.21875 1117.5625 C 248.30556 1115.5487 247.3437 1112.3054 247.34375 1107.875 L 247.34375 1030.8438 C 247.3437 1020.5734 247.70136 1008.4093 248.40625 994.3125 C 248.4062 993.7085 247.93742 993.40639 247.03125 993.40625 z M 325.5625 993.40625 C 318.31271 996.32641 304.08947 999.4829 282.84375 1002.9062 L 283.4375 1010.3125 L 296.71875 1011.6562 C 299.13531 1011.9584 300.86807 1013.4447 301.875 1016.0625 C 302.98257 1018.6806 303.53122 1023.5941 303.53125 1030.8438 L 303.53125 1107.875 C 303.53122 1112.4061 302.56934 1115.6737 300.65625 1117.6875 C 298.74309 1119.6006 295.25326 1120.7847 290.21875 1121.1875 L 284.34375 1121.7812 C 282.73268 1122.0833 281.93749 1122.8785 281.9375 1124.1875 L 281.9375 1130.0938 L 282.53125 1130.6875 C 299.04451 1130.2847 309.75362 1130.0938 314.6875 1130.0938 C 319.21854 1130.0937 329.73666 1130.2847 346.25 1130.6875 L 346.875 1130.0938 L 346.875 1124.1875 C 346.87494 1122.8785 346.04848 1122.0833 344.4375 1121.7812 L 340.0625 1121.1875 C 334.92721 1120.382 331.41307 1119.0624 329.5 1117.25 C 327.68752 1115.4376 326.78119 1112.3054 326.78125 1107.875 L 326.78125 1032.9688 C 334.33299 1024.1081 341.28142 1017.8993 347.625 1014.375 C 353.96845 1010.851 360.72588 1009.0939 367.875 1009.0938 C 375.72878 1009.0939 380.99999 1011.5663 383.71875 1016.5 C 386.53798 1021.3333 387.93739 1029.4901 387.9375 1040.9688 L 387.9375 1107.875 C 387.93739 1112.3054 387.00677 1115.4376 385.09375 1117.25 C 383.18052 1119.0624 379.69069 1120.382 374.65625 1121.1875 L 370.4375 1121.7812 C 368.72566 1122.0833 367.87491 1122.8785 367.875 1124.1875 L 367.875 1130.0938 L 368.46875 1130.6875 C 384.98192 1130.2847 395.19794 1130.0938 399.125 1130.0938 C 404.66285 1130.0937 415.70534 1130.2847 432.21875 1130.6875 L 432.8125 1130.0938 L 432.8125 1124.1875 C 432.81235 1122.9792 431.90602 1122.184 430.09375 1121.7812 L 424.1875 1121.1875 C 419.45489 1120.6841 416.10744 1119.4756 414.09375 1117.5625 C 412.1805 1115.5487 411.21861 1112.3054 411.21875 1107.875 L 411.21875 1043.25 C 411.21861 1037.41 410.91651 1032.1631 410.3125 1027.5312 C 409.80891 1022.8996 408.79147 1018.4791 407.28125 1014.25 C 405.77076 1009.9204 403.76715 1006.3507 401.25 1003.5312 C 398.73261 1000.712 395.46501 998.48618 391.4375 996.875 C 387.40975 995.1634 382.65595 994.31264 377.21875 994.3125 C 368.35787 994.31264 360.01005 996.20513 352.15625 1000.0312 C 344.40299 1003.7569 335.94403 1011.0075 326.78125 1021.7812 L 325.875 1021.7812 L 326.78125 994.3125 C 326.78119 993.7085 326.36796 993.40639 325.5625 993.40625 z M 445.9375 996.71875 L 445.03125 997.3125 L 445.03125 1005.1875 L 445.9375 1005.7812 L 450.9375 1006.375 C 456.37479 1006.9793 460.00005 1008.3544 461.8125 1010.4688 C 463.62491 1012.4827 464.53123 1016.0524 464.53125 1021.1875 L 464.53125 1091.125 C 464.53123 1096.8644 465.13543 1102.0801 466.34375 1106.8125 C 467.552 1111.4443 469.50007 1115.8404 472.21875 1119.9688 C 475.03806 1124.0971 479.07654 1127.3091 484.3125 1129.625 C 489.54837 1131.9409 495.83702 1133.0937 503.1875 1133.0938 C 510.23578 1133.0937 517.18421 1131.5034 524.03125 1128.2812 C 530.97882 1124.9585 538.47588 1118.9719 546.53125 1110.3125 L 547.15625 1110.3125 L 546.53125 1133.875 L 553.625 1133.875 C 559.66633 1128.9412 572.8791 1124.6006 593.21875 1120.875 L 592.3125 1113.625 L 577.5 1112.125 C 574.17707 1111.8229 572.06233 1110.6388 571.15625 1108.625 C 570.2499 1106.5105 569.81236 1101.6768 569.8125 1094.125 L 569.8125 1027.375 C 569.81236 1021.233 570.11447 1011.2079 570.71875 997.3125 C 570.71861 996.90987 570.24984 996.71889 569.34375 996.71875 C 567.3298 997.12165 563.7601 997.31264 558.625 997.3125 C 553.48965 997.31264 543.27364 997.12165 527.96875 996.71875 L 527.0625 997.3125 L 527.0625 1005.1875 L 527.96875 1005.7812 L 532.9375 1006.375 C 538.27401 1006.9793 541.84371 1008.3544 543.65625 1010.4688 C 545.56927 1012.4827 546.53113 1016.0524 546.53125 1021.1875 L 546.53125 1097.9062 C 542.10075 1103.1422 536.66285 1108.0314 530.21875 1112.5625 C 523.87515 1116.9929 517.53095 1119.2188 511.1875 1119.2188 C 508.46878 1119.2188 505.9165 1118.8055 503.5 1118 C 501.08336 1117.0938 498.61096 1115.5833 496.09375 1113.4688 C 493.57642 1111.2536 491.57281 1107.8749 490.0625 1103.3438 C 488.55209 1098.712 487.7812 1093.1942 487.78125 1086.75 L 487.78125 1027.375 C 487.7812 1021.233 488.08331 1011.2079 488.6875 997.3125 C 488.68745 996.90987 488.27421 996.71889 487.46875 996.71875 C 485.45488 997.12165 481.86087 997.31264 476.625 997.3125 C 471.48973 997.31264 461.24247 997.12165 445.9375 996.71875 z M 603.9375 996.71875 L 603.34375 997.625 L 603.34375 1003.5312 C 603.34374 1004.639 604.7987 1005.3786 607.71875 1005.7812 C 612.65257 1006.1841 616.82651 1007.8857 620.25 1010.9062 C 623.77416 1013.9271 627.8925 1018.9275 632.625 1025.875 L 659.65625 1065.125 C 660.26033 1066.0313 660.56244 1066.8577 660.5625 1067.5625 C 660.56244 1068.2674 660.37145 1069.007 659.96875 1069.8125 L 634 1103.1875 C 629.97233 1108.4234 626.10052 1112.4619 622.375 1115.2812 C 618.75011 1118.1006 615.9756 1119.8021 614.0625 1120.4062 C 612.14936 1120.9097 609.56585 1121.3785 606.34375 1121.7812 C 603.7258 1122.0833 602.4375 1123.1008 602.4375 1124.8125 L 602.4375 1130.0938 L 603.03125 1130.6875 C 618.33622 1130.2847 626.02428 1130.0938 626.125 1130.0938 C 628.13879 1130.0937 636.81996 1130.2847 652.125 1130.6875 L 652.875 1130.0938 L 652.875 1124.1875 C 652.87494 1122.8785 652.10405 1122.0833 650.59375 1121.7812 L 646.375 1121.1875 C 644.36114 1120.8854 642.90618 1120.3055 642 1119.5 C 641.19442 1118.6945 640.94788 1117.6527 641.25 1116.3438 C 641.55203 1114.9341 641.98957 1113.6701 642.59375 1112.5625 C 643.19785 1111.3542 644.10417 1109.8993 645.3125 1108.1875 L 664.8125 1079.9375 C 666.02072 1078.1251 666.95134 1077.2188 667.65625 1077.2188 C 668.36101 1077.2188 669.26733 1077.9341 670.375 1079.3438 L 688.375 1104.0938 C 690.48941 1106.8124 692.02425 1108.9827 693.03125 1110.5938 C 694.03807 1112.2048 694.80896 1113.8265 695.3125 1115.4375 C 695.81586 1117.0486 695.56931 1118.3125 694.5625 1119.2188 C 693.65619 1120.125 691.97898 1120.7847 689.5625 1121.1875 L 685.9375 1121.7812 C 684.42706 1122.0833 683.68741 1122.8785 683.6875 1124.1875 L 683.6875 1130.0938 L 684.28125 1130.6875 C 699.58614 1130.2847 710.3265 1130.0938 716.46875 1130.0938 C 719.18727 1130.0937 728.19488 1130.2847 743.5 1130.6875 L 744.09375 1130.0938 L 744.09375 1124.1875 C 744.0936 1123.5834 743.90262 1123.1458 743.5 1122.8438 C 743.19779 1122.5417 742.729 1122.3194 742.125 1122.2188 C 741.6214 1122.0174 740.82621 1121.8819 739.71875 1121.7812 C 734.18062 1121.2778 729.64904 1119.9027 726.125 1117.6875 C 722.70139 1115.3716 717.86771 1109.7983 711.625 1100.9375 L 683.6875 1061.6562 C 683.08326 1060.7501 682.78117 1059.9549 682.78125 1059.25 C 682.78117 1058.7466 683.08326 1058.0313 683.6875 1057.125 L 709.65625 1024.0625 C 715.29482 1016.9136 719.88196 1012.2153 723.40625 1010 C 726.9303 1007.6842 731.57298 1006.2848 737.3125 1005.7812 C 739.72894 1005.7814 740.93735 1004.9306 740.9375 1003.2188 L 740.9375 997.3125 L 740.625 996.71875 C 730.35441 997.12165 722.55524 997.31264 717.21875 997.3125 C 715.20482 997.31264 706.52363 997.12165 691.21875 996.71875 L 690.46875 997.625 L 690.46875 1003.5312 C 690.46865 1005.0417 691.12843 1005.7814 692.4375 1005.7812 L 697.4375 1006.375 C 699.85397 1006.6772 701.55549 1007.2258 702.5625 1008.0312 C 703.66998 1008.7362 704.02766 1009.8092 703.625 1011.2188 C 703.32283 1012.5278 702.79848 1013.7918 702.09375 1015 C 701.38881 1016.1077 700.23596 1017.6738 698.625 1019.6875 L 678.53125 1047.7812 C 677.32288 1049.2917 676.39224 1050.0313 675.6875 1050.0312 C 674.6805 1050.0313 673.66308 1049.0695 672.65625 1047.1562 L 653.78125 1019.375 C 652.37152 1017.2606 651.35409 1015.7501 650.75 1014.8438 C 650.24649 1013.837 649.80896 1012.7397 649.40625 1011.5312 C 649.00344 1010.3231 649.00344 1009.4411 649.40625 1008.9375 C 649.90966 1008.4342 650.70484 1007.9411 651.8125 1007.4375 C 652.92004 1006.9342 654.48612 1006.5765 656.5 1006.375 L 661.1875 1005.7812 C 662.79849 1005.3786 663.59369 1004.5278 663.59375 1003.2188 L 663.59375 997.625 L 662.6875 996.71875 C 647.38246 997.12165 636.9442 997.31264 631.40625 997.3125 C 628.38549 997.31264 619.24248 997.12165 603.9375 996.71875 z "
+         transform="matrix(1.0969828,0,0,1.0969828,154.64493,-1325.4137)"
+         id="path3006" />
+    </g>
+  </g>
+</svg>