ecclesiastic (21aug15)

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

1 files changed, 47 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/latex/ecclesiastic/ecclesiastic.sty b/Master/texmf-dist/tex/latex/ecclesiastic/ecclesiastic.sty
index 3385577ce93..f8a2a0773fb 100644
--- a/Master/texmf-dist/tex/latex/ecclesiastic/ecclesiastic.sty
+++ b/Master/texmf-dist/tex/latex/ecclesiastic/ecclesiastic.sty
@@ -6,7 +6,7 @@
 %%
 %% ecclesiastic.dtx  (with options: `package')
 %% 
-%% Copyright 2012 Claudio Beccari and Donald Goodman. All rights reserved.
+%% Copyright 2012-2015 Claudio Beccari and Donald Goodman. All rights reserved.
 %% 
 %%  This system is distributed in the hope that it will be useful,
 %%  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,11 +19,36 @@
 %% version. Copy of the LaTeX Project Public Licence is downloadable from
 %% any CTAN archive.
 %% 
+%% It may be distributed and/or modified under the
+%% conditions of the above mentiond LaTeX Project Public License
+%% 
+%% This file has the LPPL maintenance status "author-maintained".
 %% 
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]%
 \ProvidesPackage{ecclesiastic}%
-   [2012/07/29 v.0.2 Ecclesiastic composition of Latin]
-\def\CheckLatin{\expandafter\ifx\csname captionslatin\endcsname\relax
+   [2015/08/20 v.0.3 Ecclesiastic composition of Latin]
+
+\RequirePackage{iftex}
+\unless\ifPDFTeX
+\PackageError{ecclesiastic}{\MessageBreak
+***********************************************\MessageBreak
+* This package works only with pdfLaTeX       \MessageBreak
+* Please do not load it when typesetting with \MessageBreak
+* XeLaTeX or LuaLaTeX.                        \MessageBreak
+***********************************************\MessageBreak
+}{%
+**********************************************************\MessageBreak
+* Carefully read the documentation of package            \MessageBreak
+* ecclesiastic, and understand why most functionalities  \MessageBreak
+* of this package are obtained with completely different \MessageBreak
+* means, thanks the use of OpenType fonts.               \MessageBreak
+*                                                        \MessageBreak
+* Input of this package is aborted.                      \MessageBreak
+**********************************************************\MessageBreak
+}
+\expandafter\endinput
+\fi
+\def\CheckLatin{\unless\ifcsname captionslatin\endcsname
                  \PackageWarning{ecclesiastic}{\MessageBreak
                  latin must be specified as a global option\MessageBreak
                  or it must be passed as an option to babel\MessageBreak
@@ -31,29 +56,26 @@
                  Nothing done}\expandafter\endinput\fi}
 
 \@ifpackageloaded{babel}{\CheckLatin}{%
-           \PackageWarning{ecclesiastic}{\MessageBreak
+           \PackageError{ecclesiastic}{\MessageBreak
+           ************************************************\MessageBreak
            Package babel must be loaded before this package\MessageBreak
-           \MessageBreak
-           Nothing will be done}\endinput}
+           ************************************************%
+           }{Package loading is aborted}\endinput}
 \let\og\empty\let\fg\empty%
+
    \def\FrenchGuillemetsFrom#1#2#3#4{%
      \DeclareFontEncoding{#1}{}{}%
      \DeclareFontSubstitution{#1}{#2}{m}{n}%
-     \DeclareTextCommand{\guillemotleft}{OT1}{%
+     \DeclareTextCommand{\guillemotleft}{T1}{%
         {\fontencoding{#1}\fontfamily{#2}\selectfont\char#3}}%
-     \DeclareTextCommand{\guillemotright}{OT1}{%
+     \DeclareTextCommand{\guillemotright}{T1}{%
         {\fontencoding{#1}\fontfamily{#2}\selectfont\char#4}}}
-   \def\CyrillicGuillemets{\FrenchGuillemetsFrom{OT2}{wncyr}{60}{62}}
-   \def\PolishGuillemets{\FrenchGuillemetsFrom{T1}{lmr}{19}{20}}
-   \def\LasyGuillemets{%
-     \DeclareTextCommand{\guillemotleft}{OT1}{\hbox{%
-        \fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}}%
-     \DeclareTextCommand{\guillemotright}{OT1}{\hbox{%
-        \fontencoding{U}\fontfamily{lasy}\selectfont)\kern-0.20em)}}}
-   \IfFileExists{t1lmr.fd}{\PolishGuillemets}{%
-       \IfFileExists{ot2wncyr.fd}{\CyrillicGuillemets}{\LasyGuillemets}}
-   \DeclareTextSymbolDefault{\guillemotleft}{OT1}
-   \DeclareTextSymbolDefault{\guillemotright}{OT1}
+
+   \let\FrenchGuillemotsFrom\FrenchGuillemetsFrom
+
+\AtBeginDocument{%
+\unless\ifcsname guillemotleft\endcsname
+   \def\ToneGuillemets{\FrenchGuillemetsFrom{T1}{lmr}{19}{20}}\fi}
    \def\guill@spacing{\penalty\@M\hskip.3\fontdimen2\font
                        \@plus\z@\@minus\z@}
    \DeclareRobustCommand*{\begin@guill}{\leavevmode
@@ -82,12 +104,8 @@
 \declare@shorthand{latin}{'U}{\'U}
 \declare@shorthand{latin}{'Y}{\'Y}
 \declare@shorthand{latin}{"}{%
-\ifmmode
-    \def\lt@next{''}%
-\else
-    \def\lt@next{\futurelet\lt@temp\lt@cwm}%
-\fi
-\lt@next
+\textormath{\def\lt@next{\futurelet\lt@temp\lt@cwm}}%
+           {\def\lt@next{''}}\lt@next
 }%
 \def\lt@@cwm{\nobreak\discretionary{-}{}{}\nobreak\hskip\z@skip}%
 \def\lt@@ocap#1{\begin@guill}\def\lt@@ccap#1{\end@guill}%
@@ -158,7 +176,7 @@
 \addto\noextraslatin{\bbl@deactivate{:}}
 \addto\noextraslatin{\bbl@deactivate{!}}
 \addto\noextraslatin{\bbl@deactivate{?}}
-\def\punct@spacing{\penalty\@M\hskip.4\fontdimen2\font
+\def\punct@spacing{\penalty\@M\hskip.3\fontdimen2\font
                    \@plus\z@\@minus\z@}
 \declare@shorthand{latin}{;}{\ifdim\lastskip>\z@\unskip\fi
       \punct@spacing\puntoevirgola}
@@ -177,8 +195,9 @@
 \addto\extraslatin{\let\@makefntext\lt@makefntext}
 \addto\noextraslatin{\let\@makefntext\lt@ori@makefntext}
 \noextraslatin
-%% This work consists of this file ecclesiastic.dtx, a README file, and
-%% the derived files ecclesiastic.sty and ecclesiastic.pdf.
+%% This work consists of this file ecclesiastic.dtx, a README file,
+%% a manifest.txt file and the derived files ecclesiastic.sty and
+%% ecclesiastic.pdf.
 %% 
 %%
 %% End of file `ecclesiastic.sty'.