sync, missed commit

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

1 files changed, 1059 insertions, 1260 deletions

diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index d04e2ddd3b3..ddda670ef36 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-03-06.18}
+\def\texinfoversion{2016-02-05.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -310,7 +310,7 @@
 % Margin to add to right of even pages, to left of odd pages.
 \newdimen\bindingoffset
 \newdimen\normaloffset
-\newdimen\txipagewidth \newdimen\txipageheight
+\newdimen\pagewidth \newdimen\pageheight
 
 % Main output routine.
 %
@@ -334,7 +334,7 @@
   % Common context changes for both heading and footing.
   % Do this outside of the \shipout so @code etc. will be expanded in
   % the headline as they should be, not taken literally (outputting ''code).
-  \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars}
+  \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars}
   %
   % Retrieve the information for the headings from the marks in the page,
   % and call Plain TeX's \makeheadline and \makefootline, which use the
@@ -433,7 +433,7 @@
 \newinsert\margin \dimen\margin=\maxdimen
 
 % Main part of page, including any footnotes
-\def\pagebody#1{\vbox to\txipageheight{\boxmaxdepth=\maxdepth #1}}
+\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
 {\catcode`\@ =11
 \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
 % marginal hacks, juha@viisa.uucp (Juha Takala)
@@ -724,11 +724,11 @@
   % \dimen0 is the vertical size of the group's box.
   \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
   % \dimen2 is how much space is left on the page (more or less).
-  \dimen2 = \txipageheight   \advance\dimen2 by -\pagetotal
+  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
   % if the group doesn't fit on the current page, and it's a big big
   % group, force a page break.
   \ifdim \dimen0 > \dimen2
-    \ifdim \pagetotal < \vfilllimit\txipageheight
+    \ifdim \pagetotal < \vfilllimit\pageheight
       \page
     \fi
   \fi
@@ -1100,64 +1100,6 @@ where each line of input produces a line of output.}
 \newif\ifpdf
 \newif\ifpdfmakepagedest
 
-%
-% For LuaTeX
-%
-
-\ifx\luatexversion\thisisundefined
-\else
-  % Escape PDF strings UTF-8 to UTF-16
-  \begingroup
-    \catcode`\%=12
-    \directlua{
-      function UTF16oct(str)
-        tex.sprint(string.char(0x5c) .. '376' .. string.char(0x5c) .. '377')
-        for c in string.utfvalues(str) do
-          if c < 0x10000 then
-            tex.sprint(
-              string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
-                            string.char(0x5c) .. string.char(0x25) .. '03o',
-                            (c / 256), (c % 256)))
-          else
-            c = c - 0x10000
-            local c_hi = c / 1024 + 0xd800
-            local c_lo = c % 1024 + 0xdc00
-            tex.sprint(
-              string.format(string.char(0x5c) .. string.char(0x25) .. '03o' ..
-                            string.char(0x5c) .. string.char(0x25) .. '03o' ..
-                            string.char(0x5c) .. string.char(0x25) .. '03o' ..
-                            string.char(0x5c) .. string.char(0x25) .. '03o',
-                            (c_hi / 256), (c_hi % 256),
-                            (c_lo / 256), (c_lo % 256)))
-          end
-        end
-      end
-    }
-  \endgroup
-  \def\pdfescapestring#1{\directlua{UTF16oct('\luaescapestring{#1}')}}
-  \ifnum\luatexversion>84
-    % For LuaTeX >= 0.85
-    \def\pdfdest{\pdfextension dest}
-    \let\pdfoutput\outputmode
-    \def\pdfliteral{\pdfextension literal}
-    \def\pdfcatalog{\pdfextension catalog}
-    \def\pdftexversion{\numexpr\pdffeedback version\relax}
-    \let\pdfximage\saveimageresource
-    \let\pdfrefximage\useimageresource
-    \let\pdflastximage\lastsavedimageresourceindex
-    \def\pdfendlink{\pdfextension endlink\relax}
-    \def\pdfoutline{\pdfextension outline}
-    \def\pdfstartlink{\pdfextension startlink}
-    \def\pdffontattr{\pdfextension fontattr}
-    \def\pdfobj{\pdfextension obj}
-    \def\pdflastobj{\numexpr\pdffeedback lastobj\relax}
-    \let\pdfpagewidth\pagewidth
-    \let\pdfpageheight\pageheight
-    \edef\pdfhorigin{\pdfvariable horigin}
-    \edef\pdfvorigin{\pdfvariable vorigin}
-  \fi
-\fi
-
 % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
 % can be set).  So we test for \relax and 0 as well as being undefined.
 \ifx\pdfoutput\thisisundefined
@@ -1341,23 +1283,18 @@ output) for that.)}
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
     % seem worth the trouble, since most documents are normally structured.
