texlive[57640] Master/texmf-dist: cmap (6feb21)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 6 23:29:55 CET 2021
Revision: 57640
http://tug.org/svn/texlive?view=revision&revision=57640
Author: karl
Date: 2021-02-06 23:29:55 +0100 (Sat, 06 Feb 2021)
Log Message:
-----------
cmap (6feb21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/cmap/README
trunk/Master/texmf-dist/tex/latex/cmap/cmap.sty
Modified: trunk/Master/texmf-dist/doc/latex/cmap/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cmap/README 2021-02-06 22:29:38 UTC (rev 57639)
+++ trunk/Master/texmf-dist/doc/latex/cmap/README 2021-02-06 22:29:55 UTC (rev 57640)
@@ -92,3 +92,6 @@
change was inspired by discussion with Alexey Kuligin and Alexey Vikhlinin.
2021/01/29 version 1.0i:
suppress cmaps automatically generated by pdfTeX for all handled fonts
+2021/02/06 version 1.0j:
+ Don't fail if \pdfnobuiltintounicode primitive is missing
+ Add support for LuaTeX without luatex85
Modified: trunk/Master/texmf-dist/tex/latex/cmap/cmap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cmap/cmap.sty 2021-02-06 22:29:38 UTC (rev 57639)
+++ trunk/Master/texmf-dist/tex/latex/cmap/cmap.sty 2021-02-06 22:29:55 UTC (rev 57640)
@@ -11,7 +11,7 @@
% Werner Lemberg
% Oleg Katsitadze
-\ProvidesPackage{cmap}[2021/01/29 v1.0i CMap support: searchable PDF]
+\ProvidesPackage{cmap}[2021/02/06 v1.0j CMap support: searchable PDF]
\DeclareOption{resetfonts}{%
\@for\reserved at a:=%
@@ -26,12 +26,27 @@
\ProcessOptions
\@ifundefined{pdffontattr}{%
-% The cmap package can be used only with pdflatex,
+ \@ifundefined{pdfextension}{%
+% The cmap package can be used only with pdflatex and lualatex,
% but not with ordinary latex
- \PackageWarningNoLine{cmap}{pdftex not detected - exiting}%
- \endinput
-}\relax
-\ifnum\pdfoutput<1
+ \PackageWarningNoLine{cmap}{pdftex not detected - exiting}%
+ \endinput
+ }{%
+ \protected\def\cmap at pdfobj{\pdfextension obj }%
+ \protected\def\cmap at fontattr{\pdfextension fontattr }%
+ \def\cmap at lastobj{\number\pdffeedback lastobj \space 0 R}%
+ }%
+}{%
+ \let\cmap at pdfobj\pdfobj
+ \let\cmap at fontattr\pdffontattr
+ \def\cmap at lastobj{\number\pdflastobj\space 0 R}%
+}
+
+\@ifundefined{pdfoutput}{%
+ \ifnum\outputmode<1
+}{%
+ \ifnum\pdfoutput<1
+}%
\PackageWarningNoLine{cmap}{pdftex in DVI mode - exiting}
\expandafter\endinput
\fi
@@ -45,6 +60,17 @@
%\PackageWarningNoLine{cmap}{babel already loaded - some fonts may be unprocessed}%
%}\relax
+\@ifundefined{pdfnobuiltintounicode}{%
+ \@ifundefined{pdfgentounicode}\relax{%
+ \pdfgentounicode=0
+ }%
+ \protected\def\cmap at nobuiltintounicode{%
+ \expandafter\@gobble\the
+ }%
+}{%
+ \let\cmap at nobuiltintounicode\pdfnobuiltintounicode
+}
+
\def\extract at font{%
\get at external@font
\global\expandafter\font\font at name\external at font\relax
@@ -58,12 +84,12 @@
\edef\reserved at f{\lowercase{\def\noexpand\reserved at f{\cmap at f@encoding.cmap}}}%
\reserved at f
\IfFileExists{\reserved at f}{%
- \immediate\pdfobj stream
+ \immediate\cmap at pdfobj stream
%attr {/Type /CIDFile}
file {\reserved at f}%
\expandafter\xdef\csname cmap at set@\cmap at f@encoding\endcsname{%
- \pdfnobuiltintounicode\noexpand\font at name
- \noexpand\expandafter\pdffontattr\noexpand\font at name{/ToUnicode \the\pdflastobj\space 0 R}}%
+ \cmap at nobuiltintounicode\noexpand\font at name
+ \noexpand\expandafter\cmap at fontattr\noexpand\font at name{/ToUnicode \cmap at lastobj}}%
}{%
\global\expandafter\let\csname cmap at set@\cmap at f@encoding\endcsname\empty
}%
More information about the tex-live-commits
mailing list.