diff options
30 files changed, 24 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex f2eadd3a6da..c5bd3e5868f 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf Binary files differindex 0e6d8af3d77..b0aa7e93054 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf Binary files differindex cdfd835e50e..007caf1ac87 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf Binary files differindex 4114d1e9cea..cc88989255c 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf Binary files differindex 40eb6779601..2450cfe6577 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf Binary files differindex eb1628aa91a..241eddefb03 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf Binary files differindex 5f0e75f6a7c..bda3817d901 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-cross_referencing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf Binary files differindex 7ee34db70b7..70f2c51fa7a 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf Binary files differindex da25c78b6e1..3cb97819c04 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-indexing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf Binary files differindex 7b9f46d9fd4..dcd89a91f49 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 1f592069981..77f169440eb 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-line_numbers_in_header.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 6f8adbdde99..1b35fd3c535 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf Binary files differindex face7580bfd..b88028e98d0 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-performances.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 938dfd05d68..62fed6041c1 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 14db5ec00f6..55c6d3bf72e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns.pdf Binary files differindex b0d75cef971..406ee3990ea 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf Binary files differindex 5a7982ca1be..c0d026a0e87 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf Binary files differindex c570a46ea2a..4d0997b0442 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/3-eledpar_pages_different_languages_lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf Binary files differindex f2f4eb86e0c..40488f388cc 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_column_mix_with_not_column.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf Binary files differindex 4cee01567c4..d2755cac22a 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_alignment.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex e957db1ebb4..b88cc5d4815 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf Binary files differindex e080dc2db67..4fec31e9cf4 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf Binary files differindex 1eaac29d619..478ccc94673 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_page_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf Binary files differindex 08dad576a42..0c972abf469 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_long_notes.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf Binary files differindex 7c92941b7a0..4b89cac2b89 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_notes_leftpage.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf Binary files differindex d0f7a469290..74f4aa4d48c 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_pages_paragraph_separator_between.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf Binary files differindex b57434cfa36..60daaa7251e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf Binary files differindex a3f7a93fc8f..f6d03c4b994 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/4-eledpar_verse_text_between.pdf diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index 846d9b10702..b31250b595f 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -63,7 +63,7 @@ % \fi % % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} -% \CheckSum{11983} +% \CheckSum{11986} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -270,6 +270,7 @@ % \changes{v1.23.2}{2015/05/29}{Compatibility with \LaTeX's release 2015.} % \changes{v1.24.0}{2015/06/02}{We can reinitialize \cs{AtEveryPstart} and \cs{AtEveryPend} providing to it an empty argument.} % \changes{v1.24.1}{2015/06/21}{\cs{lemma} is disabled when using `nocritical` option.} +% \changes{v1.24.2}{2015/06/26}{Fix incompatibility between `nofamiliar` option and `memoir` package.} % \hyphenation{man-u-script man-u-scripts} % % @@ -3230,7 +3231,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/06/21 v1.24.1 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/06/26 v1.24.2 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -12029,14 +12030,17 @@ % \verb?\@doclearpage?. % \begin{macro}{\@mem@extranofeet} % \begin{macrocode} -\g@addto@macro{\@mem@extranofeet}{% - \unless\ifnocritical@% - \def\do#1{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% - \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% +\g@addto@macro{\@mem@extranofeet}{%% + \def\do#1{% + \unless\ifnocritical@% + \ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% + \fi% + \unless\ifnofamiliar@% + \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% + \fi% } - \dolistloop{\@series}% - \@led@extranofeet - \fi% + \dolistloop{\@series}% + \@led@extranofeet% }% }{% % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 509e3168237..2381626172e 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -27,7 +27,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/06/21 v1.24.1 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/06/26 v1.24.2 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifoldprintnpnumspace@ \newif\ifnocritical@% @@ -3842,14 +3842,17 @@ \newcommand*{\@led@extranofeet}{} \@ifclassloaded{memoir}{% -\g@addto@macro{\@mem@extranofeet}{% - \unless\ifnocritical@% - \def\do#1{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% - \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% +\g@addto@macro{\@mem@extranofeet}{%% + \def\do#1{% + \unless\ifnocritical@% + \ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi% + \fi% + \unless\ifnofamiliar@% + \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi% + \fi% } - \dolistloop{\@series}% - \@led@extranofeet - \fi% + \dolistloop{\@series}% + \@led@extranofeet% }% }{% \newcommand*{\@led@testifnofoot}{% |