From 9f745038d5a6cdd670d76719b21c4d0e38bc5cf5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Feb 2010 23:13:39 +0000 Subject: preview update (21feb09) git-svn-id: svn://tug.org/texlive/trunk@17118 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/preview/prcounters.def | 4 +-- Master/texmf-dist/tex/latex/preview/preview.sty | 22 +++++++++---- .../texmf-dist/tex/latex/preview/prtightpage.def | 36 +++++++++++++++++++--- 3 files changed, 49 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/preview') diff --git a/Master/texmf-dist/tex/latex/preview/prcounters.def b/Master/texmf-dist/tex/latex/preview/prcounters.def index be1ecc00eee..f7b5726716d 100644 --- a/Master/texmf-dist/tex/latex/preview/prcounters.def +++ b/Master/texmf-dist/tex/latex/preview/prcounters.def @@ -31,8 +31,8 @@ \def\pr@ckpt#1{{\let\@elt\pr@eltprint\edef\next{\cl@@ckpt}% \ifx\next\@empty\else\typeout{Preview: Counters\next#1}% \let\@elt\pr@eltdef\cl@@ckpt\fi}} -\g@addto@macro\pr@ship@start{\pr@ckpt:} -\g@addto@macro\pr@ship@end{\pr@ckpt.} +\pr@addto@front\pr@ship@start{\pr@ckpt:} +\pr@addto@front\pr@ship@end{\pr@ckpt.} \endinput %% %% End of file `prcounters.def'. diff --git a/Master/texmf-dist/tex/latex/preview/preview.sty b/Master/texmf-dist/tex/latex/preview/preview.sty index 0969a17790f..30402981d45 100644 --- a/Master/texmf-dist/tex/latex/preview/preview.sty +++ b/Master/texmf-dist/tex/latex/preview/preview.sty @@ -26,12 +26,12 @@ \NeedsTeXFormat{LaTeX2e} \def\reserved@a #1#2$#3: #4${\xdef#1{\reserved@c #2#4 $}} \def\reserved@c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved@a\pr@version $Name: release_11_84 $ \ifx\pr@version\@empty -\reserved@a\pr@version CVS-$Revision: 1.122 $ \endgroup \else +\reserved@a\pr@version $Name: release_11_86 $ \ifx\pr@version\@empty +\reserved@a\pr@version CVS-$Revision: 1.126 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup \def\noexpand\pr@version{\expandafter\next\pr@version}}} \next \fi -\reserved@a\next $Date: 2006/08/25 10:34:36 $ +\reserved@a\next $Date: 2010/02/14 16:19:00 $ \edef\next{\noexpand\ProvidesPackage{preview}% [\next\space \pr@version\space (AUCTeX/preview-latex)]} \next @@ -77,6 +77,8 @@ store}bind def end}}}} \DeclareOption{pdftex}{% \let\pr@graphicstype\tw@} +\DeclareOption{xetex}{% + \let\pr@graphicstype\thr@@} \begingroup \catcode`\*=11 \@firstofone{\endgroup @@ -271,8 +273,10 @@ Please complain to your document class author}% }% \pr@ship@end {\let\protect\noexpand - \voffset=-\ht\pr@box - \hoffset=\z@ + \ifx\pr@offset@override\@undefined + \voffset=-\ht\pr@box + \hoffset=\z@ + \fi \c@page=\pr@snippet \pr@shipout \ifpr@fixbb\hbox{% @@ -366,7 +370,13 @@ Please complain to your document class author}% \let\output\pr@output \def\pr@typeinfos{\typeout{Preview: Fontsize \f@size pt}% \ifnum\mag=\@m\else\typeout{Preview: Magnification \number\mag}\fi - \ifx\pdfoutput\@undefined \else + \ifx\pdfoutput\@undefined + \ifx\XeTeXversion\@undefined \else + % FIXME: The message should not be emitted if XeTeX does not produce + % PDF. There does not seem to be a primitive for that, though. + \typeout{Preview: PDFoutput 1}% + \fi + \else \ifx\pdfoutput\relax \else \ifnum\pdfoutput>\z@ \typeout{Preview: PDFoutput 1}% diff --git a/Master/texmf-dist/tex/latex/preview/prtightpage.def b/Master/texmf-dist/tex/latex/preview/prtightpage.def index 0be40a462a5..31516bed926 100644 --- a/Master/texmf-dist/tex/latex/preview/prtightpage.def +++ b/Master/texmf-dist/tex/latex/preview/prtightpage.def @@ -37,11 +37,15 @@ \advance\count@\@ne\ifnum\count@<5 \afterassignment\pr@nextbb\dimen@=\fi} \ifnum\pr@graphicstype=\z@ - \ifcase \ifx\pdfoutput\@undefined \@ne\fi - \ifx\pdfoutput\relax \@ne\fi - \ifnum\pdfoutput>\z@ \tw@\fi \@ne \or - \ExecuteOptions{dvips}\relax \or - \ExecuteOptions{pdftex}\relax\fi\fi + \ifcase + \ifx\XeTeXversion\@undefined + \ifx\pdfoutput\@undefined \@ne\fi + \ifx\pdfoutput\relax \@ne\fi + \ifnum\pdfoutput>\z@ \tw@\fi \@ne + \else \thr@@\fi + \or \ExecuteOptions{dvips}\relax + \or \ExecuteOptions{pdftex}\relax + \or \ExecuteOptions{xetex}\relax\fi\fi \global\let\pr@bbadjust\@empty \pr@addto@front\pr@ship@end{\begingroup \let\next\@gobble @@ -81,6 +85,28 @@ \advance\dimen@\pr@bb@iii \global\pdfpagewidth\dimen@ \global\pdfhorigin-\pr@bb@i}} +\or + \g@addto@macro\pr@ship@end{\dimen@\ht\pr@box + \ifdim\dimen@<\z@ \dimen@\z@\fi + \advance\dimen@\pr@bb@iv + \dimen@ii=\dimen@ + \voffset=-1in + \advance\voffset\dimen@ + \advance\voffset-\ht\pr@box + \dimen@\dp\pr@box + \ifdim\dimen@<\z@ \dimen@\z@\fi + \advance\dimen@-\pr@bb@ii + \advance\dimen@\dimen@ii + \global\pdfpageheight\dimen@ + \global\paperheight\dimen@ + \dimen@\wd\pr@box + \ifdim\dimen@<\z@ \dimen@=\z@\fi + \advance\dimen@-\pr@bb@i + \advance\dimen@\pr@bb@iii + \global\pdfpagewidth\dimen@ + \hoffset=-1in + \advance\hoffset-\pr@bb@i + \let\pr@offset@override\@empty} \fi \ifnum\pr@graphicstype=\@ne \preview@delay{\AtBeginDvi{% -- cgit v1.2.3