diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-23 21:56:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-23 21:56:55 +0000 |
commit | bbaa9588d1b77278d1752d39b8b2ac3aa26d36c2 (patch) | |
tree | 5563d97020022081f6a36439b9623b7858e28495 /Master/texmf-dist/tex/latex | |
parent | baf6e36c7179e4135cda6aab4261065477e55771 (diff) |
chextras 1.01 (23jul12)
git-svn-id: svn://tug.org/texlive/trunk@27118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
9 files changed, 26 insertions, 23 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} diff --git a/Master/texmf-dist/tex/latex/chextras/eu1lmros.fd b/Master/texmf-dist/tex/latex/chextras/eu1lmros.fd index c764b81a6fe..ebeaa8de76b 100644 --- a/Master/texmf-dist/tex/latex/chextras/eu1lmros.fd +++ b/Master/texmf-dist/tex/latex/chextras/eu1lmros.fd @@ -1,4 +1,4 @@ -\ProvidesFile{eu1lmros.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{eu1lmros.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{EU1}{lmros}{} \DeclareFontShape{EU1}{lmros}{m}{n} {<-5.5> "[lmroman5-regular]:+onum,+tnum,mapping=tex-text" diff --git a/Master/texmf-dist/tex/latex/chextras/eu1lmssos.fd b/Master/texmf-dist/tex/latex/chextras/eu1lmssos.fd index 8806b523f9b..dd938529946 100644 --- a/Master/texmf-dist/tex/latex/chextras/eu1lmssos.fd +++ b/Master/texmf-dist/tex/latex/chextras/eu1lmssos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{eu1lmssos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{eu1lmssos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{EU1}{lmssos}{} \DeclareFontShape{EU1}{lmssos}{m}{n} {<-8.5> "[lmsans8-regular]:+onum,+tnum,mapping=tex-text" diff --git a/Master/texmf-dist/tex/latex/chextras/eu1lmttos.fd b/Master/texmf-dist/tex/latex/chextras/eu1lmttos.fd index 6da8bf9a051..400543154ae 100644 --- a/Master/texmf-dist/tex/latex/chextras/eu1lmttos.fd +++ b/Master/texmf-dist/tex/latex/chextras/eu1lmttos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{eu1lmttos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{eu1lmttos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{EU1}{lmttos}{\hyphenchar\font\m@ne} \ifx\lmtt@use@light@as@normal\@empty \DeclareFontShape{EU1}{lmttos}{sb}{n} diff --git a/Master/texmf-dist/tex/latex/chextras/eu1lmvttos.fd b/Master/texmf-dist/tex/latex/chextras/eu1lmvttos.fd index 2ab9ffc6897..21ba43afb04 100644 --- a/Master/texmf-dist/tex/latex/chextras/eu1lmvttos.fd +++ b/Master/texmf-dist/tex/latex/chextras/eu1lmvttos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{eu1lmvttos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{eu1lmvttos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{EU1}{lmvttos}{} \ifx\lmtt@use@light@as@normal\@empty \DeclareFontShape{EU1}{lmvttos}{sb}{n} diff --git a/Master/texmf-dist/tex/latex/chextras/t1lmros.fd b/Master/texmf-dist/tex/latex/chextras/t1lmros.fd index 504d36dbd6e..110e603d8b6 100644 --- a/Master/texmf-dist/tex/latex/chextras/t1lmros.fd +++ b/Master/texmf-dist/tex/latex/chextras/t1lmros.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1lmros.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{t1lmros.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{T1}{lmros}{} \DeclareFontShape{T1}{lmros}{m}{n} {<-5.5> clmrj8t5 diff --git a/Master/texmf-dist/tex/latex/chextras/t1lmssos.fd b/Master/texmf-dist/tex/latex/chextras/t1lmssos.fd index a1bfe8540ae..8af892edc28 100644 --- a/Master/texmf-dist/tex/latex/chextras/t1lmssos.fd +++ b/Master/texmf-dist/tex/latex/chextras/t1lmssos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1lmssos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{t1lmssos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{T1}{lmssos}{} \DeclareFontShape{T1}{lmssos}{m}{n} {<-8.5> clmssj8t8 diff --git a/Master/texmf-dist/tex/latex/chextras/t1lmttos.fd b/Master/texmf-dist/tex/latex/chextras/t1lmttos.fd index fecc466a81e..ec28f34c3e8 100644 --- a/Master/texmf-dist/tex/latex/chextras/t1lmttos.fd +++ b/Master/texmf-dist/tex/latex/chextras/t1lmttos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1lmttos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{t1lmttos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{T1}{lmttos}{\hyphenchar\font\m@ne} \ifx\lmtt@use@light@as@normal\@empty \DeclareFontShape{T1}{lmttos}{sb}{n} diff --git a/Master/texmf-dist/tex/latex/chextras/t1lmvttos.fd b/Master/texmf-dist/tex/latex/chextras/t1lmvttos.fd index dd0a1ed0724..5094a59e0f2 100644 --- a/Master/texmf-dist/tex/latex/chextras/t1lmvttos.fd +++ b/Master/texmf-dist/tex/latex/chextras/t1lmvttos.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1lmvttos.fd}[2010/10/10 v1.0 Font defs for Latin Modern] +\ProvidesFile{t1lmvttos.fd}[2012/07/20 v1.01 Font defs for Latin Modern] \DeclareFontFamily{T1}{lmvttos}{} \ifx\lmtt@use@light@as@normal\@empty \DeclareFontShape{T1}{lmvttos}{sb}{n} |