-    {
-      \ifx\luatexversion\thisisundefined \else
-        \turnoffactive % LuaTeX can use Unicode strings for PDF
-      \fi
-      \edef\pdfoutlinedest{#3}%
-      \ifx\pdfoutlinedest\empty
-        \def\pdfoutlinedest{#4}%
-      \else
-        \txiescapepdf\pdfoutlinedest
-      \fi
-      %
-      % Also escape PDF chars in the display string.
-      \edef\pdfoutlinetext{#1}%
-      \txiescapepdf\pdfoutlinetext
-      %
-      \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
-    }
+    \edef\pdfoutlinedest{#3}%
+    \ifx\pdfoutlinedest\empty
+      \def\pdfoutlinedest{#4}%
+    \else
+      \txiescapepdf\pdfoutlinedest
+    \fi
+    %
+    % Also escape PDF chars in the display string.
+    \edef\pdfoutlinetext{#1}%
+    \txiescapepdf\pdfoutlinetext
+    %
+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
@@ -1513,92 +1450,6 @@ output) for that.)}
 \fi  % \ifx\pdfoutput
 
 %
-% PDF outline support for XeTeX
-%
-\ifx\XeTeXrevision\thisisundefined
-\else
-  \pdfmakepagedesttrue \relax
-  % Emulate the primitive of pdfTeX
-  \def\pdfdest name#1 xyz{%
-    \special{pdf:dest (name#1) [@thispage /XYZ @xpos @ypos]}%
-  }
-  \def\pdfmkdest#1{{%
-    % We have to set dummies so commands such as @code, and characters
-    % such as \, aren't expanded when present in a section title.
-    \indexnofonts  % For avoiding UTF-16 convert issue of xdvipdfmx 20150315.
-    \makevalueexpandable
-    % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
-    % Therefore \txiescapepdf is not necessary.
-    \safewhatsit{\pdfdest name{#1} xyz}%
-  }}
-  %
-  \def\dopdfoutline#1#2#3#4{%
-    \edef\pdfoutlinedest{#3}%
-    \ifx\pdfoutlinedest\empty
-      \def\pdfoutlinedest{#4}%
-    \fi
-    {
-      \turnoffactive
-      % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
-      % Therefore \txiescapepdf is not necessary.
-      \special{pdf:out [-] #2 << /Title (#1) /A << /S /GoTo /D (name\pdfoutlinedest) >> >> }%
-    }
-  }
-  %
-  \def\pdfmakeoutlines{%
-    \begingroup
-      %
-      % In the case of XeTeX, counts of subentries is not necesary.
-      % Therefore, read toc only once.
-      %
-      % We use the node names as the destinations.
-      \def\partentry##1##2##3##4{}% ignore parts in the outlines
-      \def\numchapentry##1##2##3##4{%
-        \dopdfoutline{##1}{1}{##3}{##4}}%
-      \def\numsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{2}{##3}{##4}}%
-      \def\numsubsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{3}{##3}{##4}}%
-      \def\numsubsubsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{4}{##3}{##4}}%
-      %
-      \let\appentry\numchapentry%
-      \let\appsecentry\numsecentry%
-      \let\appsubsecentry\numsubsecentry%
-      \let\appsubsubsecentry\numsubsubsecentry%
-      \let\unnchapentry\numchapentry%
-      \let\unnsecentry\numsecentry%
-      \let\unnsubsecentry\numsubsecentry%
-      \let\unnsubsubsecentry\numsubsubsecentry%
-      %
-      % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
-      % Therefore, the encoding and the language may not be considered.
-      %
-      \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315.
-      \setupdatafile
-      % We can have normal brace characters in the PDF outlines, unlike
-      % Texinfo index files.  So set that up.
-      \def\{{\lbracecharliteral}%
-      \def\}{\rbracecharliteral}%
-      \catcode`\\=\active \otherbackslash
-      \input \tocreadfilename
-    \endgroup
-  }
-  {\catcode`[=1 \catcode`]=2
-   \catcode`{=\other \catcode`}=\other
-   \gdef\lbracecharliteral[{]%
-   \gdef\rbracecharliteral[}]%
-  ]
-
-  \special{pdf:docview << /PageMode /UseOutlines >> }
-  % ``\special{pdf:tounicode ...}'' is not necessary
-  % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it.
-  % However, due to UTF-16 convert issue of xdvipdfmx 20150315,
-  % ``\special{pdf:dest ...}'' can not handle non-ASCII strings.
-  % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
-\fi
-
-%
 % @image support for XeTeX
 %
 \newif\ifxeteximgpdf
@@ -3472,16 +3323,13 @@ end
 \newif\ifseenauthor
 \newif\iffinishedtitlepage
 
-% @setcontentsaftertitlepage used to do an implicit @contents or
-% @shortcontents after @end titlepage, but it is now obsolete.
-\def\setcontentsaftertitlepage{%
-  \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo
-              command; move your @contents command if you want the contents
-              after the title page.}}%
-\def\setshortcontentsaftertitlepage{%
-  \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo
-              command; move your @shortcontents and @contents commands if you 
-              want the contents after the title page.}}%
+% Do an implicit @contents or @shortcontents after @end titlepage if the
+% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
+%
+\newif\ifsetcontentsaftertitlepage
+ \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
+\newif\ifsetshortcontentsaftertitlepage
+ \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
 \parseargdef\shorttitlepage{%
   \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
@@ -3523,6 +3371,20 @@ end
   % Need this before the \...aftertitlepage checks so that if they are
   % in effect the toc pages will come out with page numbers.
   \HEADINGSon
+  %
+  % If they want short, they certainly want long too.
+  \ifsetshortcontentsaftertitlepage
+    \shortcontents
+    \contents
+    \global\let\shortcontents = \relax
+    \global\let\contents = \relax
+  \fi
+  %
+  \ifsetcontentsaftertitlepage
+    \contents
+    \global\let\contents = \relax
+    \global\let\shortcontents = \relax
+  \fi
 }
 
 \def\finishtitlepage{%
@@ -3626,7 +3488,7 @@ end
   %
   % Leave some space for the footline.  Hopefully ok to assume
   % @evenfooting will not be used by itself.
-  \global\advance\txipageheight by -12pt
+  \global\advance\pageheight by -12pt
   \global\advance\vsize by -12pt
 }
 
@@ -3651,9 +3513,9 @@ end
 \def\oddheadingmarks{\headingmarks{odd}{heading}}
 \def\evenfootingmarks{\headingmarks{even}{footing}}
 \def\oddfootingmarks{\headingmarks{odd}{footing}}
-\parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1}
+\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
                           \headingmarks{odd}{heading}{#1} }
-\parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1}
+\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
                           \headingmarks{odd}{footing}{#1} }
 % #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
 \def\headingmarks#1#2#3 {%
@@ -3674,7 +3536,7 @@ end
 % By default, they are off at the start of a document,
 % and turned `on' after @end titlepage.
 
-\parseargdef\headings{\csname HEADINGS#1\endcsname}
+\def\headings #1 {\csname HEADINGS#1\endcsname}
 
 \def\headingsoff{% non-global headings elimination
   \evenheadline={\hfil}\evenfootline={\hfil}%
@@ -5698,7 +5560,7 @@ end
   \wd0=\hsize \wd2=\hsize
   \vbox{%
     \vskip\doublecolumntopgap
-    \hbox to\txipagewidth{\box0\hfil\box2}}%
+    \hbox to\pagewidth{\box0\hfil\box2}}%
 }
 
 
@@ -5725,7 +5587,7 @@ end
   % goal.  When TeX sees \eject from below which follows the final
   % section, it invokes the new output routine that we've set after
   % \balancecolumns below; \onepageout will try to fit the two columns
-  % and the final section into the vbox of \txipageheight (see
+  % and the final section into the vbox of \pageheight (see
   % \pagebody), causing an overfull box.
   %
   % Note that glue won't work here, because glue does not exercise the
@@ -6209,7 +6071,7 @@ end
   \fi
 }
 
-\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
+\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
 
 \def\CHAPPAGoff{%
 \global\let\contentsalignmacro = \chappager
@@ -6355,6 +6217,30 @@ end
 }
 
 
+% I don't think this chapter style is supported any more, so I'm not
+% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
+%
+\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
+%
+\def\unnchfopen #1{%
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings #1\par}%
+  \nobreak\bigskip\nobreak
+}
+\def\chfopen #1#2{\chapoddpage {\chapfonts
+\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
+\par\penalty 5000 %
+}
+\def\centerchfopen #1{%
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
+  \nobreak\bigskip \nobreak
+}
+\def\CHAPFopen{%
+  \global\let\chapmacro=\chfopen
+  \global\let\centerchapmacro=\centerchfopen}
+
+
 % Section titles.  These macros combine the section number parts and
 % call the generic \sectionheading to do the printing.
 %
@@ -7799,7 +7685,7 @@ end
 % Argument is macro body with arguments substituted
 \def\scanmacro#1{%
   \newlinechar`\^^M
-  \def\xeatspaces{\eatspaces}%
+  \def\xprocessmacroarg{\eatspaces}%
   %
   % Process the macro body under the current catcode regime.
   \scantokens{#1\texinfoc}\aftermacro%
@@ -7895,7 +7781,7 @@ end
   \catcode`\_=\other
   \catcode`\|=\other
   \catcode`\~=\other
-  \passthroughcharstrue
+  \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
 \def\scanargctxt{% used for copying and captions, not macros.
@@ -8029,7 +7915,7 @@ end
   \paramno=0\def\paramlist{}%
   \let\hash\relax
   % \hash is redefined to `#' later to get it into definitions
-  \let\xeatspaces\relax
+  \let\processmacroarg\relax
   \parsemargdefxxx#1,;,%
   \ifnum\paramno<10\relax\else
     \paramno0\relax
@@ -8041,7 +7927,7 @@ end
   \else \let\next=\parsemargdefxxx
     \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-        {\xeatspaces{\hash\the\paramno}}%
+        {\processmacroarg{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
 
@@ -8267,9 +8153,16 @@ end
 %%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%%
 
 
+
+% Remove following spaces at the expansion stage.
+% This works because spaces are discarded before each argument when TeX is 
+% getting the arguments for a macro.
+% This must not be immediately followed by a }.
+\long\def\gobblespaces#1{#1}
+
 % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
 %    \macrobody has the body of the macro in it, with placeholders for
-% its parameters, looking like "\xeatspaces{\hash 1}".
+% its parameters, looking like "\processmacroarg{\hash 1}".
 %    \paramno is the number of parameters
 %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
 % There are eight cases: recursive and nonrecursive macros of zero, one,
@@ -8280,13 +8173,14 @@ end
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifnum\paramno=1
-    \def\xeatspaces##1{##1}%
+    \def\processmacroarg{\gobblespaces}%
     % This removes the pair of braces around the argument.  We don't
     % use \eatspaces, because this can cause ends of lines to be lost
     % when the argument to \eatspaces is read, leading to line-based
     % commands like "@itemize" not being read correctly.
   \else
-    \let\xeatspaces\relax % suppress expansion
+    \def\processmacroarg{\xprocessmacroarg}%
+    \let\xprocessmacroarg\relax
   \fi
   \ifrecursive   %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     \ifcase\paramno
@@ -8299,9 +8193,12 @@ end
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
       \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-        \egroup
-        \noexpand\scanmacro{\macrobody}%
-        }%
+         \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
+           \noexpand\gobblespaces##1\empty}%
+           % The \empty is for \gobblespaces in case #1 is empty
+         }%
+      \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
+         \egroup\noexpand\scanmacro{\macrobody}}%
     \else
       \ifnum\paramno<10\relax % at most 9
         % See non-recursive section below for comments
@@ -8340,6 +8237,11 @@ end
          \noexpand\braceorline
          \expandafter\noexpand\csname\the\macname @@@\endcsname}%
       \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
+         \expandafter\noexpand\csname\the\macname @@@@\endcsname{%
+           \noexpand\gobblespaces##1\empty}%
+           % The \empty is for \gobblespaces in case #1 is empty
+         }%
+      \expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
         \egroup
         \noexpand\scanmacro{\macrobody}%
         }%
@@ -8993,6 +8895,9 @@ end
   % now.  --karl, 15jan04.
   \catcode`\\=\other
   %
+  % Make the characters 128-255 be printing characters.
+  {\setnonasciicharscatcodenonglobal\other}%
+  %
   % @ is our escape character in .aux files, and we need braces.
   \catcode`\{=1
   \catcode`\}=2
@@ -9056,7 +8961,7 @@ end
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
-  \hsize=\txipagewidth
+  \hsize=\pagewidth
   \interlinepenalty\interfootnotelinepenalty
   \splittopskip\ht\strutbox % top baseline for broken footnotes
   \splitmaxdepth\dp\strutbox
@@ -9596,68 +9501,43 @@ directory should work if nowhere else does.}
   \global\righthyphenmin = #3\relax
 }
 
-% XeTeX and LuaTeX can handle native Unicode.
-% Their default I/O is UTF-8 sequence instead of byte-wise.
-% Other TeX engine (pdfTeX etc.) I/O is byte-wise.
-%
-\newif\iftxinativeunicodecapable
-\newif\iftxiusebytewiseio
-
+% Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, 
+% otherwise the encoding support is completely broken.
 \ifx\XeTeXrevision\thisisundefined
-  \ifx\luatexversion\thisisundefined
-    \txinativeunicodecapablefalse
-    \txiusebytewiseiotrue
-  \else
-    \txinativeunicodecapabletrue
-    \txiusebytewiseiofalse
-  \fi
 \else
-  \txinativeunicodecapabletrue
-  \txiusebytewiseiofalse
+\XeTeXdefaultencoding "bytes"  % For subsequent files to be read
+\XeTeXinputencoding "bytes"  % Effective in texinfo.tex only
+% Unfortunately, there seems to be no corresponding XeTeX command for
+% output encoding.  This is a problem for auxiliary index and TOC files.
+% The only solution would be perhaps to write out @U{...} sequences in
+% place of UTF-8 characters.
 \fi
 
-% Set I/O by bytes instead of UTF-8 sequence for XeTeX and LuaTex
-% for non-UTF-8 (byte-wise) encodings.
-%
-\def\setbytewiseio{%
-  \ifx\XeTeXrevision\thisisundefined
-  \else
-    \XeTeXdefaultencoding "bytes"  % For subsequent files to be read
-    \XeTeXinputencoding "bytes"  % For document root file
-    % Unfortunately, there seems to be no corresponding XeTeX command for
-    % output encoding.  This is a problem for auxiliary index and TOC files.
-    % The only solution would be perhaps to write out @U{...} sequences in
-    % place of non-ASCII characters.
-  \fi
+\ifx\luatexversion\thisisundefined
+\else
+\directlua{
+local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
+local function convert_char (char)
+  return utf8_char(byte(char))
+end
 
-  \ifx\luatexversion\thisisundefined
-  \else
-    \directlua{
-    local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub
-    local function convert_char (char)
-      return utf8_char(byte(char))
-    end
-
-    local function convert_line (line)
-      return gsub(line, ".", convert_char)
-    end
-
-    callback.register("process_input_buffer", convert_line)
-
-    local function convert_line_out (line)
-      local line_out = ""
-      for c in string.utfvalues(line) do
-         line_out = line_out .. string.char(c)
-      end
-      return line_out
-    end
-
-    callback.register("process_output_buffer", convert_line_out)
-    }
-  \fi
+local function convert_line (line)
+  return gsub(line, ".", convert_char)
+end
+
+callback.register("process_input_buffer", convert_line)
+
+local function convert_line_out (line)
+  local line_out = ""
+  for c in string.utfvalues(line) do
+     line_out = line_out .. string.char(c)
+  end
+  return line_out
+end
 
-  \txiusebytewiseiotrue
+callback.register("process_output_buffer", convert_line_out)
 }
+\fi
 
 
 % Helpers for encodings.
@@ -9684,6 +9564,13 @@ directory should work if nowhere else does.}
 %
 \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
 \def\documentencodingzzz#1{%
+  % Get input by bytes instead of by UTF-8 codepoints for XeTeX,
+  % otherwise the encoding support is completely broken.
+  % This settings is for the document root file.
+  \ifx\XeTeXrevision\thisisundefined
+  \else
+    \XeTeXinputencoding "bytes"
+  \fi
   %
   % Encoding being declared for the document.
   \def\declaredencoding{\csname #1.enc\endcsname}%
@@ -9700,37 +9587,22 @@ directory should work if nowhere else does.}
      \asciichardefs
   %
   \else \ifx \declaredencoding \lattwo
-     \iftxinativeunicodecapable
-       \setbytewiseio
-     \fi
      \setnonasciicharscatcode\active
      \lattwochardefs
   %
   \else \ifx \declaredencoding \latone
-     \iftxinativeunicodecapable
-       \setbytewiseio
-     \fi
      \setnonasciicharscatcode\active
      \latonechardefs
   %
   \else \ifx \declaredencoding \latnine
-     \iftxinativeunicodecapable
-       \setbytewiseio
-     \fi
      \setnonasciicharscatcode\active
      \latninechardefs
   %
   \else \ifx \declaredencoding \utfeight
-     \iftxinativeunicodecapable
-       % For native Unicode (XeTeX and LuaTeX)
-       \nativeunicodechardefs
-     \else
-       % For UTF-8 byte sequence (TeX, eTeX and pdfTeX)
-       \setnonasciicharscatcode\active
-       % since we already invoked \utfeightchardefs at the top level
-       % (below), do not re-invoke it, then our check for duplicated
-       % definitions triggers.  Making non-ascii chars active is enough.
-     \fi
+     \setnonasciicharscatcode\active
+     % since we already invoked \utfeightchardefs at the top level
+     % (below), do not re-invoke it, then our check for duplicated
+     % definitions triggers.  Making non-ascii chars active is enough.
   %
   \else
     \message{Ignoring unknown document encoding: #1.}%
@@ -9756,119 +9628,109 @@ directory should work if nowhere else does.}
 % macros containing the character definitions.
 \setnonasciicharscatcode\active
 %
-
-\def\gdefchar#1#2{%
-\gdef#1{%
-   \ifpassthroughchars
-     \string#1%
-   \else
-     #2%
-   \fi
-}}
-
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdefchar^^a0{\tie}
-  \gdefchar^^a1{\exclamdown}
-  \gdefchar^^a2{{\tcfont \char162}} % cent
-  \gdefchar^^a3{\pounds}
-  \gdefchar^^a4{{\tcfont \char164}} % currency
-  \gdefchar^^a5{{\tcfont \char165}} % yen
-  \gdefchar^^a6{{\tcfont \char166}} % broken bar
-  \gdefchar^^a7{\S}
-  \gdefchar^^a8{\"{}}
-  \gdefchar^^a9{\copyright}
-  \gdefchar^^aa{\ordf}
-  \gdefchar^^ab{\guillemetleft}
-  \gdefchar^^ac{\ensuremath\lnot}
-  \gdefchar^^ad{\-}
-  \gdefchar^^ae{\registeredsymbol}
-  \gdefchar^^af{\={}}
-  %
-  \gdefchar^^b0{\textdegree}
-  \gdefchar^^b1{$\pm$}
-  \gdefchar^^b2{$^2$}
-  \gdefchar^^b3{$^3$}
-  \gdefchar^^b4{\'{}}
-  \gdefchar^^b5{$\mu$}
-  \gdefchar^^b6{\P}
-  \gdefchar^^b7{\ensuremath\cdot}
-  \gdefchar^^b8{\cedilla\ }
-  \gdefchar^^b9{$^1$}
-  \gdefchar^^ba{\ordm}
-  \gdefchar^^bb{\guillemetright}
-  \gdefchar^^bc{$1\over4$}
-  \gdefchar^^bd{$1\over2$}
-  \gdefchar^^be{$3\over4$}
-  \gdefchar^^bf{\questiondown}
-  %
-  \gdefchar^^c0{\`A}
-  \gdefchar^^c1{\'A}
-  \gdefchar^^c2{\^A}
-  \gdefchar^^c3{\~A}
-  \gdefchar^^c4{\"A}
-  \gdefchar^^c5{\ringaccent A}
-  \gdefchar^^c6{\AE}
-  \gdefchar^^c7{\cedilla C}
-  \gdefchar^^c8{\`E}
-  \gdefchar^^c9{\'E}
-  \gdefchar^^ca{\^E}
-  \gdefchar^^cb{\"E}
-  \gdefchar^^cc{\`I}
-  \gdefchar^^cd{\'I}
-  \gdefchar^^ce{\^I}
-  \gdefchar^^cf{\"I}
-  %
-  \gdefchar^^d0{\DH}
-  \gdefchar^^d1{\~N}
-  \gdefchar^^d2{\`O}
-  \gdefchar^^d3{\'O}
-  \gdefchar^^d4{\^O}
-  \gdefchar^^d5{\~O}
-  \gdefchar^^d6{\"O}
-  \gdefchar^^d7{$\times$}
-  \gdefchar^^d8{\O}
-  \gdefchar^^d9{\`U}
-  \gdefchar^^da{\'U}
-  \gdefchar^^db{\^U}
-  \gdefchar^^dc{\"U}
-  \gdefchar^^dd{\'Y}
-  \gdefchar^^de{\TH}
-  \gdefchar^^df{\ss}
-  %
-  \gdefchar^^e0{\`a}
-  \gdefchar^^e1{\'a}
-  \gdefchar^^e2{\^a}
-  \gdefchar^^e3{\~a}
-  \gdefchar^^e4{\"a}
-  \gdefchar^^e5{\ringaccent a}
-  \gdefchar^^e6{\ae}
-  \gdefchar^^e7{\cedilla c}
-  \gdefchar^^e8{\`e}
-  \gdefchar^^e9{\'e}
-  \gdefchar^^ea{\^e}
-  \gdefchar^^eb{\"e}
-  \gdefchar^^ec{\`{\dotless i}}
-  \gdefchar^^ed{\'{\dotless i}}
-  \gdefchar^^ee{\^{\dotless i}}
-  \gdefchar^^ef{\"{\dotless i}}
-  %
-  \gdefchar^^f0{\dh}
-  \gdefchar^^f1{\~n}
-  \gdefchar^^f2{\`o}
-  \gdefchar^^f3{\'o}
-  \gdefchar^^f4{\^o}
-  \gdefchar^^f5{\~o}
-  \gdefchar^^f6{\"o}
-  \gdefchar^^f7{$\div$}
-  \gdefchar^^f8{\o}
-  \gdefchar^^f9{\`u}
-  \gdefchar^^fa{\'u}
-  \gdefchar^^fb{\^u}
-  \gdefchar^^fc{\"u}
-  \gdefchar^^fd{\'y}
-  \gdefchar^^fe{\th}
-  \gdefchar^^ff{\"y}
+  \gdef^^a0{\tie}
+  \gdef^^a1{\exclamdown}
+  \gdef^^a2{{\tcfont \char162}} % cent
+  \gdef^^a3{\pounds}
+  \gdef^^a4{{\tcfont \char164}} % currency
+  \gdef^^a5{{\tcfont \char165}} % yen
+  \gdef^^a6{{\tcfont \char166}} % broken bar
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\copyright}
+  \gdef^^aa{\ordf}
+  \gdef^^ab{\guillemetleft}
+  \gdef^^ac{\ensuremath\lnot}
+  \gdef^^ad{\-}
+  \gdef^^ae{\registeredsymbol}
+  \gdef^^af{\={}}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{$\pm$}
+  \gdef^^b2{$^2$}
+  \gdef^^b3{$^3$}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{$\mu$}
+  \gdef^^b6{\P}
+  \gdef^^b7{\ensuremath\cdot}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{$^1$}
+  \gdef^^ba{\ordm}
+  \gdef^^bb{\guillemetright}
+  \gdef^^bc{$1\over4$}
+  \gdef^^bd{$1\over2$}
+  \gdef^^be{$3\over4$}
+  \gdef^^bf{\questiondown}
+  %
+  \gdef^^c0{\`A}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\~A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\ringaccent A}
+  \gdef^^c6{\AE}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\`E}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\^E}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\`I}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\"I}
+  %
+  \gdef^^d0{\DH}
+  \gdef^^d1{\~N}
+  \gdef^^d2{\`O}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\~O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\O}
+  \gdef^^d9{\`U}
+  \gdef^^da{\'U}
+  \gdef^^db{\^U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\TH}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\`a}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\~a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\ringaccent a}
+  \gdef^^e6{\ae}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\`e}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\^e}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\`{\dotless i}}
+  \gdef^^ed{\'{\dotless i}}
+  \gdef^^ee{\^{\dotless i}}
+  \gdef^^ef{\"{\dotless i}}
+  %
+  \gdef^^f0{\dh}
+  \gdef^^f1{\~n}
+  \gdef^^f2{\`o}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\~o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\o}
+  \gdef^^f9{\`u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\^u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\th}
+  \gdef^^ff{\"y}
 }
 
 % Latin9 (ISO-8859-15) encoding character definitions.
@@ -9876,119 +9738,119 @@ directory should work if nowhere else does.}
   % Encoding is almost identical to Latin1.
   \latonechardefs
   %
-  \gdefchar^^a4{\euro}
-  \gdefchar^^a6{\v S}
-  \gdefchar^^a8{\v s}
-  \gdefchar^^b4{\v Z}
-  \gdefchar^^b8{\v z}
-  \gdefchar^^bc{\OE}
-  \gdefchar^^bd{\oe}
-  \gdefchar^^be{\"Y}
+  \gdef^^a4{\euro}
+  \gdef^^a6{\v S}
+  \gdef^^a8{\v s}
+  \gdef^^b4{\v Z}
+  \gdef^^b8{\v z}
+  \gdef^^bc{\OE}
+  \gdef^^bd{\oe}
+  \gdef^^be{\"Y}
 }
 
 % Latin2 (ISO-8859-2) character definitions.
 \def\lattwochardefs{%
-  \gdefchar^^a0{\tie}
-  \gdefchar^^a1{\ogonek{A}}
-  \gdefchar^^a2{\u{}}
-  \gdefchar^^a3{\L}
-  \gdefchar^^a4{\missingcharmsg{CURRENCY SIGN}}
-  \gdefchar^^a5{\v L}
-  \gdefchar^^a6{\'S}
-  \gdefchar^^a7{\S}
-  \gdefchar^^a8{\"{}}
-  \gdefchar^^a9{\v S}
-  \gdefchar^^aa{\cedilla S}
-  \gdefchar^^ab{\v T}
-  \gdefchar^^ac{\'Z}
-  \gdefchar^^ad{\-}
-  \gdefchar^^ae{\v Z}
-  \gdefchar^^af{\dotaccent Z}
-  %
-  \gdefchar^^b0{\textdegree}
-  \gdefchar^^b1{\ogonek{a}}
-  \gdefchar^^b2{\ogonek{ }}
-  \gdefchar^^b3{\l}
-  \gdefchar^^b4{\'{}}
-  \gdefchar^^b5{\v l}
-  \gdefchar^^b6{\'s}
-  \gdefchar^^b7{\v{}}
-  \gdefchar^^b8{\cedilla\ }
-  \gdefchar^^b9{\v s}
-  \gdefchar^^ba{\cedilla s}
-  \gdefchar^^bb{\v t}
-  \gdefchar^^bc{\'z}
-  \gdefchar^^bd{\H{}}
-  \gdefchar^^be{\v z}
-  \gdefchar^^bf{\dotaccent z}
-  %
-  \gdefchar^^c0{\'R}
-  \gdefchar^^c1{\'A}
-  \gdefchar^^c2{\^A}
-  \gdefchar^^c3{\u A}
-  \gdefchar^^c4{\"A}
-  \gdefchar^^c5{\'L}
-  \gdefchar^^c6{\'C}
-  \gdefchar^^c7{\cedilla C}
-  \gdefchar^^c8{\v C}
-  \gdefchar^^c9{\'E}
-  \gdefchar^^ca{\ogonek{E}}
-  \gdefchar^^cb{\"E}
-  \gdefchar^^cc{\v E}
-  \gdefchar^^cd{\'I}
-  \gdefchar^^ce{\^I}
-  \gdefchar^^cf{\v D}
-  %
-  \gdefchar^^d0{\DH}
-  \gdefchar^^d1{\'N}
-  \gdefchar^^d2{\v N}
-  \gdefchar^^d3{\'O}
-  \gdefchar^^d4{\^O}
-  \gdefchar^^d5{\H O}
-  \gdefchar^^d6{\"O}
-  \gdefchar^^d7{$\times$}
-  \gdefchar^^d8{\v R}
-  \gdefchar^^d9{\ringaccent U}
-  \gdefchar^^da{\'U}
-  \gdefchar^^db{\H U}
-  \gdefchar^^dc{\"U}
-  \gdefchar^^dd{\'Y}
-  \gdefchar^^de{\cedilla T}
-  \gdefchar^^df{\ss}
-  %
-  \gdefchar^^e0{\'r}
-  \gdefchar^^e1{\'a}
-  \gdefchar^^e2{\^a}
-  \gdefchar^^e3{\u a}
-  \gdefchar^^e4{\"a}
-  \gdefchar^^e5{\'l}
-  \gdefchar^^e6{\'c}
-  \gdefchar^^e7{\cedilla c}
-  \gdefchar^^e8{\v c}
-  \gdefchar^^e9{\'e}
-  \gdefchar^^ea{\ogonek{e}}
-  \gdefchar^^eb{\"e}
-  \gdefchar^^ec{\v e}
-  \gdefchar^^ed{\'{\dotless{i}}}
-  \gdefchar^^ee{\^{\dotless{i}}}
-  \gdefchar^^ef{\v d}
-  %
-  \gdefchar^^f0{\dh}
-  \gdefchar^^f1{\'n}
-  \gdefchar^^f2{\v n}
-  \gdefchar^^f3{\'o}
-  \gdefchar^^f4{\^o}
-  \gdefchar^^f5{\H o}
-  \gdefchar^^f6{\"o}
-  \gdefchar^^f7{$\div$}
-  \gdefchar^^f8{\v r}
-  \gdefchar^^f9{\ringaccent u}
-  \gdefchar^^fa{\'u}
-  \gdefchar^^fb{\H u}
-  \gdefchar^^fc{\"u}
-  \gdefchar^^fd{\'y}
-  \gdefchar^^fe{\cedilla t}
-  \gdefchar^^ff{\dotaccent{}}
+  \gdef^^a0{\tie}
+  \gdef^^a1{\ogonek{A}}
+  \gdef^^a2{\u{}}
+  \gdef^^a3{\L}
+  \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+  \gdef^^a5{\v L}
+  \gdef^^a6{\'S}
+  \gdef^^a7{\S}
+  \gdef^^a8{\"{}}
+  \gdef^^a9{\v S}
+  \gdef^^aa{\cedilla S}
+  \gdef^^ab{\v T}
+  \gdef^^ac{\'Z}
+  \gdef^^ad{\-}
+  \gdef^^ae{\v Z}
+  \gdef^^af{\dotaccent Z}
+  %
+  \gdef^^b0{\textdegree}
+  \gdef^^b1{\ogonek{a}}
+  \gdef^^b2{\ogonek{ }}
+  \gdef^^b3{\l}
+  \gdef^^b4{\'{}}
+  \gdef^^b5{\v l}
+  \gdef^^b6{\'s}
+  \gdef^^b7{\v{}}
+  \gdef^^b8{\cedilla\ }
+  \gdef^^b9{\v s}
+  \gdef^^ba{\cedilla s}
+  \gdef^^bb{\v t}
+  \gdef^^bc{\'z}
+  \gdef^^bd{\H{}}
+  \gdef^^be{\v z}
+  \gdef^^bf{\dotaccent z}
+  %
+  \gdef^^c0{\'R}
+  \gdef^^c1{\'A}
+  \gdef^^c2{\^A}
+  \gdef^^c3{\u A}
+  \gdef^^c4{\"A}
+  \gdef^^c5{\'L}
+  \gdef^^c6{\'C}
+  \gdef^^c7{\cedilla C}
+  \gdef^^c8{\v C}
+  \gdef^^c9{\'E}
+  \gdef^^ca{\ogonek{E}}
+  \gdef^^cb{\"E}
+  \gdef^^cc{\v E}
+  \gdef^^cd{\'I}
+  \gdef^^ce{\^I}
+  \gdef^^cf{\v D}
+  %
+  \gdef^^d0{\DH}
+  \gdef^^d1{\'N}
+  \gdef^^d2{\v N}
+  \gdef^^d3{\'O}
+  \gdef^^d4{\^O}
+  \gdef^^d5{\H O}
+  \gdef^^d6{\"O}
+  \gdef^^d7{$\times$}
+  \gdef^^d8{\v R}
+  \gdef^^d9{\ringaccent U}
+  \gdef^^da{\'U}
+  \gdef^^db{\H U}
+  \gdef^^dc{\"U}
+  \gdef^^dd{\'Y}
+  \gdef^^de{\cedilla T}
+  \gdef^^df{\ss}
+  %
+  \gdef^^e0{\'r}
+  \gdef^^e1{\'a}
+  \gdef^^e2{\^a}
+  \gdef^^e3{\u a}
+  \gdef^^e4{\"a}
+  \gdef^^e5{\'l}
+  \gdef^^e6{\'c}
+  \gdef^^e7{\cedilla c}
+  \gdef^^e8{\v c}
+  \gdef^^e9{\'e}
+  \gdef^^ea{\ogonek{e}}
+  \gdef^^eb{\"e}
+  \gdef^^ec{\v e}
+  \gdef^^ed{\'{\dotless{i}}}
+  \gdef^^ee{\^{\dotless{i}}}
+  \gdef^^ef{\v d}
+  %
+  \gdef^^f0{\dh}
+  \gdef^^f1{\'n}
+  \gdef^^f2{\v n}
+  \gdef^^f3{\'o}
+  \gdef^^f4{\^o}
+  \gdef^^f5{\H o}
+  \gdef^^f6{\"o}
+  \gdef^^f7{$\div$}
+  \gdef^^f8{\v r}
+  \gdef^^f9{\ringaccent u}
+  \gdef^^fa{\'u}
+  \gdef^^fb{\H u}
+  \gdef^^fc{\"u}
+  \gdef^^fd{\'y}
+  \gdef^^fe{\cedilla t}
+  \gdef^^ff{\dotaccent{}}
 }
 
 % UTF-8 character definitions.
@@ -10018,56 +9880,35 @@ directory should work if nowhere else does.}
   \fi
 }
 
-% Give non-ASCII bytes the active definitions for processing UTF-8 sequences
 \begingroup
   \catcode`\~13
-  \catcode`\$12
   \catcode`\"12
 
-  % Loop from \countUTFx to \countUTFy, performing \UTFviiiTmp
-  % substituting ~ and $ with a character token of that value.
   \def\UTFviiiLoop{%
     \global\catcode\countUTFx\active
     \uccode`\~\countUTFx
-    \uccode`\$\countUTFx
     \uppercase\expandafter{\UTFviiiTmp}%
     \advance\countUTFx by 1
     \ifnum\countUTFx < \countUTFy
       \expandafter\UTFviiiLoop
     \fi}
 
-  % For bytes other than the first in a UTF-8 sequence.  Not expected to
-  % be expanded except when writing to auxiliary files.
-  \countUTFx = "80
-  \countUTFy = "C2
-  \def\UTFviiiTmp{%
-    \gdef~{
-        \ifpassthroughchars $\fi}}%
-  \UTFviiiLoop
-
   \countUTFx = "C2
   \countUTFy = "E0
   \def\UTFviiiTmp{%
-    \gdef~{%
-        \ifpassthroughchars $%
-        \else\expandafter\UTFviiiTwoOctets\expandafter$\fi}}%
+    \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
   \UTFviiiLoop
 
   \countUTFx = "E0
   \countUTFy = "F0
   \def\UTFviiiTmp{%
-    \gdef~{%
-        \ifpassthroughchars $%
-        \else\expandafter\UTFviiiThreeOctets\expandafter$\fi}}%
+    \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
   \UTFviiiLoop
 
   \countUTFx = "F0
   \countUTFy = "F4
   \def\UTFviiiTmp{%
-    \gdef~{%
-        \ifpassthroughchars $%
-        \else\expandafter\UTFviiiFourOctets\expandafter$\fi
-        }}%
+    \xdef~{\noexpand\UTFviiiFourOctets\string~}}
   \UTFviiiLoop
 \endgroup
 
@@ -10076,26 +9917,13 @@ directory should work if nowhere else does.}
 % @U{xxxx} to produce U+xxxx, if we support it.
 \def\U#1{%
   \expandafter\ifx\csname uni:#1\endcsname \relax
-    \iftxinativeunicodecapable
-      % Any Unicode characters can be used by native Unicode.
-      % However, if the font does not have the glyph, the letter will miss.
-      \begingroup
-        \uccode`\.="#1\relax
-        \uppercase{.}
-      \endgroup
-    \else
-      \errhelp = \EMsimple	
-      \errmessage{Unicode character U+#1 not supported, sorry}%
-    \fi
+    \errhelp = \EMsimple	
+    \errmessage{Unicode character U+#1 not supported, sorry}%
   \else
     \csname uni:#1\endcsname
   \fi
 }
 
-% For UTF-8 byte sequence (TeX, e-TeX and pdfTeX)
-% Definition macro to replace the Unicode character
-% Definition macro that is used by @U command
-%
 \begingroup
   \catcode`\"=12
   \catcode`\<=12
@@ -10104,12 +9932,11 @@ directory should work if nowhere else does.}
   \catcode`\;=12
   \catcode`\!=12
   \catcode`\~=13
-  \gdef\DeclareUnicodeCharacterUTFviii#1#2{%
+  \gdef\DeclareUnicodeCharacter#1#2{%
     \countUTFz = "#1\relax
+    %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
     \begingroup
       \parseXMLCharref
-      %
-      % Access definitions of characters given UTF-8 sequences
       \def\UTFviiiTwoOctets##1##2{%
         \csname u8:##1\string ##2\endcsname}%
       \def\UTFviiiThreeOctets##1##2##3{%
@@ -10127,8 +9954,7 @@ directory should work if nowhere else does.}
       % define an additional control sequence for this code point.
       \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp
     \endgroup}
-  %
-  % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp.
+
   \gdef\parseXMLCharref{%
     \ifnum\countUTFz < "A0\relax
       \errhelp = \EMsimple
@@ -10158,20 +9984,12 @@ directory should work if nowhere else does.}
     \uccode `#1\countUTFx
     \countUTFz = \countUTFy}
 
-  % Used to set \UTFviiiTmp to a UTF-8 byte sequence
   \gdef\parseUTFviiiB#1#2#3#4{%
     \advance\countUTFz by "#10\relax
     \uccode `#3\countUTFz
     \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
 \endgroup
 
-% For native Unicode (XeTeX and LuaTeX)
-% Definition macro that is set catcode other non global
-%
-\def\DeclareUnicodeCharacterNativeOther#1#2{%
-  \catcode"#1=\other
-}
-
 % https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M
 % U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block)
 % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block)
@@ -10186,750 +10004,732 @@ directory should work if nowhere else does.}
 % We won't be doing that here in this simple file.  But we can try to at
 % least make most of the characters not bomb out.
 %
-\def\unicodechardefs{%
-  \DeclareUnicodeCharacter{00A0}{\tie}%
-  \DeclareUnicodeCharacter{00A1}{\exclamdown}%
+\def\utfeightchardefs{%
+  \DeclareUnicodeCharacter{00A0}{\tie}
+  \DeclareUnicodeCharacter{00A1}{\exclamdown}
   \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
-  \DeclareUnicodeCharacter{00A3}{\pounds}%
+  \DeclareUnicodeCharacter{00A3}{\pounds}
   \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency
   \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen
   \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar
-  \DeclareUnicodeCharacter{00A7}{\S}%
-  \DeclareUnicodeCharacter{00A8}{\"{ }}%
-  \DeclareUnicodeCharacter{00A9}{\copyright}%
-  \DeclareUnicodeCharacter{00AA}{\ordf}%
-  \DeclareUnicodeCharacter{00AB}{\guillemetleft}%
-  \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}%
-  \DeclareUnicodeCharacter{00AD}{\-}%
-  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}%
-  \DeclareUnicodeCharacter{00AF}{\={ }}%
-  %
-  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
-  \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
-  \DeclareUnicodeCharacter{00B2}{$^2$}%
-  \DeclareUnicodeCharacter{00B3}{$^3$}%
-  \DeclareUnicodeCharacter{00B4}{\'{ }}%
-  \DeclareUnicodeCharacter{00B5}{$\mu$}%
-  \DeclareUnicodeCharacter{00B6}{\P}%
-  \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}%
-  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}%
-  \DeclareUnicodeCharacter{00B9}{$^1$}%
-  \DeclareUnicodeCharacter{00BA}{\ordm}%
-  \DeclareUnicodeCharacter{00BB}{\guillemetright}%
-  \DeclareUnicodeCharacter{00BC}{$1\over4$}%
-  \DeclareUnicodeCharacter{00BD}{$1\over2$}%
-  \DeclareUnicodeCharacter{00BE}{$3\over4$}%
-  \DeclareUnicodeCharacter{00BF}{\questiondown}%
-  %
-  \DeclareUnicodeCharacter{00C0}{\`A}%
-  \DeclareUnicodeCharacter{00C1}{\'A}%
-  \DeclareUnicodeCharacter{00C2}{\^A}%
-  \DeclareUnicodeCharacter{00C3}{\~A}%
-  \DeclareUnicodeCharacter{00C4}{\"A}%
-  \DeclareUnicodeCharacter{00C5}{\AA}%
-  \DeclareUnicodeCharacter{00C6}{\AE}%
-  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}%
-  \DeclareUnicodeCharacter{00C8}{\`E}%
-  \DeclareUnicodeCharacter{00C9}{\'E}%
-  \DeclareUnicodeCharacter{00CA}{\^E}%
-  \DeclareUnicodeCharacter{00CB}{\"E}%
-  \DeclareUnicodeCharacter{00CC}{\`I}%
-  \DeclareUnicodeCharacter{00CD}{\'I}%
-  \DeclareUnicodeCharacter{00CE}{\^I}%
-  \DeclareUnicodeCharacter{00CF}{\"I}%
-  %
-  \DeclareUnicodeCharacter{00D0}{\DH}%
-  \DeclareUnicodeCharacter{00D1}{\~N}%
-  \DeclareUnicodeCharacter{00D2}{\`O}%
-  \DeclareUnicodeCharacter{00D3}{\'O}%
-  \DeclareUnicodeCharacter{00D4}{\^O}%
-  \DeclareUnicodeCharacter{00D5}{\~O}%
-  \DeclareUnicodeCharacter{00D6}{\"O}%
-  \DeclareUnicodeCharacter{00D7}{\ensuremath\times}%
-  \DeclareUnicodeCharacter{00D8}{\O}%
-  \DeclareUnicodeCharacter{00D9}{\`U}%
-  \DeclareUnicodeCharacter{00DA}{\'U}%
-  \DeclareUnicodeCharacter{00DB}{\^U}%
-  \DeclareUnicodeCharacter{00DC}{\"U}%
-  \DeclareUnicodeCharacter{00DD}{\'Y}%
-  \DeclareUnicodeCharacter{00DE}{\TH}%
-  \DeclareUnicodeCharacter{00DF}{\ss}%
-  %
-  \DeclareUnicodeCharacter{00E0}{\`a}%
-  \DeclareUnicodeCharacter{00E1}{\'a}%
-  \DeclareUnicodeCharacter{00E2}{\^a}%
-  \DeclareUnicodeCharacter{00E3}{\~a}%
-  \DeclareUnicodeCharacter{00E4}{\"a}%
-  \DeclareUnicodeCharacter{00E5}{\aa}%
-  \DeclareUnicodeCharacter{00E6}{\ae}%
-  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}%
-  \DeclareUnicodeCharacter{00E8}{\`e}%
-  \DeclareUnicodeCharacter{00E9}{\'e}%
-  \DeclareUnicodeCharacter{00EA}{\^e}%
-  \DeclareUnicodeCharacter{00EB}{\"e}%
-  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}%
-  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}%
-  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}%
-  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}%
-  %
-  \DeclareUnicodeCharacter{00F0}{\dh}%
-  \DeclareUnicodeCharacter{00F1}{\~n}%
-  \DeclareUnicodeCharacter{00F2}{\`o}%
-  \DeclareUnicodeCharacter{00F3}{\'o}%
-  \DeclareUnicodeCharacter{00F4}{\^o}%
-  \DeclareUnicodeCharacter{00F5}{\~o}%
-  \DeclareUnicodeCharacter{00F6}{\"o}%
-  \DeclareUnicodeCharacter{00F7}{\ensuremath\div}%
-  \DeclareUnicodeCharacter{00F8}{\o}%
-  \DeclareUnicodeCharacter{00F9}{\`u}%
-  \DeclareUnicodeCharacter{00FA}{\'u}%
-  \DeclareUnicodeCharacter{00FB}{\^u}%
-  \DeclareUnicodeCharacter{00FC}{\"u}%
-  \DeclareUnicodeCharacter{00FD}{\'y}%
-  \DeclareUnicodeCharacter{00FE}{\th}%
-  \DeclareUnicodeCharacter{00FF}{\"y}%
-  %
-  \DeclareUnicodeCharacter{0100}{\=A}%
-  \DeclareUnicodeCharacter{0101}{\=a}%
-  \DeclareUnicodeCharacter{0102}{\u{A}}%
-  \DeclareUnicodeCharacter{0103}{\u{a}}%
-  \DeclareUnicodeCharacter{0104}{\ogonek{A}}%
-  \DeclareUnicodeCharacter{0105}{\ogonek{a}}%
-  \DeclareUnicodeCharacter{0106}{\'C}%
-  \DeclareUnicodeCharacter{0107}{\'c}%
-  \DeclareUnicodeCharacter{0108}{\^C}%
-  \DeclareUnicodeCharacter{0109}{\^c}%
-  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}%
-  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}%
-  \DeclareUnicodeCharacter{010C}{\v{C}}%
-  \DeclareUnicodeCharacter{010D}{\v{c}}%
-  \DeclareUnicodeCharacter{010E}{\v{D}}%
-  \DeclareUnicodeCharacter{010F}{d'}%
-  %
-  \DeclareUnicodeCharacter{0110}{\DH}%
-  \DeclareUnicodeCharacter{0111}{\dh}%
-  \DeclareUnicodeCharacter{0112}{\=E}%
-  \DeclareUnicodeCharacter{0113}{\=e}%
-  \DeclareUnicodeCharacter{0114}{\u{E}}%
-  \DeclareUnicodeCharacter{0115}{\u{e}}%
-  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}%
-  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}%
-  \DeclareUnicodeCharacter{0118}{\ogonek{E}}%
-  \DeclareUnicodeCharacter{0119}{\ogonek{e}}%
-  \DeclareUnicodeCharacter{011A}{\v{E}}%
-  \DeclareUnicodeCharacter{011B}{\v{e}}%
-  \DeclareUnicodeCharacter{011C}{\^G}%
-  \DeclareUnicodeCharacter{011D}{\^g}%
-  \DeclareUnicodeCharacter{011E}{\u{G}}%
-  \DeclareUnicodeCharacter{011F}{\u{g}}%
-  %
-  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}%
-  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}%
-  \DeclareUnicodeCharacter{0122}{\cedilla{G}}%
-  \DeclareUnicodeCharacter{0123}{\cedilla{g}}%
-  \DeclareUnicodeCharacter{0124}{\^H}%
-  \DeclareUnicodeCharacter{0125}{\^h}%
-  \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}%
-  \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}%
-  \DeclareUnicodeCharacter{0128}{\~I}%
-  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}%
-  \DeclareUnicodeCharacter{012A}{\=I}%
-  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}%
-  \DeclareUnicodeCharacter{012C}{\u{I}}%
-  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}%
-  \DeclareUnicodeCharacter{012E}{\ogonek{I}}%
-  \DeclareUnicodeCharacter{012F}{\ogonek{i}}%
-  %
-  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}%
-  \DeclareUnicodeCharacter{0131}{\dotless{i}}%
-  \DeclareUnicodeCharacter{0132}{IJ}%
-  \DeclareUnicodeCharacter{0133}{ij}%
-  \DeclareUnicodeCharacter{0134}{\^J}%
-  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}%
-  \DeclareUnicodeCharacter{0136}{\cedilla{K}}%
-  \DeclareUnicodeCharacter{0137}{\cedilla{k}}%
-  \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}%
-  \DeclareUnicodeCharacter{0139}{\'L}%
-  \DeclareUnicodeCharacter{013A}{\'l}%
-  \DeclareUnicodeCharacter{013B}{\cedilla{L}}%
-  \DeclareUnicodeCharacter{013C}{\cedilla{l}}%
+  \DeclareUnicodeCharacter{00A7}{\S}
+  \DeclareUnicodeCharacter{00A8}{\"{ }}
+  \DeclareUnicodeCharacter{00A9}{\copyright}
+  \DeclareUnicodeCharacter{00AA}{\ordf}
+  \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+  \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}
+  \DeclareUnicodeCharacter{00AD}{\-}
+  \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+  \DeclareUnicodeCharacter{00AF}{\={ }}
+  %
+  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+  \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}
+  \DeclareUnicodeCharacter{00B2}{$^2$}
+  \DeclareUnicodeCharacter{00B3}{$^3$}
+  \DeclareUnicodeCharacter{00B4}{\'{ }}
+  \DeclareUnicodeCharacter{00B5}{$\mu$}
+  \DeclareUnicodeCharacter{00B6}{\P}
+  \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}
+  \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+  \DeclareUnicodeCharacter{00B9}{$^1$}
+  \DeclareUnicodeCharacter{00BA}{\ordm}
+  \DeclareUnicodeCharacter{00BB}{\guillemetright}
+  \DeclareUnicodeCharacter{00BC}{$1\over4$}
+  \DeclareUnicodeCharacter{00BD}{$1\over2$}
+  \DeclareUnicodeCharacter{00BE}{$3\over4$}
+  \DeclareUnicodeCharacter{00BF}{\questiondown}
+  %
+  \DeclareUnicodeCharacter{00C0}{\`A}
+  \DeclareUnicodeCharacter{00C1}{\'A}
+  \DeclareUnicodeCharacter{00C2}{\^A}
+  \DeclareUnicodeCharacter{00C3}{\~A}
+  \DeclareUnicodeCharacter{00C4}{\"A}
+  \DeclareUnicodeCharacter{00C5}{\AA}
+  \DeclareUnicodeCharacter{00C6}{\AE}
+  \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+  \DeclareUnicodeCharacter{00C8}{\`E}
+  \DeclareUnicodeCharacter{00C9}{\'E}
+  \DeclareUnicodeCharacter{00CA}{\^E}
+  \DeclareUnicodeCharacter{00CB}{\"E}
+  \DeclareUnicodeCharacter{00CC}{\`I}
+  \DeclareUnicodeCharacter{00CD}{\'I}
+  \DeclareUnicodeCharacter{00CE}{\^I}
+  \DeclareUnicodeCharacter{00CF}{\"I}
+  %
+  \DeclareUnicodeCharacter{00D0}{\DH}
+  \DeclareUnicodeCharacter{00D1}{\~N}
+  \DeclareUnicodeCharacter{00D2}{\`O}
+  \DeclareUnicodeCharacter{00D3}{\'O}
+  \DeclareUnicodeCharacter{00D4}{\^O}
+  \DeclareUnicodeCharacter{00D5}{\~O}
+  \DeclareUnicodeCharacter{00D6}{\"O}
+  \DeclareUnicodeCharacter{00D7}{\ensuremath\times}
+  \DeclareUnicodeCharacter{00D8}{\O}
+  \DeclareUnicodeCharacter{00D9}{\`U}
+  \DeclareUnicodeCharacter{00DA}{\'U}
+  \DeclareUnicodeCharacter{00DB}{\^U}
+  \DeclareUnicodeCharacter{00DC}{\"U}
+  \DeclareUnicodeCharacter{00DD}{\'Y}
+  \DeclareUnicodeCharacter{00DE}{\TH}
+  \DeclareUnicodeCharacter{00DF}{\ss}
+  %
+  \DeclareUnicodeCharacter{00E0}{\`a}
+  \DeclareUnicodeCharacter{00E1}{\'a}
+  \DeclareUnicodeCharacter{00E2}{\^a}
+  \DeclareUnicodeCharacter{00E3}{\~a}
+  \DeclareUnicodeCharacter{00E4}{\"a}
+  \DeclareUnicodeCharacter{00E5}{\aa}
+  \DeclareUnicodeCharacter{00E6}{\ae}
+  \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+  \DeclareUnicodeCharacter{00E8}{\`e}
+  \DeclareUnicodeCharacter{00E9}{\'e}
+  \DeclareUnicodeCharacter{00EA}{\^e}
+  \DeclareUnicodeCharacter{00EB}{\"e}
+  \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+  \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+  \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+  %
+  \DeclareUnicodeCharacter{00F0}{\dh}
+  \DeclareUnicodeCharacter{00F1}{\~n}
+  \DeclareUnicodeCharacter{00F2}{\`o}
+  \DeclareUnicodeCharacter{00F3}{\'o}
+  \DeclareUnicodeCharacter{00F4}{\^o}
+  \DeclareUnicodeCharacter{00F5}{\~o}
+  \DeclareUnicodeCharacter{00F6}{\"o}
+  \DeclareUnicodeCharacter{00F7}{\ensuremath\div}
+  \DeclareUnicodeCharacter{00F8}{\o}
+  \DeclareUnicodeCharacter{00F9}{\`u}
+  \DeclareUnicodeCharacter{00FA}{\'u}
+  \DeclareUnicodeCharacter{00FB}{\^u}
+  \DeclareUnicodeCharacter{00FC}{\"u}
+  \DeclareUnicodeCharacter{00FD}{\'y}
+  \DeclareUnicodeCharacter{00FE}{\th}
+  \DeclareUnicodeCharacter{00FF}{\"y}
+  %
+  \DeclareUnicodeCharacter{0100}{\=A}
+  \DeclareUnicodeCharacter{0101}{\=a}
+  \DeclareUnicodeCharacter{0102}{\u{A}}
+  \DeclareUnicodeCharacter{0103}{\u{a}}
+  \DeclareUnicodeCharacter{0104}{\ogonek{A}}
+  \DeclareUnicodeCharacter{0105}{\ogonek{a}}
+  \DeclareUnicodeCharacter{0106}{\'C}
+  \DeclareUnicodeCharacter{0107}{\'c}
+  \DeclareUnicodeCharacter{0108}{\^C}
+  \DeclareUnicodeCharacter{0109}{\^c}
+  \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+  \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+  \DeclareUnicodeCharacter{010C}{\v{C}}
+  \DeclareUnicodeCharacter{010D}{\v{c}}
+  \DeclareUnicodeCharacter{010E}{\v{D}}
+  \DeclareUnicodeCharacter{010F}{d'}
+  %
+  \DeclareUnicodeCharacter{0110}{\DH}
+  \DeclareUnicodeCharacter{0111}{\dh}
+  \DeclareUnicodeCharacter{0112}{\=E}
+  \DeclareUnicodeCharacter{0113}{\=e}
+  \DeclareUnicodeCharacter{0114}{\u{E}}
+  \DeclareUnicodeCharacter{0115}{\u{e}}
+  \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+  \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+  \DeclareUnicodeCharacter{0118}{\ogonek{E}}
+  \DeclareUnicodeCharacter{0119}{\ogonek{e}}
+  \DeclareUnicodeCharacter{011A}{\v{E}}
+  \DeclareUnicodeCharacter{011B}{\v{e}}
+  \DeclareUnicodeCharacter{011C}{\^G}
+  \DeclareUnicodeCharacter{011D}{\^g}
+  \DeclareUnicodeCharacter{011E}{\u{G}}
+  \DeclareUnicodeCharacter{011F}{\u{g}}
+  %
+  \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+  \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+  \DeclareUnicodeCharacter{0122}{\cedilla{G}}
+  \DeclareUnicodeCharacter{0123}{\cedilla{g}}
+  \DeclareUnicodeCharacter{0124}{\^H}
+  \DeclareUnicodeCharacter{0125}{\^h}
+  \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}
+  \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}
+  \DeclareUnicodeCharacter{0128}{\~I}
+  \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+  \DeclareUnicodeCharacter{012A}{\=I}
+  \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+  \DeclareUnicodeCharacter{012C}{\u{I}}
+  \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+  \DeclareUnicodeCharacter{012E}{\ogonek{I}}
+  \DeclareUnicodeCharacter{012F}{\ogonek{i}}
+  %
+  \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+  \DeclareUnicodeCharacter{0131}{\dotless{i}}
+  \DeclareUnicodeCharacter{0132}{IJ}
+  \DeclareUnicodeCharacter{0133}{ij}
+  \DeclareUnicodeCharacter{0134}{\^J}
+  \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+  \DeclareUnicodeCharacter{0136}{\cedilla{K}}
+  \DeclareUnicodeCharacter{0137}{\cedilla{k}}
+  \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}  
+  \DeclareUnicodeCharacter{0139}{\'L}
+  \DeclareUnicodeCharacter{013A}{\'l}
+  \DeclareUnicodeCharacter{013B}{\cedilla{L}}
+  \DeclareUnicodeCharacter{013C}{\cedilla{l}}
   \DeclareUnicodeCharacter{013D}{L'}% should kern
   \DeclareUnicodeCharacter{013E}{l'}% should kern
-  \DeclareUnicodeCharacter{013F}{L\U{00B7}}%
-  %
-  \DeclareUnicodeCharacter{0140}{l\U{00B7}}%
-  \DeclareUnicodeCharacter{0141}{\L}%
-  \DeclareUnicodeCharacter{0142}{\l}%
-  \DeclareUnicodeCharacter{0143}{\'N}%
-  \DeclareUnicodeCharacter{0144}{\'n}%
-  \DeclareUnicodeCharacter{0145}{\cedilla{N}}%
-  \DeclareUnicodeCharacter{0146}{\cedilla{n}}%
-  \DeclareUnicodeCharacter{0147}{\v{N}}%
-  \DeclareUnicodeCharacter{0148}{\v{n}}%
-  \DeclareUnicodeCharacter{0149}{'n}%
-  \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}%
-  \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}%
-  \DeclareUnicodeCharacter{014C}{\=O}%
-  \DeclareUnicodeCharacter{014D}{\=o}%
-  \DeclareUnicodeCharacter{014E}{\u{O}}%
-  \DeclareUnicodeCharacter{014F}{\u{o}}%
-  %
-  \DeclareUnicodeCharacter{0150}{\H{O}}%
-  \DeclareUnicodeCharacter{0151}{\H{o}}%
-  \DeclareUnicodeCharacter{0152}{\OE}%
-  \DeclareUnicodeCharacter{0153}{\oe}%
-  \DeclareUnicodeCharacter{0154}{\'R}%
-  \DeclareUnicodeCharacter{0155}{\'r}%
-  \DeclareUnicodeCharacter{0156}{\cedilla{R}}%
-  \DeclareUnicodeCharacter{0157}{\cedilla{r}}%
-  \DeclareUnicodeCharacter{0158}{\v{R}}%
-  \DeclareUnicodeCharacter{0159}{\v{r}}%
-  \DeclareUnicodeCharacter{015A}{\'S}%
-  \DeclareUnicodeCharacter{015B}{\'s}%
-  \DeclareUnicodeCharacter{015C}{\^S}%
-  \DeclareUnicodeCharacter{015D}{\^s}%
-  \DeclareUnicodeCharacter{015E}{\cedilla{S}}%
-  \DeclareUnicodeCharacter{015F}{\cedilla{s}}%
-  %
-  \DeclareUnicodeCharacter{0160}{\v{S}}%
-  \DeclareUnicodeCharacter{0161}{\v{s}}%
-  \DeclareUnicodeCharacter{0162}{\cedilla{T}}%
-  \DeclareUnicodeCharacter{0163}{\cedilla{t}}%
-  \DeclareUnicodeCharacter{0164}{\v{T}}%
-  \DeclareUnicodeCharacter{0165}{\v{t}}%
-  \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}%
-  \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}%
-  \DeclareUnicodeCharacter{0168}{\~U}%
-  \DeclareUnicodeCharacter{0169}{\~u}%
-  \DeclareUnicodeCharacter{016A}{\=U}%
-  \DeclareUnicodeCharacter{016B}{\=u}%
-  \DeclareUnicodeCharacter{016C}{\u{U}}%
-  \DeclareUnicodeCharacter{016D}{\u{u}}%
-  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}%
-  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}%
-  %
-  \DeclareUnicodeCharacter{0170}{\H{U}}%
-  \DeclareUnicodeCharacter{0171}{\H{u}}%
-  \DeclareUnicodeCharacter{0172}{\ogonek{U}}%
-  \DeclareUnicodeCharacter{0173}{\ogonek{u}}%
-  \DeclareUnicodeCharacter{0174}{\^W}%
-  \DeclareUnicodeCharacter{0175}{\^w}%
-  \DeclareUnicodeCharacter{0176}{\^Y}%
-  \DeclareUnicodeCharacter{0177}{\^y}%
-  \DeclareUnicodeCharacter{0178}{\"Y}%
-  \DeclareUnicodeCharacter{0179}{\'Z}%
-  \DeclareUnicodeCharacter{017A}{\'z}%
-  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}%
-  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}%
-  \DeclareUnicodeCharacter{017D}{\v{Z}}%
-  \DeclareUnicodeCharacter{017E}{\v{z}}%
-  \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}%
-  %
-  \DeclareUnicodeCharacter{01C4}{D\v{Z}}%
-  \DeclareUnicodeCharacter{01C5}{D\v{z}}%
-  \DeclareUnicodeCharacter{01C6}{d\v{z}}%
-  \DeclareUnicodeCharacter{01C7}{LJ}%
-  \DeclareUnicodeCharacter{01C8}{Lj}%
-  \DeclareUnicodeCharacter{01C9}{lj}%
-  \DeclareUnicodeCharacter{01CA}{NJ}%
-  \DeclareUnicodeCharacter{01CB}{Nj}%
-  \DeclareUnicodeCharacter{01CC}{nj}%
-  \DeclareUnicodeCharacter{01CD}{\v{A}}%
-  \DeclareUnicodeCharacter{01CE}{\v{a}}%
-  \DeclareUnicodeCharacter{01CF}{\v{I}}%
-  %
-  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}%
-  \DeclareUnicodeCharacter{01D1}{\v{O}}%
-  \DeclareUnicodeCharacter{01D2}{\v{o}}%
-  \DeclareUnicodeCharacter{01D3}{\v{U}}%
-  \DeclareUnicodeCharacter{01D4}{\v{u}}%
-  %
-  \DeclareUnicodeCharacter{01E2}{\={\AE}}%
-  \DeclareUnicodeCharacter{01E3}{\={\ae}}%
-  \DeclareUnicodeCharacter{01E6}{\v{G}}%
-  \DeclareUnicodeCharacter{01E7}{\v{g}}%
-  \DeclareUnicodeCharacter{01E8}{\v{K}}%
-  \DeclareUnicodeCharacter{01E9}{\v{k}}%
-  %
-  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}%
-  \DeclareUnicodeCharacter{01F1}{DZ}%
-  \DeclareUnicodeCharacter{01F2}{Dz}%
-  \DeclareUnicodeCharacter{01F3}{dz}%
-  \DeclareUnicodeCharacter{01F4}{\'G}%
-  \DeclareUnicodeCharacter{01F5}{\'g}%
-  \DeclareUnicodeCharacter{01F8}{\`N}%
-  \DeclareUnicodeCharacter{01F9}{\`n}%
-  \DeclareUnicodeCharacter{01FC}{\'{\AE}}%
-  \DeclareUnicodeCharacter{01FD}{\'{\ae}}%
-  \DeclareUnicodeCharacter{01FE}{\'{\O}}%
-  \DeclareUnicodeCharacter{01FF}{\'{\o}}%
-  %
-  \DeclareUnicodeCharacter{021E}{\v{H}}%
-  \DeclareUnicodeCharacter{021F}{\v{h}}%
-  %
-  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}%
-  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}%
-  \DeclareUnicodeCharacter{0228}{\cedilla{E}}%
-  \DeclareUnicodeCharacter{0229}{\cedilla{e}}%
-  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}%
-  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}%
-  %
-  \DeclareUnicodeCharacter{0232}{\=Y}%
-  \DeclareUnicodeCharacter{0233}{\=y}%
-  \DeclareUnicodeCharacter{0237}{\dotless{j}}%
-  %
-  \DeclareUnicodeCharacter{02DB}{\ogonek{ }}%
+  \DeclareUnicodeCharacter{013F}{L\U{00B7}}
+  %
+  \DeclareUnicodeCharacter{0140}{l\U{00B7}}
+  \DeclareUnicodeCharacter{0141}{\L}
+  \DeclareUnicodeCharacter{0142}{\l}
+  \DeclareUnicodeCharacter{0143}{\'N}
+  \DeclareUnicodeCharacter{0144}{\'n}
+  \DeclareUnicodeCharacter{0145}{\cedilla{N}}
+  \DeclareUnicodeCharacter{0146}{\cedilla{n}}
+  \DeclareUnicodeCharacter{0147}{\v{N}}
+  \DeclareUnicodeCharacter{0148}{\v{n}}
+  \DeclareUnicodeCharacter{0149}{'n}
+  \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}
+  \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}
+  \DeclareUnicodeCharacter{014C}{\=O}
+  \DeclareUnicodeCharacter{014D}{\=o}
+  \DeclareUnicodeCharacter{014E}{\u{O}}
+  \DeclareUnicodeCharacter{014F}{\u{o}}
+  %
+  \DeclareUnicodeCharacter{0150}{\H{O}}
+  \DeclareUnicodeCharacter{0151}{\H{o}}
+  \DeclareUnicodeCharacter{0152}{\OE}
+  \DeclareUnicodeCharacter{0153}{\oe}
+  \DeclareUnicodeCharacter{0154}{\'R}
+  \DeclareUnicodeCharacter{0155}{\'r}
+  \DeclareUnicodeCharacter{0156}{\cedilla{R}}
+  \DeclareUnicodeCharacter{0157}{\cedilla{r}}
+  \DeclareUnicodeCharacter{0158}{\v{R}}
+  \DeclareUnicodeCharacter{0159}{\v{r}}
+  \DeclareUnicodeCharacter{015A}{\'S}
+  \DeclareUnicodeCharacter{015B}{\'s}
+  \DeclareUnicodeCharacter{015C}{\^S}
+  \DeclareUnicodeCharacter{015D}{\^s}
+  \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+  \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+  %
+  \DeclareUnicodeCharacter{0160}{\v{S}}
+  \DeclareUnicodeCharacter{0161}{\v{s}}
+  \DeclareUnicodeCharacter{0162}{\cedilla{T}}
+  \DeclareUnicodeCharacter{0163}{\cedilla{t}}
+  \DeclareUnicodeCharacter{0164}{\v{T}}
+  \DeclareUnicodeCharacter{0165}{\v{t}}
+  \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}
+  \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}
+  \DeclareUnicodeCharacter{0168}{\~U}
+  \DeclareUnicodeCharacter{0169}{\~u}
+  \DeclareUnicodeCharacter{016A}{\=U}
+  \DeclareUnicodeCharacter{016B}{\=u}
+  \DeclareUnicodeCharacter{016C}{\u{U}}
+  \DeclareUnicodeCharacter{016D}{\u{u}}
+  \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+  \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+  %
+  \DeclareUnicodeCharacter{0170}{\H{U}}
+  \DeclareUnicodeCharacter{0171}{\H{u}}
+  \DeclareUnicodeCharacter{0172}{\ogonek{U}}
+  \DeclareUnicodeCharacter{0173}{\ogonek{u}}
+  \DeclareUnicodeCharacter{0174}{\^W}
+  \DeclareUnicodeCharacter{0175}{\^w}
+  \DeclareUnicodeCharacter{0176}{\^Y}
+  \DeclareUnicodeCharacter{0177}{\^y}
+  \DeclareUnicodeCharacter{0178}{\"Y}
+  \DeclareUnicodeCharacter{0179}{\'Z}
+  \DeclareUnicodeCharacter{017A}{\'z}
+  \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+  \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+  \DeclareUnicodeCharacter{017D}{\v{Z}}
+  \DeclareUnicodeCharacter{017E}{\v{z}}
+  \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}
+  %
+  \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+  \DeclareUnicodeCharacter{01C5}{D\v{z}}
+  \DeclareUnicodeCharacter{01C6}{d\v{z}}
+  \DeclareUnicodeCharacter{01C7}{LJ}
+  \DeclareUnicodeCharacter{01C8}{Lj}
+  \DeclareUnicodeCharacter{01C9}{lj}
+  \DeclareUnicodeCharacter{01CA}{NJ}
+  \DeclareUnicodeCharacter{01CB}{Nj}
+  \DeclareUnicodeCharacter{01CC}{nj}
+  \DeclareUnicodeCharacter{01CD}{\v{A}}
+  \DeclareUnicodeCharacter{01CE}{\v{a}}
+  \DeclareUnicodeCharacter{01CF}{\v{I}}
+  %
+  \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+  \DeclareUnicodeCharacter{01D1}{\v{O}}
+  \DeclareUnicodeCharacter{01D2}{\v{o}}
+  \DeclareUnicodeCharacter{01D3}{\v{U}}
+  \DeclareUnicodeCharacter{01D4}{\v{u}}
+  %
+  \DeclareUnicodeCharacter{01E2}{\={\AE}}
+  \DeclareUnicodeCharacter{01E3}{\={\ae}}
+  \DeclareUnicodeCharacter{01E6}{\v{G}}
+  \DeclareUnicodeCharacter{01E7}{\v{g}}
+  \DeclareUnicodeCharacter{01E8}{\v{K}}
+  \DeclareUnicodeCharacter{01E9}{\v{k}}
+  %
+  \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+  \DeclareUnicodeCharacter{01F1}{DZ}
+  \DeclareUnicodeCharacter{01F2}{Dz}
+  \DeclareUnicodeCharacter{01F3}{dz}
+  \DeclareUnicodeCharacter{01F4}{\'G}
+  \DeclareUnicodeCharacter{01F5}{\'g}
+  \DeclareUnicodeCharacter{01F8}{\`N}
+  \DeclareUnicodeCharacter{01F9}{\`n}
+  \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+  \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+  \DeclareUnicodeCharacter{01FE}{\'{\O}}
+  \DeclareUnicodeCharacter{01FF}{\'{\o}}
+  %
+  \DeclareUnicodeCharacter{021E}{\v{H}}
+  \DeclareUnicodeCharacter{021F}{\v{h}}
+  %
+  \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+  \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+  \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+  \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+  \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+  \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+  %
+  \DeclareUnicodeCharacter{0232}{\=Y}
+  \DeclareUnicodeCharacter{0233}{\=y}
+  \DeclareUnicodeCharacter{0237}{\dotless{j}}
+  %
+  \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
   %
   % Greek letters upper case
-  \DeclareUnicodeCharacter{0391}{{\it A}}%
-  \DeclareUnicodeCharacter{0392}{{\it B}}%
-  \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}%
-  \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}%
-  \DeclareUnicodeCharacter{0395}{{\it E}}%
-  \DeclareUnicodeCharacter{0396}{{\it Z}}%
-  \DeclareUnicodeCharacter{0397}{{\it H}}%
-  \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}%
-  \DeclareUnicodeCharacter{0399}{{\it I}}%
-  \DeclareUnicodeCharacter{039A}{{\it K}}%
-  \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}%
-  \DeclareUnicodeCharacter{039C}{{\it M}}%
-  \DeclareUnicodeCharacter{039D}{{\it N}}%
-  \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}%
-  \DeclareUnicodeCharacter{039F}{{\it O}}%
-  \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}%
-  \DeclareUnicodeCharacter{03A1}{{\it P}}%
+  \DeclareUnicodeCharacter{0391}{{\it A}}
+  \DeclareUnicodeCharacter{0392}{{\it B}}
+  \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}
+  \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}
+  \DeclareUnicodeCharacter{0395}{{\it E}}
+  \DeclareUnicodeCharacter{0396}{{\it Z}}
+  \DeclareUnicodeCharacter{0397}{{\it H}}
+  \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}
+  \DeclareUnicodeCharacter{0399}{{\it I}}
+  \DeclareUnicodeCharacter{039A}{{\it K}}
+  \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}
+  \DeclareUnicodeCharacter{039C}{{\it M}}
+  \DeclareUnicodeCharacter{039D}{{\it N}}
+  \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}
+  \DeclareUnicodeCharacter{039F}{{\it O}}
+  \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}
+  \DeclareUnicodeCharacter{03A1}{{\it P}}
   %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma
-  \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}%
-  \DeclareUnicodeCharacter{03A4}{{\it T}}%
-  \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}%
-  \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}%
-  \DeclareUnicodeCharacter{03A7}{{\it X}}%
-  \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}%
-  \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}%
+  \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}
+  \DeclareUnicodeCharacter{03A4}{{\it T}}
+  \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}
+  \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}
+  \DeclareUnicodeCharacter{03A7}{{\it X}}
+  \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}
+  \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}
   %
   % Vowels with accents
-  \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}%
-  \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}%
-  \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}%
-  \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}%
-  \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}%
-  \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}%
+  \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}
+  \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}
+  \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}
+  \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}
+  \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}
+  \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}
   %
   % Standalone accent
-  \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}%
+  \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}
   %
   % Greek letters lower case
-  \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}%
-  \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}%
-  \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}%
-  \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}%
-  \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}%
-  \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}%
-  \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}%
-  \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}%
-  \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}%
-  \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}%
-  \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}%
-  \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}%
-  \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}%
-  \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}%
-  \DeclareUnicodeCharacter{03BF}{{\it o}}% omicron
-  \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}%
-  \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}%
-  \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}%
-  \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}%
-  \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}%
-  \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}%
-  \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}%
-  \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}%
-  \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}%
-  \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}%
+  \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}
+  \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}
+  \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}
+  \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}
+  \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}
+  \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}
+  \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}
+  \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}
+  \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}
+  \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}
+  \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}
+  \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}
+  \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}
+  \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}
+  \DeclareUnicodeCharacter{03BF}{{\it o}} % omicron
+  \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}
+  \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}
+  \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}
+  \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}
+  \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}
+  \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}
+  \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}
+  \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}
+  \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}
+  \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}
   %
   % More Greek vowels with accents
-  \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}%
-  \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}%
-  \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}%
-  \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}%
-  \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}%
+  \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}
+  \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}
+  \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}
+  \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}
+  \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}
   %
   % Variant Greek letters
-  \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}%
-  \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}%
-  \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}%
-  %
-  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}%
-  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}%
-  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}%
-  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}%
-  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}%
-  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}%
-  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}%
-  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}%
-  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}%
-  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}%
-  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}%
-  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}%
-  %
-  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}%
-  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}%
-  %
-  \DeclareUnicodeCharacter{1E20}{\=G}%
-  \DeclareUnicodeCharacter{1E21}{\=g}%
-  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}%
-  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}%
-  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}%
-  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}%
-  \DeclareUnicodeCharacter{1E26}{\"H}%
-  \DeclareUnicodeCharacter{1E27}{\"h}%
-  %
-  \DeclareUnicodeCharacter{1E30}{\'K}%
-  \DeclareUnicodeCharacter{1E31}{\'k}%
-  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}%
-  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}%
-  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}%
-  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}%
-  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}%
-  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}%
-  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}%
-  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}%
-  \DeclareUnicodeCharacter{1E3E}{\'M}%
-  \DeclareUnicodeCharacter{1E3F}{\'m}%
-  %
-  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}%
-  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}%
-  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}%
-  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}%
-  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}%
-  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}%
-  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}%
-  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}%
-  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}%
-  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}%
-  %
-  \DeclareUnicodeCharacter{1E54}{\'P}%
-  \DeclareUnicodeCharacter{1E55}{\'p}%
-  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}%
-  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}%
-  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}%
-  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}%
-  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}%
-  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}%
-  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}%
-  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}%
-  %
-  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}%
-  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}%
-  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}%
-  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}%
-  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}%
-  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}%
-  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}%
-  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}%
-  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}%
-  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}%
-  %
-  \DeclareUnicodeCharacter{1E7C}{\~V}%
-  \DeclareUnicodeCharacter{1E7D}{\~v}%
-  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}%
-  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}%
-  %
-  \DeclareUnicodeCharacter{1E80}{\`W}%
-  \DeclareUnicodeCharacter{1E81}{\`w}%
-  \DeclareUnicodeCharacter{1E82}{\'W}%
-  \DeclareUnicodeCharacter{1E83}{\'w}%
-  \DeclareUnicodeCharacter{1E84}{\"W}%
-  \DeclareUnicodeCharacter{1E85}{\"w}%
-  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}%
-  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}%
-  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}%
-  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}%
-  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}%
-  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}%
-  \DeclareUnicodeCharacter{1E8C}{\"X}%
-  \DeclareUnicodeCharacter{1E8D}{\"x}%
-  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}%
-  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}%
-  %
-  \DeclareUnicodeCharacter{1E90}{\^Z}%
-  \DeclareUnicodeCharacter{1E91}{\^z}%
-  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}%
-  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}%
-  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}%
-  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}%
-  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}%
-  \DeclareUnicodeCharacter{1E97}{\"t}%
-  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}%
-  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}%
-  %
-  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}%
-  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}%
-  %
-  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}%
-  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}%
-  \DeclareUnicodeCharacter{1EBC}{\~E}%
-  \DeclareUnicodeCharacter{1EBD}{\~e}%
-  %
-  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}%
-  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}%
-  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}%
-  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}%
-  %
-  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}%
-  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}%
-  %
-  \DeclareUnicodeCharacter{1EF2}{\`Y}%
-  \DeclareUnicodeCharacter{1EF3}{\`y}%
-  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}%
-  %
-  \DeclareUnicodeCharacter{1EF8}{\~Y}%
-  \DeclareUnicodeCharacter{1EF9}{\~y}%
+  \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}
+  \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}
+  \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}
+  %
+  \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+  \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+  \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+  \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+  \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+  \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+  \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+  \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+  \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+  \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+  \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+  \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+  %
+  \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+  \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+  %
+  \DeclareUnicodeCharacter{1E20}{\=G}
+  \DeclareUnicodeCharacter{1E21}{\=g}
+  \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+  \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+  \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+  \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+  \DeclareUnicodeCharacter{1E26}{\"H}
+  \DeclareUnicodeCharacter{1E27}{\"h}
+  %
+  \DeclareUnicodeCharacter{1E30}{\'K}
+  \DeclareUnicodeCharacter{1E31}{\'k}
+  \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+  \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+  \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+  \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+  \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+  \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+  \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+  \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+  \DeclareUnicodeCharacter{1E3E}{\'M}
+  \DeclareUnicodeCharacter{1E3F}{\'m}
+  %
+  \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+  \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+  \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+  \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+  \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+  \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+  \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+  \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+  \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+  \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+  %
+  \DeclareUnicodeCharacter{1E54}{\'P}
+  \DeclareUnicodeCharacter{1E55}{\'p}
+  \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+  \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+  \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+  \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+  \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+  \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+  \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+  \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+  %
+  \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+  \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+  \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+  \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+  \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+  \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+  \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+  \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+  \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+  \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+  %
+  \DeclareUnicodeCharacter{1E7C}{\~V}
+  \DeclareUnicodeCharacter{1E7D}{\~v}
+  \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+  \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+  %
+  \DeclareUnicodeCharacter{1E80}{\`W}
+  \DeclareUnicodeCharacter{1E81}{\`w}
+  \DeclareUnicodeCharacter{1E82}{\'W}
+  \DeclareUnicodeCharacter{1E83}{\'w}
+  \DeclareUnicodeCharacter{1E84}{\"W}
+  \DeclareUnicodeCharacter{1E85}{\"w}
+  \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+  \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+  \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+  \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+  \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+  \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+  \DeclareUnicodeCharacter{1E8C}{\"X}
+  \DeclareUnicodeCharacter{1E8D}{\"x}
+  \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+  \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+  %
+  \DeclareUnicodeCharacter{1E90}{\^Z}
+  \DeclareUnicodeCharacter{1E91}{\^z}
+  \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+  \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+  \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+  \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+  \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+  \DeclareUnicodeCharacter{1E97}{\"t}
+  \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+  \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+  %
+  \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+  \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+  %
+  \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+  \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+  \DeclareUnicodeCharacter{1EBC}{\~E}
+  \DeclareUnicodeCharacter{1EBD}{\~e}
+  %
+  \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+  \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+  \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+  \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+  %
+  \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+  \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+  %
+  \DeclareUnicodeCharacter{1EF2}{\`Y}
+  \DeclareUnicodeCharacter{1EF3}{\`y}
+  \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+  %
+  \DeclareUnicodeCharacter{1EF8}{\~Y}
+  \DeclareUnicodeCharacter{1EF9}{\~y}
   %
   % Punctuation
-  \DeclareUnicodeCharacter{2013}{--}%
-  \DeclareUnicodeCharacter{2014}{---}%
-  \DeclareUnicodeCharacter{2018}{\quoteleft}%
-  \DeclareUnicodeCharacter{2019}{\quoteright}%
-  \DeclareUnicodeCharacter{201A}{\quotesinglbase}%
-  \DeclareUnicodeCharacter{201C}{\quotedblleft}%
-  \DeclareUnicodeCharacter{201D}{\quotedblright}%
-  \DeclareUnicodeCharacter{201E}{\quotedblbase}%
-  \DeclareUnicodeCharacter{2020}{\ensuremath\dagger}%
-  \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}%
-  \DeclareUnicodeCharacter{2022}{\bullet}%
-  \DeclareUnicodeCharacter{202F}{\thinspace}%
-  \DeclareUnicodeCharacter{2026}{\dots}%
-  \DeclareUnicodeCharacter{2039}{\guilsinglleft}%
-  \DeclareUnicodeCharacter{203A}{\guilsinglright}%
-  %
-  \DeclareUnicodeCharacter{20AC}{\euro}%
-  %
-  \DeclareUnicodeCharacter{2192}{\expansion}%
-  \DeclareUnicodeCharacter{21D2}{\result}%
+  \DeclareUnicodeCharacter{2013}{--}
+  \DeclareUnicodeCharacter{2014}{---}
+  \DeclareUnicodeCharacter{2018}{\quoteleft}
+  \DeclareUnicodeCharacter{2019}{\quoteright}
+  \DeclareUnicodeCharacter{201A}{\quotesinglbase}
+  \DeclareUnicodeCharacter{201C}{\quotedblleft}
+  \DeclareUnicodeCharacter{201D}{\quotedblright}
+  \DeclareUnicodeCharacter{201E}{\quotedblbase}
+  \DeclareUnicodeCharacter{2020}{\ensuremath\dagger}
+  \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}
+  \DeclareUnicodeCharacter{2022}{\bullet}
+  \DeclareUnicodeCharacter{202F}{\thinspace}
+  \DeclareUnicodeCharacter{2026}{\dots}
+  \DeclareUnicodeCharacter{2039}{\guilsinglleft}
+  \DeclareUnicodeCharacter{203A}{\guilsinglright}
+  %
+  \DeclareUnicodeCharacter{20AC}{\euro}
+  %
+  \DeclareUnicodeCharacter{2192}{\expansion}
+  \DeclareUnicodeCharacter{21D2}{\result}
   %
   % Mathematical symbols
-  \DeclareUnicodeCharacter{2200}{\ensuremath\forall}%
-  \DeclareUnicodeCharacter{2203}{\ensuremath\exists}%
-  \DeclareUnicodeCharacter{2208}{\ensuremath\in}%
-  \DeclareUnicodeCharacter{2212}{\minus}%
-  \DeclareUnicodeCharacter{2217}{\ast}%
-  \DeclareUnicodeCharacter{221E}{\ensuremath\infty}%
-  \DeclareUnicodeCharacter{2225}{\ensuremath\parallel}%
-  \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}%
-  \DeclareUnicodeCharacter{2229}{\ensuremath\cap}%
-  \DeclareUnicodeCharacter{2261}{\equiv}%
-  \DeclareUnicodeCharacter{2264}{\ensuremath\leq}%
-  \DeclareUnicodeCharacter{2265}{\ensuremath\geq}%
-  \DeclareUnicodeCharacter{2282}{\ensuremath\subset}%
-  \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}%
-  %
-  \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}%
-  \DeclareUnicodeCharacter{2032}{\ensuremath\prime}%
-  \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}%
-  \DeclareUnicodeCharacter{2111}{\ensuremath\Im}%
-  \DeclareUnicodeCharacter{2113}{\ensuremath\ell}%
-  \DeclareUnicodeCharacter{2118}{\ensuremath\wp}%
-  \DeclareUnicodeCharacter{211C}{\ensuremath\Re}%
-  \DeclareUnicodeCharacter{2127}{\ensuremath\mho}%
-  \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}%
-  \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}%
-  \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}%
-  \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}%
-  \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}%
-  \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}%
-  \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}%
-  \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}%
-  \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}%
-  \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}%
-  \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}%
-  \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}%
-  \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}%
-  \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}%
-  \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}%
-  \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}%
-  \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}%
-  \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}%
-  \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}%
-  \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}%
-  \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}%
-  \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}%
-  \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}%
-  \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}%
-  \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}%
-  \DeclareUnicodeCharacter{2201}{\ensuremath\complement}%
-  \DeclareUnicodeCharacter{2202}{\ensuremath\partial}%
-  \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}%
-  \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}%
-  \DeclareUnicodeCharacter{2209}{\ensuremath\notin}%
-  \DeclareUnicodeCharacter{220B}{\ensuremath\owns}%
-  \DeclareUnicodeCharacter{220F}{\ensuremath\prod}%
-  \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}%
-  \DeclareUnicodeCharacter{2211}{\ensuremath\sum}%
-  \DeclareUnicodeCharacter{2213}{\ensuremath\mp}%
-  \DeclareUnicodeCharacter{2218}{\ensuremath\circ}%
-  \DeclareUnicodeCharacter{221A}{\ensuremath\surd}%
-  \DeclareUnicodeCharacter{221D}{\ensuremath\propto}%
-  \DeclareUnicodeCharacter{2220}{\ensuremath\angle}%
-  \DeclareUnicodeCharacter{2223}{\ensuremath\mid}%
-  \DeclareUnicodeCharacter{2228}{\ensuremath\vee}%
-  \DeclareUnicodeCharacter{222A}{\ensuremath\cup}%
-  \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}%
-  \DeclareUnicodeCharacter{222E}{\ensuremath\oint}%
-  \DeclareUnicodeCharacter{223C}{\ensuremath\sim}%
-  \DeclareUnicodeCharacter{2240}{\ensuremath\wr}%
-  \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}%
-  \DeclareUnicodeCharacter{2245}{\ensuremath\cong}%
-  \DeclareUnicodeCharacter{2248}{\ensuremath\approx}%
-  \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}%
-  \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}%
-  \DeclareUnicodeCharacter{2260}{\ensuremath\neq}%
-  \DeclareUnicodeCharacter{226A}{\ensuremath\ll}%
-  \DeclareUnicodeCharacter{226B}{\ensuremath\gg}%
-  \DeclareUnicodeCharacter{227A}{\ensuremath\prec}%
-  \DeclareUnicodeCharacter{227B}{\ensuremath\succ}%
-  \DeclareUnicodeCharacter{2283}{\ensuremath\supset}%
-  \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}%
-  \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}%
-  \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}%
-  \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}%
-  \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}%
-  \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}%
-  \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}%
-  \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}%
-  \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}%
-  \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}%
-  \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}%
-  \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}%
-  \DeclareUnicodeCharacter{2299}{\ensuremath\odot}%
-  \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}%
-  \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}%
-  \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}%
-  \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}%
-  \DeclareUnicodeCharacter{22A8}{\ensuremath\models}%
-  \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}%
-  \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}%
-  \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}%
-  \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}%
-  \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}%
-  \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}%
-  \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}%
-  \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}%
-  \DeclareUnicodeCharacter{22C6}{\ensuremath\star}%
-  \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}%
-  \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}%
-  \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}%
-  \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}%
-  \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}%
-  \DeclareUnicodeCharacter{2322}{\ensuremath\frown}%
-  \DeclareUnicodeCharacter{2323}{\ensuremath\smile}%
-  %
-  \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}%
-  \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}%
-  \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}%
-  \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}%
-  \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}%
-  \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}%
-  \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}%
-  \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}%
-  \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}%
-  \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}%
-  \DeclareUnicodeCharacter{266D}{\ensuremath\flat}%
-  \DeclareUnicodeCharacter{266E}{\ensuremath\natural}%
-  \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}%
-  \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}%
-  \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}%
-  \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}%
-  \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}%
-  \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}%
-  \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}%
-  \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}%
-  \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}%
-  \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}%
-  \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}%
-  \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}%
-  \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}%
-  \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}%
-  \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}%
-  \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}%
-  \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}%
-  \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}%
-  \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}%
-  %
-  \global\mathchardef\checkmark="1370% actually the square root sign
-  \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}%
-}% end of \unicodechardefs
-
-% UTF-8 byte sequence (pdfTeX) definitions (replacing and @U command)
-% It makes the setting that replace UTF-8 byte sequence.
-\def\utfeightchardefs{%
-  \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterUTFviii
-  \unicodechardefs
-}
-
-\newif\ifpassthroughchars
-\passthroughcharsfalse
-
-% For native Unicode (XeTeX and LuaTeX)
-% Definition macro to replace / pass-through the Unicode character
-%
-\def\DeclareUnicodeCharacterNative#1#2{%
-  \catcode"#1=\active
-  \def\dodeclareunicodecharacternative##1##2##3{%
-    \begingroup
-      \uccode`\~="##2\relax
-      \uppercase{\gdef~}{%
-        \ifpassthroughchars
-          ##1%
-        \else
-          ##3%
-        \fi
-      }
-    \endgroup
-  }
-  \begingroup
-    \uccode`\.="#1\relax
-    \uppercase{\def\UTFNativeTmp{.}}%
-    \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
-  \endgroup
-}
-
-% Native Unicode (XeTeX and LuaTeX) character replacing definitions
-% It makes the setting that replace the Unicode characters.
-\def\nativeunicodechardefs{%
-  \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative
-  \unicodechardefs
-}
-
-% For native Unicode (XeTeX and LuaTeX).  Make the character token expand
-% to the sequences given in \unicodechardefs for printing.
-\def\DeclareUnicodeCharacterNativeAtU#1#2{%
-  \def\UTFAtUTmp{#2}
-  \expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp
-}
-
-% Native Unicode (XeTeX and LuaTeX) @U command definitions
-\def\nativeunicodechardefsatu{%
-  \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU
-  \unicodechardefs
-}
+  \DeclareUnicodeCharacter{2200}{\ensuremath\forall}
+  \DeclareUnicodeCharacter{2203}{\ensuremath\exists}
+  \DeclareUnicodeCharacter{2208}{\ensuremath\in}
+  \DeclareUnicodeCharacter{2212}{\minus}
+  \DeclareUnicodeCharacter{2217}{\ast}
+  \DeclareUnicodeCharacter{221E}{\ensuremath\infty}
+  \DeclareUnicodeCharacter{2225}{\ensuremath\parallel}
+  \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}
+  \DeclareUnicodeCharacter{2229}{\ensuremath\cap}
+  \DeclareUnicodeCharacter{2261}{\equiv}
+  \DeclareUnicodeCharacter{2264}{\ensuremath\leq}
+  \DeclareUnicodeCharacter{2265}{\ensuremath\geq}
+  \DeclareUnicodeCharacter{2282}{\ensuremath\subset}
+  \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}
+  %
+  \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}
+  \DeclareUnicodeCharacter{2032}{\ensuremath\prime}
+  \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}
+  \DeclareUnicodeCharacter{2111}{\ensuremath\Im}
+  \DeclareUnicodeCharacter{2113}{\ensuremath\ell}
+  \DeclareUnicodeCharacter{2118}{\ensuremath\wp}
+  \DeclareUnicodeCharacter{211C}{\ensuremath\Re}
+  \DeclareUnicodeCharacter{2127}{\ensuremath\mho}
+  \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}
+  \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}
+  \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}
+  \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}
+  \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}
+  \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}
+  \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}
+  \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}
+  \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}
+  \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}
+  \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}
+  \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}
+  \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}
+  \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}
+  \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}
+  \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}
+  \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}
+  \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}
+  \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}
+  \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}
+  \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}
+  \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}
+  \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}
+  \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}
+  \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}
+  \DeclareUnicodeCharacter{2201}{\ensuremath\complement}
+  \DeclareUnicodeCharacter{2202}{\ensuremath\partial}
+  \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}
+  \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}
+  \DeclareUnicodeCharacter{2209}{\ensuremath\notin}
+  \DeclareUnicodeCharacter{220B}{\ensuremath\owns}
+  \DeclareUnicodeCharacter{220F}{\ensuremath\prod}
+  \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}
+  \DeclareUnicodeCharacter{2211}{\ensuremath\sum}
+  \DeclareUnicodeCharacter{2213}{\ensuremath\mp}
+  \DeclareUnicodeCharacter{2218}{\ensuremath\circ}
+  \DeclareUnicodeCharacter{221A}{\ensuremath\surd}
+  \DeclareUnicodeCharacter{221D}{\ensuremath\propto}
+  \DeclareUnicodeCharacter{2220}{\ensuremath\angle}
+  \DeclareUnicodeCharacter{2223}{\ensuremath\mid}
+  \DeclareUnicodeCharacter{2228}{\ensuremath\vee}
+  \DeclareUnicodeCharacter{222A}{\ensuremath\cup}
+  \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}
+  \DeclareUnicodeCharacter{222E}{\ensuremath\oint}
+  \DeclareUnicodeCharacter{223C}{\ensuremath\sim}
+  \DeclareUnicodeCharacter{2240}{\ensuremath\wr}
+  \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}
+  \DeclareUnicodeCharacter{2245}{\ensuremath\cong}
+  \DeclareUnicodeCharacter{2248}{\ensuremath\approx}
+  \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}
+  \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}
+  \DeclareUnicodeCharacter{2260}{\ensuremath\neq}
+  \DeclareUnicodeCharacter{226A}{\ensuremath\ll}
+  \DeclareUnicodeCharacter{226B}{\ensuremath\gg}
+  \DeclareUnicodeCharacter{227A}{\ensuremath\prec}
+  \DeclareUnicodeCharacter{227B}{\ensuremath\succ}
+  \DeclareUnicodeCharacter{2283}{\ensuremath\supset}
+  \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}
+  \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}
+  \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}
+  \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}
+  \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}
+  \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}
+  \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}
+  \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}
+  \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}
+  \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}
+  \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}
+  \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}
+  \DeclareUnicodeCharacter{2299}{\ensuremath\odot}
+  \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}
+  \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}
+  \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}
+  \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}
+  \DeclareUnicodeCharacter{22A8}{\ensuremath\models}
+  \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}
+  \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}
+  \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}
+  \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}
+  \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}
+  \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}
+  \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}
+  \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}
+  \DeclareUnicodeCharacter{22C6}{\ensuremath\star}
+  \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}
+  \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}
+  \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}
+  \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}
+  \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}
+  \DeclareUnicodeCharacter{2322}{\ensuremath\frown}
+  \DeclareUnicodeCharacter{2323}{\ensuremath\smile}
+  %
+  \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}
+  \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}
+  \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}
+  \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}
+  \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}
+  \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}
+  \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}
+  \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}
+  \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}
+  \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}
+  \DeclareUnicodeCharacter{266D}{\ensuremath\flat}
+  \DeclareUnicodeCharacter{266E}{\ensuremath\natural}
+  \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}
+  \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}
+  \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}
+  \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}
+  \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}
+  \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}
+  \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}
+  \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}
+  \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}
+  \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}
+  \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}
+  \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}
+  \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}
+  \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}
+  \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}
+  \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}
+  \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}
+  \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}
+  \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}
+  %
+  \global\mathchardef\checkmark="1370 % actually the square root sign
+  \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}
+}% end of \utfeightchardefs
 
 % US-ASCII character definitions.
 \def\asciichardefs{% nothing need be done
    \relax
 }
 
-% Whether the active definitions of non-ASCII characters expand to
-% non-active tokens with the same character code.  This is used to
-% write characters literally, instead of using active definitions for
-% printing the correct glyphs.
-\newif\ifpassthroughchars
-\passthroughcharsfalse
+% Latin1 (ISO-8859-1) character definitions.
+\def\nonasciistringdefs{%
+  \setnonasciicharscatcode\active
+  \def\defstringchar##1{\def##1{\string##1}}%
+  %
+  \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83%
+  \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87%
+  \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b%
+  \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f%
+  %
+  \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93%
+  \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97%
+  \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b%
+  \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f%
+  %
+  \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
+  \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
+  \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
+  \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
+  %
+  \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
+  \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
+  \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
+  \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
+  %
+  \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
+  \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
+  \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
+  \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
+  %
+  \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
+  \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
+  \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
+  \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
+  %
+  \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
+  \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
+  \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
+  \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
+  %
+  \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
+  \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
+  \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
+  \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
+}
+
 
 % define all the unicode characters we know about, for the sake of @U.
-\iftxinativeunicodecapable
-  \nativeunicodechardefsatu
-\else
-  \utfeightchardefs
-\fi
+\utfeightchardefs
 
 
 % Make non-ASCII characters printable again for compatibility with
@@ -10987,12 +10787,12 @@ directory should work if nowhere else does.}
   \advance\vsize by \topskip
   \outervsize = \vsize
   \advance\outervsize by 2\topandbottommargin
-  \txipageheight = \vsize
+  \pageheight = \vsize
   %
   \hsize = #2\relax
   \outerhsize = \hsize
   \advance\outerhsize by 0.5in
-  \txipagewidth = \hsize
+  \pagewidth = \hsize
   %
   \normaloffset = #4\relax
   \bindingoffset = #5\relax
@@ -11278,7 +11078,7 @@ directory should work if nowhere else does.}
 %
 {@catcode`- = @active
  @gdef@normalturnoffactive{%
-   @passthroughcharstrue
+   @nonasciistringdefs
    @let-=@normaldash
    @let"=@normaldoublequote
    @let$=@normaldollar %$ font-lock fix
@@ -11316,10 +11116,9 @@ directory should work if nowhere else does.}
   @global@let\ = @eatinput%
   @catcode`@^^M=13%
   @def@c{@fixbackslash@c}%
-  % Definition for the newline at the end of this file.
   @def ^^M{@let^^M@secondlinenl}%
-  % Definition for a newline in the main Texinfo file.
-  @gdef @secondlinenl{@fixbackslash}%
+  @gdef @secondlinenl{@let^^M@thirdlinenl}%
+  @gdef @thirdlinenl{@fixbackslash}%
 }}
 
 {@catcode`@^=7 @catcode`@^^M=13%