From 7dda79a619cf02db4cdb8b8882245bd8da077b0c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Mar 2015 21:22:46 +0000 Subject: eledmac (22mar15) git-svn-id: svn://tug.org/texlive/trunk@36596 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/README | 4 +- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 1004234 -> 1013076 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 546230 -> 546584 bytes .../latex/eledmac/examples/columns-alignment.pdf | Bin 21171 -> 21172 bytes .../latex/eledmac/examples/columns-alignment.tex | 3 +- .../latex/eledmac/examples/cross-referencing.pdf | Bin 16314 -> 16318 bytes .../latex/eledmac/examples/cross-referencing.tex | 3 +- .../doc/latex/eledmac/examples/indexing.pdf | Bin 19896 -> 19897 bytes .../doc/latex/eledmac/examples/indexing.tex | 3 +- .../eledmac/examples/lemma-disambiguation.pdf | Bin 16777 -> 16776 bytes .../eledmac/examples/lemma-disambiguation.tex | 2 +- .../eledmac/examples/line-numbers-in-header.pdf | Bin 31489 -> 31491 bytes .../eledmac/examples/line-numbers-in-header.tex | 2 +- .../eledmac/examples/lualatex-parallel-rtl.pdf | Bin 39755 -> 39757 bytes .../eledmac/examples/lualatex-parallel-rtl.tex | 3 +- .../latex/eledmac/examples/minimal-parallels.pdf | Bin 12220 -> 12221 bytes .../latex/eledmac/examples/minimal-parallels.tex | 3 +- .../doc/latex/eledmac/examples/minimal-verses.pdf | Bin 17127 -> 17124 bytes .../doc/latex/eledmac/examples/minimal-verses.tex | 2 +- .../examples/mixing-columns-and-not-columns.pdf | Bin 18782 -> 18783 bytes .../examples/mixing-columns-and-not-columns.tex | 2 +- .../examples/parallel-column-two-languages.pdf | Bin 26312 -> 26312 bytes .../examples/parallel-column-two-languages.tex | 2 +- .../eledmac/examples/parallel-pages-longnotes.pdf | Bin 59032 -> 59021 bytes .../eledmac/examples/parallel-pages-longnotes.tex | 4 +- .../examples/parallel-pages-notes-on-leftpage.pdf | Bin 22725 -> 22722 bytes .../examples/parallel-pages-notes-on-leftpage.tex | 2 +- .../examples/sections-not-in-line-numbering.pdf | Bin 17145 -> 17152 bytes .../examples/sections-not-in-line-numbering.tex | 2 +- .../sections-parallel-not-in-line-numbering.pdf | Bin 22221 -> 22223 bytes .../sections-parallel-not-in-line-numbering.tex | 2 +- ...ons-with-critical-notes-in-parallel-columns.pdf | Bin 29654 -> 29655 bytes ...ons-with-critical-notes-in-parallel-columns.tex | 3 +- ...tions-with-critical-notes-in-parallel-pages.pdf | Bin 31804 -> 31807 bytes ...tions-with-critical-notes-in-parallel-pages.tex | 3 +- .../examples/sections-with-critical-notes.pdf | Bin 22791 -> 22785 bytes .../examples/sections-with-critical-notes.tex | 2 +- .../examples/separator-between-paragraphs.pdf | Bin 18930 -> 18924 bytes .../examples/separator-between-paragraphs.tex | 3 +- .../doc/latex/eledmac/examples/side-notes.pdf | Bin 19970 -> 19969 bytes .../doc/latex/eledmac/examples/side-notes.tex | 2 +- .../examples/spaces-around-footnote-rule.pdf | Bin 20963 -> 20962 bytes .../examples/spaces-around-footnote-rule.tex | 2 +- .../doc/latex/eledmac/examples/tabular.pdf | Bin 20886 -> 20886 bytes .../doc/latex/eledmac/examples/tabular.tex | 2 +- .../examples/text-between-verses-in-parallel.pdf | Bin 16241 -> 16241 bytes .../examples/text-between-verses-in-parallel.tex | 2 +- Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 365 +++++++++++++++------ Master/texmf-dist/source/latex/eledmac/eledpar.dtx | 26 +- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 207 ++++++++---- Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 9 +- 51 files changed, 456 insertions(+), 209 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/eledmac/README b/Master/texmf-dist/doc/latex/eledmac/README index 500c5f11a18..e547e964d47 100644 --- a/Master/texmf-dist/doc/latex/eledmac/README +++ b/Master/texmf-dist/doc/latex/eledmac/README @@ -90,8 +90,8 @@ Help see also the [older tag](https://tex.stackexchange.com/questions/tagged/eledmac) -Debug -===== +Debug and feature requests +========================== Suggestions and bug reports are welcome. diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index be18f8310ba..9869d68f11d 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 ffc3f3b8310..912ec55d410 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 448dd7888d5..4f1b31d92fd 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/columns-alignment.tex b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.tex index a1c78fcb33f..313e1976f6f 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.tex @@ -4,7 +4,8 @@ \usepackage{libertineotf} \setmainlanguage{english} -\usepackage{eledmac,eledpar} +\usepackage[series={}]{eledmac} +\usepackage{eledpar} \linenummargin{left} \setlength{\Lcolwidth}{.44\textwidth} 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 1d97291b79c..0c8fcab0d05 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/cross-referencing.tex b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.tex index cdaa1bfa6ac..b0f3f4157ed 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.tex @@ -3,7 +3,8 @@ \usepackage{libertineotf} \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac,hyperref} +\usepackage[series={}]{eledmac} +\usepackage{hyperref} diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf index 45dee5521b1..6c61e2ac658 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/indexing.tex b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.tex index 0bf65cd2bcb..330ccd2b8f7 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.tex @@ -5,7 +5,8 @@ \setotherlanguage{english} \usepackage[nonewpage]{indextools} -\usepackage{eledmac,hyperref} +\usepackage[series={}]{eledmac} +\usepackage{hyperref} \makeindex \makeindex[title=Index Nominum,name=name] \begin{document} 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 ca1046da32a..05e59026740 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/lemma-disambiguation.tex b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.tex index 0e3981f5a07..34f337259a6 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.tex @@ -1,7 +1,7 @@ \documentclass{article} \usepackage{polyglossia,fontspec,xunicode} \usepackage{libertineotf} -\usepackage{eledmac} +\usepackage[series={A}]{eledmac} \setmainlanguage{latin} \setotherlanguage{english} \begin{document} 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 7a98b2a6193..17171dded69 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/line-numbers-in-header.tex b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.tex index 1817455d833..0a665ce1523 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.tex @@ -13,7 +13,7 @@ % CONFIG ELEDMAC TO ADD LINE NUMBER AS LEFT/RIGHT MARKS -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \makeatletter \renewcommand{\do@insidelinehook}{\markboth{\the\line@num}{\the\line@num}} \makeatother 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 3409e016a2d..58962d479f8 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/lualatex-parallel-rtl.tex b/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.tex index 46d62117b7c..5310fdf58ae 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/lualatex-parallel-rtl.tex @@ -1,6 +1,7 @@ \documentclass{article} \usepackage{fontspec} -\usepackage{eledmac,eledpar,metalogo,hyperref} +\usepackage[series={}]{eledmac} +\usepackage{eledpar,metalogo,hyperref} \setlength{\parindent}{0pt} \newfontfamily\syriacfont[Script=Syriac,Scale=1.2]{estre.otf} 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 be7d43558cd..0919bdf4694 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-parallels.tex b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.tex index ae9147f9d10..52cd91b9711 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.tex @@ -4,7 +4,8 @@ \setmainlanguage{english} -\usepackage{eledmac,eledpar} +\usepackage[series={}]{eledmac} +\usepackage{eledpar} \begin{document} 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 33c3794c2eb..2d8a8baf487 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/minimal-verses.tex b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.tex index d034880184d..9f0b6beace1 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.tex @@ -4,7 +4,7 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={A,B}]{eledmac} \renewcommand{\hangingsymbol}{[\,} 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 a611a08cd05..4cebbf2549f 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/mixing-columns-and-not-columns.tex b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.tex index 90ca95ad5b8..ba2b7794fdf 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.tex @@ -5,7 +5,7 @@ \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={A,B}]{eledmac} \usepackage{eledpar} 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 4320e0dbe09..eade7104909 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-column-two-languages.tex b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.tex index 366c86acfa8..7abcdea63ec 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.tex @@ -5,7 +5,7 @@ \usepackage{xunicode,metalogo,hyperref} \usepackage{polyglossia} -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \usepackage{eledpar} \linenumincrement*{1} 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 f5c893f7e0d..b02022c9391 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-longnotes.tex b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.tex index 2813b8f39ed..3696289ff30 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-longnotes.tex @@ -2,8 +2,8 @@ \usepackage{fontspec,xunicode} \usepackage{libertineotf} -\usepackage{eledmac} -\usepackage[]{eledpar} +\usepackage[series={A,B,C}]{eledmac} +\usepackage{eledpar} \renewcommand*{\goalfraction}{0.98} \maxhXnotes{0.25\textheight} 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 fc357feca8a..757692abab6 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/parallel-pages-notes-on-leftpage.tex b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.tex index 5b43dea8d41..b87cd3b4f91 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-pages-notes-on-leftpage.tex @@ -7,7 +7,7 @@ \usepackage{csquotes} -\usepackage{eledmac} +\usepackage[series={A}]{eledmac} \usepackage[shiftedpstarts]{eledpar} \usepackage{setspace} 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 0d6161194b2..6eb2b4936d6 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-not-in-line-numbering.tex b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.tex index 25b59ee77c0..bfdf82f8686 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.tex @@ -4,7 +4,7 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \begin{document} \begin{english} 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 215c64d7e39..41ff75056b8 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-parallel-not-in-line-numbering.tex b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.tex index 2062d4ab2db..31687318ff5 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.tex @@ -5,7 +5,7 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \usepackage{eledpar} 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 91b4f51e211..772417346bf 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-columns.tex b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.tex index bf50ca92228..2d447856503 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.tex @@ -3,7 +3,8 @@ \usepackage{libertineotf} \setmainlanguage{english} -\usepackage{eledmac,eledpar} +\usepackage[series={A}]{eledmac} +\usepackage{eledpar} \eledsectnotoc{L} \eledsectmark{R} \linenumincrement*{1} 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 ab3ccc71a55..4f76f8352b9 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-in-parallel-pages.tex b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.tex index f8e0e14b93e..f31167e6048 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.tex @@ -3,7 +3,8 @@ \usepackage{libertineotf} \setmainlanguage{english} -\usepackage{eledmac,eledpar} +\usepackage[series={A}]{eledmac} +\usepackage{eledpar} \linenumincrement*{1} \firstlinenum*{1} \begin{document} 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 706dd7a6ae9..b26e57290db 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/sections-with-critical-notes.tex b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.tex index b3f4dfecbfd..c5243a6f79f 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.tex @@ -3,7 +3,7 @@ \usepackage{libertineotf} \setmainlanguage{english} -\usepackage{eledmac} +\usepackage[series={A}]{eledmac} \linenumincrement{1} \firstlinenum{1} \begin{document} 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 8877525dcc6..116070ef090 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/separator-between-paragraphs.tex b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.tex index af3fcce830f..798937b3cb1 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.tex @@ -4,7 +4,8 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac,eledpar} +\usepackage[series={}]{eledmac} +\usepackage{eledpar} \AtEveryPend{\vskip \baselineskip{\hfill ***\hfill\strut}\vskip \baselineskip} \begin{document} 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 0bbf0e886a5..e9eb27b9903 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/side-notes.tex b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.tex index 5614fa00b7b..087701f740e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.tex @@ -4,7 +4,7 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \sidenotemargin{outer} \renewcommand{\ledlsnotefontsetup}{\small\it}% left \renewcommand{\ledrsnotefontsetup}{\small\it}% right 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 c0f4d9c1232..5d296707c39 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/spaces-around-footnote-rule.tex b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.tex index 43ed8bd4955..dbb1f064d76 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.tex @@ -6,7 +6,7 @@ \setotherlanguage{english} \usepackage{SIunits} -\usepackage{eledmac} +\usepackage[series={A,B,C}]{eledmac} % THE APPARATI ARE PARAGRAPHED \footparagraph{A} diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf index 3bcc584fc02..f87f03a135f 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/tabular.tex b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.tex index c96cd971de3..6bbde4feef5 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.tex @@ -5,7 +5,7 @@ \setmainlanguage{italian} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={A,B}]{eledmac} \firstlinenum{1} \linenumincrement{1}% 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 77b698f3401..c20e33c3b76 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/doc/latex/eledmac/examples/text-between-verses-in-parallel.tex b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.tex index 2b6541167c9..c2918990506 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.tex +++ b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.tex @@ -5,7 +5,7 @@ \setmainlanguage{latin} \setotherlanguage{english} -\usepackage{eledmac} +\usepackage[series={}]{eledmac} \usepackage{eledpar} \setcounter{stanzaindentsrepetition}{2} \setstanzaindents{14,0,1} diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index feaa4d1918b..02faa9a3688 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -51,7 +51,7 @@ % % \fi % -% \CheckSum{10675} +% \CheckSum{10716} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -219,6 +219,12 @@ % \changes{v1.19.0}{2015/03/06}{\cs{maxhXnotes} and \cs{maxhnotesX} work now for both two-columns and three-columns setting.} % \changes{v1.19.0}{2015/03/06}{Compatibility with \Lpack{eledpar} v.1.13.0.} % \changes{v1.19.1}{2015/03/12}{Call \cs{correct@footinsX@box} and \cs{correct@Xfootins@box} directly in \cs{print@notesX@forpages} and \cs{print@Xnotes@forpages}, that is in \Lpack{eledpar}.} +% \changes{v1.20.0}{2015/03/22}{Correct \cs{inplaceofnumber} hook.} +% \changes{v1.20.0}{2015/03/22}{Add series option.} +% \changes{v1.20.0}{2015/03/22}{Fix issues with RTL text in notes when using \LuaLaTeX.} +% \changes{v1.20.0}{2015/03/22}{The \cs{newif}s are not followed by boolean values set to false, because it is the \TeX\ default setting.} +% \changes{v1.20.0}{2015/03/22}{Explicit error message when calling \cs{Xfootnote} outside of \cs{edtext}.} +% \changes{v1.20.0}{2015/03/22}{Fix bug with line number typesetting direction when using \cs{eledsection} and similar commands for RTL texts with \LuaLaTeX.} % \hyphenation{man-u-script man-u-scripts} % % @@ -316,7 +322,7 @@ % \Lpack{eledmac} provides many tools and options. Normally, they are all documented in this file. % Also provided is a help folder, ``\href{examples/.}{examples}''. The folder contains additional examples (although not for all cases) % -% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can report bugs in English or in French (better). +% To report bugs or request a new feature, please go to ledmac GitHub page and click on ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must create an account on github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can post messages in English or in French (preferred). % % You can subscribe to the eledmac mail list in:\\ \url{http://geekographie.maieul.net/146} % \end{abstract} @@ -611,6 +617,21 @@ % edited text. % % +% \section{Options} +% The package can be loaded with a number of global options which are listed here. +% It is advised to read the relevant parts of the handbook before reading this section. +% \begin{description} +% \item[draft], if called, underline lemmas in the main text. +% \item[ledsecnolinenumber] is deprecated. +% \item[nopbinverse] prevent page break inside verses. +% \item[noquotation] by default, the quotation environment is redefined inside numbered text. You can disable this redefinition with \verb|noquotation| (see \ref{noquotation} p.~\pageref{noquotation}). +% \item[parapparatus] by default, the appparatus cannot contain paragraph breaks; this option enables paragraphing inside the apparatus. +% \item[series] \Lpack{eledmac} defines six levels of notes: A, B, C, D, E, Z. +% 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[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} % \subsection{Text lines numbering} % \DescribeMacro{\beginnumbering} @@ -707,7 +728,13 @@ % Its content will be printed before the beginning of \cs{pstart} / after the end of \cs{pend} instead of the argument of \cs{AtEveryPstart} / \cs{AtEveryPend}. % If you need to start a \cs{pstart} by brackets, or to add brackets after a \cs{pend}, just add a \cs{relax} between \cs{pstart}/\cs{pend} and the brackets. % -% This feature is not needed for normal use of \Lpack{eledmac}, but it is needed when using verse (see~\ref{verse} p.~\pageref{verse}) or \Lpack{eledpar} (see~\ref{eledpar} p.~\pageref{eledpar}). +% For example, \Lpack{eledmac} does not insert \cs{parskip} between paragraphs. This feature allows you to insert it: +% \begin{verbatim} +% \parskip=2\baselineskip% Set the skip between paragraphs +% \AtEveryPend{\vskip\parskip}% Apply after every \Pend +% \end{verbatim} + +%. This feature is also useful when typesetting verses (see~\ref{verse} p.~\pageref{verse}) or \Lpack{eledpar} (see~\ref{eledpar} p.~\pageref{eledpar}). % % A \cs{noindent} is automatically added before this argument. % \subsubsection{Content before every \cs{pstart} and after every \cs{pend}} @@ -1090,10 +1117,12 @@ % the most demanding editions. But it is not hard to add further % layers of notes should they be required. % -%\changes{v1.0}{2012/09/15}{Options nonum and nosep in \cs{Xfootnote}.}\label{Xfootnoteopt} +%\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} %An optional argument can be added before the text of the footnote. Its value is a comma separated list of options. -% The available options are: +% \label{fulllines}The available options are: % \begin{itemize} +% \item \verb|fulllines| to disable \cs{twolines} and \cs{morethantwolines} features for this note (cf. \ref{twolines} p.~\pageref{twolines}). % \item \verb|nonum| to disable line numbering for this note. % \item \verb|nosep| to disable the lemma separator for this note. % \end{itemize} @@ -1202,23 +1231,23 @@ % % \subsection{Disambiguation of identical words in the apparatus} % \changes{v1.15.0}{2015/01/12}{New tools to prevent ambiguous references in lemma} -% Sometimes, the same word occurss twice (or more time) in the same line. -% \Lpack{eledmac} provides tools to disambuigate references in the critical notes. +% Sometimes, the same word occurs twice (or more) in the same line. +% \Lpack{eledmac} provides tools to disambiguate references in the critical notes. % The lemma will be followed by a reference number if a given word occurs more that once in the same line. % % \DescribeMacro{\sameword} To use this tool, you have to mark every occurrence of the potentially ambiguous term with the \cs{sameword} command: % \begin{verbatim} -% lupus \sameword{aut} canis \edtext{\sameword{aut}}{\Afootnote{et}} felix +% Lupus \sameword{aut} canis \edtext{\sameword{aut}}{\Afootnote{et}} felix % \end{verbatim} % In this example, \verb+aut+ will be followed, in the critical note, by the exponent \verb+2+ if it is printed in the same line as the first \verb+aut+, but it won't if it is printed in a different line. The number is printed only after the second run. % -% If you use the \cs{lemma} command, \Lpack{eledmac} assumes that the word marked with \cs{sameword} is not already found in \cs{lemma}. -% However, if it is actually found in it, you must use this method: +% If you use the \cs{lemma} command, \Lpack{eledmac} assumes that the word marked with \cs{sameword} is not already present in \cs{lemma}. +% However, if it is actually present in \cs{lemma}, you must use this method: % \begin{itemize} % \item In the first argument of \cs{edtext}, use \cs{sameword} with the optional argument `[inlemma]`. % \item In the content of \cs{lemma}, use \cs{sameword} with no optional argument. % \end{itemize} -% Like this : +% Like this: % \begin{verbatim} % \edtext{\sameword[inlemma]{sw}}{\lemma{\sameword{sw} some lemma}\Afootnote{some note}} % \end{verbatim} @@ -1287,6 +1316,24 @@ % But if you use both \cs{numberonlyfirstinline}\oarg{s} and \cs{numberonlyfirstintwolines}\oarg{s}, the distinction is made. % Use \cs{numberonlyfirstintwolines}\oarg{s}\verb+[false]+ to cancel it (\verb|| can be empty if you want to disable it for every series). % +% \changes{v1.20.0}{2015/03/22}{Add \cs{twolines} and \cs{morethantwolines} hooks} +% \label{twolines} +% \DescribeMacro{\twolines}\DescribeMacro{\morethantwolines} +% If a lemma is printed on two subsequent lines, \Eledmac\ will print the first and the last line numbers. +% Instead of this, it is also possible to print an abbreviation which stands for ``line 1 and subsequent line(s)''. +% +% To achieve this, use \cs{twolines}\oarg{s}\marg{text} and \cs{morethantwolines}\oarg{s}\marg{text}. +% The \verb|| argument of \cs{twolines} will be printed if the lemma is on two lines, and the \verb|| argument of \cs{morethantwolines} will be printed if the lemma is on three or more lines. +% For example: +% \begin{verbatim} +% \twolines{sq.} +% \morethantwolines{sqq.} +% \end{verbatim} +% Will print ``1sq.'' for a lemma which falls on lines 1-2 and ``1sqq.'' for a lemma which falls on lines 1-4. +% +% If you use \cs{twolines} without setting \cs{morethantwolines}, the \verb|| argument of \cs{twolines} will be used for lemmas which fall on three and more lines. +% +% You can disable this option for a specific note by using the `[fulllines]` argument in the note macro cf.~\ref{fulllines} p.~\pageref{fulllines}. % \DescribeMacro{\symlinenum} % For setting a particular symbol in place of the line number, you can use \cs{symlinenum}\oarg{s}\marg{symbol} in combination with \cs{numberonlyfirstinline}\oarg{s}. From the second lemma of the same line, the symbol will be used instead of line number. % @@ -1348,6 +1395,10 @@ % \DescribeMacro{\boxsymlinenum} % \cs{boxsymlinenum}\oarg{s}\marg{l} is the same as \cs{boxlinenum} but for the line number symbol. % +% +% \DescribeMacro{\boxXendlinenum} +% \changes{v1.20.0}{2015/03/22}{Add \cs{boxXendlinenum}} +% \cs{boxXendlinenum}\oarg{s}\marg{l} is the same as \cs{boxlinenum} except in endnotes. %\subsubsection{Separator between the lemma and the note content} % \DescribeMacro{\lemmaseparator} % By default, in a footnote, the separator between the lemma and thenote is a right bracket (\cs{rbracket}). You can use \cs{lemmaseparator}\oarg{s}\marg{lemmaseparator} to change it. The optional argument can be used to specify in which series it is applied. Note that there is a non-breakable space between lemma and separator, but \textbf{breakable} space between separator and lemma. @@ -1660,8 +1711,6 @@ % is ended by an ampersand (\&), and the stanza itself is ended % by putting \verb?\&? at the end of the last line. % -% \textbf{Be careful: you must have NO space between the end of your verse and} \verb+&+ \textbf{or} \verb+\&+. -% In most cases, you will see no difference, but if your verse is exactly the same length as a line, then you will have an empty hanging verse. % % \DescribeMacro{\stanzaindentbase} % Lines within a stanza may be indented. The indents are integer multiples @@ -2465,8 +2514,16 @@ % \section{Sectioning commands} % \changes{v1.1.0}{2012/09/25}{Sectioning commands.} % \changes{v1.12.0}{2014/08/05}{New sectioning commands.}\label{eledsection} -% The standard sectioning command (\cs{chapter}, \cs{section} etc.) can be used inside a numbered text. -% But the line which contains it won't be numbered, and you can't add critical notes inside. +% \subsection{Sectioning commands without line numbers or critical notes} +% The standard sectioning commands (\cs{chapter}, \cs{section} etc.) can be used inside numbered text. +% In this case, you must call them as optional argument of \cs{pstart} (\ref{pstart:optionalarg} p.~\pageref{pstart:optionalarg}: +% \begin{verbatim} +% \pstart[\section{section}] +% Pstart content. +% \pend +% \end{verbatim} +% The line which contains them won't be numbered, and you can't add critical notes inside. +% \subsection{Sectioning commands with line numbering and critical notes} % In the past (between versions 1.1.0 and 1.12.0), % these following commands were provided: % \begin{itemize} @@ -2520,7 +2577,7 @@ % A quotation environment MUST not be opened immediately after a \cs{pstart} % and MUST not be closed immediately before a \cs{pend}. % -% In some case, you don't want these environments be redefined in numbered section. +% \label{noquotation} In some cases, you don't want these environments to be redefined in numbered sections. % You can load the package with the option \verb+noquotation+ to prevent this redefinition. % \section{Page breaks} % \changes{v1.7.0}{2013/11/08}{New features for managing page breaks.} @@ -2793,7 +2850,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/03/12 v1.19.1 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/03/22 v1.20.0 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -2831,14 +2888,17 @@ \newif\ifwidthliketwocolumns% \newif\ifledsecnolinenumber \parapparatus@false -\DeclareOption{noquotation}{\noquotation@true} -\DeclareOption{final}{\ledfinaltrue} -\DeclareOption{draft}{\ledfinalfalse} -\DeclareOption{parapparatus}{\parapparatus@true} -\DeclareOption{nopbinverse}{\lednopbinversetrue} -\DeclareOption{ledsecnolinenumber}{\ledsecnolinenumbertrue} -\DeclareOption{widthliketwocolumns}{\widthliketwocolumnstrue}% -\ExecuteOptions{final} +\RequirePackage{xkeyval} +\DeclareOptionX{series}[A,B,C,D,E,Z]{\xdef\default@series{#1}} +\DeclareOptionX{noquotation}{\noquotation@true} +\DeclareOptionX{final}{\ledfinaltrue} +\DeclareOptionX{draft}{\ledfinalfalse} +\DeclareOptionX{parapparatus}{\parapparatus@true} +\DeclareOptionX{nopbinverse}{\lednopbinversetrue} +\DeclareOptionX{ledsecnolinenumber}{\ledsecnolinenumbertrue} +\DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\ExecuteOptionsX{series}% +\ExecuteOptionsX{final} % \end{macrocode} % Use the starred form of \verb?\ProcessOptions? which executes options in % the order listed in the source file: class options, then listed package @@ -2846,7 +2906,7 @@ % This was suggested by Dan Luecking\index{Luecking, Dan} in the \texttt{ctt} % thread \textit{Class/package option processing}, on 27 February 2004. % \begin{macrocode} -\ProcessOptions*\relax +\ProcessOptionsX*\relax % \end{macrocode} % \end{macro} @@ -3221,6 +3281,13 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@err@FootnoteWithoutEdtext} +% \begin{macrocode} +\newcommand{\led@err@FootnoteWithoutEdtext}{% + \eledmac@error{Xfootnote without edtext. Check syntax.}{\@ehd}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@error@ImakeidxAfterEledmac} % \begin{macrocode} \newcommand{\led@error@ImakeidxAfterEledmac}{% @@ -3359,15 +3426,10 @@ % \changes{v1.18.0}{2015/02/23}{Add \cs{ifl@dprintingpages} and \cs{@dprintingcolumns} for \Lpack{eledpar}} % \begin{macrocode} \newif\ifl@dpairing - \l@dpairingfalse \newif\ifl@dpaging% - \l@dpagingfalse% \newif\ifl@dprintingpages% - \l@dprintingpagesfalse% \newif\ifl@dprintingcolumns% - \l@dprintingcolumnsfalse% \newif\ifpst@rtedL - \pst@rtedLfalse \newcount\l@dnumpstartsL % \end{macrocode} % \cs{ifledRcol} is set to true in the \verb+Rightside+ environnement. It must be distingued from \cs{ifledRcol@} which is set to true when a right line is processed, in \cs{Pages} or \cs{Columns}. @@ -3891,12 +3953,19 @@ \setlength{\linenumsep}{1pc} \newcommand*{\numlabfont}{\normalfont\scriptsize} \newcommand*{\ledlinenum}{% + \bgroup% + \ifluatex% + \luatextextdir TLT% + \fi% \numlabfont\linenumrep{\line@num}% \ifsublines@ \ifnum\subline@num>0\relax \unskip\fullstop\sublinenumrep{\subline@num}% \fi - \fi} + \fi% + \egroup% +}% + \newcommand*{\leftlinenum}{% \ledlinenum \kern\linenumsep} @@ -5153,7 +5222,6 @@ % \changes{v0.7}{2005/02/22}{Added \cs{skipnumbering} and supports} % \begin{macrocode} \newif\ifl@dskipnumber - \l@dskipnumberfalse \newcommand*{\skipnumbering}{\skipnumbering@reg} \newcommand*{\skipnumbering@reg}{% \write\linenum@out{\string\n@num}% @@ -5408,9 +5476,9 @@ % % \begin{macro}{\@tag} % Now, we define an empty \cs{@tag} command. It will be redefine by \cs{edtext}: its value is the first args. It will be used by the \cs{Xfootnote} commands. -% \begin{macrocode} +% \begin{macrocode} \newcommand{\@tag}{} -% \end{macrocode} +% \end{macrocode} % \end{macro} % \begin{macro}{\if@edtext@} % \changes{v1.15.0}{2015/01/12}{New boolean \cs{if@edtext@}.} @@ -5743,9 +5811,9 @@ \fi% \global\let\@tempb=\undefined% \fi% -% \end{macrocode} +% \end{macrocode} % Do the same thing if we are in the right columns. -% \begin{macrocode} +% \begin{macrocode} \else% \csnumgdef{sw@#2@R}{\csuse{sw@#2@R}+1}% \protected@write\linenum@outR{}{\string\@sw{#2}{\csuse{sw@#2@R}}}% @@ -5761,9 +5829,9 @@ \global\let\@tempb=\undefined% \fi% \fi% -% \end{macrocode} +% \end{macrocode} % In any case, print the word. -% \begin{macrocode} +% \begin{macrocode} #2% }% % \end{macrocode} @@ -6543,7 +6611,7 @@ % \end{macrocode} % \end{macro} -% \subsection{Line number printing} +% \section{Line number printing} % % \begin{macro}{\affixline@num} % \cs{affixline@num} originally took a single argument, a series of @@ -7371,28 +7439,31 @@ % minimise the number of new ones they create. In line with this % Peter Wilson has reverted to traditional booleans. % +% Maïeul Rouquette has added \cs{ifl@d@twolines} and \cs{ifl@d@morethantwolines} +% to print a symbol which stands for ``and subsequent`` when there are two, three or more lines. % \begin{macro}{\ifl@d@pnum} % \begin{macro}{\ifl@d@ssub} % \begin{macro}{\ifl@d@elin} % \begin{macro}{\ifl@d@esl} % \begin{macro}{\ifl@d@dash} +% \begin{macro}{\ifl@d@twolines} +% \begin{macro}{\ifl@d@morethantwolines} % \begin{macrocode} \newif\ifl@d@pnum - \l@d@pnumfalse \newif\ifl@d@ssub - \l@d@ssubfalse \newif\ifl@d@elin - \l@d@elinfalse \newif\ifl@d@esl - \l@d@eslfalse \newif\ifl@d@dash - \l@d@dashfalse +\newif\ifl@d@twolines% +\newif\ifl@d@morethantwolines% % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % % \begin{macro}{\l@dparsefootspec} @@ -7491,7 +7562,34 @@ \l@d@esltrue \l@d@dashtrue \fi - \fi} + \fi% +% \end{macrocode} +% However, if the \cs{twolines} is set for the current series, we don't print the last line number. +% \begin{macrocode} + \ifl@d@dash% + \iftoggle{fulllines@}% + {}% + {% + \ifcsempty{twolines@\@currentseries}% + {}% + {% + \l@d@dashfalse% + \l@d@twolinestrue% + \l@d@elinfalse% + \l@d@eslfalse% + \ifcsempty{morethantwolines@\@currentseries}% + {}% + {\ifnum\numexpr #5-#2>1\relax% + \l@d@morethantwolinestrue% + \fi% + }% + }% + }% + \fi% +% \end{macrocode} +% End of \cs{setprintlines}. +% \begin{macrocode} +}% % \end{macrocode} % \end{macro} % @@ -7500,6 +7598,9 @@ % \changes{v0.15}{2012/06/11}{Line numbering can be reset at each pstart.} % \begin{macrocode} \def\printlines#1|#2|#3|#4|#5|#6|#7|{\begingroup + \ifluatex% + \luatextextdir TLT% + \fi% \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}% % \end{macrocode} % One subtlety left here is when to print a period between @@ -7513,12 +7614,20 @@ % \end{macrocode} % \changes{v0.3}{2004/02/14}{Added \cs{linenumr@p} and \cs{sublinenumr@p} % to \cs{printlines}} +% \changes{v1.20.0}{2015/03/22}{Added \cs{ifl@d@morethantwolines} and \cs{ifl@d@morethantwolines} to \cs{printlines}} % \begin{macrocode} \ifl@d@ssub \fullstop \sublinenumrep{#3}\fi - \ifl@d@dash \endashchar\fi + \ifl@d@dash \ifl@d@twolines\else\endashchar\fi\fi \ifl@d@pnum #4\fullstop\fi \ifl@d@elin \linenumrep{#5}\fi \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi + \ifl@d@twolines% + \ifl@d@morethantwolines% + \csuse{morethantwolines@\@currentseries}% + \else% + \csuse{twolines@\@currentseries}% + \fi% + \fi% \endgroup} % \end{macrocode} % \end{macro} @@ -8124,7 +8233,7 @@ % \end{macro} % \end{macro} % -% \subsection{Insertion of the footnotes separator} +% \subsubsection{Insertion of the footnotes separator} %The command \cs{insertparafootsep}\marg{series} must be called at the beginning of \cs{parafootftm} (and like commands). % \begin{macro}{\prevpage@num} % \changes{v1.8.0}{2013/12/13}{Correct \cs{parafootsep} when using with ledgroup.} @@ -8185,7 +8294,7 @@ % \end{macro} % \end{macro} % -% \paragraph{Three columns} +% \subsubsection{Three columns} % % \begin{macro}{\footthreecol} % You say \verb"\footthreecol{A}" to have the \texttt{A} series of the footnotes @@ -8360,7 +8469,7 @@ % \end{macrocode} % \end{macro} % -% \paragraph{Two columns} +% \subsubsection{Two columns} % % \begin{macro}{\foottwocol} % You say \verb"\foottwocol{A}" to have the \texttt{A} series of the footnotes @@ -8699,6 +8808,11 @@ % prepended by the marker. % \begin{macrocode} \newcommand*{\normalfootfmtX}[2]{% + \ifluatex% + \luatextextdir\footnote@luatextextdir% + \luatexpardir\footnote@luatexpardir% + \par% + \fi% \protected@edef\@currentlabel{% \@nameuse{@thefnmark#1}% }% @@ -9374,7 +9488,7 @@ }% % \end{macrocode} % We print all the series of notes by looping on them. -% We check before printing them that there are not voided. +% We check before printing them that they are not voided. % \begin{macrocode} \newcommand*{\doxtrafeeti}{% \setbox\@outputbox \vbox{% @@ -9483,8 +9597,22 @@ % custom macros to do something with it. % \changes{v1.18.0}{2015/02/23}{Option parapparatus works for endnotes.} % \begin{macrocode} -\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4{{\csuse{bhookXendnote@#4}\csuse{Xendnotefontsize@#4}{\csuse{Xendnotenumfont@#4}\printendlines#1|}% - \enspace{\nottoggle{Xendlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}\enskip#3\par}} +\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4{{% + \csuse{bhookXendnote@#4}% + \csuse{Xendnotefontsize@#4}% + {% + \csuse{Xendnotenumfont@#4}% + \ifdimequal{\csuse{boxXendlinenum@#4}}{0pt}% + {\printendlines#1|}% + {\leavevmode\hbox to \csuse{boxXendlinenum@#4}{\printendlines#1|\hfill}}% + }% + \enspace{% + \nottoggle{Xendlemmadisablefontselection@#4}% + {\select@lemmafont#1|#2}% + {#2}% + }% + \enskip#3\par% +}}% \let\l@d@section=\@gobble @@ -9669,9 +9797,12 @@ \csgdef{bhookXnote@#1}{}% \csgdef{bhookXendnote@#1}{}% \csgdef{boxlinenum@#1}{0pt}% + \csgdef{boxXendlinenum@#1}{0pt}% \csgdef{boxsymlinenum@#1}{0pt}% \newtoggle{numberonlyfirstinline@#1}% \newtoggle{numberonlyfirstintwolines@#1}% + \csgdef{twolines@#1}{}% + \csgdef{morethantwolines@#1}{}% \newtoggle{onlypstartinfootnote@#1}% \newtoggle{pstartinfootnoteeverytime@#1}% \newtoggle{pstartinfootnote@#1}% @@ -9714,41 +9845,45 @@ % \begin{macrocode} \global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{% - \begingroup% - \newcommand{\content}{##2}% - \ifnumberedpar@ - \ifledRcol% - \ifluatex% - \footnotelang@lua[R]% - \fi% - \@ifundefined{xpg@main@language}%if polyglossia - {}% - {\footnotelang@poly[R]}% - \footnoteoptions@[R]{##1}{true}% - \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% -\noexpand\csuse{v#1footnote}{#1}% - {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@listR - \footnoteoptions@[R]{##1}{false}% - \global\advance\insert@countR \@ne% - \else% + \if@edtext@% + \begingroup% + \newcommand{\content}{##2}% + \ifnumberedpar@% + \ifledRcol% \ifluatex% - \footnotelang@lua% + \footnotelang@lua[R]% \fi% - \@ifundefined{xpg@main@language}%if polyglossia - {}% - {\footnotelang@poly}% - \footnoteoptions@{##1}{true}% - \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% -\noexpand\csuse{v#1footnote}{#1}% - {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{##1}{false}% - \fi - \else - \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% + \@ifundefined{xpg@main@language}%if polyglossia + {}% + {\footnotelang@poly[R]}% + \footnoteoptions@[R]{##1}{true}% + \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% + \noexpand\csuse{v#1footnote}{#1}% + {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@listR + \footnoteoptions@[R]{##1}{false}% + \global\advance\insert@countR \@ne% + \else% + \ifluatex% + \footnotelang@lua% + \fi% + \@ifundefined{xpg@main@language}%if polyglossia + {}% + {\footnotelang@poly}% + \footnoteoptions@{##1}{true}% + \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% + \noexpand\csuse{v#1footnote}{#1}% + {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@list + \global\advance\insert@count \@ne% + \footnoteoptions@{##1}{false}% + \fi + \else + \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% + \fi% + \ignorespaces% + \endgroup% + \else% + \led@err@FootnoteWithoutEdtext% \fi% - \ignorespaces% - \endgroup } % \end{macrocode} %Set standard display and remember the display. @@ -9765,18 +9900,22 @@ \newcommand{\content}{##1}% \stepcounter{footnote#1}% \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% - \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with eledpar + \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with eledpar {\csuse{@footnotemark#1}}% {}% + \ifluatex% + \xdef\footnote@luatextextdir{\the\luatextextdir}% + \xdef\footnote@luatexpardir{\the\luatexpardir}% + \fi% \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% \endgroup% } % \end{macrocode} % The counters. -% \begin{macrocode} +% \begin{macrocode} \newcounter{footnote#1} \global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}} -% \end{macrocode} +% \end{macrocode} % Don't forget to initialize series % \begin{macrocode} \csgdef{series@displayX#1}{} @@ -9810,11 +9949,11 @@ % \begin{macrocode} \global\cslet{#1end}{\@gobblefour} -%\end{macrocode} +% \end{macrocode} % We need to be able to modify \Eledmac's footnote macros and restore their \global\csletcs{#1@@footnote}{#1footnote} -% \cs{Stock series in \cs{@series} +% \cs{Stock series in \cs{@series}} % \begin{macrocode} \listxadd{\@series}{#1} @@ -9824,9 +9963,10 @@ % \end{macro} % \subsection{Init standards series (A,B,C,D,E,Z)} % \begin{macrocode} -\newseries{A,B,C,D,E,Z} +\expandafter\newseries\expandafter{\default@series} % \end{macrocode} -% \subsection{Some tools} +% \section{Display} +% \subsection{Change series order} % \changes{v1.1}{2012/09/25}{New tools to change order of series} % \begin{macro}{\firstseries} % \cs{seriesatbegin}\marg{s} changes the order of series, to put the series \meta{s} at the beginning of the list. @@ -9844,7 +9984,7 @@ % \end{macro} % \begin{macro}{\seriesatend} % And \cs{seriesatend} moves the series to the end of the list. -% \begin{macrocode} +% \begin{macrocode} \newcommand{\seriesatend}[1]{ \edef\series{#1} \def\new{} @@ -9853,11 +9993,10 @@ \listeadd{\new}{\series} \xdef\@series{\new} } -% \end{macrocode} +% \end{macrocode} % \end{macro} -% \subsection{Display} % \changes{v1.0}{2012/09/15}{New generic commands to customize footnote display.} -% \subsubsection{Options} +% \subsection{Options} % \begin{macro}{\settoggle@series} % \changes{v1.1}{2012/09/25}{\cs{settoggle@series} switch the global value of the toggle, not only the local value.} % \changes{v1.13.0}{2014/09/16}{\cs{settoggle@series} can take an optional arguments to reload series setup.} @@ -9910,6 +10049,11 @@ \setcommand@series{##1}{#1}{##2}% }% } + +\newhookcommand@series{twolines} + +\newhookcommand@series{morethantwolines} + \newhookcommand@series{Xhangindent} \newhookcommand@series{hangindentX} @@ -9946,6 +10090,8 @@ \newhookcommand@series{boxlinenum} +\newhookcommand@series{boxXendlinenum}% + \newhookcommand@series{boxsymlinenum} \newhookcommand@series{parafootsep} @@ -9987,7 +10133,7 @@ % \changes{v1.12.0}{2014/08/05}{Debug \cs{beforeXnotes} and \cs{maxhXnotes} which didn't work when called after \cs{footparagraph}.} % \cs{newhookcommand@series@reload} does the same thing as \cs{newhookcommand@series} % but the commands created by this macro also reload the series displaying (normal, paragraph, twocol, threecol). -% \begin{macrocode} +% \begin{macrocode} \newcommand{\newhookcommand@series@reload}[1]{% \global\expandafter\newcommand\expandafter*\csname #1\endcsname[2][]{% \setcommand@series{##1}{#1}{##2}[reload]% @@ -10000,7 +10146,7 @@ \newhookcommand@series@reload{maxhnotesX} \newhookcommand@series@reload{maxhXnotes} -% \end{macrocode} +% \end{macrocode} % \end{macro} % \begin{macro}{\newhooktoggle@series} %\cs{newhooktoggle@series}\cs{command names} is a generic command to add new commands for new toggle hook, like \cs{numberonlyfirstinline}. @@ -10055,6 +10201,12 @@ % \end{macro} % \end{macro} % \subsection{Hooks for a particular footnote} +% \begin{macro}{\fulllines@} +%\cs{fulllines@} toggle is used to print the fulllines references, and not the abbreviated form defined by \cs{twolines} and \cs{morethantwolines}. +% \begin{macrocode} +\newtoggle{fulllines@}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\nonum@} %\cs{nonum@} toggle is used to disable line number printing in a particular footnote. % \begin{macrocode} @@ -10099,7 +10251,7 @@ % \end{macrocode} % \end{macro} % -% \subsection{Line number printing} +% \section{Line number printing} % \begin{macro}{\printlinefootnote} % The \cs{printlinefootnote} macro is called in each \cs{footfmt} command. % It controls whether the line number is printed or not, according to the previous options. Its first argument is the information about lines ; its second is the series of the footnote. @@ -10134,7 +10286,7 @@ {%Be sure the \prevline exists. \ifcsequal{prevline#2}{lineinfo@}%Try it {% - \ifcsempty{symlinenum@#2}% Try if a symbol is define + \IfStrEq{\csuse{symlinenum@#2}}{}% {% \hspace{\csuse{inplaceofnumber@#2}}% }% @@ -10200,6 +10352,7 @@ % The previous \cs{boxlinefootnote} calls it. % \begin{macrocode} \newcommand{\printlinefootnotenumbers}[2]{% + \xdef\@currentseries{#2}% \ifboolexpr{% (togl{pstartinfootnote@#2} and bool{numberpstart})% or togl{pstartinfootnoteeverytime@#2}}% @@ -10981,6 +11134,7 @@ % % \begin{macro}{\xxref} % \changes{v1.19.0}{2015/03/06}{\cs{xxref} works also with right side numbers, when \cs{Rlineflag} is not empty.} +% \changes{v1.20.0}{2015/03/22}{Debug \cs{xxref} when not loading eledpar (fix bug added in 1.19.0).} % The \cs{xxref} command takes two arguments, both of which are % labels, e.g., \verb"\xxref{mouse}{elephant}". It first does some % checking to make sure that the labels do exist (if one doesn't, @@ -11006,8 +11160,13 @@ \else% \expandafter\def\csname the@@label#2\endcsname{\l@dgetref@num{1}{#2}|\l@dgetref@num{2}{#2}|\l@dgetref@num{3}{#2}}% \fi% + \ifdefined\Rlineflag% \StrDel{\csuse{the@@label#1}}{\Rlineflag}[\@tempa]% - \StrDel{\csuse{the@@label#2}}{\Rlineflag}[\@tempb]% + \StrDel{\csuse{the@@label#2}}{\Rlineflag}[\@tempb]% + \else% + \letcs{\@tempa}{the@@label#1}% + \letcs{\@tempb}{the@@label#2}% + \fi% \linenum{\@tempa|% \@tempb}}}% @@ -12241,7 +12400,6 @@ % \begin{macrocode} \newcommand*{\hangingsymbol}{} \newif\ifinstanza -\instanzafalse % \end{macrocode} % \end{macro} % \end{macro} @@ -12417,6 +12575,7 @@ % \changes{v1.12.0}{2014/08/05}{Add \cs{newverse} macro, \cs{falseverse} deprecated.} % \changes{v1.12.0}{2014/08/05}{\cs{Stanza} can have an optional argument: content to be printed before.} % \changes{v1.12.0}{2014/08/05}{\ampersand can have an optional argument: content to be printed after.} +% \changes{v1.20.0}{2015/03/22}{\ampersand\ and \textbackslash\ampersand\ can be preceded by spaces.} % \begin{macro}{\@stopstanza} % \begin{macro}{\newverse} % \begin{macro}{\falseverse} @@ -12470,6 +12629,7 @@ \newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} \newcommandx{\@stopstanza}[1][1,usedefault]{% + \unskip% \endlock% \pend[#1]% \endgroup% @@ -12478,6 +12638,7 @@ } \newcommandx*{\newverse}[2][1,2,usedefault]{% + \unskip% \endlock\pend[#1]\sza@penalty\global% \advance\stanza@count\@ne\stanza@line[#2]% } diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx index db2c6a10a28..76b7303b1ce 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx @@ -65,7 +65,7 @@ % % % \fi -% \CheckSum{4970} +% \CheckSum{4968} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -188,6 +188,8 @@ % \changes{v1.12.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.} % \changes{v1.13.0}{2015/03/06}{With parallel pages, long notes can now flow from the Left to the right side and from the Right to the left side.} % \changes{v1.13.0}{2015/03/06}{Fix bug in shiftedpstarts when size difference between pstarts is very important.} +% \changes{v1.14.0}{2015/03/22}{The \cs{newif}s are not followed by boolean values set to false, because it is the \TeX\ default setting.} +% \changes{v1.14.0}{2015/03/22}{Fix bug with line number position when using \cs{eledsection} and similar commands for RTL texts with \LuaLaTeX.} % \hyphenation{man-u-script man-u-scripts} % % @@ -420,9 +422,10 @@ % \setlength{\beforecolumseparator}{length} % \setlength{\aftercolumseparator}{length} % \end{verbatim} -% If you want to come back to the previous behavior, just set them with a negative value. +% If you want to revert to the previous behavior, just set with a negative value. % \DescribeMacro{\widthliketwocolumns} -% If you want to mix texts in columns and text without columns, you can horizontally align text in one column to text in two columns with \cs{widthliketwocolumnstrue}. To reset this feature, just use \cs{widthliketwocolumnsfalse}. +% If you want to mix two-column with single-column text, you can align horizontally single-column text to two-column text with \cs{widthliketwocolumnstrue}. To reset this feature, use \cs{widthliketwocolumnsfalse}. +% You can also call \cs{widthliketwocolumns} as a global option when loading \Lpack{eledmac} or \Lpack{eledpar} % % \DescribeMacro{\Xnoteswidthliketwocolumns} % \DescribeMacro{\notesXwidthliketwocolumns} @@ -922,7 +925,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2015/03/12 v1.13.1 eledmac extension for parallel texts]% +\ProvidesPackage{eledpar}[2015/03/22 v1.14.0 eledmac extension for parallel texts]% % \end{macrocode} % Few commands use \cs{xspace} command. @@ -1054,7 +1057,6 @@ % \begin{macrocode} \pst@rtedLfalse \newif\ifpst@rtedR - \pst@rtedRfalse % \end{macrocode} % \end{macro} @@ -1238,8 +1240,6 @@ % \begin{macrocode} \newif\ifbypage@R \newif\ifbypstart@R - \bypage@Rfalse - \bypstart@Rfalse % \end{macrocode} % \end{macro} % \end{macro} @@ -3041,6 +3041,7 @@ \luatextextdir\l@luatextextdir@L% \luatexpardir\l@luatexpardir@L% \luatexbodydir\l@luatexbodydir@L% + \ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}% \fi% \csuse{eled@sectioning@\the\l@dpscL}% \egroup% @@ -3172,6 +3173,7 @@ \luatextextdir\l@luatextextdir@R% \luatexpardir\l@luatexpardir@R% \luatexbodydir\l@luatexbodydir@R% + \ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}% \fi% \csuse{eled@sectioning@\the\l@dpscR R}% \egroup% @@ -3680,7 +3682,7 @@ % general case, is a rather complicated task. % The seven parameters of the % argument are the line numbers as stored in \cs{l@d@nums}, in the -% form described on page \pageref{linenumbers}: the starting +% form described on page \pageref{eledmac-linenumbers} of \Eledmac{}' handbook: the starting % page, line, and sub-line numbers, followed by the ending page, % line, and sub-line numbers, and then the font specifier for % the lemma. @@ -3770,14 +3772,14 @@ (test {\ifcsstring{onlyXside@#1}{R}} and test{\ifnumodd{\c@page}}))% }% % \end{macrocode} -% If we are in a page where notes must be printed, print them, making box's correction before. +% If we are in a page where notes must be printed, print the notes, after having made the corrections which are needed for boxes. % \begin{macrocode} {% \correct@Xfootins@box{#1}% \csuse{#1footstart}{#1}% \csuse{#1footgroup}{#1}% % \end{macrocode} -% Then, say to not keep room for notes in the next page. +% Then, say not to keep room for notes in the next page. % \begin{macrocode} \global\count\csuse{#1footins}=0% \global\skip\csuse{#1footins}=0pt% @@ -4402,7 +4404,6 @@ % A flag for checking if \verb?babel? has been used as a package. % \begin{macrocode} \newif\ifl@dusedbabel - \l@dusedbabelfalse % \end{macrocode} % \end{macro} % \end{macro} @@ -4553,7 +4554,6 @@ % otherwise both are void and it sets \cs{araw@textfalse}. % \begin{macrocode} \newif\ifaraw@text - \araw@textfalse \newcommand*{\checkraw@text}{% \araw@textfalse \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL} @@ -5257,7 +5257,7 @@ % \end{macro} % % \begin{macro}{\finish@Pages@notes} -% This macro ensures that all long notes are printed at the end of \cs{Pages} typessetting, and that there is no more long notes for the next pages. +% This macro ensures that all long notes are printed at the end of \cs{Pages} typessetting, and that there is no more long notes left for the next pages. % \begin{macrocode} \newcommand{\finish@Pages@notes}{% \def\do##1{% diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index d8669f70833..cb2acbfc52d 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -24,8 +24,9 @@ + \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/03/12 v1.19.1 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/03/22 v1.20.0 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -34,15 +35,18 @@ \newif\ifwidthliketwocolumns% \newif\ifledsecnolinenumber \parapparatus@false -\DeclareOption{noquotation}{\noquotation@true} -\DeclareOption{final}{\ledfinaltrue} -\DeclareOption{draft}{\ledfinalfalse} -\DeclareOption{parapparatus}{\parapparatus@true} -\DeclareOption{nopbinverse}{\lednopbinversetrue} -\DeclareOption{ledsecnolinenumber}{\ledsecnolinenumbertrue} -\DeclareOption{widthliketwocolumns}{\widthliketwocolumnstrue}% -\ExecuteOptions{final} -\ProcessOptions*\relax +\RequirePackage{xkeyval} +\DeclareOptionX{series}[A,B,C,D,E,Z]{\xdef\default@series{#1}} +\DeclareOptionX{noquotation}{\noquotation@true} +\DeclareOptionX{final}{\ledfinaltrue} +\DeclareOptionX{draft}{\ledfinalfalse} +\DeclareOptionX{parapparatus}{\parapparatus@true} +\DeclareOptionX{nopbinverse}{\lednopbinversetrue} +\DeclareOptionX{ledsecnolinenumber}{\ledsecnolinenumbertrue} +\DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\ExecuteOptionsX{series}% +\ExecuteOptionsX{final} +\ProcessOptionsX*\relax \RequirePackage{xargs} \RequirePackage{etoolbox} @@ -197,6 +201,9 @@ \newcommand{\led@err@EdtextWithoutFootnote}{% \eledmac@error{edtext without Xfootnote. Check syntaxis.}{\@ehd}% }% +\newcommand{\led@err@FootnoteWithoutEdtext}{% + \eledmac@error{Xfootnote without edtext. Check syntax.}{\@ehd}% +}% \newcommand{\led@error@ImakeidxAfterEledmac}{% \eledmac@error{Imakeidx must be loaded before eledmac.}{\@ehd}% }% @@ -213,15 +220,10 @@ \let\extensionchars=\empty \newif\ifnumbering \newif\ifl@dpairing - \l@dpairingfalse \newif\ifl@dpaging% - \l@dpagingfalse% \newif\ifl@dprintingpages% - \l@dprintingpagesfalse% \newif\ifl@dprintingcolumns% - \l@dprintingcolumnsfalse% \newif\ifpst@rtedL - \pst@rtedLfalse \newcount\l@dnumpstartsL \newif\ifledRcol \newif\ifledRcol@ @@ -448,12 +450,19 @@ \setlength{\linenumsep}{1pc} \newcommand*{\numlabfont}{\normalfont\scriptsize} \newcommand*{\ledlinenum}{% + \bgroup% + \ifluatex% + \luatextextdir TLT% + \fi% \numlabfont\linenumrep{\line@num}% \ifsublines@ \ifnum\subline@num>0\relax \unskip\fullstop\sublinenumrep{\subline@num}% \fi - \fi} + \fi% + \egroup% +}% + \newcommand*{\leftlinenum}{% \ledlinenum \kern\linenumsep} @@ -838,7 +847,6 @@ \def\endlock{\write\linenum@out{\string\lock@off}} \newif\ifl@dskipnumber - \l@dskipnumberfalse \newcommand*{\skipnumbering}{\skipnumbering@reg} \newcommand*{\skipnumbering@reg}{% \write\linenum@out{\string\n@num}% @@ -1646,15 +1654,12 @@ }% } \newif\ifl@d@pnum - \l@d@pnumfalse \newif\ifl@d@ssub - \l@d@ssubfalse \newif\ifl@d@elin - \l@d@elinfalse \newif\ifl@d@esl - \l@d@eslfalse \newif\ifl@d@dash - \l@d@dashfalse +\newif\ifl@d@twolines% +\newif\ifl@d@morethantwolines% \newcommand*{\l@dparsefootspec}[3]{\l@dp@rsefootspec#1|} \def\l@dp@rsefootspec#1|#2|#3|#4|#5|#6|#7|{% \gdef\l@dparsedstartpage{#1}% @@ -1696,16 +1701,47 @@ \l@d@esltrue \l@d@dashtrue \fi - \fi} + \fi% + \ifl@d@dash% + \iftoggle{fulllines@}% + {}% + {% + \ifcsempty{twolines@\@currentseries}% + {}% + {% + \l@d@dashfalse% + \l@d@twolinestrue% + \l@d@elinfalse% + \l@d@eslfalse% + \ifcsempty{morethantwolines@\@currentseries}% + {}% + {\ifnum\numexpr #5-#2>1\relax% + \l@d@morethantwolinestrue% + \fi% + }% + }% + }% + \fi% +}% \def\printlines#1|#2|#3|#4|#5|#6|#7|{\begingroup + \ifluatex% + \luatextextdir TLT% + \fi% \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}% \ifl@d@pnum #1\fullstop\fi \linenumrep{#2} \ifl@d@ssub \fullstop \sublinenumrep{#3}\fi - \ifl@d@dash \endashchar\fi + \ifl@d@dash \ifl@d@twolines\else\endashchar\fi\fi \ifl@d@pnum #4\fullstop\fi \ifl@d@elin \linenumrep{#5}\fi \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi + \ifl@d@twolines% + \ifl@d@morethantwolines% + \csuse{morethantwolines@\@currentseries}% + \else% + \csuse{twolines@\@currentseries}% + \fi% + \fi% \endgroup} \newcommand*{\normalfootstart}[1]{% \ifdimequal{0pt}{\preXnotes@}{}% @@ -2180,6 +2216,11 @@ \@nameuse{footfmt#1}{#1}{#2}\color@endgroup}} \newcommand*{\normalfootfmtX}[2]{% + \ifluatex% + \luatextextdir\footnote@luatextextdir% + \luatexpardir\footnote@luatexpardir% + \par% + \fi% \protected@edef\@currentlabel{% \@nameuse{@thefnmark#1}% }% @@ -2647,8 +2688,22 @@ \fi \immediate\write\l@d@end{\string\l@d@section{\the\section@num}}} -\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4{{\csuse{bhookXendnote@#4}\csuse{Xendnotefontsize@#4}{\csuse{Xendnotenumfont@#4}\printendlines#1|}% - \enspace{\nottoggle{Xendlemmadisablefontselection@#4}{\select@lemmafont#1|#2}{#2}}\enskip#3\par}} +\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4{{% + \csuse{bhookXendnote@#4}% + \csuse{Xendnotefontsize@#4}% + {% + \csuse{Xendnotenumfont@#4}% + \ifdimequal{\csuse{boxXendlinenum@#4}}{0pt}% + {\printendlines#1|}% + {\leavevmode\hbox to \csuse{boxXendlinenum@#4}{\printendlines#1|\hfill}}% + }% + \enspace{% + \nottoggle{Xendlemmadisablefontselection@#4}% + {\select@lemmafont#1|#2}% + {#2}% + }% + \enskip#3\par% +}}% \let\l@d@section=\@gobble @@ -2728,9 +2783,12 @@ \csgdef{bhookXnote@#1}{}% \csgdef{bhookXendnote@#1}{}% \csgdef{boxlinenum@#1}{0pt}% + \csgdef{boxXendlinenum@#1}{0pt}% \csgdef{boxsymlinenum@#1}{0pt}% \newtoggle{numberonlyfirstinline@#1}% \newtoggle{numberonlyfirstintwolines@#1}% + \csgdef{twolines@#1}{}% + \csgdef{morethantwolines@#1}{}% \newtoggle{onlypstartinfootnote@#1}% \newtoggle{pstartinfootnoteeverytime@#1}% \newtoggle{pstartinfootnote@#1}% @@ -2764,41 +2822,45 @@ \expandafter\newinsert\csname mp#1footins\endcsname% \global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{% - \begingroup% - \newcommand{\content}{##2}% - \ifnumberedpar@ - \ifledRcol% - \ifluatex% - \footnotelang@lua[R]% - \fi% - \@ifundefined{xpg@main@language}%if polyglossia - {}% - {\footnotelang@poly[R]}% - \footnoteoptions@[R]{##1}{true}% - \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% -\noexpand\csuse{v#1footnote}{#1}% - {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@listR - \footnoteoptions@[R]{##1}{false}% - \global\advance\insert@countR \@ne% - \else% + \if@edtext@% + \begingroup% + \newcommand{\content}{##2}% + \ifnumberedpar@% + \ifledRcol% \ifluatex% - \footnotelang@lua% + \footnotelang@lua[R]% \fi% - \@ifundefined{xpg@main@language}%if polyglossia - {}% - {\footnotelang@poly}% - \footnoteoptions@{##1}{true}% - \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% -\noexpand\csuse{v#1footnote}{#1}% - {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{##1}{false}% - \fi - \else - \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% + \@ifundefined{xpg@main@language}%if polyglossia + {}% + {\footnotelang@poly[R]}% + \footnoteoptions@[R]{##1}{true}% + \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% + \noexpand\csuse{v#1footnote}{#1}% + {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@listR + \footnoteoptions@[R]{##1}{false}% + \global\advance\insert@countR \@ne% + \else% + \ifluatex% + \footnotelang@lua% + \fi% + \@ifundefined{xpg@main@language}%if polyglossia + {}% + {\footnotelang@poly}% + \footnoteoptions@{##1}{true}% + \xright@appenditem{\noexpand\prepare@edindex@fornote{\l@d@nums}% + \noexpand\csuse{v#1footnote}{#1}% + {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}}\to\inserts@list + \global\advance\insert@count \@ne% + \footnoteoptions@{##1}{false}% + \fi + \else + \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% + \fi% + \ignorespaces% + \endgroup% + \else% + \led@err@FootnoteWithoutEdtext% \fi% - \ignorespaces% - \endgroup } \csgdef{series@display#1}{} \footnormal{#1} @@ -2808,9 +2870,13 @@ \newcommand{\content}{##1}% \stepcounter{footnote#1}% \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% - \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with eledpar + \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with eledpar {\csuse{@footnotemark#1}}% {}% + \ifluatex% + \xdef\footnote@luatextextdir{\the\luatextextdir}% + \xdef\footnote@luatexpardir{\the\luatexpardir}% + \fi% \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% \endgroup% } @@ -2834,7 +2900,7 @@ \listxadd{\@series}{#1} } }% End of \newseries -\newseries{A,B,C,D,E,Z} +\expandafter\newseries\expandafter{\default@series} \newcommand{\seriesatbegin}[1]{ \edef\series{#1} \def\new{} @@ -2888,6 +2954,11 @@ \setcommand@series{##1}{#1}{##2}% }% } + +\newhookcommand@series{twolines} + +\newhookcommand@series{morethantwolines} + \newhookcommand@series{Xhangindent} \newhookcommand@series{hangindentX} @@ -2924,6 +2995,8 @@ \newhookcommand@series{boxlinenum} +\newhookcommand@series{boxXendlinenum}% + \newhookcommand@series{boxsymlinenum} \newhookcommand@series{parafootsep} @@ -2996,6 +3069,7 @@ \newif\ifledplinenum \ledplinenumtrue \newcommand*{\symplinenum}{} +\newtoggle{fulllines@}% \newtoggle{nonum@} \newtoggle{nosep@} \newtoggle{nomk@}% @@ -3032,7 +3106,7 @@ {%Be sure the \prevline exists. \ifcsequal{prevline#2}{lineinfo@}%Try it {% - \ifcsempty{symlinenum@#2}% Try if a symbol is define + \IfStrEq{\csuse{symlinenum@#2}}{}% {% \hspace{\csuse{inplaceofnumber@#2}}% }% @@ -3076,6 +3150,7 @@ }% }% \newcommand{\printlinefootnotenumbers}[2]{% + \xdef\@currentseries{#2}% \ifboolexpr{% (togl{pstartinfootnote@#2} and bool{numberpstart})% or togl{pstartinfootnoteeverytime@#2}}% @@ -3384,8 +3459,13 @@ \else% \expandafter\def\csname the@@label#2\endcsname{\l@dgetref@num{1}{#2}|\l@dgetref@num{2}{#2}|\l@dgetref@num{3}{#2}}% \fi% + \ifdefined\Rlineflag% \StrDel{\csuse{the@@label#1}}{\Rlineflag}[\@tempa]% - \StrDel{\csuse{the@@label#2}}{\Rlineflag}[\@tempb]% + \StrDel{\csuse{the@@label#2}}{\Rlineflag}[\@tempb]% + \else% + \letcs{\@tempa}{the@@label#1}% + \letcs{\@tempb}{the@@label#2}% + \fi% \linenum{\@tempa|% \@tempb}}}% @@ -3973,7 +4053,6 @@ \newcommand*{\hangingsymbol}{} \newif\ifinstanza -\instanzafalse \newif\ifinserthangingsymbol \newcommand{\inserthangingsymbol}{% \ifinserthangingsymbol% @@ -4070,6 +4149,7 @@ \newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} \newcommandx{\@stopstanza}[1][1,usedefault]{% + \unskip% \endlock% \pend[#1]% \endgroup% @@ -4078,6 +4158,7 @@ } \newcommandx*{\newverse}[2][1,2,usedefault]{% + \unskip% \endlock\pend[#1]\sza@penalty\global% \advance\stanza@count\@ne\stanza@line[#2]% } diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index 38f18761f1c..07d9fadb905 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2015/03/12 v1.13.1 eledmac extension for parallel texts]% +\ProvidesPackage{eledpar}[2015/03/22 v1.14.0 eledmac extension for parallel texts]% \RequirePackage{xspace}% \newif\ifshiftedpstarts @@ -54,7 +54,6 @@ \section@numR=\z@ \pst@rtedLfalse \newif\ifpst@rtedR - \pst@rtedRfalse \newcommand*{\beginnumberingR}{% \ifnumberingR @@ -159,8 +158,6 @@ \newif\ifbypage@R \newif\ifbypstart@R - \bypage@Rfalse - \bypstart@Rfalse \newcommand*{\lineationR}[1]{{% \ifnumbering \led@err@LineationInNumbered @@ -1054,6 +1051,7 @@ \luatextextdir\l@luatextextdir@L% \luatexpardir\l@luatexpardir@L% \luatexbodydir\l@luatexbodydir@L% + \ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}% \fi% \csuse{eled@sectioning@\the\l@dpscL}% \egroup% @@ -1144,6 +1142,7 @@ \luatextextdir\l@luatextextdir@R% \luatexpardir\l@luatexpardir@R% \luatexbodydir\l@luatexbodydir@R% + \ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}% \fi% \csuse{eled@sectioning@\the\l@dpscR R}% \egroup% @@ -1826,7 +1825,6 @@ \l@dpscR=\z@} \newif\ifl@dusedbabel - \l@dusedbabelfalse \newcommand*{\l@dbbl@set@language}[1]{% \edef\languagename{#1}% \select@language{\languagename}% @@ -1885,7 +1883,6 @@ } \newif\ifaraw@text - \araw@textfalse \newcommand*{\checkraw@text}{% \araw@textfalse \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL} -- cgit v1.2.3