diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/autonum/autonum.pdf | bin | 279676 -> 279967 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/autonum/test-autonum.pdf | bin | 90483 -> 101725 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/autonum/test-autonum.tex | 47 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/autonum/test-freeze.tex | 52 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/autonum/autonum.dtx | 15 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/autonum/autonum.sty | 5 |
6 files changed, 113 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/autonum/autonum.pdf b/Master/texmf-dist/doc/latex/autonum/autonum.pdf Binary files differindex ccdb3ce8b28..fb612176019 100644 --- a/Master/texmf-dist/doc/latex/autonum/autonum.pdf +++ b/Master/texmf-dist/doc/latex/autonum/autonum.pdf diff --git a/Master/texmf-dist/doc/latex/autonum/test-autonum.pdf b/Master/texmf-dist/doc/latex/autonum/test-autonum.pdf Binary files differindex de100cf4665..d60bab22107 100644 --- a/Master/texmf-dist/doc/latex/autonum/test-autonum.pdf +++ b/Master/texmf-dist/doc/latex/autonum/test-autonum.pdf diff --git a/Master/texmf-dist/doc/latex/autonum/test-autonum.tex b/Master/texmf-dist/doc/latex/autonum/test-autonum.tex index 2f2804e0272..adc9300fd55 100644 --- a/Master/texmf-dist/doc/latex/autonum/test-autonum.tex +++ b/Master/texmf-dist/doc/latex/autonum/test-autonum.tex @@ -1,5 +1,18 @@ \documentclass{article} +% Make this document look like endless paper to avoid page breaks, which make some of the tests useless. +% See http://tex.stackexchange.com/a/27057/7323 +\usepackage{geometry} +\geometry{paperwidth=20cm,paperheight=\maxdimen,margin=4cm} +\usepackage{etoolbox} +\AtBeginDocument{ + \setbox0=\vbox\bgroup + \preto\enddocument{\egroup + \dimen0=\dp0 + \pdfpageheight=\dimexpr\ht0+10cm\relax + \unvbox0\kern-\dimen0 } +} + % \usepackage[english,ngerman]{babel} % \usepackage[utf8]{inputenx} % \usepackage[utf8x]{inputenx} @@ -47,6 +60,7 @@ \begin{itemize} \item Additionally, test that deactivating the package does not result in compile errors during the next run if only basic features are used. \item Additionally, test that everything works with and without the above inputenx package (after deactivating the very strange label below). + \item Additionally, test test-freeze.tex. \item Having a referenced equation with reference before \ref{referenceBefore} \begin{equation}\label{referenceBefore} d - d = 0 @@ -212,6 +226,39 @@ % c\label{gatheredThree} % \end{gathered} % \end{equation} +% \item Placing no number in long equations +% \begin{equation} +% \sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum\sum a +% \end{equation} + \item Split with a long line and a \texttt{\textbackslash notag} after ending split has too much spacing afterwards, if the split environment is not patched: + \begin{equation} + \begin{split} + \sum_1^2 a &= 2a\\ + &= \sum_3^4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + \end{split}\notag + \end{equation} + \item Split with a long line and a \texttt{\textbackslash notag} before ending split has correct spacing afterwards: + \begin{equation} + \begin{split} + \sum_1^2 a &= 2a\\ + &= \sum_3^4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\notag + \end{split} + \end{equation} + \item Split with a long line should have correct spacing afterwards automatically: + \begin{equation} + \begin{split} + \sum_1^2 a &= 2a\\ + &= \sum_3^4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + \end{split} + \end{equation} + \item Split with a long line should have long spacing afterwards if it is referenced \ref{splitLong}: + \begin{equation}\label{splitLong} + \begin{split} + \sum_1^2 a &= 2a\\ + &= \sum_3^4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + \end{split} + \end{equation} + Note, that the \texttt{\textbackslash label} must not be put inside the \texttt{split} environment, as according to the \AmS-math documentation \texttt{split} provides no numbering. \end{itemize} \section{Using ref in section \ref{i1}}\label{i1} text \ifcleveref{ diff --git a/Master/texmf-dist/doc/latex/autonum/test-freeze.tex b/Master/texmf-dist/doc/latex/autonum/test-freeze.tex new file mode 100644 index 00000000000..0e0955b06a7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/autonum/test-freeze.tex @@ -0,0 +1,52 @@ +\documentclass[12pt]{book} + +\usepackage{caption} +\usepackage{autonum} + +\begin{document} + + \makeatletter + \autonum@patchParametrizedFullEnvironment{figure}% +% \autonum@patchFullEnvironment{figure}% + \makeatother + +\ref{eq1}, \ref{fig1}, \ref{eq2}, \ref{fig2}, \ref{sec:xyz} + +\begin{figure}[ht] +\begin{align}\label{eq1} +x=y +\end{align} +\caption{Caption} +\label{fig1} +\end{figure} + +\subsection{Title} +\label{sec:xyz} + +\begin{figure}[ht] +\begin{align}\label{eq2} +y=z +\end{align} +\caption{Caption} +\label{fig2} +\end{figure} + + +\end{document} + + +% \documentclass{article} +% \usepackage{caption} +% \usepackage{autonum} +% +% \begin{document} +% \begin{figure} +% \begin{align} +% a +% \end{align} +% \end{figure} +% \begin{figure} +% b +% \label{fig2} +% \end{figure} +% \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/source/latex/autonum/autonum.dtx b/Master/texmf-dist/source/latex/autonum/autonum.dtx index 5df4b5f7ae8..9e09f6475c4 100644 --- a/Master/texmf-dist/source/latex/autonum/autonum.dtx +++ b/Master/texmf-dist/source/latex/autonum/autonum.dtx @@ -85,7 +85,7 @@ and the derived files autonum.ins, %</internal> %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{autonum}[2013/11/10 v0.3.7 autonum LaTeX package] +\ProvidesPackage{autonum}[2014/04/14 v0.3.8 autonum LaTeX package] \PassOptionsToPackage{hypertexnames=false}{hyperref} \RequirePackage{etoolbox} \RequirePackage{amsmath} @@ -133,8 +133,9 @@ and the derived files autonum.ins, %\changes{v0.3.3}{2013/04/20}{Fix using cleveref inside section.} %\changes{v0.3.4}{2013/04/28}{Gracefully handle deactivating the package.} %\changes{v0.3.5}{2013/06/15}{Support reference commands with optional arguments or stars.} -%\changes{v0.3.6}{2013/10/13}{Fix special characters regression. Fix deactivating the package with TOC and LOF} -%\changes{v0.3.7}{2013/11/10}{Suport label commands with an optional argument} +%\changes{v0.3.6}{2013/10/13}{Fix special characters regression. Fix deactivating the package with TOC and LOF.} +%\changes{v0.3.7}{2013/11/10}{Suport label commands with an optional argument.} +%\changes{v0.3.8}{2014/04/14}{Correct vertical whitespace after long lines with split.} % % \section{Introduction} % With \LaTeX, the user has to decide manually to not number an equation by adding a star in the math environment. Authors who do not want to think about the numbering during the writing (and maybe they should not), often use the environments without stars. As default, these users get all equations numbered, although there are \href{http://tex.stackexchange.com/q/29267/7323}{different opinions} about what should be numbered. @@ -334,6 +335,10 @@ and the derived files autonum.ins, % \begin{itemize} % \item sent an MWE showing a regression in the support of special characters what lead to its fix % \end{itemize} +% \item Vladimir Pozdyayev +% \begin{itemize} +% \item found an error if an equation is used inside of a figure environment, which has not been fixed, yet +% \end{itemize} % \end{itemize} % % @@ -481,8 +486,10 @@ and the derived files autonum.ins, % If align is redefined before flalign or alignat, autonum.dtx does not build anymore. The error reason is unknown. As the error disappears when align is redefined after both, there is no motivation in finding the underlying problem. % \begin{macrocode} \newlength{\autonum@environmentWidth}% +% \forcsvlist{\autonum@patchParametrizedFullEnvironment}{alignat,figure}% \forcsvlist{\autonum@patchParametrizedFullEnvironment}{alignat}% \forcsvlist{\autonum@patchFullEnvironment}{equation,gather,multline,flalign,align}% + \autonum@patchBlockEnvironment{split}% % \end{macrocode} % % Patch the environment delimited by \cmd{\[} and \cmd{\]}. @@ -517,7 +524,7 @@ and the derived files autonum.ins, \autonum@patchEnvironmentHelper{#1}{1}% } \def\autonum@patchBlockEnvironment#1{% - \autonum@saveEnvironmentSubcommands{#1}{equation*}{}% + \autonum@saveEnvironmentSubcommands{#1}{equation}{}% \autonum@patchEnvironmentHelper{#1}{0}% } \def\autonum@patchEnvironmentHelper#1#2{% diff --git a/Master/texmf-dist/tex/latex/autonum/autonum.sty b/Master/texmf-dist/tex/latex/autonum/autonum.sty index 826fde6ab44..348314e193c 100644 --- a/Master/texmf-dist/tex/latex/autonum/autonum.sty +++ b/Master/texmf-dist/tex/latex/autonum/autonum.sty @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{autonum}[2013/11/10 v0.3.7 autonum LaTeX package] +\ProvidesPackage{autonum}[2014/04/14 v0.3.8 autonum LaTeX package] \PassOptionsToPackage{hypertexnames=false}{hyperref} \RequirePackage{etoolbox} \RequirePackage{amsmath} @@ -75,6 +75,7 @@ \newlength{\autonum@environmentWidth}% \forcsvlist{\autonum@patchParametrizedFullEnvironment}{alignat}% \forcsvlist{\autonum@patchFullEnvironment}{equation,gather,multline,flalign,align}% +\autonum@patchBlockEnvironment{split}% \def\[#1\]{% \begin{equation}#1\end{equation}% }% @@ -93,7 +94,7 @@ \autonum@patchEnvironmentHelper{#1}{1}% } \def\autonum@patchBlockEnvironment#1{% -\autonum@saveEnvironmentSubcommands{#1}{equation*}{}% +\autonum@saveEnvironmentSubcommands{#1}{equation}{}% \autonum@patchEnvironmentHelper{#1}{0}% } \def\autonum@patchEnvironmentHelper#1#2{% |