From 4689c7acddfa64375a78e6703a6c2671131e3628 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Apr 2015 22:54:05 +0000 Subject: eledmac (25apr15) git-svn-id: svn://tug.org/texlive/trunk@37049 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/Makefile | 1 + Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 1053599 -> 1070389 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 553625 -> 553624 bytes .../latex/eledmac/examples/columns-alignment.pdf | Bin 21172 -> 21175 bytes .../latex/eledmac/examples/cross-referencing.pdf | Bin 17618 -> 17621 bytes .../doc/latex/eledmac/examples/eledmac.xdy | 58 +++ .../doc/latex/eledmac/examples/indexing.pdf | Bin 19898 -> 19893 bytes .../eledmac/examples/lemma-disambiguation.pdf | Bin 16781 -> 16775 bytes .../eledmac/examples/line-numbers-in-header.pdf | Bin 31486 -> 31486 bytes .../eledmac/examples/lualatex-parallel-rtl.pdf | Bin 39757 -> 39757 bytes .../latex/eledmac/examples/minimal-parallels.pdf | Bin 12222 -> 12222 bytes .../doc/latex/eledmac/examples/minimal-verses.pdf | Bin 17126 -> 17126 bytes .../examples/mixing-columns-and-not-columns.pdf | Bin 18784 -> 18784 bytes .../examples/one-series-per-pstart-eledpar.pdf | Bin 36472 -> 36475 bytes .../eledmac/examples/one-series-per-pstart.pdf | Bin 25872 -> 25869 bytes .../examples/parallel-column-two-languages.pdf | Bin 26065 -> 26068 bytes .../eledmac/examples/parallel-pages-longnotes.pdf | Bin 59040 -> 59037 bytes .../examples/parallel-pages-notes-on-leftpage.pdf | Bin 22723 -> 22720 bytes .../examples/sections-not-in-line-numbering.pdf | Bin 17149 -> 17149 bytes .../sections-parallel-not-in-line-numbering.pdf | Bin 22223 -> 22224 bytes ...ons-with-critical-notes-in-parallel-columns.pdf | Bin 29341 -> 29344 bytes ...tions-with-critical-notes-in-parallel-pages.pdf | Bin 31615 -> 31608 bytes .../examples/sections-with-critical-notes.pdf | Bin 22711 -> 22712 bytes .../examples/separator-between-paragraphs.pdf | Bin 18718 -> 18715 bytes .../doc/latex/eledmac/examples/side-notes.pdf | Bin 20143 -> 19952 bytes .../examples/spaces-around-footnote-rule.pdf | Bin 20762 -> 20770 bytes .../doc/latex/eledmac/examples/tabular.pdf | Bin 20637 -> 20636 bytes .../examples/text-between-verses-in-parallel.pdf | Bin 16240 -> 16241 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 457 +++++++++++++++++---- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 204 +++++++-- 30 files changed, 612 insertions(+), 108 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/eledmac/examples/eledmac.xdy diff --git a/Master/texmf-dist/doc/latex/eledmac/Makefile b/Master/texmf-dist/doc/latex/eledmac/Makefile index cdec9019ca8..5dbeb1cebe6 100644 --- a/Master/texmf-dist/doc/latex/eledmac/Makefile +++ b/Master/texmf-dist/doc/latex/eledmac/Makefile @@ -38,6 +38,7 @@ dist: $(PACKAGE) examples $(MAKE) -C examples all ln examples/*pdf eledmac/examples ln examples/*tex eledmac/examples + ln examples/*xdy eledmac/examples ln examples/makefile eledmac/examples ln $(PACKAGE) eledmac diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index caf6962801a..e5ed3676331 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf index 5d2fea44436..cbd4805b190 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf index 3c8abfcde92..715e66daa1d 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf index 4af62d1162a..173cadea175 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/eledmac.xdy b/Master/texmf-dist/doc/latex/eledmac/examples/eledmac.xdy new file mode 100644 index 00000000000..402c9daa644 --- /dev/null +++ b/Master/texmf-dist/doc/latex/eledmac/examples/eledmac.xdy @@ -0,0 +1,58 @@ +;;;;;;;;;;;;;;;; +;; This file provides an example of xindy configuration file to use with eledmac. +;; To complete the eledmac Handbook, one can read the French online article on +;; http://geekographie.maieul.net/174 +;;;;;;;;;;;;;;;; + +;;;; Mandatory lines for eledmac +;; The following lines are mandatory. +;; they let eledmac understand the references +;; in the form of: +;; pagenumber-linenumber +;; which are provided by \edtext. +(define-location-class "eledmac" + ("arabic-numbers" :sep"-" "arabic-numbers") + :hierdepth 2 +) + +;; The following lines require the file +;; eledmac-markup-attr.xdy which is automatically generated by the +;; xindy option. +;; This file defines some markup attributes that are required +;; for building the index with both footnote and xindy+hyperref options. +(require "eledmac-markup-attr.xdy") + +;; The following lines are to print +;; the line number in parenthesis +;; after the page number, with a comma between line numbers if there is more than +;; one line number. +;; +;; This setting is strongly recommended, in order to make a distinction +;; between page ranges which are marked with a dash and +;; line numbers, which are by default also marked with a dash. +;; +;; Of course, you can use your own settings + + +(markup-locref-list :open " (" :sep ", " :close ")" + :depth 1 :class "eledmac") + + + +;;;; The following lines should be uncommented if you use xindy + hyperref package +;; This group is not directly linked to eledmac, +;; but is required to have internal hyperlinking in the index +;; if you used the hyperindex=false option of hyperref. +;; Generally, this option and these lines are recommended +;; to provide the best possible compatibility between hyperref and xindy. +;; Read http://geekographie.maieul.net/172 for further explanations. +;; The first line of the first group is just to allow |emph markup in indexing, +;; and is not directly related to eledmac nor to hyperref. + +;(define-attributes ("emph")) +;(markup-locref :open "\hyperpage{" :close "}" :attr "default") +;(markup-locref :open "\textbf{\hyperpage{" :close "}}" :attr "textbf") +;(markup-locref :open "\textit{\hyperpage{" :close "}}" :attr "textit") +;(markup-locref :open "\emph{\hyperpage{" :close "}}" :attr "emph") + + diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf index 476e9a5f9d8..4c85d11278c 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf index bb9d8d462e6..09e2e490678 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf index 65498e0831b..bb893ddfbd4 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.pdf index cad5b756f1d..2626319cdb8 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf index 1c88dc2df30..e6e600ee6cc 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf index 4f0e2d1e45a..b8f1ce132ea 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf index 0395a10934e..822382ed207 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart-eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart-eledpar.pdf index 1497b6e19a9..0fe6de49d05 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart-eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart-eledpar.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart.pdf index e9163b07dbc..0a40b5dc3de 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/one-series-per-pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf index 95128e4d88b..ac83e96ff56 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.pdf index 6bb937de2e7..de3d8cb6a91 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.pdf index cb33dc2d686..c1bb3ed2bd4 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf index b533cc2456e..b7bbc3130d2 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf index 394496208f5..abac300ff2a 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf index 0b82092649d..6967c96a704 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf index 6af49dc6e77..b54bdd7c929 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf index 56c312550ca..d9dcbb5535f 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf index fd299da0e25..7cf100dcd44 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf index 4e96433a827..5c553918dc0 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf index 27f3f3dffcf..04d1d3fb4c1 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf index cba57d995a1..8ca35539ea2 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf index e3a500e07c4..17835d9686d 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf differ diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index a4497cb1601..48a02d57583 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -52,7 +52,7 @@ % \fi % % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} -% \CheckSum{11453} +% \CheckSum{11661} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -241,6 +241,11 @@ % \changes{v1.21.0}{2015/04/13}{\cs{preXnotes} and \cs{prenotesX} features no longer create problems of overflowing at the bottom of the page.} % \changes{v1.21.0}{2015/04/13}{Fix spurious space after first page number in \cs{doendnotes}. oldprintnpnumspace option allows to come back to previous setting} % \changes{v1.21.0}{2015/04/13}{\cs{chapter} inside optional argument of \cs{pstart} works when typesetting parallel pages} +% \changes{v1.22.0}{2015/04/25}{When using hyperref package, internal links in index or with \cs{edlineref} are now targeted to the top and not longer to the bottom of the lines they refer to.} +% \changes{v1.22.0}{2015/04/25}{Provides support for xindy.} +% \changes{v1.22.0}{2015/04/25}{Adds hyperlink for references to notes in indices.} +% \changes{v1.22.0}{2015/04/25}{Fix bug (added on v1.19.2) with \cs{symlinenum} hook when the argument is a not full expandable macro, like \cs{textbardbl}.} +% \changes{v1.22.0}{2015/04/25}{Fix conflict between noend package option and edtabularx environments} % \hyphenation{man-u-script man-u-scripts} % % @@ -654,6 +659,7 @@ % Using all these levels consumes memory space and processing speed. % This is why, if your work does not require all of the A-E, Z series, you can narrow down the available number of series. % For example, if you only need A and B series, call the package with \verb+series={A,B}+ option. +% \item[xindy] and \verb|xindy+hyperref| are for selecting \verb+xindy+ as the index processor (\reff{xindy}). % \item[widthliketwocolumns] set the width of the text disposed on one column to be the same as the width of the text disposed on two parallel columns with \Lpack{eledpar}. This is useful when alternating between normal and parallel typesetting. % \end{description} % \section{Text lines and paragraphs numbering} @@ -1061,6 +1067,7 @@ % Note that if you use it in \cs{stanza}, you must call it at the beginning of the verse. % \section{The apparatus} % \subsection{Commands} +% \subsubsection{The lemma} % \DescribeMacro{\edtext} % Within numbered paragraphs, all footnotes and endnotes are generated % by the \cs{edtext} macro: @@ -1125,7 +1132,7 @@ % \cs{lemma} and \cs{linenum} commands may be used to % generate overlapping notes if necessary.) % -% \paragraph{Commands used in {\tt\protect\bslash edtext}'s second argument} +% \subsubsection{Footnotes} % % The second argument of the \cs{edtext} macro, \meta{commands}, % may contain a series of subsidiary commands that generate @@ -1138,14 +1145,15 @@ % \DescribeMacro{\Efootnote} % \DescribeMacro{\Zfootnote} % Six separate series of the footnotes are maintained; each macro -% takes one argument like \cs{Afootnote}\marg{text}. When all of the five +% takes one argument like \cs{Afootnote}\marg{text}. +% When all of the six % are used, the \texttt{A} notes appear in a layer just below the main % text, followed by the rest in turn, down to the \texttt{Z} notes at -% the bottom. These are the main macros that you will use to construct -% the critical apparatus of your text. The package provides five -% layers of notes in the belief that this will be adequate for -% the most demanding editions. But it is not hard to add further -% layers of notes should they be required. +% the bottom. +% These are the main macros that you will use to construct +% the critical apparatus of your text. +% +% If you need more series of critical notes, please look at \reff{newseries}. % %\changes{v1.0}{2012/09/15}{Options nonum and nosep in \cs{Xfootnote}.} %\changes{v1.20.0}{2015/03/22}{Options fulllines in \cs{Xfootnote}.}\label{Xfootnoteopt} @@ -1159,6 +1167,7 @@ % % Example: \cs{Afootnote}\verb|[nonum]|\marg{text}. % +% \subsubsection{Endnotes} % \DescribeMacro{\Aendnote} % \DescribeMacro{\Bendnote} % \DescribeMacro{\Cendnote} @@ -1166,13 +1175,49 @@ % \DescribeMacro{\Eendnote} % \DescribeMacro{\Zendnote} % The package also maintains six separate series of endnotes. -% Like footnotes each macro takes a single argument like -% \cs{Aendnote}\marg{text}. -% Normally, none of them are printed: you must use the -% \cs{doendnotes} macro described below -% (\reff{doendnotes}) to call for their -% output at the appropriate point in your document. % +% If you do not need the endnotes facility, you should use \verb+noend+ option when loading \Lpack{eledmac}. +% +% The mechanism is similar to the one for footnotes: each macro takes one or more optional arguments and one single argument, like:\\ +% \cs{Aendnote}\oarg{option}\marg{text}. +% +% \verb+[