summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-02-15 03:01:20 +0000
committerNorbert Preining <norbert@preining.info>2021-02-15 03:01:20 +0000
commit8fb1cfd3d240ef62d78c2320bd90f8f07b7916fa (patch)
tree402ab28aa933f0b5a42c2a1d9646717340fae50e /macros
parent8c6ca435b3bc584eb3efe8e52417fb989e677789 (diff)
CTAN sync 202102150301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin197373 -> 197373 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin195586 -> 195586 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin291128 -> 291128 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin280887 -> 280887 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin197414 -> 197414 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin197363 -> 197363 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin205371 -> 205371 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin196250 -> 196250 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin199696 -> 199696 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin280642 -> 280642 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin279716 -> 279716 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin273887 -> 273887 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin289371 -> 289371 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin284597 -> 284597 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin285213 -> 285213 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin202991 -> 202991 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin208585 -> 208585 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin281520 -> 281520 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31055 -> 31051 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin304585 -> 304585 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin283465 -> 283465 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin196014 -> 196014 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23262 -> 23264 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin172561 -> 172561 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32053 -> 32053 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin284700 -> 284700 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190058 -> 190058 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189290 -> 189290 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168066 -> 168066 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189692 -> 189692 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188622 -> 188622 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188675 -> 188675 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188809 -> 188809 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin209918 -> 209918 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin208856 -> 208856 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin201188 -> 201188 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin292929 -> 292929 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin200260 -> 200260 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin221533 -> 221533 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin246187 -> 246187 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin200801 -> 200801 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin196882 -> 196882 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin297242 -> 297242 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin203241 -> 203241 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin192355 -> 192355 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin357853 -> 357853 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx13
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin2024065 -> 2024050 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin986567 -> 986596 bytes
-rw-r--r--macros/latex/contrib/shtthesis/CHANGELOG.md7
-rw-r--r--macros/latex/contrib/shtthesis/LICENSE4
-rw-r--r--macros/latex/contrib/shtthesis/README.md4
-rw-r--r--macros/latex/contrib/shtthesis/shtthesis-user-guide.pdfbin2172646 -> 2173716 bytes
-rw-r--r--macros/latex/contrib/shtthesis/shtthesis-user-guide.tex20
-rw-r--r--macros/latex/contrib/shtthesis/shtthesis.cls59
-rw-r--r--macros/luatex/generic/luatexja/README21
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin699665 -> 700774 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin1135849 -> 1136034 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja.dtx10
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-jfmglue.lua16
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-jfont.lua11
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-setwidth.lua18
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.lua2
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty4
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjdefs.sty13
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjfont.sty291
66 files changed, 358 insertions, 135 deletions
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 165d028636..3557889e53 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index 1e55c902c6..2956a995dd 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 7eccba622b..66b1d0bdc4 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 5a2a274974..2b22872ff1 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 fbc924e5be..a2751a55bd 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 48eb6b37ff..b955cb86c7 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-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index 4051cf43fb..edad13ac9a 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.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 682c1cbbe1..a85c5ed4ca 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 fbb4ceaaf9..fd04a369f5 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 b0857eb76c..baeff7cebc 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 75f5b0fde0..de2c48df82 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 fb3dc53f79..98ab6f5abe 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 4b83cb8c3f..93426cc000 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 e1d5188bac..358b2802d3 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 e348e2c4bd..9092fd0513 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 5595dce49f..a9f41d55d2 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 4e55ada708..9931ef416c 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 0e46cd89b9..8ca11ac319 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 2cb0f2fbbc..bfe9513f98 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 f31e67b074..56fb7e50f6 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 0eda587dfb..db198be2c4 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 3fff132699..37afb6905b 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 1c54e5cbd6..d19d9b20bb 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 b433a80bae..f9c3b1b389 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 c4e2ccc2cc..7fa8e901c2 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 10b6adfeb5..311737e2da 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 e0289ac44b..dfa8fc6738 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 3ae7b3834f..61286c642b 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 bf8e7f8b22..e39214ce63 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 7080c95c41..b717c9fc2b 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 6be0623679..2a952503b4 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 f46132b5e9..80fb9ae37f 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 351789d748..91e6b93517 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 551c8e4b78..e7ea3fece5 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 e8694c0d08..effe2d7b69 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 737621201c..ae7deb7d07 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 add1ae9773..bd5b80ad82 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 1418987930..65ab68e1c5 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 363bc877d0..a01e1bb1e8 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 9f8bd3e55d..9e82ce62c5 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 62aadc9696..dd463643f5 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 fa2703711a..c96b6706ca 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 5e169a7118..17726a67f9 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 80b794ccf7..949b97b503 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 aed5bab126..ede0873d4e 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 37cf227d04..7e2d214d59 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 eefa3d1c61..af00ef41de 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -571,8 +571,9 @@
% \changes{v2.35.0}{2020/11/29}{Add \protect\cs{linenumannotationothersidetrue}.}
% \changes{v2.35.0}{2020/11/29}{Add new hooks: \protect\cs{Xnolinenumber}, \protect\cs{Xendnolinenumber}, \protect\cs{Xnolinenumberifannotation}, \protect\cs{Xendnolinenumberifannotation}.}
% \changes{v2.35.1}{2020/12/20}{Fix a bug when printing ending page number in endnotes and using the \protect\package{hyperref} package.}
-% \changes{v2.36.0}{2020/01/21}{Fix bug with sublineation on right side of parallel typesetting.}
-% \changes{v2.36.0}{2020/01/21}{Add \protect\cs{Xnonote} and \protect\cs{nonoteX}.}
+% \changes{v2.36.0}{2021/01/21}{Fix bug with sublineation on right side of parallel typesetting.}
+% \changes{v2.36.0}{2021/01/21}{Add \protect\cs{Xnonote} and \protect\cs{nonoteX}.}
+% \changes{v2.36.0}{2021/02/14}{Fix bug with crossreferecing in parallel typesetting (added in v2.34.4)}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4459,7 +4460,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/01/21 v2.36.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/02/14 v2.36.1 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -13868,12 +13869,12 @@
{}%
\global\csname prevpage#1@numR\endcsname=\page@numR%
\else%
- \ifnumbering%
+ \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns} or bool{numbering}}{%
\ifnumequal{\csuse{prevpage#1@num}}{\page@num}%
{\csuse{parafootsepX@#1}}%
{}%
\global\csname prevpage#1@num\endcsname=\page@num%
- \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712
+ }{%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712
\global\expandafter\advance\csname footnote#1@parafootsepX\endcsname by 1%
\edef\@tmpa{parafootsepX@#1@\the\csname footnote#1@parafootsepX\endcsname}%
\expandafter\edlabel\expandafter{\@tmpa}%
@@ -13882,7 +13883,7 @@
{\csuse{parafootsepX@#1}}%
{}%
\global\cslet{prevpage#1@num@outnumbering}{\@tmpb}%
- \fi%
+ }%
\fi%
}
% \end{macrocode}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index 1af494b089..cc9b749b1e 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.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 0f60806681..e4216577e1 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/latex/contrib/shtthesis/CHANGELOG.md b/macros/latex/contrib/shtthesis/CHANGELOG.md
index 9dd9f07ef4..73356830a7 100644
--- a/macros/latex/contrib/shtthesis/CHANGELOG.md
+++ b/macros/latex/contrib/shtthesis/CHANGELOG.md
@@ -2,6 +2,13 @@
`sht-thesis` 项目派生于 `ucasthesis`,一个在 GPLv3 License 下分发的项目。根据该许可证条款,`sht-thesis` 项目列出基于 `ucasthesis` (commit `faad94b` 之后) 的所有修改条目:
+## 2021-02-14
+> Release: v0.3.2
+
+1. 修复 TexLive 2020 宏包升级后 ulem 的兼容性问题,使用更为鲁棒的 lastpage 实现本科生论文*第X页 共Y页*的排版需求;
+2. 更新文档内校徽文件下载链接;
+3. 修复 issue [#1](https://github.com/lirundong/shtthesis/issues/1) 关于本科生论文格式的问题;
+
## 2020-06-30
> Release: v0.3.1
diff --git a/macros/latex/contrib/shtthesis/LICENSE b/macros/latex/contrib/shtthesis/LICENSE
index cec6f6b1f8..633be1564f 100644
--- a/macros/latex/contrib/shtthesis/LICENSE
+++ b/macros/latex/contrib/shtthesis/LICENSE
@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
- Copyright (C) 2020 Li Rundong <rundong.001@gmail.com>
+ Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- shtthesis Copyright (C) 2020 Li Rundong <rundong.001@gmail.com>
+ shtthesis Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff --git a/macros/latex/contrib/shtthesis/README.md b/macros/latex/contrib/shtthesis/README.md
index 794511d3f2..48ef2f9c5f 100644
--- a/macros/latex/contrib/shtthesis/README.md
+++ b/macros/latex/contrib/shtthesis/README.md
@@ -31,7 +31,7 @@
tlmgr update shtthesis
```
- **Note**: `shtthesis` package on CTAN does not include the university logo file. Please download [`shanghaitech-logo.pdf`](https://github.com/lirundong/shtthesis/raw/master/shanghaitech-logo.pdf) from this repository and put it in the root of your project directory.
+ **Note**: `shtthesis` package on CTAN does not include the university logo file. Please download [`shanghaitech-emblem.pdf`](https://github.com/lirundong/shtthesis/raw/master/shanghaitech-emblem.pdf) from this repository and put it in the root of your project directory.
- [Overleaf](https://www.overleaf.com/latex/templates/shanghaitech-university-thesis-template/mskbxkmfxqpt): Please compile with XeLaTeX. Since compilation time for Overleaf free-plan is limited to *1 minute*, you might encounter with timeout issue if compiling with LuaLaTeX
- GitHub Release: Please refer to the [release](https://github.com/lirundong/sht-thesis/releases) page and download required files based on release information
- Develop version: Directly clone the GitHub repo
@@ -57,5 +57,5 @@ After cloning or downloading this template, please
2. Open the document source file [shtthesis-user-guide.tex](shtthesis-user-guide.tex) and enjoy TeXing :smirk:
## License
-- The copyright of ShanghaiTech University logo (`shanghaitech-logo.pdf`) is owned by ShanghaiTech University
+- The copyright of ShanghaiTech University logo (`shanghaitech-emblem.pdf`) is owned by ShanghaiTech University
- The rest of `shtthesis` project is licensed under GNU Public License v3, see [LICENSE](LICENSE) for details
diff --git a/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf b/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf
index 3badd9ad13..5a51b6aa2d 100644
--- a/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf
+++ b/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf
Binary files differ
diff --git a/macros/latex/contrib/shtthesis/shtthesis-user-guide.tex b/macros/latex/contrib/shtthesis/shtthesis-user-guide.tex
index 16e951a3ff..ae0ff1d4c0 100644
--- a/macros/latex/contrib/shtthesis/shtthesis-user-guide.tex
+++ b/macros/latex/contrib/shtthesis/shtthesis-user-guide.tex
@@ -1,5 +1,5 @@
% shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2020 Li Rundong <rundong.001@gmail.com>
+% Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -44,8 +44,8 @@
% title* = {A~User's~Guide~to\\\ShtThesis{}~v\version{}},
% keywords = {上海科技大学,学位论文,\LaTeX{}},
% keywords* = {ShanghaiTech~University, Thesis, \LaTeX{}},
-% date = {2020~年~06~月},
-% date* = {06~/~2020},
+% date = {2021~年~02~月},
+% date* = {02~/~2021},
% author = {李润东},
% author* = {Rundong~Li},
% author-id = {36273800},
@@ -268,7 +268,7 @@
本文档将尽量详细地阐释 \shtthesis{} 的使用方法和技巧。同时本文档直接使用 \shtthesis{} 排版,其源代码文件 \jobname.tex 也可以作为一个实际样例以供读者参考使用。
-我们计划在 \shtthesis{} 后续版本中加入本科学位论文的排版选项,因此亟需有上海科技大学本科论文排版经验的同学参与到 \shtthesis{} 项目中。我们也计划将该使用说明和模板文件 shtthesis.cls 使用 \textsf{DocStrip} 统一重构,并逐步向 \LaTeX3 迁移。我们非常希望得到用户宝贵的反馈和建议,若您有意为 \shtthesis{} 贡献 issues 和 pull requests,请移步至项目主页 \url{https://github.com/lirundong/shtthesis}。
+目前 \shtthesis{} 已\emph{试验性地}加入对本科学位论文的支持,但仍亟需有上海科技大学本科论文排版经验的同学参与到 \shtthesis{} 项目中。我们也计划将该使用说明和模板文件 shtthesis.cls 使用 \textsf{DocStrip} 统一重构,并逐步向 \LaTeX3 迁移。我们非常希望得到用户宝贵的反馈和建议,若您有意为 \shtthesis{} 贡献 issues 和 pull requests,请移步至项目主页 \url{https://github.com/lirundong/shtthesis}。
\section*{文档排版样式说明}
本文档针对各部分不同内容使用不同的排版样式:文档正文使用宋体和英文衬线体(serif),\emph{强调部分}使用\emph{楷体}和英文意大利体(\emph{italic}),宏包名称使用英文无衬线体(\textsf{sans serif},例如 \textsf{hyperref}),代码及选项使用英文等宽体(\texttt{typewriter})和\texttt{仿宋体}排版。
@@ -293,7 +293,7 @@
`\prompt' tlmgr update shtthesis
\end{shell}
-为避免版权问题,上传至 CTAN 的 \shtthesis{} 并不包含校徽文件,需要至项目主页下载 shanghaitech-logo.pdf\footnote{\url{https://github.com/lirundong/shtthesis/raw/master/shanghaitech-logo.pdf}}。假设用户的论文文档为 thesis.tex,参考文献数据库为 reference.bib (本文档的 bib 数据库由 \jobname.tex 自动生成),则需要将下载的校徽文件与它们放在同一目录下,下文称为\emph{工作目录}。工作目录中必要的文件包括:
+为避免版权问题,上传至 CTAN 的 \shtthesis{} 并不包含校徽文件,需要至项目主页下载 shanghaitech-emblem.pdf\footnote{\url{https://github.com/lirundong/shtthesis/raw/master/shanghaitech-emblem.pdf}}。假设用户的论文文档为 thesis.tex,参考文献数据库为 reference.bib (本文档的 bib 数据库由 \jobname.tex 自动生成),则需要将下载的校徽文件与它们放在同一目录下,下文称为\emph{工作目录}。工作目录中必要的文件包括:
\begin{center}
\begin{tabular}{ll}
\toprule
@@ -301,7 +301,7 @@
\midrule
thesis.tex & 论文文档 \\
reference.bib & 参考文献数据库 \\
- shanghaitech-logo.pdf & 上海科技大学校徽 \\
+ shanghaitech-emblem.pdf & 上海科技大学校徽 \\
\bottomrule
\end{tabular}
\end{center}
@@ -604,7 +604,7 @@ P(A|B) &= \frac{P(A)P(B|A)}{P(B)} \label{eq::bayesian}
\end{align}
同时重载了 \verb|\eqref|,使得公式编号格式修改后,其引用格式仍与 \textsf{amsmath} 无异:贝叶斯定理~\eqref{eq::bayesian}。排版本科生论文时不修改公式编号格式。
-\shtthesis{} 使用 \textsf{unicode-math} 宏包进行公式排版,因此在数学环境内既可以用标准 \LaTeX{} 宏,也可以直接输入 Unicode 符号。例如 $\oiint$ 符号可以通过 \verb|\oiint| 宏录入,也可以通过 Unicode 符号 $∯$ (对应 \verb|U+0222F| 码点) 录入。以下测试公式来自 \citet{clerkma2013unicode},其中所有字符均直接使用对应 Unicode 符号录入。
+\shtthesis{} 使用 \textsf{unicode-math} 宏包进行公式排版,因此在数学环境内既可以用标准 \LaTeX{} 宏,也可以直接输入 Unicode 符号。例如 $\oiint$ 符号可以通过 \verb|$\oiint$| 录入,也可以直接使用 Unicode 符号 \verb|$|$∯$\verb|$| (对应 \verb|U+0222F| 码点) 录入。以下测试公式来自 \citet{clerkma2013unicode},其中所有字符均直接使用对应 Unicode 符号录入。
\begin{align}
& ⊢ ∀x[(Fx ∨ Gx) → \mathord{∼}Hx] \\
& ⊨ ¬∃y∀x[x∈y ↔ x∉x] \\
@@ -733,13 +733,13 @@ P(A|B) &= \frac{P(A)P(B|A)}{P(B)} \label{eq::bayesian}
《规范》要求正文中所有图形、表格标题使用中英双语。此需求可以通过 \textsf{bicaption} 宏包实现,如图~\ref{img::sht_logo} 所示。
\begin{figure}[htb]
\centering
- \IfFileExists{shanghaitech-logo.pdf}{%
- \includegraphics[width=0.5\columnwidth]{shanghaitech-logo.pdf}%
+ \IfFileExists{shanghaitech-emblem.pdf}{%
+ \includegraphics[width=0.5\columnwidth]{shanghaitech-emblem.pdf}%
}{%
\fbox{%
\begin{minipage}[b][2.5cm][c]{0.75\columnwidth}%
\centering\zihao{-5}\bfseries\sffamily\color{ShtRed}%
- 校徽文件 \texttt{shanghaitech-logo.pdf} 缺失%
+ 校徽文件 \texttt{shanghaitech-emblem.pdf} 缺失%
\end{minipage}%
}%
}%
diff --git a/macros/latex/contrib/shtthesis/shtthesis.cls b/macros/latex/contrib/shtthesis/shtthesis.cls
index 1d616c240c..d1bcc8fcdc 100644
--- a/macros/latex/contrib/shtthesis/shtthesis.cls
+++ b/macros/latex/contrib/shtthesis/shtthesis.cls
@@ -1,5 +1,5 @@
% shtthesis, an unofficial LaTeX thesis template for ShanghaiTech University.
-% Copyright (C) 2020 Li Rundong <rundong.001@gmail.com>
+% Copyright (C) 2021 Li Rundong <rundong.001@gmail.com>
%
% This program is free software: you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
% Identification
% ==============================================================================
\NeedsTeXFormat{LaTeX2e}
-\newcommand\version{0.3.1}
-\newcommand\versiondate{2020/06/30}
+\newcommand\version{0.3.2}
+\newcommand\versiondate{2021/01/23}
\ProvidesClass{shtthesis}[%
\versiondate\space%
v\version\space%
@@ -313,7 +313,7 @@
\RequirePackage{indentfirst}
\RequirePackage[normalem]{ulem}
\RequirePackage{fancyhdr}
-\RequirePackage{pageslts}
+\RequirePackage{lastpage}
\RequirePackage{tocvsec2}
\RequirePackage{letltxmacro}
\RequirePackage{fontspec}
@@ -373,7 +373,7 @@
\definecolor{ShtRed}{RGB}{146,46,23}
\def\school@logo@missing{%
校徽文件缺失,请至\href{https://github.com/lirundong/shtthesis/raw/master/%
- shanghaitech-logo.pdf}{项目主页}下载!%
+ shanghaitech-emblem.pdf}{项目主页}下载!%
}
% ------------------------------------------------------------------------------
% Geometry and layouts
@@ -418,11 +418,14 @@
% ------------------------------------------------------------------------------
% Headers and footers
% ------------------------------------------------------------------------------
-\def\sht@flat@title{\renewcommand\\{\space} \@title}
-\def\sht@flat@title@en{\renewcommand\\{\space} \sht@title@en}
+\def\sht@flat@title{\renewcommand\\{\space} \sht@title}
+\def\sht@flat@title@upper@en{%
+ \renewcommand\\{\space}%
+ \MakeUppercase{\sht@title@en}%
+}
\newcommand\sht@head@logo{%
- \IfFileExists{shanghaitech-logo.pdf}{%
- \includegraphics[height=\sht@head@logo@height]{shanghaitech-logo.pdf}%
+ \IfFileExists{shanghaitech-emblem.pdf}{%
+ \includegraphics[height=\sht@head@logo@height]{shanghaitech-emblem.pdf}%
}{%
\fbox{%
\begin{minipage}[b][\sht@head@logo@height][c]{0.4\columnwidth}%
@@ -475,7 +478,7 @@
\fancyhead[R]{\zihao{-5}\sffamily\sht@flat@title}
\fancyfoot[C]{%
\footnotesize%
- 第~\thepage~页\hspace*{1\ccwd}共~\lastpageref*{VeryLastPage}~页%
+ 第~\thepage~页\hspace*{1\ccwd}共~\pageref*{LastPage}~页%
}
\renewcommand{\headrulewidth}{0.8pt}
\renewcommand{\footrulewidth}{0pt}
@@ -494,16 +497,14 @@
\LetLtxMacro{\TmpMainmatter}{\mainmatter}
\renewcommand{\mainmatter}{%
\TmpMainmatter%
+ \renewcommand{\chaptermark}[1]{%
+ \markboth{第~\thechapter~章\hspace{1\ccwd}##1}{}%
+ }%
\ifsht@undergraduate%
\pagestyle{MNNumberedWithLogo}%
\else%
\pagestyle{LRNumbered}%
\fi%
- \pagenumbering{arabic}%
- \setcounter{page}{1}%
-}
-\AtBeginDocument{%
- \pagenumbering{arabic}%
}
% ------------------------------------------------------------------------------
% Font utilities
@@ -1095,8 +1096,8 @@
}
\ExplSyntaxOff
\newcommand\sht@schoollogo{%
- \IfFileExists{shanghaitech-logo.pdf}{%
- \includegraphics[width=10.48cm]{shanghaitech-logo.pdf}%
+ \IfFileExists{shanghaitech-emblem.pdf}{%
+ \includegraphics[width=10.48cm]{shanghaitech-emblem.pdf}%
}{%
\begin{center}%
\fbox{%
@@ -1109,8 +1110,8 @@
}
\newcommand\sht@schoollogo@undergraduate{%
\noindent%
- \IfFileExists{shanghaitech-logo.pdf}{%
- \includegraphics[width=5.39cm]{shanghaitech-logo.pdf}%
+ \IfFileExists{shanghaitech-emblem.pdf}{%
+ \includegraphics[width=5.39cm]{shanghaitech-emblem.pdf}%
}{%
\fbox{%
\begin{minipage}[t][1.45cm][c]{0.75\columnwidth}%
@@ -1517,7 +1518,7 @@
毕业论文(设计)。
\hspace*{6\ccwd}\textbf{保\hspace*{1\ccwd}密}$\square$,%
- 在\uline{\hspace*{2\ccwd}}年解密后适用本授权书。
+ 在\uline{\mbox{\hspace*{2\ccwd}}}年解密后适用本授权书。
本论文属于
@@ -1565,8 +1566,15 @@
\end{center}%
\vspace*{\baselineskip}%
\ctexset{chapter/format += \zihao{4}, chapter/beforeskip = 0pt}%
+ \ifsht@comfort%
+ \def\sht@abstract@name{摘\hspace{1\ccwd}要}
+ \else%
+ \def\sht@abstract@name{摘要}
+ \fi
+ \else%
+ \def\sht@abstract@name{摘\hspace{1\ccwd}要}
\fi
- \intobmk\chapter*{摘\hspace{1\ccwd}要}%
+ \intobmk\chapter*{\sht@abstract@name}%
}{%
\vspace{\baselineskip}%
\ifsht@undergraduate%
@@ -1582,7 +1590,7 @@
\newenvironment{abstract*}[1][\sht@null@arg]{%
\cleardoublepage%
\ifthenelse{\equal{#1}{flattitle}}{%
- \def\sht@abs@title@en{\sht@flat@title@en}%
+ \def\sht@abs@title@en{\sht@flat@title@upper@en}%
}{%
\def\sht@abs@title@en{\sht@title@en}%
}%
@@ -1594,8 +1602,10 @@
\end{center}%
\vspace*{\baselineskip}%
\ctexset{chapter/format += \zihao{4}\rmfamily, chapter/beforeskip = 0pt}%
+ \intobmk\chapter*{ABSTRACT}%
+ \else
+ \intobmk\chapter*{Abstract}%
\fi
- \intobmk\chapter*{Abstract}%
}{%
\vspace{\baselineskip}%
\ifsht@undergraduate%
@@ -1676,6 +1686,9 @@
\renewcommand{\backmatter}{%
\origin@backmatter%
\settocdepth{chapter}%
+ \renewcommand{\chaptermark}[1]{%
+ \markboth{##1}{}%
+ }%
\ifsht@undergraduate%
\pagestyle{MNNumberedWithLogo}%
\else%
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index e6c21ab100..de1f90c0a2 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20210103.0
+The LuaTeX-ja Package 20210214.0
--------------------------------
Copyright (c) 2011--2021 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -25,14 +25,13 @@ Installation
- LuaTeX 1.10.0 (or later)
- luaotfload (v3.1 or later recommended)
- adobemapping (Adobe CMap files)
- - LaTeX 2020-02-02 patch level 5 or later (if you want to use with LaTeX)
- - everysel package
+ - LaTeX2e 2020-02-02 patch level 5 or later (if you want to use with LaTeX)
+ Note that the adaptation for LaTeX2e 2021-05-01 is
+ work in progress; it will be done after the freeze of TL'20
- etoolbox package
- - ltxcmds package
- - pdftexcmds package
- - atbegshi package
- - filehook package
- - stfloats package
+ - ltxcmds package, pdftexcmds package
+ - filehook package, atbegshi package (for LaTeX2e 2020-02-02)
+ - everysel package (for LaTeXe 2020-02-02 and 2020-10-01)
- Harano Aji fonts (https://github.com/trueroad/HaranoAjiFonts)
more specifically, HaranoAjiMincho-Regular and HaranoAjiGothic-Medium
@@ -45,9 +44,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20210103.0 in the Git repository by
+ or tagged as 20210214.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20210103.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20210214.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -96,4 +95,4 @@ Notes
This file and ltj-kinsoku.lua are not used anymore.
(Do not remove ltj-kinsoku.tex.)
-Last commit date: Sun Jan 3 09:48:34 2021 +0900
+Last commit date: Sun Feb 14 10:04:35 2021 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index 41fd1bd246..a40501866e 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index ea0025d79d..ee3964dc09 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx
index eaf4b8ebae..308288dabc 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja.dtx
+++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx
@@ -652,17 +652,15 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
%<ja> (DVI出力(\cs{outputmode=0})は対応していない.)
\item recent \href{https://github.com/latex3/luaotfload}{\Pkg{luaotfload}} (v3.1 or later recommended)
\item \Pkg{adobemapping} (Adobe cmap and pdfmapping files)
-\item \LaTeX\ 2020-02-02 patch level 5 or later
+\item \LaTeXe\ 2020-02-02 patch level 5 or later
%<en> (if you want to use \LuaTeX-ja with \LaTeXe)
%<ja> (\LaTeXe 下で\LuaTeX-jaを使う場合)
-\item \href{https://github.com/josephwright/etoolbox/}{\Pkg{etoolbox}},
- \Pkg{everysel}
+\item \href{https://github.com/josephwright/etoolbox/}{\Pkg{etoolbox}}
%<en> (if you want to use \LuaTeX-ja with \LaTeXe)
%<ja> (\LaTeXe 下で\LuaTeX-jaを使う場合)
+\item \Pkg{everysel} (only for \LaTeXe\ 2020-02-02~and~2020-10-01)
+\item \Pkg{filehook}, \Pkg{atbegshi} (only for \LaTeXe\ 2020-02-02)
\item \Pkg{ltxcmds}, \Pkg{pdftexcmds}
-\item \Pkg{filehook}, \Pkg{atbegshi}
-%<en> (not needed if you want to use \LuaTeX-ja with \LaTeXe~2020-10-01 or later)
-%<ja> (\LaTeXe 2020-10-01以降で\LuaTeX-jaを使う場合はどちらも不要)
\item \href{https://github.com/wspr/fontspec/}{\Pkg{fontspec}} v2.7c (or later)
%<*en>
\item \emph{Harano Aji fonts} (\url{https://github.com/trueroad/HaranoAjiFonts})\\
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
index 019e24ae2e..7437492772 100644
--- a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
@@ -3,7 +3,7 @@
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2020-12-22',
+ date = '2021-02-11',
description = 'Insertion process of JFM glues, [x]kanjiskip and others',
})
luatexja.jfmglue = luatexja.jfmglue or {}
@@ -347,8 +347,7 @@ function calc_np_aux_glyph_common(lp, acc_flag)
local lx=lp
while lx do
local lai = get_attr_icflag(lx)
- if lx==last or lai>=PACKED then
- lp=lx; break
+ if lx==last or lai>=PACKED then break
else
local lid = getid(lx)
if lid==id_glyph and not if_lang_ja(lx) then
@@ -368,19 +367,20 @@ function calc_np_aux_glyph_common(lp, acc_flag)
else -- アクセントは上下にシフトされている
setfield(lx, 'shift', getfield(lx, 'shift') + (has_attr(lx,attr_ablshift) or 0))
end
- lx = node_next(node_next(lx))
+ set_attr(lx, attr_icflag, PROCESSED)
+ lx = node_next(lx); set_attr(lx, attr_icflag, PROCESSED)
+ lx = node_next(lx); set_attr(lx, attr_icflag, PROCESSED)
elseif ls==0 then
Np.last = lx; lx = node_next(lx)
elseif (ls==3) or (lai==ITALIC) then
Np.last = lx; set_attr(lx, attr_icflag, IC_PROCESSED); lx = node_next(lx)
- else
- lp=lx; break
+ else break
end
- else
- lp=lx; break
+ else break
end
end
end
+ lp=lx
local r
if adj_depth>node_depth then
r = node_new(id_rule,3)
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfont.lua b/macros/luatex/generic/luatexja/src/ltj-jfont.lua
index ed40e86821..ac8ce5c2fb 100644
--- a/macros/luatex/generic/luatexja/src/ltj-jfont.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-jfont.lua
@@ -784,6 +784,11 @@ end
luatexja.jfont.font_extra_info = font_extra_info -- key: fontnumber
local font_extra_basename = {} -- key: basename
+local rotate_exception = {
+ [0xFF1A]= { ['zht'] = true, },
+ [0xFF1B]= { ['zht'] = true, },
+}
+luatexja.jfont.rotate_exception = rotate_exception
local list_rotate_glyphs
do
local ceil = math.ceil
@@ -825,14 +830,14 @@ do
-- end)
for i,_ in pairs(rot) do
dest = dest or {}; dest.rotation = dest.rotation or {}
- dest.rotation[i] = true
+ dest.rotation[i] = rotate_exception[i] or true
end
return dest
end
end
do
- local cache_ver = 23
+ local cache_ver = 24
local nameonly, lower = file.nameonly, string.lower
local lfs = require"lfs"
local file_attributes = lfs.attributes
@@ -972,7 +977,7 @@ luatexbase.add_to_callback(
for j,w in pairs(vform) do
if (i==j)and(w==k) then vform[j]=nil elseif w==i then vform[j] = k end
end
- end)
+ end)
return fmtable
end, 'ltj.get_vert_form', 1
)
diff --git a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
index c502e9879e..03ec44fe13 100644
--- a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
@@ -190,13 +190,19 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
local pf, pc = getfont(p), getchar(p)
local feir = ltjf_font_extra_info[pf]
if met.rotation and met.vert_activated then
- if met.rotation[pc] and (has_attr(p, attr_vert_ori) or 0)<=0 then
+ local f = font_getfont(pf)
+ local r, l = met.rotation[pc], f.properties and f.properties.language
+ if ((r==true) or (type(r)=="table" and not r[l])) and (has_attr(p, attr_vert_ori) or 0)<=0 then
return capsule_glyph_tate_rot(p, met, char_data, head, dir,
0.5*(get_ascender(pf)-get_descender(pf)))
- end
- end
- pwidth, ascender = feir.vheight[pc]*met.size, feir.vorigin[pc]*met.size
+ end
+ end
+ pwidth, ascender = feir.vheight[pc]*met.size, feir.vorigin[pc]*met.size
+ -- print(pwidth/65536.,ascender/65536.)
end
+ -- luatexja.ext_show_node(node.direct.tonode(p), 'B> ', print)
+ local xo, yo = getoffsets(p)
+ --pwidth = pwidth - yo
fwidth = fwidth or pwidth
if pwidth>fwidth and char_data.round_threshold then
local frac = pwidth / fwidth
@@ -207,7 +213,6 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
fshift = call_callback("luatexja.set_width", fshift, met, char_data)
local fheight = char_data.height or 0
local fdepth = char_data.depth or 0
- local xo, yo = getoffsets(p)
local y_shift = xo + (has_attr(p,attr_tkblshift) or 0)
local q
head, q = node_remove(head, p)
@@ -215,7 +220,7 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
setwhd(box, fwidth, fheight, fdepth)
setfield(box, 'shift', y_shift)
setdir(box, dir)
-
+ -- print(yo, ascender, char_data.align, fwidth-pwidth)
setoffsets(p, -fshift.down,
yo -(ascender + char_data.align*(fwidth-pwidth) - fshift.left) )
local ws = node_new(id_whatsit, sid_save)
@@ -231,6 +236,7 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
setnext(k3, wr);
set_attr(box, attr_icflag, PACKED)
+ -- luatexja.ext_show_node(node.direct.tonode(box), 'A> ', print)
head = q and node_insert_before(head, q, box)
or node_insert_after(head, node_tail(head), box)
return q, head, box
diff --git a/macros/luatex/generic/luatexja/src/luatexja.lua b/macros/luatex/generic/luatexja/src/luatexja.lua
index b4e2e68efb..fbda46e344 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.lua
+++ b/macros/luatex/generic/luatexja/src/luatexja.lua
@@ -351,7 +351,7 @@ do
r = tostring(n.char)
end
end
- tex.sprint(r)
+ tex.sprint(-2, r)
end
end
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index 3448634592..c389cf8d50 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -35,13 +35,13 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2021-01-03 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2021-02-14 Japanese Typesetting with Lua(La)TeX]
\DeclareOption{disablejfam}{\ltj@disablejfamtrue}
\DeclareOption*{}
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20210103.0}
+\def\LuaTeXjaversion{20210214.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
index 754a9122f8..07b2c0d58b 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2020-10-05 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2021-01-24 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
@@ -18,8 +18,13 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
\kanjifamily{mc}
-\kanjiseries{m}
-\kanjishape{n}
+\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
+ \kanjiseries{m}
+ \kanjishape{n}
+\else % >=2021-05-01
+ \def\k@series{m}
+ \def\k@shape{n}
+\fi
\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY3}{}{}
\DeclareKanjiSubstitution{JY3}{mc}{m}{n}
@@ -35,7 +40,7 @@
\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
%% LaTeX 2020-02-02
\newcommand\kanjishapedefault{\shapedefault}
-\else %% LaTeX 2019-10-01
+\else%% LaTeX 2019-10-01
\newcommand\kanjishapedefault{\updefault}
\fi
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
index 287a3968f5..8ebe8e7af2 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
@@ -3,7 +3,30 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020-12-29 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2021-02-14 Patch to NFSS2 for LuaTeX-ja]
+
+%%%%%%%% LaTeX2e version detection
+\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
+\ifltj@ltfilehook@avail
+ \IfHookExistsTF{selectfont}%
+ {\ltj@@latex@plv=1500}% 2021-05-01
+ {\ifnum\patch@level>2 \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}% 2020-10-01
+\else\ifdefined\@rmfamilyhook % 2020-02-02
+ \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
+ \@latex@error
+ {Please update LaTeX2e!^^J\space\space
+ At least LaTeX2e 2020-02-02 patch level 3 is required}%
+ {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
+ \else
+ \ltj@@latex@plv=300
+ \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
+ \ltj@@latex@plv=501
+ \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
+ \ltj@@latex@plv=500
+ \fi\fi
+ \fi
+\fi\fi
+
%% patching \DeclareTextComposite
\def\ltj@chardef@text@cmd#1{%
@@ -350,18 +373,6 @@
\newif\if@knjcmd
\DeclareRobustCommand\userelfont{\@knjcmdtrue}
-
-\RequirePackage{everysel}
-\let\ltj@@EverySelectfont@Init=\@EverySelectfont@Init
-\expandafter\expandafter\expandafter\let
-\expandafter\expandafter\csname ltj@@orig@selectfont\endcsname\csname selectfont\space\endcsname
-\@EverySelectfont@Init
-%\let\ltj@@font@info\@font@info
-%\let\ltj@@font@warning\@font@warning
-\def\@EverySelectfont@Init{%
- \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
- \ltj@@EverySelectfont@Init
-}
\def\ltj@selectfont@tate{%
\let\k@encoding\ct@encoding
\xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
@@ -386,7 +397,8 @@
\directlua{luatexja.jfont.pickup_alt_font_a('\f@size')}%
}%
\fi}
-\def\ltj@selectfont@patch{%
+\ifnum\ltj@@latex@plv<1500 % <=2020-10-01
+\protected\def\ltj@selectfont@patch{%
\ltj@@start@time@measure{selectfont}%
\let\tmp@error@fontshape\error@fontshape
\let\error@fontshape\error@kfontshape
@@ -427,7 +439,78 @@
\global\let\font@name=\ltj@afont@name
\ltj@@stop@time@measure{selectfont}%
}
+\RequirePackage{everysel}
+\let\ltj@@EverySelectfont@Init=\@EverySelectfont@Init
+\expandafter\expandafter\expandafter\let
+\expandafter\expandafter\csname ltj@@orig@selectfont\endcsname\csname selectfont\space\endcsname
+\@EverySelectfont@Init% for LaTeX2e <=2020-10-01
+\def\@EverySelectfont@Init{%
+ \expandafter\let\csname selectfont\space \endcsname \ltj@@orig@selectfont
+ \ltj@@EverySelectfont@Init
+}
\EverySelectfont{\ltj@selectfont@patch}
+\else % LaTeX2e >=2021-05-01
+\AddToHook{selectfont}[luatexja]{%
+ \ltj@@start@time@measure{selectfont}%
+ \ifx\delayed@k@adjustment\@empty
+ \else
+ \let\k@shape@saved\k@shape
+ \let\k@series@saved\k@series
+ \delayed@k@adjustment
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
+ \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname
+ \else
+ \let\k@shape\k@shape@saved
+ \let\k@series\k@series@saved
+ \let\delayed@merge@kanji@shape\merge@kanji@shape
+ \let\delayed@merge@kanji@series\merge@kanji@series
+ \delayed@k@adjustment
+ \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
+ \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution
+ \fi
+ \let\delayed@k@adjustment\@empty
+ \fi
+ \let\tmp@error@fontshape\error@fontshape
+ \let\error@fontshape\error@kfontshape
+ \ltj@@is@kyenc{\k@encoding}\ifin@%
+ \let\cy@encoding\k@encoding
+ \ensure@KanjiEncodingPair{t}%
+ \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
+ \else
+ \ltj@@is@ktenc{\k@encoding}\ifin@%
+ \let\ct@encoding\k@encoding
+ \ensure@KanjiEncodingPair{y}%
+ \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
+ \else
+ \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
+ \fi
+ \fi
+ \global\let\ltj@afont@name=\font@name
+ \ltj@selectfont@tate\ltj@selectfont@yoko
+%
+ \edef\tmp@item{{\k@encoding}}\expandafter\def\expandafter\k@encoding\tmp@item
+ \kenc@update
+ \global\let\font@name=\ltj@afont@name
+ \let\error@fontshape\tmp@error@fontshape
+ \if@knjcmd \@knjcmdfalse
+ \expandafter\ifx
+ \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
+ \expandafter\ifx
+ \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
+ \else
+ \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\selectfont
+ % 警告: 再び \selectfont を呼んでいる.無限ループの可能性あり
+ \fi
+ \else
+ \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\selectfont
+ % 警告: 再び \selectfont を呼んでいる.無限ループの可能性あり
+ \fi
+ \fi
+ \global\let\font@name=\ltj@afont@name
+ \ltj@@stop@time@measure{selectfont}%
+}
+\fi
\bgroup
\def\ltj@@dir@patch#1#2#3{%
@@ -632,26 +715,6 @@
\fi\fi
}
-\newcount\ltj@@latex@plv \ltj@@latex@plv=-1
-\ifltj@ltfilehook@avail % 2020-10-01
- \@ifl@t@r\fmtversion{2020-10-02}{\ltj@@latex@plv=1300}%
- {\ifnum\patch@level>2 \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}
-\else\ifdefined\@rmfamilyhook % 2020-02-02
- \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
- \@latex@error
- {Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 3 is required}%
- {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
- \else
- \ltj@@latex@plv=300
- \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
- \ltj@@latex@plv=501
- \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
- \ltj@@latex@plv=500
- \fi\fi
- \fi
-\fi\fi
-
%%%%%%
\ifnum\ltj@@latex@plv>0
%%%% LaTeX >= 2020-02-02
@@ -664,6 +727,13 @@
{#1}%
\@nil
}
+\def\merge@kanji@shape#1{%
+ \expandafter\expandafter\expandafter
+ \merge@kanji@shape@
+ \csname shape@\k@shape @#1\endcsname
+ {#1}%
+ \@nil
+}
\ifnum\ltj@@latex@plv>500 % !!! pl5 + develop
\def\set@target@series@kanji#1{%
@@ -682,6 +752,7 @@
}
\fi\fi
+\ifnum\ltj@@latex@plv<1500% <=2020-10-01
\def\merge@kanji@series@#1#2#3\@nil{%
\def\reserved@a{#3}%
\ifx\reserved@a\@empty
@@ -703,13 +774,75 @@
\fi
\fi
}
-\def\merge@kanji@shape#1{%
+\def\merge@kanji@shape@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \if@shape@roman@kanji
+ \set@safe@kanji@shape{#2}{}%
+ \else
+ \edef\k@shape{#2}%
+ \fi
+ \else
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
+ \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
+ \ifcsname \reserved@a\endcsname
+ \edef\k@shape{#1}%
+ \else
+ \ifcsname \k@encoding /\k@family /\k@series/#2\endcsname
+ \edef\k@shape{#2}%
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
+ \else
+ \if@shape@roman@kanji
+ \set@safe@kanji@shape{#3}%
+ {{\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}}%
+ \else
+ \edef\k@shape{#3}%
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
+\else % >=2021-05-01
+\def\merge@kanji@series@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \set@target@series@kanji{#2}%
+ \else
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
+ \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}%
+ \ifcsname \reserved@a \endcsname
+ \set@target@series@kanji{#1}%
+ \else
+ \ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname
+ \set@target@series@kanji{#2}%
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
+ \else
+ \set@target@series@kanji{#3}%
+ {\let\curr@fontshape\curr@kfontshape\@font@shape@subst@warning}%
+ \fi
+ \fi
+ \fi
+}
+\def\merge@kanji@series@without@substitution#1{%
\expandafter\expandafter\expandafter
- \merge@kanji@shape@
- \csname shape@\k@shape @#1\endcsname
+ \merge@kanji@series@without@substitution@
+ \csname series@\k@series @#1\endcsname
{#1}%
\@nil
}
+\def\merge@kanji@series@without@substitution@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \set@target@series@kanji{#2}%
+ \else
+ \set@target@series@kanji{#1}%
+ \fi
+}
+\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution
+
\def\merge@kanji@shape@#1#2#3\@nil{%
\def\reserved@a{#3}%
\ifx\reserved@a\@empty
@@ -719,8 +852,6 @@
\edef\k@shape{#2}%
\fi
\else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
\edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
\ifcsname \reserved@a\endcsname
\edef\k@shape{#1}%
@@ -740,7 +871,25 @@
\fi
\fi
}
-\ifnum\ltj@@latex@plv=300 % !!! pl3, 4
+\def\merge@kanji@shape@without@substitution#1{%
+ \expandafter\expandafter\expandafter
+ \merge@kanji@shape@without@substitution@
+ \csname shape@\k@shape @#1\endcsname
+ {#1}%
+ \@nil
+}
+\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \edef\k@shape{#2}%
+ \else
+ \edef\k@shape{#1}%
+ \fi
+}
+\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
+\fi
+
+\ifnum\ltj@@latex@plv=300 % 2020-02-02 pl3, 4
\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{%
@@ -749,7 +898,7 @@
\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{%
\edef\f@series{#1}\edef\k@series{#1}}
-\else % !!! pl 5
+\else\ifnum\ltj@@latex@plv<1500% >=2020-02-02 pl5 and <=2020-10-01
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{%
@@ -758,17 +907,57 @@
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\merge@kanji@series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{%
\@forced@seriestrue\merge@font@series{#1}\merge@kanji@series{#1}}
+\else% >=2021-05-01
+ \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\delayed@merge@font@series{#1}}}
+ \DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}}
+ \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
+ \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\edef\f@series{#1}}}
+ \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\edef\k@series{#1}}}
+ \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}%
+ \let\delayed@k@adjustment\@empty
+\fi\fi
+\ifnum\ltj@@latex@plv<1500% <=2020-10-01
+ \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
+ \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
+ \DeclareRobustCommand\fontshape[1]{%
+ \@shape@roman@kanjitrue
+ \merge@font@shape{#1}\merge@kanji@shape{#1}%
+ \@shape@roman@kanjifalse
+ }
+ \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
+ \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
+ \DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}}
+\else% >=2021-05-01
+ \DeclareRobustCommand\romanshape[1]{%
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\delayed@merge@font@shape{#1}}}
+ \DeclareRobustCommand\kanjishape[1]{%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}}
+ \DeclareRobustCommand\fontshape[1]{%
+ \romanshape{#1}%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\@shape@roman@kanjitrue
+ \delayed@merge@kanji@shape{#1}\@shape@roman@kanjifalse}}
+ \DeclareRobustCommand\romanshapeforce[1]{%
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\edef\f@shape{#1}}}
+ \DeclareRobustCommand\kanjishapeforce[1]{%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\edef\k@shape{#1}}}
+ \DeclareRobustCommand\fontshapeforce[1]{%
+ \romanshapeforce{#1}%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}}
\fi
-\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
-\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
-\DeclareRobustCommand\fontshape[1]{%
- \@shape@roman@kanjitrue
- \merge@font@shape{#1}\merge@kanji@shape{#1}%
- \@shape@roman@kanjifalse
-}
-\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
-\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
-\DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}}
\ifnum\ltj@@latex@plv>1000
%%%% LaTeX >= 2020-10-01 PL3
\DeclareRobustCommand\usekanji[4]{%