diff --git a/Makefile b/Makefile index 732d849a1b34a69a6332cb75fd5ce2747b71007e..89414fd7acd5f82e77fc2e0ede5da07b4219b290 100644 --- a/Makefile +++ b/Makefile @@ -4,23 +4,28 @@ NAME = test LATEX = pdflatex BIBTEX = biber -OUTDIR = .\build +OUTDIR = build +TEX_FLAGS = -file-line-error -interaction=nonstopmode -include-directory=.\src -quiet +SUB_TEX_FILES = $(wildcard img/*.tex) $(wildcard plt/*.tex) +SUB_PDF_FILES = $(join $(dir $(SUB_TEX_FILES)),$(addprefix $(OUTDIR)/,$(notdir $(SUB_TEX_FILES:tex=pdf)))) -export TEXINPUTS:=.\src -all: - $(MAKE) pdf - $(MAKE) bib - $(MAKE) pdf - $(MAKE) pdf +export TEXINPUTS:=$(CURDIR)\src -pdf: $(NAME).tex - $(LATEX) -synctex=1 -interaction=nonstopmode -file-line-error -include-directory=.\src -output-directory=$(OUTDIR) $(NAME).tex - move $(OUTDIR)\$(NAME).pdf .\ +all: bib + $(LATEX) -output-directory=$(OUTDIR) $(TEX_FLAGS) $(NAME).tex + $(LATEX) -synctex=1 -output-directory=$(OUTDIR) $(TEX_FLAGS) $(NAME).tex -bib: $(OUTDIR)\$(NAME).bcf +pdf: $(SUB_PDF_FILES) + $(LATEX) -synctex=1 -output-directory=$(OUTDIR) $(TEX_FLAGS) $(NAME).tex + copy /Y $(OUTDIR)\$(NAME).pdf .\ + +bib: pdf $(OUTDIR)\$(NAME).bcf $(BIBTEX) -output-directory $(OUTDIR) $(NAME) +$(SUB_PDF_FILES): $(SUB_TEX_FILES) + $(LATEX) -output-directory=$(dir $@) $(TEX_FLAGS) $(subst build/,$(notdir $(@:pdf=tex)),$(dir $@)) + clean: tidy if exist $(OUTDIR)\$(NAME).pdf del $(OUTDIR)\$(NAME).pdf if exist $(OUTDIR) rmdir $(OUTDIR) diff --git a/img/HSH-Logo.pdf b/img/HSH-Logo.pdf deleted file mode 100644 index f6ddc0fa82f4999a70cbe8ca9834745f4a8a2108..0000000000000000000000000000000000000000 Binary files a/img/HSH-Logo.pdf and /dev/null differ diff --git a/img/bild.png b/img/bild.png deleted file mode 100644 index 3bd7ffc0879f3e5e0a6b6122b493de9a70868ef0..0000000000000000000000000000000000000000 Binary files a/img/bild.png and /dev/null differ diff --git a/img/exampleCircuit.tex b/img/exampleCircuit.tex new file mode 100644 index 0000000000000000000000000000000000000000..bdff1605d0487c37aee31a208d565096b7bda939 --- /dev/null +++ b/img/exampleCircuit.tex @@ -0,0 +1,15 @@ +\documentclass[11pt,ngerman]{HsH-standalone} + +\usepackage{siunitx} % kennt SI einheiten +\usepackage{amsmath} % schöne Formeln +\usepackage{circuitikz} % zeichnen von Schaltplänen + +\begin{document} %----------------------Inhalt---------------------------------------------------% +\begin{circuitikz} \draw + (0,0) to[V, v<=$U_q$, i=2] ++(0,2) + -- ++(2,0) + to[R, v^=$U_R$] ++(0,-2) + -- (0,0) + ; +\end{circuitikz} +\end{document} diff --git a/img/lorem-ipsum.jpg b/img/lorem-ipsum.jpg new file mode 100644 index 0000000000000000000000000000000000000000..04a14b8c7a35b4550a3fb737ca8eb9175ede8496 Binary files /dev/null and b/img/lorem-ipsum.jpg differ diff --git a/plt/examplePlot.tex b/plt/examplePlot.tex index 0b3b8420c3433457e946335fe632775d8bf72849..5629a7661c7fc3855f3873a69adffa23a1ec63ae 100644 --- a/plt/examplePlot.tex +++ b/plt/examplePlot.tex @@ -6,7 +6,6 @@ %__________Daten Import_____________________ \usepackage{pgfplots,pgfplotstable} % plots und bilder, enthält tikz und graphix -\usepackage{circuitikz} % zeichnen von Schaltplänen \begin{document} %----------------------Inhalt---------------------------------------------------% diff --git a/test.pdf b/test.pdf new file mode 100644 index 0000000000000000000000000000000000000000..9f1ad07eac5900f975f4c8a8ece7203e43afd622 Binary files /dev/null and b/test.pdf differ diff --git a/test.tex b/test.tex index 1936f75dd39294687c01904aea3282725b58fdd6..34dd7b2768ca1bab04316661ea96d76dfc82cb43 100644 --- a/test.tex +++ b/test.tex @@ -6,8 +6,6 @@ \usepackage{biblatex} \addbibresource{src/localBibliography.bib} -\usepackage{pgfplots,pgfplotstable} % plots und bilder, enthält tikz und graphix - \begin{document} @@ -29,7 +27,7 @@ {\color{red}test} und stuff \begin{figure} \centering - \includegraphics[width=.15\textwidth]{img/bild} + \includegraphics[width=.6\textwidth]{img/lorem-ipsum.jpg} \caption{test} \end{figure} @@ -40,11 +38,17 @@ \vspace{2cm}\\\pagebreak eine zahl: $3,5+3.5$\\ - \begin{tikzpicture} - \begin{axis}[MyPlots] - \addplot[FM1,domain=-5:5]{x^2}; - \end{axis} - \end{tikzpicture} + \begin{figure} + \centering + \includegraphics[width=0.6\textwidth, page=2]{plt/build/examplePlot.pdf} + \caption{a nice plot} + \end{figure} + + \begin{figure} + \centering + \includegraphics{img/build/exampleCircuit.pdf} + \caption{a circuit diagramm} + \end{figure} \printbibliography \listoffigures