From 0396814223158484c2f424d382bcd670de158d82 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 29 Sep 2021 03:02:14 +0000 Subject: CTAN sync 202109290302 --- macros/latex/contrib/easybook/easybook.dtx | 7 ++++--- macros/latex/contrib/easybook/easybook.pdf | Bin 577947 -> 577949 bytes macros/latex/contrib/easybook/easybook.tex | 4 ++-- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40812 -> 40813 bytes .../reledmac/examples/1-criticalendnotes.pdf | Bin 197491 -> 201045 bytes .../contrib/reledmac/examples/1-criticalnotes.pdf | Bin 195653 -> 199196 bytes .../contrib/reledmac/examples/1-sidenotes.pdf | Bin 291188 -> 295847 bytes .../latex/contrib/reledmac/examples/1-tabular.pdf | Bin 281031 -> 284803 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 197564 -> 200373 bytes .../latex/contrib/reledmac/examples/1-verses.pdf | Bin 197396 -> 200204 bytes .../latex/contrib/reledmac/examples/2-antilabe.pdf | Bin 205373 -> 209856 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 196391 -> 199197 bytes .../reledmac/examples/2-footnote_spacing.pdf | Bin 199862 -> 202702 bytes .../contrib/reledmac/examples/2-glossaries.pdf | Bin 280691 -> 284462 bytes .../latex/contrib/reledmac/examples/2-indexing.pdf | Bin 279825 -> 283598 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 273987 -> 277764 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 289480 -> 293260 bytes .../contrib/reledmac/examples/2-linespacing.pdf | Bin 284653 -> 288423 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 285314 -> 290106 bytes .../contrib/reledmac/examples/2-notes-width.pdf | Bin 203109 -> 205925 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 208756 -> 211562 bytes .../contrib/reledmac/examples/2-performances.pdf | Bin 281669 -> 286175 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31448 -> 31498 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 304788 -> 309311 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 283765 -> 287548 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 196243 -> 199051 bytes .../3-reledpar_columns_different_languages.pdf | Bin 23426 -> 23428 bytes .../contrib/reledmac/examples/3-reledpar_mwe.pdf | Bin 172606 -> 174535 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 32047 -> 32047 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 284905 -> 288679 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190129 -> 199948 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189364 -> 199183 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168145 -> 177026 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189772 -> 199590 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188698 -> 198522 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188752 -> 198573 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188888 -> 198707 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 210267 -> 213256 bytes ...mn_mix_with_not_column-continuous-numbering.tex | 1 + .../4-reledpar_column_mix_with_not_column.pdf | Bin 209050 -> 211867 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 201331 -> 204143 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 293347 -> 297127 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 200437 -> 203251 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 221703 -> 224508 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 246378 -> 249192 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 201164 -> 203970 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 197012 -> 199821 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 297750 -> 301523 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 203497 -> 206311 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 192572 -> 195383 bytes macros/latex/contrib/reledmac/migration.pdf | Bin 358155 -> 368877 bytes macros/latex/contrib/reledmac/reledmac.dtx | 7 ++++--- macros/latex/contrib/reledmac/reledmac.pdf | Bin 2041560 -> 2063704 bytes macros/latex/contrib/reledmac/reledpar.dtx | 8 ++++++-- macros/latex/contrib/reledmac/reledpar.pdf | Bin 987754 -> 1006705 bytes macros/latex/contrib/willowtreebook/README | 6 +++--- .../contrib/willowtreebook/willowtreebook.pdf | Bin 13991774 -> 13992183 bytes .../contrib/willowtreebook/willowtreebook.tex | 20 +++++++++++++++++--- 58 files changed, 37 insertions(+), 16 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 2081f55551..2a841ac896 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/09/12}{1.3d} +\ProvidesExplClass{easybook}{2021/09/28}{1.3e} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -297,7 +297,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/09/12}{1.3d} +\ProvidesExplPackage{easybase}{2021/09/28}{1.3e} {Typeset Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -1771,6 +1771,7 @@ \tl_gset:Nn \dbltopfraction { 0.9 } \tl_gset:Nn \dblfloatpagefraction { 0.9 } } +\dim_zero:N \mathindent \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt } \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt } \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt } @@ -2389,7 +2390,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/12}{1.3d} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/28}{1.3e} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 2549d682b3..9a4997299c 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index a979be5a54..0c202a3674 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -12,8 +12,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK 使用手册, - version = v1.3d, - date = 2021/09/12, + version = v1.3e, + date = 2021/09/28, authors = 瞿毅, info = 排版简体中文学位论文和书籍, email = quee123@foxmail.com, 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 4e6cef7423..b92b60e47b 100644 Binary files a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf and b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf index 4a4492ba6d..4766e38d38 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf index edcc2bf125..f669ce30c9 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf index 87fcfccdb0..fe9826bcf5 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf and b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf index 3b5e5715b7..abb3976b59 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-tabular.pdf and b/macros/latex/contrib/reledmac/examples/1-tabular.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf index c833b9f6ae..ac76fd9f8b 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf and b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf index 382ba54302..8a975fac9f 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses.pdf and b/macros/latex/contrib/reledmac/examples/1-verses.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf index 319e83f2ea..e295f0204d 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf and b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf index a407c54f18..55fb7476ee 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf and b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf index d66bb8eda8..81a3764006 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf and b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf index c75e366e1a..4f21057ba8 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf and b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf index 471a7a233d..99ce6fe10b 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-indexing.pdf and b/macros/latex/contrib/reledmac/examples/2-indexing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf index 0561b50d0d..2a1b3ebdf4 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf and b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf 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 4cdceb5b2e..56789481bf 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf and b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf index 5fd637fe57..bf49a6826b 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf and b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf index 494cc2fa3c..274f719ce6 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf and b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf index 3237be4be1..028329e06b 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf and b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf 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 e7c505a201..d4ac5f3c64 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf index 65d17ca2e9..482b1ed01b 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-performances.pdf and b/macros/latex/contrib/reledmac/examples/2-performances.pdf 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 62a3ac3b45..5ae176bc27 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf and b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf 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 60abd860ab..3d7988bcde 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf and b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf 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 113a237956..0fa1eda97d 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf 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 ff5d2b97c7..784b4f5e91 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf 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 a7fd40a1ea..5a2396d8fa 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf index a963695d7c..a5ac937d4b 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf 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 c47c522bb4..297ddc4672 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf 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 33b19d76f6..222c139845 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf 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 4b48dcc44c..04a751bd9e 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf 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 4883912f88..957720ca6f 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf 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 6dab47543e..3338e9124c 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf 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 08c01a94bf..67756d6ad9 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf 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 7d1d97c5c1..d292d76db0 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf 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 4f5cf3ccf6..b378e9dec8 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf 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 40df495e5a..497ecc61f5 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf 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 3bd111bac9..bb47c504a1 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex index 8ca3aa3aed..9c542dda87 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex @@ -22,6 +22,7 @@ \begin{english} \date{} \title{Mixing multiple columns with a single column, using continuous numbering} +\maketitle \begin{abstract} In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and typesetting in a single column, getting continuous line numbering between them. \end{abstract} 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 7c5e7413e5..70aa4ce555 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf 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 5b42775a42..612f63e28b 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf 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 c8b8d81cf9..a901f4b4d6 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf 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 5f21322ee8..4e610657b4 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf 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 4ac56fd5c9..9195e3c8a4 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf 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 f328cc61d3..3232142908 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf 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 842a706a28..8d323b82b5 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf 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 2b2f02ecbb..7b169a2f9c 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf 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 353ab235fa..95ee47081d 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf 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 23415e60b4..b8eb7dabec 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf 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 32008aee75..205c3bc2f9 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf index 6800d46fac..6363914c61 100644 Binary files a/macros/latex/contrib/reledmac/migration.pdf and b/macros/latex/contrib/reledmac/migration.pdf differ diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index dd6a6f39c0..996dc98008 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -586,6 +586,7 @@ % \changes{v2.38.0}{2021/05/30}{Add hyperlinks between footnote and lemma when using abbreviated line range.} % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.} % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.} +% \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4475,7 +4476,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/05/30 v2.38.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/09/27 v2.38.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -6808,7 +6809,7 @@ \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \ifboolexpr{% - bool{resumenumberingR@start}% + (bool{continuousnumberingwithcolumns} or bool{resumenumberingR@start})% and test {\ifnumequal{\last@page@numR}{-10000}}% }% {}% @@ -6821,7 +6822,7 @@ \fi \page@numR=#1% \global\this@section@page@numR=#1% - \last@page@numR=#1% + \global\last@page@numR=#1% \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf index 0e3ba600ed..a0bae5136c 100644 Binary files a/macros/latex/contrib/reledmac/reledmac.pdf and b/macros/latex/contrib/reledmac/reledmac.pdf differ diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx index 4fe935f799..55d7ea094b 100644 --- a/macros/latex/contrib/reledmac/reledpar.dtx +++ b/macros/latex/contrib/reledmac/reledpar.dtx @@ -349,6 +349,7 @@ % \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.} % \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}. % \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@R} migrated to \protect\macpackage} +% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v.3.61} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1405,7 +1406,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/09/27 v2.25.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -5617,7 +5618,10 @@ % that \protect\cs{theledlanguageL} and \protect\cs{theledlanguageR} are unaltered. % \begin{macrocode} \renewcommand*{\l@duselanguage}[1]{% - \expandafter\l@doldselectlanguage\expandafter{#1}} + \let\bbl@savelastskip\relax% Babel 3.61, which provokes spurious vertical space + \let\bbl@restorelastskip\relax%% Babel 3.61, which provokes spurious vertical space + \expandafter\l@doldselectlanguage\expandafter{#1}% + }% % \end{macrocode} % Lastly, initialise the left and right languages to the current \protect\package{babel} % one. diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf index ed94a2657e..01117f6c19 100644 Binary files a/macros/latex/contrib/reledmac/reledpar.pdf and b/macros/latex/contrib/reledmac/reledpar.pdf differ diff --git a/macros/latex/contrib/willowtreebook/README b/macros/latex/contrib/willowtreebook/README index df5fb11cab..fb1eb87949 100644 --- a/macros/latex/contrib/willowtreebook/README +++ b/macros/latex/contrib/willowtreebook/README @@ -1,6 +1,6 @@ Willow Tree Book Class -v1.02 -22 September 2021 +v1.03 +28 September 2021 Authors: Ben McKay @@ -18,4 +18,4 @@ See http://www.latex-project.org/lppl.txt The willowtreebook class is a simple book class, which I use for lecture notes. It actually just selects options for the more sophisticated memoir class. -Changes: added hint and bibliography preambles, to load before the hints or bibliography. +Changes: fixed typo in user manual. diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.pdf b/macros/latex/contrib/willowtreebook/willowtreebook.pdf index 0c3d8b6578..6df38e5391 100644 Binary files a/macros/latex/contrib/willowtreebook/willowtreebook.pdf and b/macros/latex/contrib/willowtreebook/willowtreebook.pdf differ diff --git a/macros/latex/contrib/willowtreebook/willowtreebook.tex b/macros/latex/contrib/willowtreebook/willowtreebook.tex index 2418ae455e..331432e52e 100644 --- a/macros/latex/contrib/willowtreebook/willowtreebook.tex +++ b/macros/latex/contrib/willowtreebook/willowtreebook.tex @@ -1,5 +1,5 @@ \documentclass{willowtreebook} -\Title{The Willow Tree Book Class 1.02} +\Title{The Willow Tree Book Class 1.03} \Author{Benjamin \scotsMc{}Kay} \Colophon{Released under the \LaTeX{} Public Project License 1.3c} \BibliographyFile{willowtreebook} @@ -129,12 +129,26 @@ is evaluated by substituting \(u=x^2\), so \section{Preambles} We can put some \LaTeX{} code before the hints: \begin{Verbatim}[frame=leftline] -\RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}} +\RenewDocumentCommand\hintsPreamble{}{ +\par\noindent{} +\textit{When you are describing, \\ +A shape, or sound, or tint; \\ +Don't state the matter plainly, \\ +But put it in a hint; \\ +And learn to look at all things, \\ +With a sort of mental squint.} +\par\noindent{}---\ {Lewis Carroll}} \end{Verbatim} \RenewDocumentCommand\hintsPreamble{}{\par\noindent{}\textit{When you are describing, \\ A shape, or sound, or tint; \\ Don't state the matter plainly, \\ But put it in a hint; \\\ And learn to look at all things, \\ With a sort of mental squint.}\par\noindent{}---\ {Lewis Carroll}} or before the bibliography: \begin{Verbatim}[frame=leftline] -\RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}} +\RenewDocumentCommand\bibliographyPreamble{}{ +\par\noindent +\textit{If those books are in agreement with the Quran, +we have no need of them; +and if these are opposed to the Quran, +destroy them.} +\par\noindent{}---\ {Omar}} \end{Verbatim} \RenewDocumentCommand\bibliographyPreamble{}{\par\noindent\textit{If those books are in agreement with the Quran, we have no need of them; and if these are opposed to the Quran, destroy them.}\par\noindent{}---\ {Omar}} \end{document} -- cgit v1.2.3