Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

detach tikz figure test, update extra tests #2314

Merged
merged 2 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,9 @@ t/tikz/cycle.xml
t/tikz/dominoes.pdf
t/tikz/dominoes.tex
t/tikz/dominoes.xml
t/tikz/tikz_figure.pdf
t/tikz/tikz_figure.tex
t/tikz/tikz_figure.xml
t/tikz/unit_tests_by_silviu.pdf
t/tikz/unit_tests_by_silviu.tex
t/tikz/unit_tests_by_silviu.xml
Expand Down
Binary file modified t/complex/figure_mixed_content.pdf
Binary file not shown.
20 changes: 1 addition & 19 deletions t/complex/figure_mixed_content.tex
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
\usepackage{algorithm}
\usepackage{booktabs}
\usepackage{subcaption}
\usepackage{tikz}
\usepackage{xcolor}
\usepackage{algorithmic}
\usetikzlibrary{spy}
\usepackage{listings}
\newtheorem{theorem}{Theorem}
% Examples of custom/rare figures with mixed content
Expand Down Expand Up @@ -43,23 +42,6 @@
\end{table*}
\clearpage

% \includegraphics as a node in tikz, see ar5iv#215
\begin{figure*}
\begin{tikzpicture}
\begin{scope}[spy using outlines={rectangle,blue,magnification=2.5,size=3cm}]
\node { \includegraphics[height=3cm]{\imgfile}};
\end{scope}
\end{tikzpicture}

\begin{tikzpicture}
\begin{scope}[spy using outlines={rectangle,blue,magnification=2.5,size=3cm}]
\node { \includegraphics[height=3cm]{\imgfile}};
\end{scope}
\end{tikzpicture}
\caption{tikz nodes with includegraphics}
\end{figure*}
\clearpage

% math array with subfloat
\begin{figure}
$ \begin{array}{cc}
Expand Down
167 changes: 71 additions & 96 deletions t/complex/figure_mixed_content.xml

Large diffs are not rendered by default.

56 changes: 27 additions & 29 deletions t/tikz/ac-drive-components.xml

Large diffs are not rendered by default.

533 changes: 250 additions & 283 deletions t/tikz/consort-flowchart.xml

Large diffs are not rendered by default.

Binary file modified t/tikz/cycle.pdf
Binary file not shown.
3 changes: 1 addition & 2 deletions t/tikz/cycle.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
\usepackage{tikz}
%%%<
\usepackage{verbatim}
\usepackage{verbatim}
\usepackage[active,tightpage]{preview}
\PreviewEnvironment{tikzpicture}
\setlength\PreviewBorder{5pt}%
Expand All @@ -25,7 +24,7 @@
\foreach \s in {1,...,\n}
{
\node[draw, circle] at ({360/\n * (\s - 1)}:\radius) {$\s$};
\draw[->, >=latex] ({360/\n * (\s - 1)+\margin}:\radius)
\draw[->, >=latex] ({360/\n * (\s - 1)+\margin}:\radius)
arc ({360/\n * (\s - 1)+\margin}:{360/\n * (\s)-\margin}:\radius);
}
\end{tikzpicture}
Expand Down
1 change: 0 additions & 1 deletion t/tikz/cycle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<?latexml class="article"?>
<?latexml package="tikz"?>
<?latexml package="verbatim"?>
<?latexml package="verbatim"?>
<?latexml package="preview" options="active,tightpage"?>
<?latexml RelaxNGSchema="LaTeXML"?>
<document xmlns="http://dlmf.nist.gov/LaTeXML" xmlns:svg="http://www.w3.org/2000/svg">
Expand Down
Binary file added t/tikz/tikz_figure.pdf
Binary file not shown.
25 changes: 25 additions & 0 deletions t/tikz/tikz_figure.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
\documentclass{article}
\usepackage{graphicx}
\usepackage{tikz}
\usetikzlibrary{spy}
\def\imgfile{../graphics/none.png}

\begin{document}

% \includegraphics as a node in tikz, see ar5iv#215
\begin{figure*}
\begin{tikzpicture}
\begin{scope}[spy using outlines={rectangle,blue,magnification=2.5,size=3cm}]
\node { \includegraphics[height=3cm]{\imgfile}};
\end{scope}
\end{tikzpicture}

\begin{tikzpicture}
\begin{scope}[spy using outlines={rectangle,blue,magnification=2.5,size=3cm}]
\node { \includegraphics[height=3cm]{\imgfile}};
\end{scope}
\end{tikzpicture}
\caption{tikz nodes with includegraphics}
\end{figure*}

