summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-25 01:40:41 +0000
committerKarl Berry <karl@freefriends.org>2010-11-25 01:40:41 +0000
commit70be14e9ec1c5bc101114cdd33ea23c8ec080f84 (patch)
tree368c97daa4540d925086a9f313e6d2868551ea01 /Master
parent0c694ce62f7d2cc1495ce4bb55fe41861ef5bd2d (diff)
xunicode 96 (24nov10)
git-svn-id: svn://tug.org/texlive/trunk@20553 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/xelatex/xunicode/xunicode.sty23
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
2 files changed, 20 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xunicode/xunicode.sty b/Master/texmf-dist/tex/xelatex/xunicode/xunicode.sty
index 37703330247..5d442b6804a 100644
--- a/Master/texmf-dist/tex/xelatex/xunicode/xunicode.sty
+++ b/Master/texmf-dist/tex/xelatex/xunicode/xunicode.sty
@@ -1,7 +1,9 @@
% Copyright 2004-2010 Ross Moore <ross.moore@mq.edu.au>
-\ProvidesFile{xunicode.sty}[2010/05/18 v0.95 provides access to
+% Released under the LPPL licence, version 1.3c or later.
+\ProvidesFile{xunicode.sty}[2010/11/06 v0.96 provides access to
latin accents and many other characters in Unicode lower plane]
+%
% This package is designed to work with TeX engines that directly
% process UTF8 input and use Unicode and OpenType fonts.
% At the time of writing, XeTeX is the only known engine of this kind.
@@ -105,6 +107,9 @@
% completed blocks: x02B0-x02DF and x02E* \textdblig
% supports more macro names
%
+% v0.96 2010/11/06
+% added LPPL licence statement
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% This package should work with any encoding name.
@@ -821,13 +826,23 @@
\csname useTIPAfont\endcsname
\implementTIPAtextx
}
+\def\implementTIPAtextx#1{#1\egroup}
+\def\implementTIPAtextxx#1{\endlinechar=-1 \scantokens{#1}\egroup}
+\AtBeginDocument{\let\textipa\implementTIPAtext}
\expandafter\ifx\csname scantokens\endcsname\relax
- \def\implementTIPAtextx#1{#1\egroup}
\else
- \def\implementTIPAtextx#1{\scantokens{#1}\egroup}
+ \AtBeginDocument{\@ifpackageloaded{linguex}{%
+ \let\implementTIPAtextx\implementTIPAtextxx}}
\fi
-\AtBeginDocument{\let\textipa\implementTIPAtext}
+%\expandafter\ifx\csname scantokens\endcsname\relax
+% \def\implementTIPAtextx#1{#1\egroup}
+%\else
+%% \def\implementTIPAtextx#1{\scantokens{#1}\egroup}
+% \def\implementTIPAtextx#1{\endlinechar=-1 \scantokens{#1}\egroup}
+%\fi
+%
+%\AtBeginDocument{\let\textipa\implementTIPAtext}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 69298fb3aba..bc572326cd1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -342,6 +342,7 @@ $Master = "$mydir/../..";
'hfoldsty', "&MAKEflatten",
'highlight', "die 'skipping, complicated compilation'",
'hilowres', "die 'skipping, nonfree'",
+ 'html2latex', "die 'skipping, no self-locating of Perl modules'",
'hyph-utf8', "&MAKEcopy",
'hyphen-german',"die 'skipping, part of hyph-utf8'",
'ibycus-babel',"&MAKEibycusbabel",