eledmac (20jul15)

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

2 files changed, 24 insertions, 6 deletions

diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index da312e0c651..5c7b2fc477a 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -31,7 +31,8 @@
              ]{hyperref}
 \usepackage{fontspec}
 \usepackage[english]{babel}
-\usepackage{graphicx,eledmac,metalogo}
+\usepackage[,noreledmac]{eledmac}
+\usepackage{graphicx,metalogo}
 % Index and Changelog in one column
 \makeatletter
   \renewenvironment{theglossary}{%
@@ -63,7 +64,7 @@
 % \fi
 %
 % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}}
-% \CheckSum{11990}
+% \CheckSum{12008}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -274,6 +275,7 @@
 % \changes{v1.24.3}{2015/07/07}{Restore marginal numbers and notes with sectioning command (bug introduced in v1.21.0)}
 % \changes{v1.24.4}{2015/07/14}{Fix spurious space with \cs{edindex} when using xindy+hyperref option.}
 % \changes{v1.24.5}{2015/07/16}{Fix bug of indent, when a  added in 1.1.0, when a \cs{beginnumbering} immediately follow a sectioning command.}
+% \changes{v1.24.6}{2015/07/19}{Eledmac support ends. Migrate to reledmac.}
 % \hyphenation{man-u-script man-u-scripts}
 %
 %
@@ -344,6 +346,7 @@
 %
 % \maketitle
 %
+% \textbf{This is documentation of deprecated eledmac package. If you are beginning a new project, we suggest that you use reledmac instead. If for old projects you can't migrate to reledmac, you can continue to use this documentation and the eledmac package. You should add noreledmac option when loading package, to disable message about reledmac.}
 %
 % \begin{abstract}
 % \edmac, a set of \PlainTeX\ macros, was made at the beginning of 90's 
@@ -3234,7 +3237,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/07/16 v1.24.5 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/07/19 v1.24.6 LaTeX port of EDMAC]%
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -3323,6 +3326,13 @@
 \ExecuteOptionsX{series}%
 \ExecuteOptionsX{final}
 %    \end{macrocode}
+% Suggest to migrate to reledmac.
+% \changes{v1.24.6}{2015/07/19}{Add an optional message to suggest to migrate to reledmac.}
+%    \begin{macrocode}
+\newif\ifnoreledmac
+\DeclareOptionX{noreledmac}{\noreledmactrue}
+%    \end{macrocode}
+%    \begin{macrocode}
 % Use the starred form of \verb?\ProcessOptions? which executes options in
 % the order listed in the source file: class options, then listed package
 % options, so a package option can override a class option with the same name.
@@ -3430,7 +3440,12 @@
 \newcommand{\eledmac@error}[2]{\PackageError{eledmac}{#1}{#2}}
 %    \end{macrocode}
 % \end{macro}
-%
+% First, suggest to use reledmac.
+%    \begin{macrocode}
+\ifnoreledmac\else%
+  \eledmac@error{Using package `eledmac' is deprecated. We suggest\MessageBreak using `reledmac' instead. If you want to continue\MessageBreak with `eledmac', you can disable this message by\MessageBreak adding the option `noreledmac' when loading `eledmac'}{\@ehc}
+\fi%
+%    \end{macrocode}
 % \begin{macro}{\led@err@NumberingStarted}
 % \begin{macro}{\led@err@NumberingNotStarted}
 % \begin{macro}{\led@err@NumberingShouldHaveStarted}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 19adc281d9d..e5d47d16ae7 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -32,7 +32,8 @@
              ]{hyperref}
 \usepackage{fontspec}
 \usepackage[english]{babel}
-\usepackage{graphicx,eledmac,eledpar,metalogo}
+\usepackage[noreledmac]{eledmac}
+\usepackage{graphicx,eledpar,metalogo}
 \makeatletter
   \renewenvironment{theglossary}{%
       \@restonecoltrue\if@twocolumn\@restonecolfalse\fi
@@ -211,6 +212,7 @@
 % \changes{v1.16.1}{2015/05/20}{Write information about line-list file version in the correct file.}
 % \changes{v1.16.2}{2015/05/29}{Fix bug when adding empty lines before a \cs{pend} in combination with some specific penalties setting.}
 % \changes{v1.17.0}{2015/06/02}{Add compatibility of optional argument of \cs{pstart}/\cs{pend} and \cs{AtEveryPstart}/\cs{AtEveryPend} with two columns mode.}
+% \changes{v1.17.0a}{2015/07/19}{Eledpar support ends. Migrate to reledpar.}
 % \hyphenation{man-u-script man-u-scripts}
 %
 %
@@ -244,6 +246,7 @@
 %
 % \maketitle
 %
+% \textbf{This is documentation of deprecated eledmac package. If you are beginning a new project, we suggest that you use reledmac instead. If for old projects you can't migrate to reledmac, you can continue to use this documentation and the eledmac package. You should add noreledmac option when loading package, to disable message about reledmac.}
 %
 % \begin{abstract}
 % The \Eledmac{} package, which is based on the \PlainTeX\ set of
@@ -976,7 +979,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2015/06/02 v1.17.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2015/07/19 v1.17.0a eledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % Few commands use \cs{xspace} command.