diff options
Diffstat (limited to 'Master')
30 files changed, 17 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex 70a7ef458ba..f2eadd3a6da 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 ff720c37149..0e6d8af3d77 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 54f47cbef33..cdfd835e50e 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 115db8a24df..4114d1e9cea 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 59a1024c943..40eb6779601 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 d25ef63d16a..eb1628aa91a 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 1991b0aee18..5f0e75f6a7c 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 f07230b4746..7ee34db70b7 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 eb3dccab95c..da25c78b6e1 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 e1023bf9fd6..7b9f46d9fd4 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 28104613e0e..1f592069981 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 5684ca78225..6f8adbdde99 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 d6bff051f42..face7580bfd 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 79141f91805..938dfd05d68 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 142cb8d532a..14db5ec00f6 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 b2b558bf64f..b0d75cef971 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 26ab730059c..5a7982ca1be 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 12b57cf98a8..c570a46ea2a 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 6149a391798..f2f4eb86e0c 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 7bace0838a2..4cee01567c4 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 3359cf823f8..e957db1ebb4 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 0bf742123c6..e080dc2db67 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 4447c78b53e..1eaac29d619 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 8a6cbb6d8e1..08dad576a42 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 49ac41c3682..7c92941b7a0 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 9628d33f88e..d0f7a469290 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 48124958cf8..b57434cfa36 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 662a5c70539..a3f7a93fc8f 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 8411945969e..846d9b10702 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{11980} +% \CheckSum{11983} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -269,6 +269,7 @@ % \changes{v1.23.1}{2015/05/20}{Fix bug with \cs{lemma} command in the right side.} % \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.} % \hyphenation{man-u-script man-u-scripts} % % @@ -3229,7 +3230,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/06/02 v1.24.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/06/21 v1.24.1 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -6302,6 +6303,7 @@ % that's passed on to the notes. % Read about \cs{@tag} in normal \cs{edtext} macro for more details about \cs{sw@list@inedtext} and \cs{no@expands} (\reff{@tag}). % \begin{macrocode} +\unless\ifnocritical@ \newcommand*{\lemma}[1]{% \global\@lemmacommand@true% \global\renewcommand{\@tag}{% @@ -6312,14 +6314,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\if@lemmacommand@} -% \changes{v1.15.0}{2015/01/12}{New boolean \cs{iflemmacommand@}.} -% This boolean is set to TRUE inside a \cs{edtext} (or \cs{critext}) when a \cs{lemma} command is called. -% That is useful for some commands which can have a different behavior if the lemma in the note is different from the lemma in the main text. -% \begin{macrocode} -\newif\if@lemmacommand@% -% \end{macrocode} -% \end{macro} % \begin{macro}{\@lemma} % The \cs{@lemma} is written in the numbered file to set which \cs{edtext} has an % \cs{lemma} as second argument. @@ -6327,6 +6321,15 @@ \newcommand{\@lemma}{% \booltrue{lemmacommand@\the\@edtext@level}% }% +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\if@lemmacommand@} +% \changes{v1.15.0}{2015/01/12}{New boolean \cs{iflemmacommand@}.} +% This boolean is set to TRUE inside a \cs{edtext} (or \cs{critext}) when a \cs{lemma} command is called. +% That is useful for some commands which can have a different behavior if the lemma in the note is different from the lemma in the main text. +% \begin{macrocode} +\newif\if@lemmacommand@% % \end{macrocode} % \end{macro} % \subsection{Substitute line numbers} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index e469e7ea4c1..509e3168237 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/02 v1.24.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/06/21 v1.24.1 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifoldprintnpnumspace@ \newif\ifnocritical@% @@ -1075,6 +1075,7 @@ \newcommand*{\edfont@info}{\f@encoding/\f@family/\f@series/\f@shape} +\unless\ifnocritical@ \newcommand*{\lemma}[1]{% \global\@lemmacommand@true% \global\renewcommand{\@tag}{% @@ -1082,10 +1083,11 @@ }% \ignorespaces% }% -\newif\if@lemmacommand@% \newcommand{\@lemma}{% \booltrue{lemmacommand@\the\@edtext@level}% }% +\fi +\newif\if@lemmacommand@% \newcommand*{\linenum}[1]{% \xdef\@tempa{#1|||||||\noexpand\\\l@d@nums}% \global\let\l@d@nums=\empty |