summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-08 03:01:00 +0000
committerNorbert Preining <norbert@preining.info>2020-03-08 03:01:00 +0000
commita8880a5ee484845d9a526c5ca8d21d31214af22b (patch)
tree6571a4bcbb457a90ddeef77c05fd72b7ebbac86e /macros/latex/contrib
parent8012fbf3193a5d1699496b198c3bd448973557bd (diff)
CTAN sync 202003080300
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/acro/README2
-rw-r--r--macros/latex/contrib/acro/acro-manual.pdfbin576935 -> 576765 bytes
-rw-r--r--macros/latex/contrib/acro/acro.history1
-rw-r--r--macros/latex/contrib/acro/acro.sty26
-rw-r--r--macros/latex/contrib/chemformula/README2
-rw-r--r--macros/latex/contrib/chemformula/chemformula-manual.cls5
-rw-r--r--macros/latex/contrib/chemformula/chemformula-manual.pdfbin857474 -> 859314 bytes
-rw-r--r--macros/latex/contrib/chemformula/chemformula.sty247
-rw-r--r--macros/latex/contrib/pdfpc/pdfpc.dtx4
-rw-r--r--macros/latex/contrib/pdfpc/pdfpc.pdfbin0 -> 170447 bytes
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40794 -> 40808 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf (renamed from macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf)bin177475 -> 177475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex (renamed from macros/latex/contrib/reledmac/examples/1-criticalendotes.tex)0
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin121597 -> 121597 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin145283 -> 145283 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin189798 -> 189798 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin123178 -> 123178 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin123463 -> 123463 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin122256 -> 122256 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin126045 -> 126045 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin18108 -> 18103 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin187631 -> 187631 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin124324 -> 124324 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin144492 -> 144492 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin138405 -> 138405 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin158108 -> 158108 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin129005 -> 129005 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin140523 -> 140523 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin135414 -> 135414 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31649 -> 31578 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin215012 -> 215012 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin190222 -> 190222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin175170 -> 175170 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin24279 -> 24281 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin93475 -> 93475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin37802 -> 37805 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin138222 -> 138222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190161 -> 190161 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189362 -> 189362 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168099 -> 168099 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189915 -> 189915 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188836 -> 188836 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188745 -> 188745 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188865 -> 188865 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin189690 -> 189690 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin134815 -> 134815 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin190134 -> 190134 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin201833 -> 201833 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin123601 -> 123601 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin215182 -> 215182 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin239560 -> 239560 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin125082 -> 125082 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin123151 -> 123151 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin263410 -> 263410 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin183782 -> 183782 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin118947 -> 118947 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin356258 -> 356254 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx105
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin1982446 -> 1982228 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx89
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin985304 -> 987328 bytes
61 files changed, 247 insertions, 234 deletions
diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README
index 221ded70e3..9dbf34791f 100644
--- a/macros/latex/contrib/acro/README
+++ b/macros/latex/contrib/acro/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the ACRO package v2.11c 2020/02/03
+the ACRO package v2.11d 2020/03/07
Typeset Acronyms
diff --git a/macros/latex/contrib/acro/acro-manual.pdf b/macros/latex/contrib/acro/acro-manual.pdf
index 4fea1ccc17..a352ce8772 100644
--- a/macros/latex/contrib/acro/acro-manual.pdf
+++ b/macros/latex/contrib/acro/acro-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/acro.history b/macros/latex/contrib/acro/acro.history
index d719448f3e..fa6f336991 100644
--- a/macros/latex/contrib/acro/acro.history
+++ b/macros/latex/contrib/acro/acro.history
@@ -283,3 +283,4 @@ feel free to contact me.
2020/01/16 v2.11a - adapt to new l3text module
2020/01/24 v2.11b - fix issue #147
2020/02/03 v2.11c - fix issue #76
+2020/03/07 v2.11c - fix issues #149 and #150
diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty
index 7346367aff..5209dda3ca 100644
--- a/macros/latex/contrib/acro/acro.sty
+++ b/macros/latex/contrib/acro/acro.sty
@@ -35,10 +35,10 @@
\ExplSyntaxOn
-\tl_const:Nn \c_acro_date_tl {2020/02/03}
+\tl_const:Nn \c_acro_date_tl {2020/03/07}
\tl_const:Nn \c_acro_version_major_number_tl {2}
\tl_const:Nn \c_acro_version_minor_number_tl {11}
-\tl_const:Nn \c_acro_version_subrelease_tl {c}
+\tl_const:Nn \c_acro_version_subrelease_tl {d}
\tl_const:Nx \c_acro_version_number_tl
{
\c_acro_version_major_number_tl .
@@ -174,6 +174,7 @@
\bool_new:N \l__acro_custom_alt_format_bool
\bool_new:N \l__acro_custom_long_format_bool
\bool_new:N \l__acro_custom_short_format_bool
+\bool_new:N \l__acro_custom_foreign_format_bool
\bool_new:N \l__acro_extra_punct_bool
\bool_new:N \l__acro_extra_use_brackets_bool
\bool_new:N \g__acro_first_acronym_declared_bool
@@ -529,8 +530,8 @@
\tl_set_eq:NN \l__acro_alt_format_tl \l__acro_short_format_tl
\tl_set:Nn \l__acro_list_short_format_tl {#1} ,
short-format .value_required:n = true ,
- alt-format .code:n =
- \tl_set:Nn \l__acro_alt_format_tl {#1} ,
+ alt-format .tl_set:N = \l__acro_alt_format_tl ,
+ alt-format .value_required:n = true ,
long-format .code:n =
\tl_set:Nn \l__acro_long_format_tl {#1}
\tl_set:Nn \l__acro_first_long_format_tl {#1}
@@ -2074,6 +2075,12 @@
\bool_set_true:N \l__acro_custom_alt_format_bool
}
{ \bool_set_false:N \l__acro_custom_alt_format_bool }
+ \acro_property_get:nnTF {#1} {foreign-format}
+ {
+ \tl_set_eq:NN \l__acro_custom_foreign_format_tl \l__acro_foreign_format_tl
+ \bool_set_true:N \l__acro_custom_foreign_format_bool
+ }
+ { \bool_set_false:N \l__acro_custom_foreign_format_bool }
\acro_property_get:nn {#1} {single-format}
\acro_for_endings_do:n
{
@@ -2110,7 +2117,7 @@
% input
% #1: ending
% #2: id
-% #3: short|alt|long
+% #3: short|alt|long|foreign
\cs_new_protected:Npn \__acro_set_ending_for:nnn #1#2#3
{
\acro_if_ending_form_exist:nnT {#1} {#3}
@@ -2199,6 +2206,12 @@
{ \l__acro_custom_alt_format_tl }
{ \l__acro_alt_format_tl }
}
+ {foreign}
+ {
+ \bool_if:NTF \l__acro_custom_foreign_format_bool
+ { \l__acro_custom_foreign_format_tl }
+ { \l__acro_foreign_format_tl }
+ }
}
}
{ \use:n }
@@ -2652,6 +2665,7 @@
\acro_property_get:nnT {#1} {foreign}
{
\group_begin:
+ \__acro_endings:nn {#1} {foreign}
\tl_use:N \l__acro_foreign_format_tl
{
\acro_foreign_language:VV
@@ -2663,7 +2677,7 @@
}
}
-\cs_new:Npn \acroenparen #1 { ( #1 ) }
+\cs_new:Npn \acroenparen #1 { (#1) }
\cs_new_protected:Npn \acro_get_foreign:n #1
{
diff --git a/macros/latex/contrib/chemformula/README b/macros/latex/contrib/chemformula/README
index 5de7b5d18b..d539688182 100644
--- a/macros/latex/contrib/chemformula/README
+++ b/macros/latex/contrib/chemformula/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMFORMULA package v4.15i 2020/02/01
+the CHEMFORMULA package v4.15j 2020/03/07
typeset chemical compounds and reactions
diff --git a/macros/latex/contrib/chemformula/chemformula-manual.cls b/macros/latex/contrib/chemformula/chemformula-manual.cls
index e57fd96154..1935e5d8b3 100644
--- a/macros/latex/contrib/chemformula/chemformula-manual.cls
+++ b/macros/latex/contrib/chemformula/chemformula-manual.cls
@@ -153,17 +153,16 @@
\begingroup
\catcode`\^^M=13
\gdef\chemformula@read@options#1#2^^M{%
- \endgroup
\ifblank{#2}{}{\chemformula@read@options@#2}%
#1%
\XSIMfilewritestart*{\jobname.tmp}%
}%
\endgroup
+
\def\chemformula@read@options@[#1]{\pgfqkeys{/cnltx}{#1}}
\RenewDocumentEnvironment{sourcecode}{}
{%
- \begingroup
\chemformula@readoptions{%
\setlength\cnltx@sidebysidewidth
{\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
@@ -187,7 +186,6 @@
\RenewDocumentEnvironment{example}{}
{%
- \begingroup
\chemformula@readoptions{%
\setlength\cnltx@sidebysidewidth
{\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
@@ -204,6 +202,7 @@
}
{%
\XSIMfilewritestop
+ \catcode`\^^M=5
\ifbool{cnltx@sidebyside}
{%
\cnltxcode
diff --git a/macros/latex/contrib/chemformula/chemformula-manual.pdf b/macros/latex/contrib/chemformula/chemformula-manual.pdf
index ab030bac8a..6e3c49e1af 100644
--- a/macros/latex/contrib/chemformula/chemformula-manual.pdf
+++ b/macros/latex/contrib/chemformula/chemformula-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/chemformula/chemformula.sty b/macros/latex/contrib/chemformula/chemformula.sty
index f54109bf59..1f926e1243 100644
--- a/macros/latex/contrib/chemformula/chemformula.sty
+++ b/macros/latex/contrib/chemformula/chemformula.sty
@@ -30,9 +30,9 @@
\usetikzlibrary{arrows.meta}
\ExplSyntaxOn
-\tl_const:Nn \c_chemformula_date_tl {2020/02/01}
+\tl_const:Nn \c_chemformula_date_tl {2020/03/07}
\tl_const:Nn \c_chemformula_version_number_tl {4.15}
-\tl_const:Nn \c_chemformula_version_suffix_tl {i}
+\tl_const:Nn \c_chemformula_version_suffix_tl {j}
\tl_const:Nx \c_chemformula_version_tl
{ \c_chemformula_version_number_tl \c_chemformula_version_suffix_tl }
\tl_const:Nn \c_chemformula_info_tl
@@ -366,6 +366,61 @@
\box_new:N \l__chemformula_subscript_box
% --------------------------------------------------------------------------
+% catcode stuff
+\cs_new_protected:Npn \__chemformula_save_catcodes:
+ {
+ \cs_gset_protected:Npx \__chemformula_restore:
+ {
+ \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
+ \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
+ \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
+ \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
+ \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
+ \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
+ \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
+ \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
+ \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
+ \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
+ \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }% ~
+ }
+ }
+
+\cs_gset_protected:Npn \__chemformula_basic_catcodes:
+ {
+ % expl3 catcodes:
+ \char_set_catcode_letter:N \_
+ \char_set_catcode_letter:N \:
+ % I've forgotten why I put this here:
+ \char_set_catcode_math_superscript:N \^
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \#
+ % make the naming work with babel languages like French that make
+ % ! active:
+ \char_set_catcode_other:N \!
+ % make the naming work with babel languages like Spanish that make
+ % < and > active:
+ \char_set_catcode_other:N \>
+ \char_set_catcode_other:N \<
+ % ensure " is other:
+ \char_set_catcode_other:N \"
+ % spaces are spaces:
+ \char_set_catcode_space:N \
+ }
+
+\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
+ {
+ \tl_set_rescan:Nnn #1
+ {
+ \__chemformula_basic_catcodes:
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \{
+ \char_set_catcode_letter:N \}
+ }
+ {#2}
+ }
+\cs_generate_variant:Nn \__chemformula_sanitize:Nn {NV}
+
+% --------------------------------------------------------------------------
% general and helper functions:
\cs_new_protected:Npn \chemformula_tikz:nn #1#2
{
@@ -829,9 +884,10 @@
\cs_new_protected:Npn \__chemformula_arrow_draw:nnn #1#2#3
{
\chemformula_nobreak:
+ % \__chemformula_sanitize:Nn \l__chemformula_tmpc_tl {#1}
% prepare arrow code for drawing:
\tl_set_rescan:Nnn \l__chemformula_tmpc_tl
- { \char_set_catcode_letter:N \_ } {#1}
+ { \__chemformula_basic_catcodes: } {#1}
% determine length of the arrow
\hbox_set:Nn \l__chemformula_arrow_arg_i_box
{ \tl_use:N \l__chemformula_arrow_label_style_tl #2 }
@@ -880,10 +936,27 @@
\prg_new_conditional:Npnn \chemformula_if_is_arrow:n #1 {p,T,F,TF}
{
- \seq_if_in:NnTF \l__chemformula_arrows_type_seq {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \seq_if_in:NVTF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
{ \prg_return_true: }
{ \prg_return_false: }
}
+\prg_generate_conditional_variant:Nnn \chemformula_if_is_arrow:n {V} {T,F,TF}
+
+\cs_new_protected:Npn \chemformula_define_arrow:nn #1#2
+ {
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpb_tl {#2}
+ \seq_if_in:NVF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
+ {
+ \seq_put_right:NV
+ \l__chemformula_arrows_type_seq
+ \l__chemformula_tmpa_tl
+ }
+ \prop_put:NVV \l__chemformula_arrows_code_prop
+ \l__chemformula_tmpa_tl
+ \l__chemformula_tmpb_tl
+ }
% commands to declare arrows (can also be used by users):
% #1: symbol, #2: code
@@ -891,36 +964,23 @@
{
\chemformula_if_is_arrow:nTF {#1}
{ \msg_error:nnn {chemformula} {new-arrow} {#1} }
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \DeclareChemArrow {mm}
- {
- \chemformula_if_is_arrow:nF {#1}
- { \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1} }
- % store type in the sequence and code in the property list
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
\NewDocumentCommand \RenewChemArrow {mm}
{
\chemformula_if_is_arrow:nTF {#1}
- { \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2} }
+ { \chemformula_define_arrow:nn {#1} {#2} }
{ \msg_error:nnn {chemformula} {renew-arrow} {#1} }
}
\NewDocumentCommand \ProvideChemArrow {mm}
{
\chemformula_if_is_arrow:nF {#1}
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \ShowChemArrow {m}
@@ -1021,7 +1081,7 @@
\draw[chemarrow] (cf_arrow_mid) ++ (.6ex,.4ex) -- ++(-.4ex,-.8ex) ;
}
% net reaction:
-\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) { = } ; }
+\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) {=} ; }
% quasi equilibria:
\NewChemArrow{<=o>}{
\draw[chemarrow,-left~cf]
@@ -1072,7 +1132,6 @@
\tl_set:Nn \l__chemmacros_tmpa_tl {#1}
\tl_trim_spaces:N \l__chemmacros_tmpa_tl
\seq_set_split:NnV \l__chemformula_input_seq {~} \l__chemmacros_tmpa_tl
- % \seq_show:N \l__chemformula_input_seq
% remove empty items in order to avoid unnecessary processing:
\seq_remove_all:Nn \l__chemformula_input_seq {}
% disable \xspace:
@@ -1087,11 +1146,9 @@
\seq_map_function:NN
\l__chemformula_input_seq
\__chemformula_input:n
- % \tl_analysis_show:N \l__chemformula_input_tl
\__chemformula_prepare_output:NV
\l__chemformula_input_tl
\l__chemformula_catcodes_tl
- % \tl_analysis_show:N \l__chemformula_input_tl
\chemformula_write:V \l__chemformula_input_tl
}
\group_end:
@@ -1116,7 +1173,6 @@
\__chemformula_ch_newline:w #2 \\ \q_no_value \q_stop
\group_align_safe_end:
\tl_use:N \g__chemformula_output_tl
-% \tl_show:N \g__chemformula_output_tl
\tl_gclear:N \g__chemformula_output_tl
}
\cs_generate_variant:Nn \chemformula_ch:nn {V,nV,VV}
@@ -1286,8 +1342,6 @@
\cs_new_protected:Npn \chemformula_chwritebelow:nn #1#2
{
- % \tl_set:Nn \l_tmpa_tl {#1} \show \l_tmpa_tl
- % \tl_set:Nn \l_tmpa_tl {#2} \show \l_tmpa_tl
\c_math_toggle_token
\underset
{
@@ -1715,8 +1769,6 @@
}
\cs_generate_variant:Nn \__chemformula_subscript:n {V}
-% TODO: add hook for cleanup?
-% similar to ChemCompoundProperty?
\prop_new:N \l__chemformula_clean_subscript_prop
\seq_new:N \l__chemformula_clean_subscript_seq
@@ -1838,75 +1890,9 @@
}
\cs_generate_variant:Nn \__chemformula_superscript:n {V}
-% TODO: add hook for cleanup?
-% \prop_new:N \l__chemformula_clean_superscript_prop
-% \seq_new:N \l__chemformula_clean_superscript_seq
-
-% \cs_new_protected:Npn \chemformula_add_superscript_cleanup:nnn #1#2#3
-% {
-% \seq_put_right:Nn \l__chemformula_clean_superscript_seq {#1}
-% \prop_put:Nnn \l__chemformula_clean_superscript_prop {#1}
-% { \bool_if:NTF \l__chemformula_kroegervink_bool {#2} {#3} }
-% }
-
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_single_bond: }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { - }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_triple_bond: }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { + }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { . }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_adduct: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_star_adduct: }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { * }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { ' }
-% { ' }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_prime: }
-% { \chemformula_prime: }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { , }
-% { \chemformula_decimal: }
-% { , }
-
% rename this function into treatment instead of cleanup
\cs_new_protected:Npn \__chemformula_clean_superscript:
{
- % \seq_map_inline:Nn \l__chemformula_clean_superscript_seq
- % {
- % \tl_replace_all:Nnx \l__chemformula_superscript_tl
- % {##1}
- % { \prop_item:Nn \l__chemformula_clean_superscript_prop {##1} }
- % }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_single_bond: } { \chemformula_minus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
@@ -2294,7 +2280,6 @@
% input compounds
\cs_new_protected:Npn \__chemformula_input_compound:Nn #1#2
{
- % \tl_show:n {#1}
\tl_if_blank:VTF \l__chemformula_stoich_tl
{
% TODO
@@ -2397,53 +2382,6 @@
\cs_new_protected:Npn \__chemformula_fontspec_aux:w [#1]#2 \q_stop
{ \newfontfamily \chemformula_font: [#1] {#2} }
-\cs_new_protected:Npn \__chemformula_save_catcodes:
- {
- \cs_gset_protected:Npx \__chemformula_restore:
- {
- \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
- \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
- \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
- \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
- \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
- \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
- \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
- \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
- \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
- \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
- \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }% ~
- }
- }
-
-\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
- {
- \tl_set_rescan:Nnn #1
- {
- % expl3 catcodes:
- \char_set_catcode_letter:N \_
- \char_set_catcode_letter:N \:
- % I've forgotten why I put this here:
- \char_set_catcode_math_superscript:N \^
- % disable some of the specials (needed for sub- and superscripts):
- \char_set_catcode_letter:N \{
- \char_set_catcode_letter:N \}
- % this one seems not necessary any more:
- % \char_set_catcode_letter:N \\
- \char_set_catcode_letter:N \#
- % make the naming work with babel languages like French that make
- % ! active:
- \char_set_catcode_other:N \!
- % make the naming work with babel languages like Spanish that make
- % < and > active:
- \char_set_catcode_other:N \>
- \char_set_catcode_other:N \<
- % ensure " is other:
- \char_set_catcode_other:N \"
- }
- {#2}
- }
-\cs_generate_variant:Nn \__chemformula_sanitize:Nn {NV}
-
\cs_new_protected:Npn \__chemformula_prepare_output:Nn #1#2
{
\tl_set_rescan:NnV #1
@@ -2869,8 +2807,9 @@
{
\tl_set_rescan:Nnn \l__chemformula_tmpa_tl
{
- \char_set_catcode_letter:N \_
- \char_set_catcode_other:N \:
+ % \char_set_catcode_letter:N \_
+ % \char_set_catcode_other:N \:
+ \char_set_catcode_space:N \~
}
{#1}
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
@@ -2879,15 +2818,6 @@
{_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % those cause trouble with chemmacros' \ox:
- % \tl_put_left:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_begin: }
- % \tl_put_right:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_end: }
- % \tl_set_rescan:NnV \l__chemformula_tmpa_tl
- % { \__chemformula_restore: \char_set_catcode_other:N \~ }
- % \l__chemformula_tmpa_tl
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
}
@@ -2946,7 +2876,6 @@
{_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_left:Nn \l__chemformula_tmpa_tl
{ \chemformula_group_begin: }
\tl_put_right:Nn \l__chemformula_tmpa_tl
@@ -3083,7 +3012,7 @@
\bool_set_false:N \l__chemformula_fontspec_bool
\tl_set:Nn \l__chemformula_format_tl {#1} ,
atom-format .tl_set:N = \l__chemformula_atom_format_tl ,
- set-catcodes .tl_set:N = \l__chemformula_catcodes_tl
+ set-catcodes .tl_set:N = \l__chemformula_catcodes_tl
}
% --------------------------------------------------------------------------
@@ -3574,12 +3503,14 @@ VERSION HISTORY
- implement \shortintertext bypass
2019/09/23 - version 4.15f - add missing definition for temporary variable
2019/09/27 - version 4.15g - bug fix in fontspec option
-2019/10/13 - version 4.15h - new (undocumented) option set-catcodes
+2019/10/13 - version 4.15h - new (undocumented) option `set-catcodes'
- fix behaviour with category codes
(https://tex.stackexchange.com/q/511592/)
- fix bug: local format changes are now applied
again
2020/02/01 - version 4.15i - fix issue #12
+2020/03/07 - version 4.15j - make sure that < and > have catcode 12 when read
+ as arrows -- again...
% --------------------------------------------------------------------------
% IDEAS:
diff --git a/macros/latex/contrib/pdfpc/pdfpc.dtx b/macros/latex/contrib/pdfpc/pdfpc.dtx
index 4177554186..ad5430f324 100644
--- a/macros/latex/contrib/pdfpc/pdfpc.dtx
+++ b/macros/latex/contrib/pdfpc/pdfpc.dtx
@@ -55,7 +55,7 @@
%
% Identify the package and force \LaTeXe:
% \begin{macrocode}
-\ProvidesPackage{pdfpc}[2019/12/03 v0.2 PDFPC]
+\ProvidesPackage{pdfpc}[2019/12/03 v0.2.1 PDFPC]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
%
@@ -89,14 +89,12 @@
{\PackageWarningNoLine{pdfpc}{`duration' should be an integer}}%
\fi
%
-\ifx\PDFPC@duration\@empty
\ifx\PDFPC@enduserslide\@empty
\else
\IfInteger{\PDFPC@enduserslide}{}
{\PackageWarningNoLine{pdfpc}{`enduserslide' should be an integer}}%
\fi
%
-\ifx\PDFPC@duration\@empty
\ifx\PDFPC@lastminutes\@empty
\else
\IfInteger{\PDFPC@lastminutes}{}
diff --git a/macros/latex/contrib/pdfpc/pdfpc.pdf b/macros/latex/contrib/pdfpc/pdfpc.pdf
new file mode 100644
index 0000000000..275a168ac1
--- /dev/null
+++ b/macros/latex/contrib/pdfpc/pdfpc.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index 77b921de15..8d9a06b286 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 19d0762f4d..569aa77469 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendotes.tex b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
index 453b1ce5e4..453b1ce5e4 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendotes.tex
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index a4811cf3e9..c7be79abaf 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index de8bcfccc9..3c9593e657 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index f71e0c840d..2a9d0dac7a 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index 2d2a61ecb4..469ee797c0 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 7e45349188..c17e0c41f9 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index 26085b2246..6886bf80ff 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index 37724a0477..22bf961c99 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index adae49930f..d7a8c20469 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index ec7e2ece1a..ecc70e013f 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 13ff8a36cd..958c9fa978 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 69b8e3ff6d..d2aff82445 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index fe82c6f1b4..4aa9567e30 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 665a7c04af..15095aba74 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index e38c08326c..ff1a00d2ac 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index b4766f6b5f..ee7f120c90 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 5966417770..f73205792e 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 65fc70c7d9..97d2f7f851 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 84ca39a203..838b2a3409 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 20af46f3ad..8699fc6293 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 16dfbd79c4..47816b8c0d 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index 3e404a80e2..208c6fcb01 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index 8cf7b2e56e..2e0f36b80b 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index ec75344f04..5dee9bad9c 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index e8a2841f21..5d5f5dbc52 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 8cad26ed49..15217b2e57 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 5d5fff895c..d74ac16fa4 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index d90724dda1..8d734eb247 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index c82a62cde3..8f3aed07f8 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index b01479e9a9..91a3e6bd91 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 1d0e5da940..8cb89f7bd5 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 3dbfa513d9..2c69289ec2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index af994fccee..188b182e8c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index f0eb2e184d..bc2dd25e64 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index bc33f2c41a..d1579129da 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index a8ec60d177..6ec18019d0 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 4043c44adc..dfa0ce2ea4 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 040f1d384d..b58cd2c2a1 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 28d4e10483..970c4cd22c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 3107cf1c01..17510a9312 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 9ccd07ce64..9280fcf71e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 0fcd37b00f..9730bd9485 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 15a296f84f..d2b1e2540e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index 824adbbfd5..e64716dd29 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index a1860bc1c5..395c1fe719 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index 41a7e62244..2634484f6a 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -295,7 +295,7 @@
% \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.}
% \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.}
% \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.}
-% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.}
% \changes{v1.23.0}{2015/05/18}{Fix a bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).}
@@ -382,7 +382,7 @@
% \changes{v2.7.2}{2015/12/13}{Fix problem of hyphenation when using \protect\package{hyperref} package (added in v2.7.0).}
% \changes{v2.8.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.}
% \changes{v2.8.0}{2016/01/15}{No indentation for paragraphed notes in ledgroup. Can be changed with \protect\cs{Xparindent} and \protect\cs{parindentX}.}
-% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls...} commands.}
+% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls\ldots} commands.}
% \changes{v2.8.1}{2016/02/22}{Warnings for undefined labels are really parsable by latexmk}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with \protect\cs{AtEveryPstart} added in version 2.0.0.}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with vertical space after the between-sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content}
@@ -449,8 +449,8 @@
% \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.}
% \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.16.6}{2016/11/14}{Fix a bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering}.}
% \changes{v2.16.8}{2016/12/16}{Fix a bug with \protect\cs{edindex} in footnotes in parallel typesetting.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
@@ -540,9 +540,12 @@
% \changes{v2.32.2}{2019/11/28}{Fix spurious vertical space in familiar footnotes with \protect\LuaLaTeX.}
% \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting arabic text with \protect\package{polyglossia}.}
% \changes{v2.32.4}{2020/02/04}{Fix bug \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.}
-% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnotenote number.}
+% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnote number.}
% \changes{v2.32.4}{2020/02/04}{Fix bug when using \protect\cs{Xgroupbyline} and twocol arrangement.}
% \changes{v2.32.4}{2020/02/04}{Fix bug with three and two columns footnotes when using \protect\package{bidi}.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with \protect\cs{edindex} inside \protect\cs{eledsection} and related.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with page number in index with \protect\cs{edindex} when indexing a critical notes.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with macro inside \protect\cs{sameword} with no-\protect\XeTeX\ engines.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -801,6 +804,7 @@
%
%Please read \reff{Xmaxhnotes}.
%
+% If you use \LuaTeX\ engine, you need \LuaTeX\ 1.1.0 or later.
% A file may mix \emph{numbered} and \emph{unnumbered} text.
%
% Numbered text is printed with marginal line numbers and can include
@@ -1395,7 +1399,7 @@
% If you want to change the separator, you can use \\
% \cs{setlinenumannotationsep}\marg{sep}
% \subsubsection{Annotations in the apparatus}
-% Some others options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
+% Some other options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
% \subsection{Executing code at each line}\label{linehook}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -1779,6 +1783,10 @@
%
% With these tools, \XeTeX\ / \LuaTeX\ will dynamicaly normalize unicode input when reading the file.
% Consequently, you will have no problems with the \protect\cs{sameword} command.
+% \subsubsection{Notes about right-to-left texts}
+% Due to some internal limits of \XeTeX, \cs{sameword} does not work with right-to-left text with this engine.
+%
+% If you need to use \cs{sameword} with right-to-left text, you must use \LuaTeX.
% \subsubsection{Use with \protect\cs{lemma} command}
% If you use the \protect\cs{lemma} command, \macpackage\ cannot know to which occurence of \cs{sameword} in the first argument of \cs{edtext} a word marked with \cs{sameword} in \cs{lemma} should refer.
%
@@ -2267,7 +2275,7 @@
% \subsubsection{Print line number only at first time}
% \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline}
% \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{Xnumberonlyfirstinline} with lineation by pstart or by page.}
-% By default, the line number is printed in every note. If you want to print it only the first time for a given line number
+% By default, the line number is printed inside every note. If you want to print it only the first time for a given line number
% (i.e., once for line 1, once for line 2, etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}.
%
%
@@ -2289,18 +2297,18 @@
%
% \subsubsection{Print line number annotation only at first time}\label{annotation-inapparatus}
% \DescribeMacro{\Xlinenumannotationonlyfirst}
-% By default, the line number annotation (\reff{annotion} is printed in every note. If you want to print it only the first time for a given annotation
+% By default, the line number annotation (\reff{annotion} is printed inside every note. If you want to print it only the first time for a given annotation
% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}.
%
-% Note the two followings points:
+% Note the two following points:
% \begin{itemize}
% \item If you use \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number.
-% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemma with the same annotation. That is, if you have for example a lemma with \verb+A+ annotation, then a lemma with \verb+B+ annotation, then a lemma with \verb+A+ annotation, all lemma will have its annotation in the apparatus.
+% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemmas with the same annotation. That is, if you have for example a lemma with \verb+A+ annotation, then a lemma with \verb+B+ annotation, then a lemma with \verb+A+ annotation, all lemmas will have its own annotation in the apparatus.
% \end{itemize}
%
% \DescribeMacro{\Xlinenumannotationonlyfirstintwo}
-% Suppose you have a lemma on annoation~1 and a lemma between annotation~1 and annotation~3.
-% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to be with the same line annotation as the first lemma.
+% Suppose you have a lemma on annotation~1 and a lemma between annotation~1 and annotation~3.
+% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to have the same annotation as the first lemma.
% But if you use both \cs{Xlinenumannotationonlyfirst}\oarg{s} and \cs{Xlinenumannotationonlyfirstintwo}\oarg{s}, a distinction is made.
%
%
@@ -4321,7 +4329,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/02/04 v2.32.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/03/08 v2.32.5 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4494,6 +4502,11 @@
\ifx\directlua\undefined\else%
\directlua{tex.enableprimitives("",{"textdir","pardir","bodydir"})}
\fi
+\ifluatex%
+ \ifnum\luatexversion<110%
+ \PackageWarning{reledmac}{You need to use LuaTeX 1.1.0 or higher}{\@ehc}%
+ \fi%
+\fi%
% \end{macrocode}
% \subsection{Boolean flags}
% \begin{macro}{\ifl@dmemoir}
@@ -4590,7 +4603,13 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \begin{macro}{\led@err@samewordRTL}
+% \begin{macrocode}
+\newcommand*{\led@err@samewordRTL}{%
+ \reledmac@error{You can't use \string\sameword \MessageBreak with XeLaTeX \MessageBreak when typesetting RTL text.\MessageBreak Please use LuaTeX instead.}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led@err@edtextoutsidepstart}
% \begin{macro}{\led@err@PstartInEdtext}
% \begin{macro}{\led@err@PendInEdtext}
@@ -7287,7 +7306,7 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\new@line}
-% \begin{macro}{\l@the@c@page}
+% \begin{macro}{\set@this@c@page}
% The \protect\cs{new@line} macro sends the \protect\cs{@nl} command to the line-list
% file, to mark the start of a new text line, and its page number.
% \label{new@line@pagecounting}
@@ -7305,6 +7324,7 @@
% \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers}
% \begin{macrocode}
\newcommand*{\new@line}{%
+ \set@this@c@page%
\ifnumberline%
\IfStrEq{\led@pb@setting}{after}%
{\xifinlist{\the\absline@num}{\l@prev@nopb}%
@@ -7312,9 +7332,9 @@
{\numgdef{\@next@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\@next@page][\@next@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}}%
{}%
\IfStrEq{\led@pb@setting}{before}%
{\numdef{\next@absline}{\the\absline@num+\@ne}%
@@ -7323,9 +7343,9 @@
{\numgdef{\nc@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\nc@page][\nc@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
{}%
\IfStrEqCase{\led@pb@setting}%
@@ -7333,18 +7353,19 @@
{before}{\relax}%
{after}{\relax}%
}[%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
]%
\fi%
}
-\newcommand{\l@the@c@page}{%
+\newcount\@this@c@page%%
+\newcommand{\set@this@c@page}{%
\ifboolexpr{%
bool{sameparallelpagenumber}%
or bool{prevpgnotnumbered}%
}%
- {\the\c@par@page}%
- {\the\c@page}%
+ {\global\@this@c@page=\c@par@page}%
+ {\global\@this@c@page=\c@page}%
}%
% \end{macrocode}
% \end{macro}
@@ -8258,7 +8279,7 @@
% The general mechanism is the following:
% \begin{itemize}
% \item \textbf{At the first run}, each \protect\cs{sameword} command increments an \protect\package{etoolbox} counter the name of which contains the argument of the \protect\cs{sameword} commands.
-% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+... file).
+% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+\ldots\ file).
% \item \textbf{When this auxiliary file is read at the second run}, different operations are achieved:
% \begin{enumerate}
% \item Get the rank of each \protect\cs{sameword} in a line (relative rank) from the rank of each \protect\cs{sameword} in all the numbered section (absolute rank):
@@ -8329,13 +8350,8 @@
% \end{itemize}
% \end{itemize}
% After theory, implementation.
+% First, getting a sanitized form of the argument of \cs{sameword}
% \begin{macro}{\get@sw@txt}
-% As the argument of \protect\cs{sameword} can contain an active character if we
-% use \protect\package{inputenc} with \verb+utf8+ option instead of native UTF-8 engine,
-% we store its detokenized content in a macro in order to allow the dynamic name of macro with \protect\cs{csname}.\footnote{See \url{http://tex.stackexchange.com/q/244538/7712}.}
-%
-% Because there is a bug with \protect\cs{detokenize} and \XeTeX\ when using non BMP characters\footnote{\url{http://sourceforge.net/p/xetex/bugs/108/}},
-% we detokenize only for non-\XeTeX engines. In any case, in \XeTeX a \protect\cs{csname} construction can contain UTF-8 characters without a problem, as UTF-8 characters are not managed with category codes, but instead read directly as UTF-8 characters.
% \begin{macrocode}
\newcommand{\get@sw@txt}[1]{%
\begingroup%
@@ -8351,11 +8367,7 @@
% \end{macrocode}
% And now, define \cs{sw@txt}.
% \begin{macrocode}
- \ifxetex%
- \@tmpa{\xdef\sw@txt{#1}}%
- \else%
- \@tmpa{\expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}}%
- \fi%
+ \@tmpa{\protected@xdef\sw@txt{#1}}%
\endgroup%
}%
% \end{macrocode}
@@ -8393,6 +8405,11 @@
% The hight level macro \protect\cs{sameword}, used by the editor.
% \begin{macrocode}
\newcommandx{\sameword}[2][1,usedefault]{%
+ \ifxetex%
+ \if@RTL%
+ \led@err@samewordRTL%
+ \fi%
+ \fi%
\leavevmode%
\get@sw@txt{#2}%
% \end{macrocode}
@@ -8829,7 +8846,7 @@
}%
% \end{macrocode}
% Restore standard \enquote{nobreak} and \enquote{autopar} settings.
-% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ ...\ \cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false.
+% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ldots\ \cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false.
% \begin{macrocode}
\@nobreakfalse%
\ifautopar%
@@ -9123,6 +9140,7 @@
% Because of how this prints, a vertical spacing correction is added.
% \begin{macrocode}
\def\print@eledsection{%
+ \disable@edindex%
\if@firstlineofpage%
\set@Xtxtbeforenotes%
\set@txtbeforenotesX%
@@ -9153,6 +9171,7 @@
\fi%
\vskip-\baselineskip%
\continuousnumberingwithcolumns@sync@linenumber@singletext%
+ \restore@edindex%
}
% \end{macrocode}
% \end{macro}
@@ -12274,13 +12293,6 @@
\def\printlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup%
% \end{macrocode}
-% If we use \LuaTeX, ensure we use good text's direction.
-% \begin{macrocode}
- \ifluatex%
- \edef\@tmp{\the\textdir}%
- \ifdefstring{\@tmp}{TLT}{}{\textdir TLT}%Test in order to prevent spurious space (bug #397)
- \fi%
-% \end{macrocode}
% Decide which part of line number components we will print.
% \begin{macrocode}
\setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
@@ -18000,6 +18012,8 @@
{\led@error@fail@patch@makeindex}%
\newcommand{\edindex}[1]{\@bsphack\@esphack}
\newcommandx{\dummy@edindex}[2][1=\expandonce\jobname,usedefault]{}%
+\newcommand{\disable@edindex}{\let\old@edindex\edindex\let\edindex\dummy@edindex}%
+\newcommand{\restore@edindex}{\let\edindex\old@edindex}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -21453,6 +21467,11 @@
% \subsection{critical-keys for \emph{Emacs}}
% The \emph{Emacs} editor has a package to help inserting \macpackage's commands (Juan Manuel Macías Chaín).\\
% \url{https://gitlab.com/maciaschain/critical-keys}
+% \subsection{critical-marks for \emph{Emacs}}
+% A set of functions for \emph{Emacs} that run in the export process from Org Mode to
+% LaTeX and replace a series of simple textual marks with the basic \macpackage's commands (Juan Manuel Macías Chaín)
+% \url{https://gitlab.com/maciaschain/critical-marks}
+%\subsection{Import from TEI}
% \subsection{Import from TEI}
% There are multiple tools to convert from XML-TEI to \emph{reledmac}. Here is a non exhaustive-list:
% \begin{itemize}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index c2b67b97c7..ab37c448c0 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index 2649200823..45e86de80e 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -225,7 +225,7 @@
% \changes{v1.15.0}{2015/04/13}{Fix vertical spurious space before right \protect\cs{eledchapter} (bug added in v1.13.0).}
% \changes{v1.15.0}{2015/04/13}{Prevent vertical space when using \protect\cs{AtEveryPstart} or \protect\cs{AtEveryPend} with a command which prints nothing}
% \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.}
-% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.}
% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.}
% \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.}
@@ -293,7 +293,7 @@
% \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.}
% \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.}
-% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}}
+% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix a bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix a bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
% \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}}
@@ -317,7 +317,7 @@
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.}
% \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).}
-% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
+% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.}
% \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.}
% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.}
@@ -338,6 +338,8 @@
% \changes{v2.22.1}{2019/01/08}{Really reset line number annotation at each line}
% \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
% \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
+% \changes{v2.23.0}{2020/03/08}{Add \protect\cs{Leftpagehook} and \protect\cs{Rightpagehook}.}
+% \changes{v2.23.0}{2020/03/08}{Add hanging symbol feature into \protect\env{astanza}.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -627,8 +629,8 @@
% numbers between multiple columns and single columns, use the
% \option{continuousnumberingwithcolumns} option when loading \macpackage
% or \parpackage.
-% You will need to use \cs{pausenumbering}~...\
-% \cs{resumenumbering} in addition to \cs{beginnumbering}~...\
+% You will need to use \cs{pausenumbering}\ldots
+% \cs{resumenumbering} in addition to \cs{beginnumbering}\ldots
% \cs{endnumbering} (see \reff{reledmac-pause}).
%
% The best way to understand the behaviour of \cs{pausenumbering} and
@@ -640,15 +642,15 @@
% left-column commands.
%
% This means that you must switch between single-column and left-column
-% text using \cs{beginnumbering}~...\ \cs{pausenumbering}~...\
-% \cs{resumenumbering}~...\ \cs{pausenumbering}~...\
-% \cs{resumenumbering}~...\ \cs{endnumbering}.
+% text using \cs{beginnumbering}\ldots\cs{pausenumbering}\ldots
+% \cs{resumenumbering}\ldots\cs{pausenumbering}\ldots
+% \cs{resumenumbering}\ldots\cs{endnumbering}.
%
% On the other side, the first right column must always begin with
% \cs{beginnumbering}, no matter if the corresponding left-column started
% with \cs{resumenumbering} or not; this is because numbering in the right
% column has not been started yet. Then, for consecutive chunks of
-% right-column text you should use \cs{pausenumbering}~...\
+% right-column text you should use \cs{pausenumbering}\ldots
% \cs{resumenumbering}.
%
% You must use \cs{endnumbering} in a right column in the following cases:
@@ -1210,6 +1212,13 @@
%
% About these two hooks, read \macpackage's handbook (\reff{reledmac-linehook}).
%
+% \subsection{Executing code at each page}
+% \DescribeMacro{\Rightpagehook}
+% \DescribeMacro{\Leftpagehook}
+% When typesetting parallel pages, the \cs{Leftpagehook} and \cs{Rightpagehook} macros
+% are executed each time \Parpackage switches to Left / Right page.
+%
+% These macro are initially void. You can redefine them using \cs{renewcommand}.
% \section{Verse}
%
% If you are typesetting verses with \macpackage you can use the \protect\cs{stanza}
@@ -1386,7 +1395,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2019/11/04 v2.22.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -2636,7 +2645,7 @@
%
% \begin{macro}{\l@d@set}
% The \protect\cs{l@d@set}\marg{num} macro sets
-% the line number for the next \verb?\pstart...? to the value specified as
+% the line number for the next \cs{pstart}\ldots\ to the value specified as
% its argument. This is used to implement \protect\cs{setlinenum}.
% It is defined in \macpackage.
% \changes{v2.0.0}{2015/07/19}{\protect\cs{l@d@set} defined only in \reledmac.}
@@ -3001,8 +3010,9 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new@lineL}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
% \end{macrocode}
@@ -3012,8 +3022,9 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new@lineR}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}%
+ \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
% \end{macrocode}
@@ -3051,7 +3062,7 @@
%
% \begin{macro}{\setline}
% You can use \protect\cs{setline}\marg{num}
-% in running text (i.e., within \verb?\pstart...\pend?) to set the
+% in running text (i.e., within \cs{pstart}\ldots\cs{pend}) to set the
% current visible
% line-number to a specified positive value.
% It is defined in \macpackage.
@@ -3413,6 +3424,15 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \begin{macro}{ifinastanzaL}
+% \begin{macro}{ifinastanzaR}
+% These boolean tests are switched by the \protect\env{astanza} environnement, using either the left or right side.
+% \begin{macrocode}
+ \newif\ifinastanzaL%
+ \newif\ifinastanzaR%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{environment}{Leftside}
% Within the \verb?pairs? and \verb?pages? environments the left and
% right hand texts are within \verb?Leftside? and \verb?Rightside?
@@ -3461,6 +3481,15 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \begin{macro}{\Rightpagehook}
+% \begin{macro}{\Leftpagehook}
+% Hook at the start of Left/Right page, initially empty.
+% \begin{macrocode}
+\newcommand*{\Rightpagehook}{}%
+\newcommand*{\Leftpagehook}{}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
% \begin{environment}{Rightside}
% The \verb?Rightside? environment is only slightly more complicated
@@ -4056,6 +4085,7 @@
% \protect\cs{print@eledsectionL} is for line with macro code.
% \begin{macrocode}
\def\print@eledsectionL{%%
+ \disable@edindex%
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
@@ -4081,6 +4111,7 @@
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
% \end{macrocode}
@@ -4245,6 +4276,7 @@
}
\def\print@eledsectionR{%
+ \disable@edindex%
\addtocounter{pstartR}{-1}%
\set@sectcountR%
\ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%
@@ -4270,7 +4302,8 @@
\hspace{3\paperwidth}%
{\new@lineR \hbox{\l@dunhbox@line{\one@lineR}}}%
\fi%
- \vskip\eledsection@correcting@skip
+ \vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
% \end{macro}
% \end{macro}
@@ -5309,6 +5342,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaL%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
\newcommand{\inserthangingsymbolR}{%
@@ -5318,6 +5354,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaR%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
% \end{macrocode}
@@ -5344,6 +5383,11 @@
%
% \begin{macrocode}
\newenvironmentx{astanza}[2][1,2,usedefault]{%
+ \ifledRcol%
+ \global\inastanzaRtrue%
+ \else%
+ \global\inastanzaLtrue%
+ \fi%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\newdimen\parindent@beforestanza%
@@ -5555,11 +5599,14 @@
% If use \protect\package{polyglossia}
% \changes{v1.8.0}{2014/08/05}{Correct left/right language setting with polyglossia.}
% \changes{v1.9.0}{2014/09/16}{Debug left/right language switching with polyglossia. Do not write in .aux file when setting left/right lines.}
-% \changes{v2.22.4}{2019/11/4}{Provide compatibility with lastet version of polyglossia (v1.45).}
+% \changes{v2.22.4}{2019/11/04}{Provide compatibility with last version of polyglossia (v1.45).}
+% \changes{v2.23.0}{2020/03/08}{Restore compatibility with version of polyglossia prior to v1.45.}
% \begin{macrocode}
{ \let\old@otherlanguage\otherlanguage%
\renewcommand{\otherlanguage}[2][]{%
- \xpg@set@group@aux%
+ \ifdefined\xpg@set@group@aux%
+ \xpg@set@group@aux%
+ \fi%
\selectlanguage[#1]{#2}%
\ifledRcol \gdef\theledlanguageR{#2}%
\else \gdef\theledlanguageL{#2}%
@@ -6241,8 +6288,8 @@
% \begin{macro}{setnotepositionliketwocolumns@R}
% The \protect\cs{setwidthliketwocolumns} macro is called in \protect\cs{beginnumbering} in a \textbf{non-parallel}
% typesetting context, to fix the width of the lines to be vertically aligned with parallel columns. It is also called at the beginning of a note's group, if some options are enabled.
-% The \protect\cs{setposition...} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
-% The \protect\cs{setnoteposition...} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
+% The \protect\cs{setposition\ldots} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
+% The \protect\cs{setnoteposition\ldots} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
% \begin{macrocode}
\newcommand{\setwidthliketwocolumns}{%
\get@intercolumns@width%As \columns is not necessary called before \setwidthliketwocolumns
@@ -6505,6 +6552,7 @@
% \changes{v0.2.0}{2004/12/20}{Added \protect\cs{l@duselanguage} to \protect\cs{Pages}}
% \begin{macrocode}
\checkpageL%
+ \Leftpagehook%
\l@duselanguage{\theledlanguageL}%
{ \loop\ifl@dsamepage%
% \end{macrocode}
@@ -6602,6 +6650,7 @@
% \changes{v0.3.0}{2005/02/10}{Added \protect\cs{ledstrutR} to \protect\cs{Pages}}
% \begin{macrocode}
\checkpageR%
+ \Rightpagehook%
\l@duselanguage{\theledlanguageR}%
{ \loop\ifl@dsamepage%
\set@sectcountR%
@@ -6698,6 +6747,8 @@
\global\l@dnumpstartsR=\z@%
\global\instanzaLfalse%
\global\instanzaRfalse%
+ \global\inastanzaLfalse%
+ \global\inastanzaRfalse%
\global\l@dprintingpagesfalse%
% \end{macrocode}
% Check the consistency of \cs{edtext@later} and \cs{edtext@now}
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index a2ff6324dd..7db2af1159 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