From 0d32907b0e3676ad4a28c85ec95dbd6d3abdaf95 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Apr 2015 22:30:13 +0000 Subject: csplain (19apr15) git-svn-id: svn://tug.org/texlive/trunk@36949 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index a643ce92856..299c25fa728 100644 --- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex +++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex @@ -1594,7 +1594,7 @@ \def\setpagedimensB (#1,#2)#3 {\setpagedimensC\pgwidth=#1:#3 \setpagedimensC\pgheight=#2:#3 \ifx\pdfpagewidth\undefined \else \pdfpagewidth=\pgwidth \pdfpageheight=\pgheight \fi} -\def\setpagedimensC #1=#2:#3 {#1=#2\ifx^#3^\tmp\else#3\fi\relax} +\def\setpagedimensC #1=#2:#3 {#1=#2\ifx^#3^\tmp\else#3\fi\relax\truedimen#1} \sdef{pgs:a3}{(297,420)mm} \sdef{pgs:a4}{(210,297)mm} \sdef{pgs:a5}{(148,210)mm} \sdef{pgs:a3l}{(420,297)mm} \sdef{pgs:a4l}{(297,210)mm} \sdef{pgs:a5l}{(210,148)mm} @@ -1607,7 +1607,7 @@ \truedimen\pdfpagewidth \truedimen\pdfpageheight \pdfhorigin=1truein \pdfvorigin=1truein % Origin is independent off \mag \fi} -\def\truedimen#1{#1=\expandafter\ignorept\the#1truept } +\def\truedimen#1{\ifx\trueunit\empty \else#1=\expandafter\ignorept\the#1truept \fi} %%%%%%%%%%%%%% XeTeX specific + REF file is read now -- sec 3.26 in opmac-d.pdf @@ -1721,5 +1721,6 @@ Dec. 2014 Color features rewritten using \pdfcolorstack. \margins/\setpagedimens improved, \isnextchar: \bgroup\egroup added. Apr. 2015 \wtotoc, \Xtoc, \tocilabel, \pgilabel introduced. \outlinesC introduced + \setpagedimensC corrected: \truedimen %%%%%%%%%%%%%% End of opmac.tex -- cgit v1.2.3