figure WIP
This commit is contained in:
jaseg
parent
0238e388cd
commit
6d1a510304
20 changed files with 52 additions and 46 deletions
|
|
@ -6,7 +6,7 @@ SHELL := bash
|
|||
MAKEFLAGS += --warn-undefined-variables
|
||||
MAKEFLAGS += --no-builtin-rules
|
||||
|
||||
VERSION_STRING := $(shell git describe --tags --long --dirty)
|
||||
VERSION_STRING := $(shell git describe --always --tags --long)
|
||||
|
||||
all: chapter.pdf
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ version.tex: chapter.tex
|
|||
|
||||
.PHONY: update-figures
|
||||
update-figures:
|
||||
make -C figures
|
||||
@python figures/update_figures.py figures
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -10,6 +10,7 @@
|
|||
\usepackage{wasysym}
|
||||
\usepackage{extdash}
|
||||
\usepackage{amsthm}
|
||||
\usepackage{mwe}
|
||||
\usepackage{tabularx}
|
||||
\usepackage{multirow}
|
||||
\usepackage{multicol}
|
||||
|
|
@ -32,6 +33,7 @@
|
|||
\usetikzlibrary{calc}
|
||||
\usepackage{epstopdf}
|
||||
\usepackage{pdfpages}
|
||||
\usepackage{etoolbox}
|
||||
\usepackage{minitoc}
|
||||
\usepackage{minted} % pygmentized source code
|
||||
%\usepackage[pdftex]{graphicx,color}
|
||||
|
|
@ -119,6 +121,28 @@
|
|||
}
|
||||
}
|
||||
|
||||
% https://tex.stackexchange.com/questions/30720/footnote-without-a-marker
|
||||
\newcommand\blfootnote[1]{%
|
||||
\begingroup
|
||||
\renewcommand\thefootnote{}\footnote{#1}%
|
||||
\addtocounter{footnote}{-1}%
|
||||
\endgroup
|
||||
}
|
||||
|
||||
\newcommand{\figurepath}{figures}
|
||||
\graphicspath{{\figurepath}}
|
||||
\newcommand{\figureattrib}[1]{
|
||||
\listxadd{\figureattribcache}{Resource location:}
|
||||
%\href{\input{\figurepath/#1.git_url}}{
|
||||
% git repo \input{\figurepath/#1.git_remote}
|
||||
% path \input{\figurepath/#1.git_path}
|
||||
% rev \input{\figurepath/#1.git_rev}}
|
||||
}
|
||||
\newcommand{\flushfigureattrib}{
|
||||
\forlistloop{\blfootnote}{\figureattribcache}
|
||||
\undef\figureattribcache
|
||||
}
|
||||
|
||||
\hyphenation{a-me-na-ble}
|
||||
|
||||
\begin{document}
|
||||
|
|
@ -580,7 +604,17 @@ provides a combined power and multi-fiber passthrough that is sufficient for QKD
|
|||
|
||||
\subsection{Multi-fiber passthrough with active secondary mesh}
|
||||
|
||||
\begin{figure}
|
||||
\subcaptionbox{}{\includegraphics[width=\textwidth]{render_side_1.png}}
|
||||
\figureattrib{render_side_1.png}
|
||||
\subcaptionbox{}{\includegraphics[width=\textwidth]{render_side_2.png}}
|
||||
\figureattrib{render_side_2.png}
|
||||
|
||||
\caption{
|
||||
Renderings of the complete offset secondary mesh assembly with interlocking labyrinth.
|
||||
}
|
||||
\end{figure}
|
||||
\flushfigureattrib
|
||||
|
||||
\section{Outlook}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
|
||||
SUBMODULE_FIGURES := \
|
||||
ihsm-secondary-mesh/gear_plan_1.svg \
|
||||
ihsm-secondary-mesh/gear_plan_2.svg \
|
||||
ihsm-secondary-mesh/gear_plan_3.svg \
|
||||
ihsm-secondary-mesh/render_exp_1.png \
|
||||
ihsm-secondary-mesh/render_exp_2.png \
|
||||
ihsm-secondary-mesh/render_side_1.png \
|
||||
ihsm-secondary-mesh/render_side_2.png \
|
||||
ihsm-secondary-mesh/schema_wire.svg
|
||||
|
||||
|
||||
.ONESHELL:
|
||||
|
||||
all: pull-submodules $(notdir SUBMODULE_FIGURES)
|
||||
|
||||
pull-submodules:
|
||||
git -C ihsm-secondary-mesh pull
|
||||
|
||||
$(notdir SUBMODULE_FIGURES):
|
||||
@for f in ${SUBMODULE_FIGURES}; do
|
||||
FIG_FN="$$(basename "$$f")"
|
||||
FIG_DIR="$$(dirname "$$f")"
|
||||
cp "$$f" "$$FIG_FN"
|
||||
git -C "$$FIG_DIR" remote get-url $$(git -C "$$FIG_DIR" config "branch.$$(git -C "$$FIG_DIR" branch --show-current).remote") > "$${FIG_FN}.git_remote"
|
||||
git -C "$$FIG_DIR" describe --always --tags > "$${FIG_FN}.git_rev"
|
||||
done
|
||||
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
|
|
@ -1 +1 @@
|
|||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
git@git.jaseg.de:ihsm-secondary-mesh.git
|
||||
|
|
@ -1 +1 @@
|
|||
3a7edbd
|
||||
3a7edbd
|
||||
Loading…
Add table
Add a link
Reference in a new issue