From 8fb1cfd3d240ef62d78c2320bd90f8f07b7916fa Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 15 Feb 2021 03:01:20 +0000 Subject: CTAN sync 202102150301 --- .../reledmac/examples/1-criticalendnotes.pdf | Bin 197373 -> 197373 bytes .../contrib/reledmac/examples/1-criticalnotes.pdf | Bin 195586 -> 195586 bytes .../contrib/reledmac/examples/1-sidenotes.pdf | Bin 291128 -> 291128 bytes .../latex/contrib/reledmac/examples/1-tabular.pdf | Bin 280887 -> 280887 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 197414 -> 197414 bytes .../latex/contrib/reledmac/examples/1-verses.pdf | Bin 197363 -> 197363 bytes .../latex/contrib/reledmac/examples/2-antilabe.pdf | Bin 205371 -> 205371 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 196250 -> 196250 bytes .../reledmac/examples/2-footnote_spacing.pdf | Bin 199696 -> 199696 bytes .../contrib/reledmac/examples/2-glossaries.pdf | Bin 280642 -> 280642 bytes .../latex/contrib/reledmac/examples/2-indexing.pdf | Bin 279716 -> 279716 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 273887 -> 273887 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 289371 -> 289371 bytes .../contrib/reledmac/examples/2-linespacing.pdf | Bin 284597 -> 284597 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 285213 -> 285213 bytes .../contrib/reledmac/examples/2-notes-width.pdf | Bin 202991 -> 202991 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 208585 -> 208585 bytes .../contrib/reledmac/examples/2-performances.pdf | Bin 281520 -> 281520 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31055 -> 31051 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 304585 -> 304585 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 283465 -> 283465 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 196014 -> 196014 bytes .../3-reledpar_columns_different_languages.pdf | Bin 23262 -> 23264 bytes .../contrib/reledmac/examples/3-reledpar_mwe.pdf | Bin 172561 -> 172561 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 32053 -> 32053 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 284700 -> 284700 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190058 -> 190058 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189290 -> 189290 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168066 -> 168066 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189692 -> 189692 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188622 -> 188622 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188675 -> 188675 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188809 -> 188809 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 209918 -> 209918 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 208856 -> 208856 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 201188 -> 201188 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 292929 -> 292929 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 200260 -> 200260 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 221533 -> 221533 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 246187 -> 246187 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 200801 -> 200801 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 196882 -> 196882 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 297242 -> 297242 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 203241 -> 203241 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 192355 -> 192355 bytes macros/latex/contrib/reledmac/migration.pdf | Bin 357853 -> 357853 bytes macros/latex/contrib/reledmac/reledmac.dtx | 13 ++--- macros/latex/contrib/reledmac/reledmac.pdf | Bin 2024065 -> 2024050 bytes macros/latex/contrib/reledmac/reledpar.pdf | Bin 986567 -> 986596 bytes macros/latex/contrib/shtthesis/CHANGELOG.md | 7 +++ macros/latex/contrib/shtthesis/LICENSE | 4 +- macros/latex/contrib/shtthesis/README.md | 4 +- .../contrib/shtthesis/shtthesis-user-guide.pdf | Bin 2172646 -> 2173716 bytes .../contrib/shtthesis/shtthesis-user-guide.tex | 20 +++---- macros/latex/contrib/shtthesis/shtthesis.cls | 59 +++++++++++++-------- 55 files changed, 64 insertions(+), 43 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf index 165d028636..3557889e53 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 1e55c902c6..2956a995dd 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 7eccba622b..66b1d0bdc4 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 5a2a274974..2b22872ff1 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 fbc924e5be..a2751a55bd 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 48eb6b37ff..b955cb86c7 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 4051cf43fb..edad13ac9a 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 682c1cbbe1..a85c5ed4ca 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 fbb4ceaaf9..fd04a369f5 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 b0857eb76c..baeff7cebc 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 75f5b0fde0..de2c48df82 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 fb3dc53f79..98ab6f5abe 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 4b83cb8c3f..93426cc000 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 e1d5188bac..358b2802d3 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 e348e2c4bd..9092fd0513 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 5595dce49f..a9f41d55d2 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 4e55ada708..9931ef416c 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 0e46cd89b9..8ca11ac319 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 2cb0f2fbbc..bfe9513f98 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 f31e67b074..56fb7e50f6 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 0eda587dfb..db198be2c4 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 3fff132699..37afb6905b 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 1c54e5cbd6..d19d9b20bb 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 b433a80bae..f9c3b1b389 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 c4e2ccc2cc..7fa8e901c2 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 10b6adfeb5..311737e2da 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 e0289ac44b..dfa8fc6738 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 3ae7b3834f..61286c642b 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 bf8e7f8b22..e39214ce63 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 7080c95c41..b717c9fc2b 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 6be0623679..2a952503b4 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 f46132b5e9..80fb9ae37f 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 351789d748..91e6b93517 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 551c8e4b78..e7ea3fece5 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.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index e8694c0d08..effe2d7b69 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 737621201c..ae7deb7d07 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 add1ae9773..bd5b80ad82 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 1418987930..65ab68e1c5 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 363bc877d0..a01e1bb1e8 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 9f8bd3e55d..9e82ce62c5 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 62aadc9696..dd463643f5 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 fa2703711a..c96b6706ca 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 5e169a7118..17726a67f9 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 80b794ccf7..949b97b503 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 aed5bab126..ede0873d4e 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 37cf227d04..7e2d214d59 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 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 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.pdf b/macros/latex/contrib/reledmac/reledpar.pdf index 0f60806681..e4216577e1 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/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 + Copyright (C) 2021 Li Rundong 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 + shtthesis Copyright (C) 2021 Li Rundong 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 Binary files a/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf and b/macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf 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 +% Copyright (C) 2021 Li Rundong % % 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 +% Copyright (C) 2021 Li Rundong % % 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% -- cgit v1.2.3