diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/chextras/chextras.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/chextras/chextras.sty | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/chextras/chextras.sty b/Master/texmf-dist/tex/latex/chextras/chextras.sty index 7ec3d183dae..2ec4426e301 100644 --- a/Master/texmf-dist/tex/latex/chextras/chextras.sty +++ b/Master/texmf-dist/tex/latex/chextras/chextras.sty @@ -6,7 +6,7 @@ %% %% chextras.dtx (with options: `chextras.sty') %% -%% Copyright 2008, 2009, 2010 by Boris Oriet <http://boris.oriet.net> +%% Copyright 2010 - 2012 by Boris Oriet <http://boris.oriet.net> %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -15,13 +15,13 @@ %% %% http://www.latex-project.org/lppl.txt %% -%% and version 1.3c or later is part of all distributions of LaTeX version -%% 2008/05/04 or later. +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. %% %% This file has the LPPL maintenance status "author-maintained". %% \NeedsTeXFormat{LaTeX2e}[1996/06/01] -\ProvidesPackage{chextras}[2010/10/10 v1.0 Swiss companion package] +\ProvidesPackage{chextras}[2012/07/20 v1.01 Swiss companion package] \DeclareOption{nomath}{\PassOptionsToPackage{nomath}{lmodern}} \DeclareOption{lighttt}{\PassOptionsToPackage{lighttt}{lmodern}} \DeclareOption{variablett}{\PassOptionsToPackage{variablett}{lmodern}} @@ -67,7 +67,11 @@ \ProcessOptions\relax \expandafter\ifx\csname XeTeXrevision\endcsname\relax \def\UTFencname{T1} - \RequirePackage[utf8]{inputenc} + \expandafter\ifx\csname directlua\endcsname\relax + \RequirePackage[utf8]{inputenc} + \else + \RequirePackage[utf8]{luainputenc} + \fi \DeclareUnicodeCharacter{00A0}{\nobreak\space} \else \def\UTFencname{EU1} @@ -99,8 +103,7 @@ \newcommand*{\ch@mrg}[3]{\edef\@tempa{#1}\edef\@tempb{#2}% \ifx\f@shape\@tempb \ifcsname\f@encoding/\f@family/\f@series/#3\endcsname - \edef\@tempa{#3}\fi\fi - \fontshape{\@tempa}\selectfont} + \edef\@tempa{#3}\fi\fi\fontshape{\@tempa}\selectfont} \DeclareRobustCommand{\itshape} {\not@math@alphabet\itshape\mathit \ch@mrg\itdefault\scdefault\sidefault} @@ -127,19 +130,19 @@ \RequirePackage{etoolbox} \RequirePackage{xkeyval} \RequirePackage{makecmds} - \let\old@Require\RequirePackage\let\old@Explsyntax\ExplSyntaxOn + \let\old@Require\RequirePackage + \let\old@ExplsyntaxOn\ExplSyntaxOn\let\old@ExplsyntaxOff\ExplSyntaxOff \def\new@Require#1[#2]{}\def\new@ExplSyntax{} - \let\RequirePackage\new@Require\let\ExplSyntaxOn\new@ExplSyntax + \let\RequirePackage\new@Require + \let\ExplSyntaxOn\new@ExplSyntax\let\ExplSyntaxOff\new@ExplSyntax \old@Require[nolocalmarks]{polyglossia}[2010/07/27] - \let\RequirePackage\old@Require\let\ExplSyntaxOn\old@ExplSyntax + \let\RequirePackage\old@Require + \let\ExplSyntaxOn\old@ExplSyntaxOn\let\ExplSyntaxOff\old@ExplSyntaxOff \setdefaultlanguage{\load@lang} \def\ch@thn{\nobreak\hskip.166667em plus.083333em minus\z@\relax} \def\ch@gll{\nobreak\hskip.25em plus\z@ minus.083333em\relax} - \ifstd@space - \def\ch@thk{\nobreak\space\relax} - \else - \let\ch@thk\ch@thn - \fi + \ifstd@space\def\ch@thk{\nobreak\space\relax} + \else\let\ch@thk\ch@thn\fi \addto\french@punctuation {\XeTeXinterchartoks\z@\french@punctthin={\ch@thn} \XeTeXinterchartoks\z@\french@punctthick={\ch@thk} |