From afe5b0f18d58c89b530ae4b699203c1cd2ab60c5 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Fri, 4 Jul 2008 13:51:53 +0000 Subject: mparhack v1.4 2005/04/17 git-svn-id: svn://tug.org/texlive/trunk@9227 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/mparhack/mparhack.dtx | 36 +++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex/mparhack') diff --git a/Master/texmf-dist/source/latex/mparhack/mparhack.dtx b/Master/texmf-dist/source/latex/mparhack/mparhack.dtx index 7c390633be1..11ea9965b9d 100644 --- a/Master/texmf-dist/source/latex/mparhack/mparhack.dtx +++ b/Master/texmf-dist/source/latex/mparhack/mparhack.dtx @@ -36,7 +36,7 @@ % \DoNotIndex{\newcount,\newif,\newlinechar,\newread,\newtoks,\newwrite} % \DoNotIndex{\dp,\wd,\ht,\vss,\unskip} % -% \CheckSum{405} +% \CheckSum{418} % % \MakeShortVerb\| % @@ -73,8 +73,8 @@ % % =================================================================== % @LaTeX-package-file{ -% version = "1.3a", -% date = "2003/05/22", +% version = "1.4", +% date = "2005/04/17", % filename = "mparhack.sty", % author-1 = "Tom Sgouros", % email-1 = "tomfool@top.gso.uri.edu", @@ -107,7 +107,7 @@ % \title{\PackageName} % \author{Tom Sgouros\\ {\small\texttt{tomfool@top.gso.uri.edu}} \and % Stefan Ulrich\\ {\small\href{mailto:stefanulrich@users.sourceforge.net}{\texttt{stefanulrich@users.sourceforge.net}}}} -% \date{v1.3a 2003/05/22\\[1ex] {\footnotesize CTAN: +% \date{v1.4 2005/04/17\\[1ex] {\footnotesize CTAN: % \href{http://www.ucc.ie/cgi-bin/ctan?server=ftp.dante.de%2Ftex-archive&term=mparhack} % {\texttt{macros/latex/contrib/supported/mparhack/}}}} % \maketitle @@ -123,7 +123,9 @@ % \changes{v1.2}{2000/02/29}{Small documentation changes} % \changes{1.2a}{2000/03/14}{Fixed the \Com{NeedsTeXFormat} to use 1997/04/14} % \changes{1.2c}{2001/02/07}{Small documentation changes} -% \changes{1.3}{2001/02/07}{Use \Com{mph@tempa} instead of \Com{@tempa} to avoid possible clashes with other classes (e.g. scrpage2)} +% \changes{1.3}{2001/02/07}{Use \Com{mph@tempa} instead of \Com{@tempa} to avoid +% possible clashes with other classes (e.g. scrpage2)} +% \changes{1.4}{2005/04/17}{Fix a bug with eso-pic.sty (latex/3775)} % % % {\parskip 0pt \tableofcontents } @@ -135,7 +137,7 @@ % A persistent problem with the |\marginpar| command is that the % marginalia produced often show up on the wrong margin. This has % been noted in the \LaTeX\ bugs database.^^A -% \footnote{See \url{http://www.Uni-Mainz.DE/cgi-bin/ltxbugs2html}: +% \footnote{See \url{http://www.latex-project.org/cgi-bin/ltxbugs2html}: % \href{http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex/2361}{latex/2361}, % \href{http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex/2484}{latex/2484}, % \href{http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex/2617}{latex/2617}.} @@ -333,7 +335,7 @@ %<*sty> \NeedsTeXFormat{LaTeX2e}[1997/04/14] \ProvidesPackage{mparhack} - [2003/05/22 v1.3a (T. Sgouros and S. Ulrich)] + [2005/04/17 v1.4 (T. Sgouros and S. Ulrich)] % \end{macrocode} % ^^A -------------------------------------------------- % \subsubsection{Booleans, Options, etc.} @@ -476,6 +478,20 @@ \protected@write\@auxout{}{% \string\providecommand\string\mph@setcol[2]{}% }% +% \end{macrocode} +% Fix for latex/3775\footnote{^^A +% \url{http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex/3775}^^A +% }: eso-pic uses \Com{@picture} inside the output routine, +% which causes problems with our redefinition of \Com{hb@xt@} in \Com{@outputdblcol}. +% So, as suggested by M. H\o gholm in his reply to the above bug report, we patch +% \Com{@picture} to revert to the original definition of \Com{hb@xt@}. +% \begin{macrocode} + \@ifpackageloaded{eso-pic}{% + \let\mph@orig@picture\@picture + \renewcommand\@picture{\let\hb@xt@\mph@orig@hb@xt@\mph@orig@picture}% + }{% + \relax + }% } % \end{macrocode} % Add the needed checks to |\@enddocumenthook|. Again, use @@ -811,6 +827,12 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\mph@orig@picture} +% \begin{macrocode} +\newcommand\mph@orig@picture{} +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} % % \end{macrocode} -- cgit v1.2.3