\end{document}
33 changes: 33 additions & 0 deletions t/tikz/tikz_figure.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<?latexml class="article"?>
<?latexml package="graphicx"?>
<?latexml package="tikz"?>
<?latexml RelaxNGSchema="LaTeXML"?>
<document xmlns="http://dlmf.nist.gov/LaTeXML" xmlns:svg="http://www.w3.org/2000/svg">
<resource src="LaTeXML.css" type="text/css"/>
<resource src="ltx-article.css" type="text/css"/>
<figure inlist="lof" xml:id="S0.F1">
<tags>
<tag>Figure 1</tag>
<tag role="refnum">1</tag>
<tag role="typerefnum">Figure 1</tag>
</tags>
<picture class="ltx_figure_panel" height="127.22" tex="\hbox to91.94pt{\vbox to91.94pt{\pgfpicture\makeatletter\raise 0.0pt\hbox{%&#10;\hskip 45.9723pt\lower-45.9723pt\hbox to0.0pt{\pgfsys@beginscope\pgfsys@invoke%&#10;{ }\definecolor{pgfstrokecolor}{rgb}{0,0,0}\pgfsys@color@rgb@stroke{0}{0}{0}%&#10;\pgfsys@invoke{ }\pgfsys@color@rgb@fill{0}{0}{0}\pgfsys@invoke{ }%&#10;\pgfsys@setlinewidth{0.4pt}\pgfsys@invoke{ }\nullfont\hbox to0.0pt{%&#10;\pgfsys@beginscope\pgfsys@invoke{ }\pgfsys@beginscope\pgfsys@invoke{ }\color[%&#10;rgb]{0,0,0}\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}%&#10;\pgfsys@color@gray@stroke{0}\pgfsys@invoke{ }\pgfsys@color@gray@fill{0}%&#10;\pgfsys@invoke{ }\definecolor[named]{pgffillcolor}{rgb}{0,0,0}%&#10;\pgfsys@setlinewidth{0.4pt}\pgfsys@invoke{ }\pgfsys@setdash{}{0.0pt}%&#10;\pgfsys@invoke{ }\pgfsys@stroke@opacity{1}\pgfsys@invoke{ }%&#10;\pgfsys@fill@opacity{1}\pgfsys@invoke{ }\pgfsys@buttcap\pgfsys@invoke{ }%&#10;\pgfsys@miterjoin\pgfsys@invoke{ }{\hbox{{&#10;{{}}\hbox{\hbox{{\pgfsys@beginscope\pgfsys@invoke{ }{{}{}{{&#10;{}{}}}{&#10;{}{}}&#10;{{}{{}}}{{}{}}{}{{}{}}&#10;{&#10;}{{{{}}\pgfsys@beginscope\pgfsys@invoke{ }\pgfsys@transformcm{1.0}{0.0}{0.0}{1%&#10;.0}{-42.6393pt}{-42.6393pt}\pgfsys@invoke{ }\hbox{{\definecolor[named]{.}{rgb}%&#10;{0,0,0}\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}%&#10;\pgfsys@color@gray@stroke{0}\pgfsys@invoke{ }\pgfsys@color@gray@fill{0}%&#10;\pgfsys@invoke{ }\hbox{{\definecolor[named]{.}{rgb}{0,0,0}\color[rgb]{0,0,0}%&#10;\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}\pgfsys@color@gray@stroke{0}%&#10;\pgfsys@color@gray@fill{0}\includegraphics[height=85.35826pt]{../graphics/none%&#10;.png}}}&#10;}}\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope}}}&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope}}}&#10;}}}&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope{}{}{}\hss}%&#10;\pgfsys@discardpath\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope\hss}}%&#10;\lxSVG@closescope\endpgfpicture}}" width="127.22" xml:id="S0.F1.pic1">
<svg:svg height="127.22" overflow="visible" version="1.1" width="127.22">
<svg:g color="#000000" fill="#000000" fill-opacity="1" stroke="#000000" stroke-dasharray="none" stroke-dashoffset="0.0pt" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="0.4pt" transform="translate(0,127.22) matrix(1 0 0 -1 0 0) translate(63.61,0) translate(0,63.61) matrix(1.0 0.0 0.0 1.0 -59 -59)">
<svg:foreignObject height="118" overflow="visible" transform="matrix(1 0 0 -1 0 16.6)" width="118"><graphics candidates="../graphics/none.png" graphic="../graphics/none.png" options="height=85.35826pt,keepaspectratio=true" xml:id="S0.F1.pic1.g1"/></svg:foreignObject>
</svg:g>
</svg:svg>
</picture>
<picture class="ltx_figure_panel" height="127.22" tex="\hbox to91.94pt{\vbox to91.94pt{\pgfpicture\makeatletter\raise 0.0pt\hbox{%&#10;\hskip 45.9723pt\lower-45.9723pt\hbox to0.0pt{\pgfsys@beginscope\pgfsys@invoke%&#10;{ }\definecolor{pgfstrokecolor}{rgb}{0,0,0}\pgfsys@color@rgb@stroke{0}{0}{0}%&#10;\pgfsys@invoke{ }\pgfsys@color@rgb@fill{0}{0}{0}\pgfsys@invoke{ }%&#10;\pgfsys@setlinewidth{0.4pt}\pgfsys@invoke{ }\nullfont\hbox to0.0pt{%&#10;\pgfsys@beginscope\pgfsys@invoke{ }\pgfsys@beginscope\pgfsys@invoke{ }\color[%&#10;rgb]{0,0,0}\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}%&#10;\pgfsys@color@gray@stroke{0}\pgfsys@invoke{ }\pgfsys@color@gray@fill{0}%&#10;\pgfsys@invoke{ }\definecolor[named]{pgffillcolor}{rgb}{0,0,0}%&#10;\pgfsys@setlinewidth{0.4pt}\pgfsys@invoke{ }\pgfsys@setdash{}{0.0pt}%&#10;\pgfsys@invoke{ }\pgfsys@stroke@opacity{1}\pgfsys@invoke{ }%&#10;\pgfsys@fill@opacity{1}\pgfsys@invoke{ }\pgfsys@buttcap\pgfsys@invoke{ }%&#10;\pgfsys@miterjoin\pgfsys@invoke{ }{\hbox{{&#10;{{}}\hbox{\hbox{{\pgfsys@beginscope\pgfsys@invoke{ }{{}{}{{&#10;{}{}}}{&#10;{}{}}&#10;{{}{{}}}{{}{}}{}{{}{}}&#10;{&#10;}{{{{}}\pgfsys@beginscope\pgfsys@invoke{ }\pgfsys@transformcm{1.0}{0.0}{0.0}{1%&#10;.0}{-42.6393pt}{-42.6393pt}\pgfsys@invoke{ }\hbox{{\definecolor[named]{.}{rgb}%&#10;{0,0,0}\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}%&#10;\pgfsys@color@gray@stroke{0}\pgfsys@invoke{ }\pgfsys@color@gray@fill{0}%&#10;\pgfsys@invoke{ }\hbox{{\definecolor[named]{.}{rgb}{0,0,0}\color[rgb]{0,0,0}%&#10;\definecolor[named]{pgfstrokecolor}{rgb}{0,0,0}\pgfsys@color@gray@stroke{0}%&#10;\pgfsys@color@gray@fill{0}\includegraphics[height=85.35826pt]{../graphics/none%&#10;.png}}}&#10;}}\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope}}}&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope}}}&#10;}}}&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope&#10;\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope{}{}{}\hss}%&#10;\pgfsys@discardpath\pgfsys@invoke{\lxSVG@closescope }\pgfsys@endscope\hss}}%&#10;\lxSVG@closescope\endpgfpicture}}" width="127.22" xml:id="S0.F1.pic2">
<svg:svg height="127.22" overflow="visible" version="1.1" width="127.22">
<svg:g color="#000000" fill="#000000" fill-opacity="1" stroke="#000000" stroke-dasharray="none" stroke-dashoffset="0.0pt" stroke-linecap="butt" stroke-linejoin="miter" stroke-opacity="1" stroke-width="0.4pt" transform="translate(0,127.22) matrix(1 0 0 -1 0 0) translate(63.61,0) translate(0,63.61) matrix(1.0 0.0 0.0 1.0 -59 -59)">
<svg:foreignObject height="118" overflow="visible" transform="matrix(1 0 0 -1 0 16.6)" width="118"><graphics candidates="../graphics/none.png" graphic="../graphics/none.png" options="height=85.35826pt,keepaspectratio=true" xml:id="S0.F1.pic2.g1"/></svg:foreignObject>
</svg:g>
</svg:svg>
</picture>
<toccaption><tag close=" ">1</tag>tikz nodes with includegraphics</toccaption>
<caption><tag close=": ">Figure 1</tag>tikz nodes with includegraphics</caption>
</figure>
<pagination role="newpage"/>
</document>
117 changes: 58 additions & 59 deletions t/tikz/unit_tests_by_silviu.xml

Large diffs are not rendered by default.

Loading