diff --git a/docs.tex b/docs.tex index c7caacf174d76785223d6f67b58e8651c576df16..95f7d537a58247f6efa14ec29487541b94aa1f5d 100644 --- a/docs.tex +++ b/docs.tex @@ -219,6 +219,8 @@ Wider pictures should be placed with \verb"\widePic{s1}", and they will appear o \widePic{s1} +You can also use \verb"\csComments{\mapCircle{-4,3.4}{2}{Dyson_Logos/forgotten_city}}" to place comments on top of the map, either in call out boxes, or (previously) in the \verb"\mapCircle" command. + \subsubsection{Maps} The map function works like \verb"\widePic", but for maps. diff --git a/layout.sty b/layout.sty index 168c86facd7e3637cf95150e0ba010c45c8d31a6..eb2ae2b88abb6b0edf0fd2585a650047b6a1684d 100644 --- a/layout.sty +++ b/layout.sty @@ -290,23 +290,23 @@ bookmarks=true]% \label{#2} } + %before upper={\parindent0pt}, + %boxrule=0mm, + %finish fading vignette={size=0.02\textwidth}, + \newcommand{\widePic}[2][b]{ \begin{figure*}[#1!] \setcounter{enc}{0} - \IfFileExists{images/#2.svg}{ - \begin{tikzpicture} - \raggedright - \node (mapPic) {\includesvg[width=\textwidth]{images/#2}}; + %\IfFileExists{images/#2.svg}{} + \begin{tikzpicture}[every shadow/.style={ + shadow blur invert, + shadow xshift=-1pt, + shadow yshift=-3pt + }] + \node[path fading=semi west,blue] (mapPic) {\pic{#2}}; + \tcbvignette{outside node=mapPic, lowered color=\pageSideColor,size=4mm} \csComments \end{tikzpicture} - }{ - \tcbincludegraphics[ - blankest, - before upper={\parindent0pt}, - boxrule=0mm, - finish fading vignette={size=0.02\textwidth}, - ]{images/#2.jpg} - } \label{#2} \renewcommand\csComments{} \end{figure*} @@ -320,6 +320,16 @@ bookmarks=true]% \node [black, font=\bfseries] at (0.#2,0.#3) {#4 #1}; } +\newcommand\mapCircle[4][0]{ + \setcounter{track}{#3} + \addtocounter{track}{3} + \addtocounter{track}{#1} + \begin{scope} + \draw[fill=white] (#2) circle (#3em); + \clip[draw] (#2) circle (#3em) node {\includesvg[width=\arabic{track}em]{images/#4}}; + \end{scope} +} + \newcommand\mapPic[4][\Huge]{ \begin{figure*}[#2!] \begin{tikzpicture}[every shadow/.style={