diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/chextras/README | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/chextras/chextras.pdf | bin | 126824 -> 130469 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/chextras/chextras.dtx | 148 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/chextras/chextras.ins | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/chextras.sty | 33 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/eu1lmros.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/eu1lmssos.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/eu1lmttos.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/eu1lmvttos.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/t1lmros.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/t1lmssos.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/t1lmttos.fd | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/chextras/t1lmvttos.fd | 2 |
13 files changed, 113 insertions, 104 deletions
diff --git a/Master/texmf-dist/doc/latex/chextras/README b/Master/texmf-dist/doc/latex/chextras/README index f4fe2c26484..8391530293e 100644 --- a/Master/texmf-dist/doc/latex/chextras/README +++ b/Master/texmf-dist/doc/latex/chextras/README @@ -1,4 +1,4 @@ -{chextras}[2010/10/10 v1.0 Swiss companion package] +{chextras}[2012/07/20 v1.01 Swiss companion package] The chextras package is a companion for the chletter document class and other classes. It is targeted at the Swiss typesetter. @@ -9,8 +9,8 @@ setting up font, linguistic and other common packages. While it is linked to the chletter document class, it is not tied to it and may be used as a general purpose toolbox for casual writing. -This package is compatible with with both LaTeX and XeTeX, taking in -account their specifics and setting things up accordingly. +This package is compatible with LaTeX, LuaTeX and XeTeX, trying to take +in account their specifics and setting things up accordingly. A bunch of options are provided to easily alter the behaviour of loaded packages. Additional options allow for disabling unwanted features. @@ -20,5 +20,5 @@ chextras.dtx code and documentation chextras.ins install script chextras.pdf documentation -Copyright 2010 Boris Oriet +Copyright 2010 - 2012 Boris Oriet The licence is LPPL 1.3c. diff --git a/Master/texmf-dist/doc/latex/chextras/chextras.pdf b/Master/texmf-dist/doc/latex/chextras/chextras.pdf Binary files differindex 3bf1238716d..f90f6e18c3b 100644 --- a/Master/texmf-dist/doc/latex/chextras/chextras.pdf +++ b/Master/texmf-dist/doc/latex/chextras/chextras.pdf diff --git a/Master/texmf-dist/source/latex/chextras/chextras.dtx b/Master/texmf-dist/source/latex/chextras/chextras.dtx index 417b5959ea0..3481d788bc9 100644 --- a/Master/texmf-dist/source/latex/chextras/chextras.dtx +++ b/Master/texmf-dist/source/latex/chextras/chextras.dtx @@ -1,12 +1,11 @@ % \iffalse meta-comment % -% 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 or (at your option) any later version. -% The latest version of this license is in: +% This file may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, either version 1.3c of this license +% or (at your option) any later version. The latest version of this +% license is in: % % http://www.latex-project.org/lppl.txt % @@ -30,13 +29,14 @@ \makeatother \setlength\parindent{0pt} \CodelineIndex +\RecordChanges \begin{document} \DocInput{chextras.dtx} \end{document} %</driver> % \fi % -% \CheckSum{827} +% \CheckSum{844} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -55,9 +55,10 @@ % Right brace \} Tilde \~} % % \changes{v1.0}{2010/10/10}{Initial version} +% \changes{v1.01}{2012/07/20}{LuaTeX compatiblity} % % \title{The \textsf{chextras} Package -% \thanks{This document corresponds to \textsf{chextras} v1.0, dated 2010/10/10.}} +% \thanks{This document corresponds to \textsf{chextras} v1.01, dated 2012/07/20.}} % \author{Boris \textsc{Oriet}\\\url{http://boris.oriet.net}} % \maketitle % \bigskip\bigskip @@ -75,7 +76,7 @@ % While it is linked to the \textsf{chletter} document class, it is not tied to it % and may be used as a general purpose toolbox for casual writing.\bigskip % -% This package is compatible with with both \LaTeX\ and \XeTeX, taking in +% This package is compatible with with \LaTeX, Lua\TeX\ and \XeTeX, trying to take in % account their specifics and setting things up accordingly.\bigskip % % A bunch of options are provided to easily alter the behaviour of loaded @@ -122,9 +123,9 @@ % \DescribeMacro{italian} % \DescribeMacro{english} % Selecting one of these options will trigger the execution of a linguistic package, either -% \textsf{babel} under \LaTeX\ or \textsf{polyglossia} under \XeTeX. -% Then the given language will be loaded as the default. To have more than one language in -% the document, the appropriate commands supplied by the linguistic packages should be used. +% \textsf{babel} under \LaTeX\ and Lua\TeX, or \textsf{polyglossia} under \XeTeX. To have more +% than one language in the document, the appropriate commands supplied by the linguistic +% packages should be used. % % \subsubsection{Hyperlinks options} % @@ -194,10 +195,10 @@ % The \textsf{chextras} package loads the \textsf{Latin Modern} fonts instead of the older % \textsf{Computer Modern} fonts. Moreover, it always uses |utf8| as input encoding, hence % requiring |utf8| (or |ascii7| which is a subset of |utf8|) encoded sources. At lower level, -% font mecanisms deeply depend on the engine (\LaTeX\ or \XeTeX) and we have to manage this -% situation with addtional font definition files. Finally, a little trick converts the -% \textsc{alt\,+\,space} character to a |\nobreakspace|, thus enabling correct formatting of -% text produced by common word processors. +% font mecanisms deeply depend on the engine (\LaTeX, Lua\TeX\ or \XeTeX) and we have to +% manage this situation with addtional font definition files. Finally, a little trick converts +% the \textsc{alt\,+\,space} character to a |\nobreakspace|, thus enabling correct formatting +% of text produced by common word processors. % % \subsubsection{Oldstyle numbers} % @@ -209,8 +210,8 @@ % \DescribeMacro{\textttos} % These macros take advantage of features included in OpenType \textsf{Latin Modern} fonts. % They don't require the presence of any external package, but rely on specific |.fd| files -% packed with \textsf{chextras}. With \LaTeX\, the |clm| virtual fonts are used; with \XeTeX\ -% the system fonts are called directly. |\rmosfamily|, |\sfosfamily| and |ttosfamily| are the +% packed with \textsf{chextras}. With \LaTeX\ and Lua\TeX, |clm| virtual fonts are used; +% with \XeTeX, system fonts are called. |\rmosfamily|, |\sfosfamily| and |ttosfamily| are the % respective oldstyle numbers counterparts of |\rmfamily|, |sffamily| and |ttfamily|. The % commands |\textrmos|, |\textsfos| and |\textttos| are also defined. % @@ -263,13 +264,13 @@ % % \subsection{With distributions} % -% The \textsf{chextras} package is intended to be used with the full version of \TeX Live 2010. +% The \textsf{chextras} package is intended to be used with the full version of \TeX Live 2012. % It may encounter trouble with earlier versions of \TeX Live or other distributions. % % \subsection{With engines} % -% The \textsf{chextras} package is able to take advantage of both \LaTeX\ (\textsf{pdftex v1.40}) -% and \XeTeX\ (\textsf{xetex v0.9997}). Lua\TeX\ is currently not supported. +% The \textsf{chextras} package is able to take advantage of \LaTeX\ (\textsf{pdftex v1.40}), +% Lua\TeX\ (\textsf{luatex v0.70}) and \XeTeX\ (\textsf{xetex v0.9997}). % % \subsection{With regular classes} % @@ -280,12 +281,12 @@ % \subsection{With other packages} % % The \textsf{chextras} package at least requires \textsf{fixltx2e~v1.1}, \textsf{lmodern~v1.6} -% and \textsf{fontenc~v1.99}; plus \textsf{inputenc v1.1} (for compilation under \LaTeX) or -% \textsf{xunicode~v0.95} (for compilation under \XeTeX). For some additional features, -% \textsf{chextras} requires \textsf{babel~v3.8} or \textsf{polyglossia~v1.2.0} and -% \textsf{hyperref~v6.81}. These packages would load another bunch of related packages when -% called (please look at their respective documentation). Older or newer versions of these -% packages could break \textsf{chextras} at some point.\medskip +% and \textsf{fontenc~v1.99}; respectively \textsf{inputenc v1.1} (\LaTeX), \textsf{luainputenc~v0.973} +% (Lua\TeX) or \textsf{xunicode~v0.95} (\XeTeX). For some additional features, \textsf{chextras} +% uses \textsf{babel~v3.8} or \textsf{polyglossia~v1.2.0} and \textsf{hyperref~v6.81}. +% These packages would load another bunch of related packages when called (please look at their +% respective documentation). Older or newer versions of these packages could break +% \textsf{chextras} at some point.\medskip % % \textsf{chextras} aims at avoiding packages overload. The minimum set of % packages and font definitions is invoked by: @@ -304,12 +305,12 @@ % \subsection{With text and font encodings} % % The \textsf{chextras} requires |utf8| or |ascii7| sources. There is no provision for any other -% encoding scheme. \textsf{Latin Modern v2.004} fonts with the appropriate |T1| (for \LaTeX) -% or |EU1| (for \XeTeX) encodings must be available. For oldstyle figures, the provided font -% definitions |t1lmros.fd|, |t1lmssos.fd|, |t1lmttos.fd|, |t1lmvttos.fd|; respectively -% |eu1lmros.fd|, |eu1lmssos.fd|, |eu1lmttos.fd|, |eu1lmvttos.fd| are needed. Please note that -% the \textsf{cfr-lm v1.3} package, while not called by \textsf{chextras}, is required under -% \LaTeX\ because of the associated font definitions (|clm| virtual fonts, built upon |lm| +% encoding scheme. \textsf{Latin Modern v2.004} fonts with the appropriate |T1| (for \LaTeX\ and +% Lua\TeX) or |EU1| (for \XeTeX) encodings must be available. For oldstyle figures, the provided +% font definitions |t1lmros.fd|, |t1lmssos.fd|, |t1lmttos.fd|, |t1lmvttos.fd|; and |eu1lmros.fd|, +% |eu1lmssos.fd|, |eu1lmttos.fd|, |eu1lmvttos.fd|, are needed. Please note that the +% \textsf{cfr-lm v1.3} package, while not called by \textsf{chextras}, is required under \LaTeX\ +% and Lua\TeX\ because of the associated font definitions (|clm| virtual fonts, built upon |lm| % fonts, are used in this case). % % \StopEventually @@ -320,11 +321,11 @@ % % The \textsf{chextras} code is mostly pure \LaTeX, with few \TeX\ primitives. It is % however fairly compact. Its main parts are the selection and configuration of the input and -% font encodings (\textsf{inputenc} for \LaTeX, \textsf{xunicode} for \XeTeX, \textsf{fontenc} -% for both), the linguistic packages (either \textsf{babel} or \textsf{polyglossia}), and -% finally the \textsf{hyperref} package. Another part of the code handles the document layout -% settings, taking in account some `disable' package options. The last part provides a few -% convenient commands. +% font encodings (\textsf{inputenc} for \LaTeX, \textsf{luainputenc} for Lua\TeX\ or +% \textsf{xunicode} for \XeTeX, plus \textsf{fontenc} in any case), the linguistic packages (either +% \textsf{babel} or \textsf{polyglossia}), and finally the \textsf{hyperref} package. Another +% part of the code handles the document layout settings, taking in account some `disable' +% package options. The last part provides a few convenient commands. % % \subsection{Initial code} % @@ -333,7 +334,7 @@ % \end{macrocode} % \begin{macrocode} \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] % \end{macrocode} % % \subsubsection{Declaring options} @@ -459,20 +460,25 @@ % % \subsubsection{Input and font encoding packages} % -% Here we test for the engine. Firstly, the \LaTeX\ case. The |T1| encoding is set for later -% call of \textsf{fontenc}, then \textsf{inputenc} (with |utf8|) is loaded. The last line trick -% converts the |0x00a0| character (\textsc{alt\,+\,space}) to something like |\nobreakspace|. +% Here we test for the engine. In \LaTeX\ and Lua\TeX\ cases, |T1| encoding is set for later +% call of \textsf{fontenc}, then the relevant \textsf{inputenc} (with |utf8|) is loaded. The +% last line trick converts the |0x00a0| character (\textsc{alt\,+\,space}) to something like +% |\nobreakspace|. % % \begin{macrocode} \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} % \end{macrocode} % -% Secondly, the \XeTeX\ case. The |EU1| encoding is set for later call of \textsf{fontenc}. -% The \textsf{xunicode} package relies on |\UTFencname| (\textsf{fontspec} is bypassed by -% design decision). The last line is the non \textsf{inputenc} version of the |0x00a0| trick. +% In the \XeTeX\ case, |EU1| encoding is set for later call of \textsf{fontenc}. +% \textsf{fontspec} is bypassed by design decision. The last line is the non \textsf{inputenc} +% version of the |0x00a0| trick. % % \begin{macrocode} \else @@ -498,9 +504,9 @@ % \begin{macro}{\textttos} % We previously have set the \textsf{Latin Modern} fonts as the document's default by loading % the \textsf{lmodern} package. The font selection scheme for oldstyle figures is initialized -% according to the font definitions provided with this package. Under \XeTeX, things are -% straightforward: we just apply |otf| features; while under \LaTeX\ we have to relie on the -% |clm| virtual fonts from the \textsf{cfr-lm} package (see the |.fd| files below for a deeper +% according to the font definitions provided with this package. Under \XeTeX\ things are +% straightforward: we just apply |otf| features; under \LaTeX\ or Lua\TeX\ we relie on the +% |clm| virtual fonts from \textsf{cfr-lm} package (see the |.fd| files below for a deeper % sight into those things). The |variablett| option is cryptically treated here! % % \begin{macrocode} @@ -549,8 +555,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} @@ -599,24 +604,26 @@ % can load alternate languages with |\setotherlanguages|). Finally, we dispense a heavy patch % to the \textsf{polyglossia} |gloss-french.ldf|, taking in account |std@space|. % +% \changes{v1.01}{2012/07/20}{ExplSyntaxOff trick} +% % \begin{macrocode} \else \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} @@ -882,7 +889,7 @@ % \section{Font definitions} % % Appart from the \textsf{chextras} package itself, eight files are provided to enable oldstyle -% numbers in \textsf{Latin Modern} fonts, both in |T1| (\LaTeX) and |EU1| (\XeTeX) encodings. +% numbers in |T1| encoded \textsf{Latin Modern} fonts (for \LaTeX\ and Lua\TeX). % % \setcounter{CodelineNo}{0} % @@ -890,7 +897,7 @@ %<*t1lmros.fd> % \end{macrocode} % \begin{macrocode} -\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 @@ -948,7 +955,7 @@ %<*t1lmssos.fd> % \end{macrocode} % \begin{macrocode} -\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 @@ -995,7 +1002,7 @@ %<*t1lmttos.fd> % \end{macrocode} % \begin{macrocode} -\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} @@ -1071,7 +1078,7 @@ %<*t1lmvttos.fd> % \end{macrocode} % \begin{macrocode} -\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} @@ -1121,7 +1128,7 @@ %<*eu1lmros.fd> % \end{macrocode} % \begin{macrocode} -\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" @@ -1179,7 +1186,7 @@ %<*eu1lmssos.fd> % \end{macrocode} % \begin{macrocode} -\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" @@ -1226,7 +1233,7 @@ %<*eu1lmttos.fd> % \end{macrocode} % \begin{macrocode} -\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} @@ -1302,7 +1309,7 @@ %<*eu1lmvttos.fd> % \end{macrocode} % \begin{macrocode} -\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} @@ -1349,7 +1356,6 @@ % \pagebreak % % \Finale +% \PrintChanges % \PrintIndex -\endinput - - +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/source/latex/chextras/chextras.ins b/Master/texmf-dist/source/latex/chextras/chextras.ins index 67b7983e2a7..d56cf30e599 100644 --- a/Master/texmf-dist/source/latex/chextras/chextras.ins +++ b/Master/texmf-dist/source/latex/chextras/chextras.ins @@ -1,5 +1,5 @@ %% -%% 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 @@ -8,8 +8,8 @@ %% %% 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". %% @@ -18,7 +18,7 @@ \preamble -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 @@ -27,8 +27,8 @@ license is in: 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". 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} |