summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/cmap/README15
-rw-r--r--Master/texmf-dist/tex/latex/cmap/cmap.sty30
-rw-r--r--Master/texmf-dist/tex/latex/cmap/lgr.cmap290
-rw-r--r--Master/texmf-dist/tex/latex/cmap/ot6.cmap124
-rw-r--r--Master/texmf-dist/tex/latex/cmap/t1.cmap2
-rw-r--r--Master/texmf-dist/tex/latex/cmap/t2a.cmap2
-rw-r--r--Master/texmf-dist/tex/latex/cmap/t2b.cmap2
-rw-r--r--Master/texmf-dist/tex/latex/cmap/t2c.cmap2
-rwxr-xr-xMaster/tlpkg/bin/ctan2tds2
9 files changed, 447 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/cmap/README b/Master/texmf-dist/doc/latex/cmap/README
index 8b8c377b600..c5f6c21c348 100644
--- a/Master/texmf-dist/doc/latex/cmap/README
+++ b/Master/texmf-dist/doc/latex/cmap/README
@@ -9,7 +9,7 @@ for the font encoding.
Current version of the CMap package includes CMap files for the
following LaTeX font encodings: T1, T2A, T2B, T2C, T5, OT1, OT1tt,
-LAE, LFE.
+OT6, LGR, LAE, LFE.
Adding support for other font encoding does not require the change in
the cmap.sty package: just create the <encoding>.cmap file and make it
@@ -77,3 +77,16 @@ History:
Added package option "resetfonts" to undefine standard preloaded fonts.
2007/04/25 version 1.0g:
fixed a typo
+2008/03/06 version 1.0h:
+ added greek mapping (lgr.cmap), contributed by Werner Lemberg
+ added armenian mapping (ot6.cmap)
+ bugfix - running \usepackage[resetfonts]{cmap} in DVI mode was giving an error
+ because the endinput was run too early, and option was not declared - thanks
+ to Werner Lemberg
+ suppress `Missing character' warnings when testing for monowidth fonts (which may
+ not include W and/or i, e.g. some CJK fonts) - thanks to Werner Lemberg
+ {t1,t2a,t2b,t2c}.cmap: change mapping of <7F> from <002D> (hyphen-minus) to
+ <00AD> (soft hyphen) as, it appears, acrobat reader in this case
+ allows to search hyphenated words, ignoring the hyphenation character.
+ (this requires redefining the \defaulthyphenchar to 127). This
+ change was inspired by discussion with Alexey Kuligin and Alexey Vikhlinin.
diff --git a/Master/texmf-dist/tex/latex/cmap/cmap.sty b/Master/texmf-dist/tex/latex/cmap/cmap.sty
index 3dd539cdb27..87a0361d20b 100644
--- a/Master/texmf-dist/tex/latex/cmap/cmap.sty
+++ b/Master/texmf-dist/tex/latex/cmap/cmap.sty
@@ -1,4 +1,4 @@
-% Copyright (c) 2003-2007 Vladimir Volovich <vvv@vsu.ru>
+% Copyright (c) 2003-2008 Vladimir Volovich <vvv@vsu.ru>
% cmap package -- download CMap files into PDF
% to make "search" and "copy-and-paste" functions work properly
% You may distribute and/or modify this program under the terms of LPPL
@@ -11,18 +11,7 @@
% Werner Lemberg
% Oleg Katsitadze
-\ProvidesPackage{cmap}[2007/04/25 v1.0g CMap support: searchable PDF]
-
-\@ifundefined{pdffontattr}{%
-% The cmap package can be used only with pdflatex,
-% but not with ordinary latex
- \PackageWarningNoLine{cmap}{pdftex not detected - will not do anything}%
- \endinput
-}\relax
-\ifnum\pdfoutput<1
- \PackageWarningNoLine{cmap}{pdftex in DVI mode - will not do anything}
- \expandafter\endinput
-\fi
+\ProvidesPackage{cmap}[2008/03/06 v1.0h CMap support: searchable PDF]
\DeclareOption{resetfonts}{%
\@for\reserved@a:=%
@@ -36,6 +25,17 @@
}
\ProcessOptions
+\@ifundefined{pdffontattr}{%
+% The cmap package can be used only with pdflatex,
+% but not with ordinary latex
+ \PackageWarningNoLine{cmap}{pdftex not detected - exiting}%
+ \endinput
+}\relax
+\ifnum\pdfoutput<1
+ \PackageWarningNoLine{cmap}{pdftex in DVI mode - exiting}
+ \expandafter\endinput
+\fi
+
\edef\reserved@a{\noexpand\in@{,fontenc.sty,}{\@filelist}}% enc.def
\reserved@a
\ifin@
@@ -71,9 +71,7 @@
\ifdim\fontdimen3\font@name=\z@
\ifdim\fontdimen4\font@name=\z@
\begingroup
- \setbox0=\hbox{\font@name i}%
- \setbox1=\hbox{\font@name W}%
- \ifdim\wd0=\wd1 %
+ \ifdim\fontcharwd\font@name`\i=\fontcharwd\font@name`\w
\edef\reserved@f{\lowercase{\def\noexpand\reserved@f{\cmap@f@encoding tt.cmap}}}%
\reserved@f
\IfFileExists{\reserved@f}{\xdef\cmap@f@encoding{\cmap@f@encoding tt}}\relax
diff --git a/Master/texmf-dist/tex/latex/cmap/lgr.cmap b/Master/texmf-dist/tex/latex/cmap/lgr.cmap
new file mode 100644
index 00000000000..cfc988210d2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cmap/lgr.cmap
@@ -0,0 +1,290 @@
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-LGR-0)
+%%Title: (TeX-LGR-0 TeX LGR 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (LGR)
+/Supplement 0
+>> def
+/CMapName /TeX-LGR-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <FF>
+endcodespacerange
+64 beginbfchar
+<00> <2013>
+<01> <0020032F>
+<02> <D800DD44>
+<03> <D800DD45>
+<04> <D800DD46>
+<05> <D800DD47>
+<06> <03DB>
+<07> <03DB>
+<08> <1FBE>
+<09> <1FBC>
+<0A> <1FCC>
+<0B> <1FFC>
+<0C> <0391>
+<0D> <03AB>
+<0E> <03B1>
+<0F> <03CB>
+<10> <23E0>
+<11> <23E0>
+<12> <03DF>
+<13> <03D9>
+<14> <0020032E>
+<15> <03D8>
+<16> <03DA>
+<17> <03E0>
+<18> <20AC>
+<19> <2030>
+<1A> <0259>
+<1B> <03E1>
+<1C> <2018>
+<1D> <2019>
+<1E> <02D8>
+<1F> <00AF>
+<20> <1FC1>
+<21> <0021>
+<22> <00A8>
+<23> <0385>
+<24> <1FED>
+<25> <0025>
+<26> <00B7>
+<27> <0384>
+<28> <0028>
+<29> <0029>
+<2A> <002A>
+<2B> <002B>
+<2C> <002C>
+<2D> <002D>
+<2E> <002E>
+<2F> <002F>
+<30> <0030>
+<31> <0031>
+<32> <0032>
+<33> <0033>
+<34> <0034>
+<35> <0035>
+<36> <0036>
+<37> <0037>
+<38> <0038>
+<39> <0039>
+<3A> <003A>
+<3B> <0387>
+<3C> <1FFE>
+<3D> <003D>
+<3E> <1FBF>
+<3F> <003B>
+endbfchar
+63 beginbfchar
+<40> <1FDF>
+<41> <0391>
+<42> <0392>
+<43> <1FDD>
+<44> <0394>
+<45> <0395>
+<46> <03A6>
+<47> <0393>
+<48> <0397>
+<49> <0399>
+<4A> <0398>
+<4B> <039A>
+<4C> <039B>
+<4D> <039C>
+<4E> <039D>
+<4F> <039F>
+<50> <03A0>
+<51> <03A7>
+<52> <03A1>
+<53> <03A3>
+<54> <03A4>
+<55> <03A5>
+<56> <1FDE>
+<57> <03A9>
+<58> <039E>
+<59> <03A8>
+<5A> <0396>
+<5B> <005B>
+<5C> <1FCF>
+<5D> <005D>
+<5E> <1FCE>
+<5F> <1FCD>
+<60> <1FEF>
+<61> <03B1>
+<62> <03B2>
+<63> <03C2>
+<64> <03B4>
+<65> <03B5>
+<66> <03C6>
+<67> <03B3>
+<68> <03B7>
+<69> <03B9>
+<6A> <03B8>
+<6B> <03BA>
+<6C> <03BB>
+<6D> <03BC>
+<6E> <03BD>
+<6F> <03BF>
+<70> <03C0>
+<71> <03C7>
+<72> <03C1>
+<73> <03C3>
+<74> <03C4>
+<75> <03C5>
+% <76> /internalchar2
+<77> <03C9>
+<78> <03BE>
+<79> <03C8>
+<7A> <03B6>
+<7B> <00AB>
+<7C> <037A>
+<7D> <00BB>
+<7E> <1FC0>
+<7F> <2014>
+endbfchar
+62 beginbfchar
+<80> <1F70>
+<81> <1F01>
+<82> <1F00>
+<83> <1F03>
+<84> <1FB2>
+<85> <1F81>
+<86> <1F80>
+<87> <1F83>
+<88> <03AC>
+<89> <1F05>
+<8A> <1F04>
+<8B> <1F02>
+<8C> <1FB4>
+<8D> <1F85>
+<8E> <1F84>
+<8F> <1F82>
+<90> <1FB6>
+<91> <1F07>
+<92> <1F06>
+<93> <03DD>
+<94> <1FB7>
+<95> <1F87>
+<96> <1F86>
+<97> <0020035D>
+<98> <1F74>
+<99> <1F21>
+<9A> <1F20>
+% <9B> /.notdef
+<9C> <1FC2>
+<9D> <1F91>
+<9E> <1F90>
+% <9F> /internalchar1
+<A0> <03AE>
+<A1> <1F25>
+<A2> <1F24>
+<A3> <1F23>
+<A4> <1FC4>
+<A5> <1F95>
+<A6> <1F94>
+<A7> <1F93>
+<A8> <1FC6>
+<A9> <1F27>
+<AA> <1F26>
+<AB> <1F22>
+<AC> <1FC7>
+<AD> <1F97>
+<AE> <1F96>
+<AF> <1F92>
+<B0> <1F7C>
+<B1> <1F61>
+<B2> <1F60>
+<B3> <1F63>
+<B4> <1FF2>
+<B5> <1FA1>
+<B6> <1FA0>
+<B7> <1FA3>
+<B8> <03CE>
+<B9> <1F65>
+<BA> <1F64>
+<BB> <1F62>
+<BC> <1FF4>
+<BD> <1FA5>
+<BE> <1FA4>
+<BF> <1FA2>
+endbfchar
+62 beginbfchar
+<C0> <1FF6>
+<C1> <1F67>
+<C2> <1F66>
+<C3> <03DC>
+<C4> <1FF7>
+<C5> <1FA7>
+<C6> <1FA6>
+% <C7> /.notdef
+<C8> <1F76>
+<C9> <1F31>
+<CA> <1F30>
+<CB> <1F33>
+<CC> <1F7A>
+<CD> <1F51>
+<CE> <1F50>
+<CF> <1F53>
+<D0> <03AF>
+<D1> <1F35>
+<D2> <1F34>
+<D3> <1F32>
+<D4> <03CD>
+<D5> <1F55>
+<D6> <1F54>
+<D7> <1F52>
+<D8> <1FD6>
+<D9> <1F37>
+<DA> <1F36>
+<DB> <03AA>
+<DC> <1FE6>
+<DD> <1F57>
+<DE> <1F56>
+<DF> <03AB>
+<E0> <1F72>
+<E1> <1F11>
+<E2> <1F10>
+<E3> <1F13>
+<E4> <1F78>
+<E5> <1F41>
+<E6> <1F40>
+<E7> <1F43>
+<E8> <03AD>
+<E9> <1F15>
+<EA> <1F14>
+<EB> <1F12>
+<EC> <03CC>
+<ED> <1F45>
+<EE> <1F44>
+<EF> <1F42>
+<F0> <03CA>
+<F1> <1FD2>
+<F2> <0390>
+<F3> <1FD7>
+<F4> <03CB>
+<F5> <1FE2>
+<F6> <03B0>
+<F7> <1FE7>
+<F8> <1FB3>
+<F9> <1FC3>
+<FA> <1FF3>
+<FB> <1FE5>
+<FC> <1FE4>
+% <FD> /.notdef
+<FE> <0374>
+<FF> <0375>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
diff --git a/Master/texmf-dist/tex/latex/cmap/ot6.cmap b/Master/texmf-dist/tex/latex/cmap/ot6.cmap
new file mode 100644
index 00000000000..e7f856f559a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cmap/ot6.cmap
@@ -0,0 +1,124 @@
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT6-0)
+%%Title: (TeX-OT6-0 TeX OT6 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT6)
+/Supplement 0
+>> def
+/CMapName /TeX-OT6-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <FF>
+endcodespacerange
+6 beginbfrange
+<03> <05> <0541>
+<06> <09> <0537>
+<13> <15> <0571>
+<16> <19> <0567>
+<23> <26> <0023>
+<28> <39> <0028>
+endbfrange
+64 beginbfchar
+<0A> <0547>
+<0B> <0549>
+<0C> <054C>
+<0D> <053E>
+<0E> <0553>
+<0F> <0555>
+<1A> <0577>
+<1B> <0579>
+<1C> <057C>
+<1D> <056E>
+<1E> <0583>
+<1F> <0585>
+<20> <0587>
+<21> <055C>
+<22> <201D>
+<27> <055A>
+<3A> <0589>
+<3B> <003B>
+<3C> <00AB>
+<3D> <003D>
+<3E> <00BB>
+<3F> <055E>
+<40> <0040>
+<41> <0531>
+<42> <0532>
+<43> <0551>
+<44> <0534>
+<45> <0535>
+<46> <0556>
+<47> <0533>
+<48> <0540>
+<49> <053B>
+<4A> <054B>
+<4B> <053F>
+<4C> <053C>
+<4D> <0544>
+<4E> <0546>
+<4F> <0548>
+<50> <054A>
+<51> <0554>
+<52> <0550>
+<53> <054D>
+<54> <054F>
+<55> <05480552>
+<56> <054E>
+<57> <0552>
+<58> <053D>
+<59> <0545>
+<5A> <0536>
+<5B> <005B>
+<5C> <201C>
+<5D> <005D>
+<5E> <007B>
+<5F> <007D>
+<60> <055D>
+<61> <0561>
+<62> <0562>
+<63> <0581>
+<64> <0564>
+<65> <0565>
+<66> <0586>
+<67> <0563>
+<68> <0570>
+<69> <056B>
+endbfchar
+22 beginbfchar
+<6A> <057B>
+<6B> <056F>
+<6C> <056C>
+<6D> <0574>
+<6E> <0576>
+<6F> <0578>
+<70> <057A>
+<71> <0584>
+<72> <0580>
+<73> <057D>
+<74> <057F>
+<75> <05780582>
+<76> <057E>
+<77> <0582>
+<78> <056D>
+<79> <0575>
+<7A> <0566>
+<7B> <058A>
+<7C> <055B>
+<7D> <2014>
+<7E> <0021>
+<7F> <003F>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
diff --git a/Master/texmf-dist/tex/latex/cmap/t1.cmap b/Master/texmf-dist/tex/latex/cmap/t1.cmap
index 4367ea826d7..0db2154527e 100644
--- a/Master/texmf-dist/tex/latex/cmap/t1.cmap
+++ b/Master/texmf-dist/tex/latex/cmap/t1.cmap
@@ -58,7 +58,7 @@ endbfrange
<20> <2423>
<27> <2019>
<60> <2018>
-<7F> <002D>
+<7F> <00AD>
<80> <0102>
<81> <0104>
<82> <0106>
diff --git a/Master/texmf-dist/tex/latex/cmap/t2a.cmap b/Master/texmf-dist/tex/latex/cmap/t2a.cmap
index d21d7392e3b..aa15850d833 100644
--- a/Master/texmf-dist/tex/latex/cmap/t2a.cmap
+++ b/Master/texmf-dist/tex/latex/cmap/t2a.cmap
@@ -59,7 +59,7 @@ endbfrange
<20> <2423>
<27> <2019>
<60> <2018>
-<7F> <002D>
+<7F> <00AD>
endbfchar
64 beginbfchar
<80> <0490>
diff --git a/Master/texmf-dist/tex/latex/cmap/t2b.cmap b/Master/texmf-dist/tex/latex/cmap/t2b.cmap
index 0fe21732ced..7d477ad58fd 100644
--- a/Master/texmf-dist/tex/latex/cmap/t2b.cmap
+++ b/Master/texmf-dist/tex/latex/cmap/t2b.cmap
@@ -59,7 +59,7 @@ endbfrange
<20> <2423>
<27> <2019>
<60> <2018>
-<7F> <002D>
+<7F> <00AD>
endbfchar
48 beginbfchar
<81> <0492>
diff --git a/Master/texmf-dist/tex/latex/cmap/t2c.cmap b/Master/texmf-dist/tex/latex/cmap/t2c.cmap
index 3e888008739..b6a5b437c9e 100644
--- a/Master/texmf-dist/tex/latex/cmap/t2c.cmap
+++ b/Master/texmf-dist/tex/latex/cmap/t2c.cmap
@@ -59,7 +59,7 @@ endbfrange
<20> <2423>
<27> <2019>
<60> <2018>
-<7F> <002D>
+<7F> <00AD>
endbfchar
54 beginbfchar
<80> <04A6>
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index f3fd84eac5c..d1e8d379fb1 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -845,7 +845,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'chemstyle', '\.jdf|' . $standardtex,
'cirth', 'num\.tex',
'clock', '\.sty|clock\.tex',
- 'cmap', '\.sty',
+ 'cmap', '\.cmap|' . $standardtex,
'codepage', '\.sty|\.tex',
'contour', '\.cfg|\.sty|\.cnt',
'ctib', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|ctib\.tex',