diff --git a/examples/124_eoatex/preambel/pre_xml.tex b/examples/124_eoatex/preambel/pre_xml.tex index 010401d..0a490f2 100644 --- a/examples/124_eoatex/preambel/pre_xml.tex +++ b/examples/124_eoatex/preambel/pre_xml.tex @@ -89,16 +89,51 @@ \newcommand{\EOAnewtheorem}[2]{\newtheorem{#1}{#2}} \newenvironment{EOAdescription}{\begin{description}}{\end{description}} -\newcommand*{\EOAfigure}[5]{\begin{xmlelement*}{EOAfigure}% -\anchor\label{#3}% + +\newcommand*{\EOAfigure}[6][1]{\begin{xmlelement*}{EOAfigure}% +\anchor\label{#4}% \begin{xmlelement}{caption}% -#2% +#3% +\end{xmlelement}% +\begin{xmlelement}{shortcaption}% +#1% \end{xmlelement}% \begin{xmlelement}{file}% +#2% +\end{xmlelement}% +\begin{xmlelement}{width}% +#5% +\end{xmlelement}% +\end{xmlelement*}% +} + +% \newcommand*{\EOAfigure}[5]{\begin{xmlelement*}{EOAfigure}% +% \anchor\label{#3}% +% \begin{xmlelement}{caption}% +% #2% +% \end{xmlelement}% +% \begin{xmlelement}{file}% +% #1% +% \end{xmlelement}% +% \begin{xmlelement}{width}% +% #4% +% \end{xmlelement}% +% \end{xmlelement*}% +% } + +\newcommand*{\EOAsidecaptionfigure}[6][1]{\begin{xmlelement*}{EOAfigure}% +\anchor\label{#4}% +\begin{xmlelement}{caption}% +#3% +\end{xmlelement}% +\begin{xmlelement}{shortcaption}% #1% \end{xmlelement}% +\begin{xmlelement}{file}% +#2% +\end{xmlelement}% \begin{xmlelement}{width}% -#4% +#5% \end{xmlelement}% \end{xmlelement*}% }