summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base/inputenc.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/base/inputenc.sty')
-rw-r--r--Master/texmf-dist/tex/latex/base/inputenc.sty40
1 files changed, 37 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/base/inputenc.sty b/Master/texmf-dist/tex/latex/base/inputenc.sty
index 002bca27963..07e9382d681 100644
--- a/Master/texmf-dist/tex/latex/base/inputenc.sty
+++ b/Master/texmf-dist/tex/latex/base/inputenc.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+%% Copyright 1993-2014
%% The LaTeX3 Project and any individual authors listed elsewhere
%% in this file.
%%
@@ -56,7 +56,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{inputenc}
- [2008/03/30 v1.1d Input encoding file]
+ [2014/04/30 v1.2b Input encoding file]
\def\DeclareInputMath#1{%
\@inpenc@test
\bgroup
@@ -82,10 +82,11 @@
\noexpand\IeC
\fi
}
+\ifx\Umathchar\@undefined
\def\inputencoding#1{%
\the\inpenc@prehook
\gdef\@inpenc@test{\global\let\@inpenc@test\relax}%
- \edef\@inpenc@undefined{\noexpand\@inpenc@undefined@{#1}}%
+ \edef\@inpenc@undefined{\noexpand\protect\noexpand\@inpenc@undefined@{#1}}%
\edef\inputencodingname{#1}%
\@inpenc@loop\^^A\^^H%
\@inpenc@loop\^^K\^^K%
@@ -95,9 +96,12 @@
\endlinechar\m@ne
\xdef\saved@space@catcode{\the\catcode`\ }%
\catcode`\ 9\relax
+ \xdef\saved@at@catcode{\the\catcode`\@}%
+ \makeatletter
\input{#1.def}%
\endlinechar\saved@endlinechar@code\relax
\catcode`\ \saved@space@catcode\relax
+ \catcode`\@\saved@at@catcode\relax
\ifx\@inpenc@test\relax\else
\PackageWarning{inputenc}%
{No characters defined\MessageBreak
@@ -105,6 +109,36 @@
\fi
\the\inpenc@posthook
}
+\else
+\def\inputencoding#1{%
+\edef\reserved@a{#1}%
+\def\reserved@b{utf8x}%
+\ifx\reserved@a\reserved@b\def\reserved@a{utf8}\fi
+\def\reserved@b{utf8}%
+\ifx\reserved@a\reserved@b
+\PackageWarningNoLine
+ {inputenc}%
+ {inputenc package ignored with utf8 based engines}%
+\else
+\def\reserved@b{x-ascii}%
+\ifx\reserved@a\reserved@b\def\reserved@a{ascii}\fi
+\def\reserved@b{ascii}%
+\ifx\reserved@a\reserved@b
+\PackageWarningNoLine
+ {inputenc}%
+ {inputenc can't be used to ensure 7bit clean source\MessageBreak
+ with a utf engine: Package ignored: utf8 assumed}%
+\else
+\PackageError
+ {inputenc}%
+ {inputenc is not designed for xetex or luatex.\MessageBreak
+ only UTF-8 supported}%
+ {For xelatex or lualatex save the document in UTF-8 encoding\MessageBreak
+ and do not use inputenc, or use the [utf8] option.}
+\fi
+\fi
+}
+\fi
\newtoks\inpenc@prehook
\newtoks\inpenc@posthook
\def\@inpenc@undefined@#1{\PackageError{inputenc}%