csplain (27jun16)

git-svn-id: svn://tug.org/texlive/trunk@41552 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 35 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini
index 735c61100c2..1a6dcc3ca45 100644
--- a/Master/texmf-dist/tex/csplain/base/csplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/csplain.ini
@@ -262,6 +262,8 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
   Jun. 2016:
 * ff-mac + fontfiles: \ffdecl: first modifiers then basic selectors.
 * cs-baskerx, cs-heuristica, cs-kurier, cs-iwona, ki-math, pazo-math added
+* plaina4: \ifx\pdfhorigin added (bug when XeTeX is used fixed)
+* glyphtounicode-cs.tex added
 
 COPYRIGHT
 =========
diff --git a/Master/texmf-dist/tex/csplain/base/plaina4.tex b/Master/texmf-dist/tex/csplain/base/plaina4.tex
index 5a5db96dae4..6da3015827c 100644
--- a/Master/texmf-dist/tex/csplain/base/plaina4.tex
+++ b/Master/texmf-dist/tex/csplain/base/plaina4.tex
@@ -14,11 +14,12 @@
 \gdef\m@g{\mag\count@
   \hsize=159.2truemm \vsize=239.2truemm \dimen\footins8truein
   \ifx\pdfpagewidth\undefined\else     % added by P. O. Nov 2012
-     \recount@true\pdfpagewidth   % \recont@true added by P. O Apr. 2016
-     \recount@true\pdfpageheight  % because media size is distribution-dependent
-     \recount@true\pdfhorigin
-     \recount@true\pdfvorigin
-  \fi
+     \recount@true\pdfpagewidth     % \recont@true added by P. O. Apr. 2016
+     \recount@true\pdfpageheight    % because media size is distribution-dependent
+     \ifx\pdfhorigin\undefined\else % corrected by P. O. Jun. 2016
+        \recount@true\pdfhorigin
+        \recount@true\pdfvorigin
+  \fi\fi
 }
 \gdef\recount@true#1{#1=\expandafter\recount@trueA\the#1truept\relax}
 {\catcode`p=12 \gdef\recount@trueA#1p#2{#1}}
diff --git a/Master/texmf-dist/tex/csplain/base/xeplain.ini b/Master/texmf-dist/tex/csplain/base/xeplain.ini
index 181baeda470..28f7e666a07 100644
--- a/Master/texmf-dist/tex/csplain/base/xeplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/xeplain.ini
@@ -35,6 +35,7 @@
 
 %% Next base macros:
    \input plaina4  % \hsize and \vsize for A4
+   \pdfpagewidth=210mm \pdfpageheight=297mm
    \def\font#1 {}  % ignore \font\tenbi=csbxti10
    \input csfontsm % macros: \sizespec, \resizefont, \resizeall, \tenbi, \bi
    \let\font=\orifont
diff --git a/Master/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex b/Master/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex
new file mode 100644
index 00000000000..4581f30d943
--- /dev/null
+++ b/Master/texmf-dist/tex/csplain/fonts/glyphtounicode-cs.tex
@@ -0,0 +1,21 @@
+% glyphtounicode-cs.tex
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% P. Olsak, inspired by Pali Rohar
+
+% Use \input glyphtounicode-cs
+% in your pdfTeX document if you want to have working characters mentioned
+% below when copy-pasting from PDF output or when finding string in the PDF
+% output. This file is special only for csfonts in T1 (*.pfb) format. Other
+% fonts (like lmfonts, for example) need not to use it.
+
+% Note that this file works in pdfTeX only. Other glyph names listed in the
+% glyphtounicode.tex file need not to be declared because the contents of
+% this file is hardcoded in typical PDF viewers.
+
+\pdfgentounicode=1
+\pdfglyphtounicode{csquotedblright}{201C}
+\pdfglyphtounicode{althyphen}{002D}
+\pdfglyphtounicode{polishlcross}{0337}
+\pdfglyphtounicode{suppress}{0337}
+
+% end of file
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index fa60ecc3a8f..74883ed93cc 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
@@ -1613,9 +1613,10 @@
 \def\magscale[#1]{\mag=#1\def\trueunit{true}%
    \ifdim\pgwidth=0pt \else \truedimen\pgwidth \truedimen\pgheight \fi
    \ifx\pdfpagewidth\undefined \else 
-       \truedimen\pdfpagewidth \truedimen\pdfpageheight 
-       \pdfhorigin=1truein \pdfvorigin=1truein % Origin is independent off \mag 
-   \fi}
+      \truedimen\pdfpagewidth \truedimen\pdfpageheight 
+      \ifx\pdfhorigin\undefined\else       
+         \pdfhorigin=1truein \pdfvorigin=1truein % Origin is independent off \mag
+   \fi\fi}
 \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
@@ -1766,5 +1767,6 @@ May  2016  \replacestrings improved
            \bfshape: \everymath={\boldmath} instead \boldmath directly
            \tskip corrected
 Jun. 2016  \thefontsize: \fontdim=#1\ptunit added.
+           \pdfhvorigin unknown in XeTeX, bug fixed
 
 %%%%%%%%%%%%%% End of opmac.tex