diff --git a/CHANGELOG.md b/CHANGELOG.md index fd0c9f22..d9dbefcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ ## [Unreleased] +### Added + +- 增加选项 `eqn-paren-style` 控制公式编号的括号样式([#959](https://github.com/tuna/thuthesis/pull/959))。 + ### Fixed - 解决本科生的多篇“书面翻译对应的原文索引”([#956](https://github.com/tuna/thuthesis/issues/956))。 diff --git a/testfiles/02-committee.tlg b/testfiles/02-committee.tlg index 9a5d5282..b898b836 100644 --- a/testfiles/02-committee.tlg +++ b/testfiles/02-committee.tlg @@ -108,9 +108,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 49.18375 plus -1.0 -...\marks1{学位论文指导小组、公开评阅人和答辩委员会名单} -...\marks2{学位论文指导小组、公开评阅人和答辩委员会名单} -...\marks3{学位论文指导小组、公开评阅人和答辩委员会名单} +...\marks1{\__mark_id:n {1}学位论文指导小组、公开评阅人和答辩委\ETC.} +...\marks2{\__mark_id:n {2}学位论文指导小组、公开评阅人和答辩委\ETC.} +...\marks3{\__mark_id:n {3}学位论文指导小组、公开评阅人和答辩委\ETC.} ...\mark{{学位论文指导小组、公开评阅人和答辩委员会名单}{\ETC.} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -793,7 +793,10 @@ Completed box being shipped out [1] .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x78.24507 ........\rule(14.05243+6.02255)x0.0 -........\vbox(14.05243+6.02255)x78.24507 +........\vbox(0.0+-0.00002)x78.24507 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x78.24507, glue set 39.12254fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 @@ -891,7 +894,10 @@ Completed box being shipped out [1] .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x78.24507 ........\rule(14.05243+6.02255)x0.0 -........\vbox(14.05243+6.02255)x78.24507 +........\vbox(0.0+-0.00002)x78.24507 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x78.24507, glue set 39.12254fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 @@ -903,7 +909,10 @@ Completed box being shipped out [1] ........\glue 0.0 plus 1.0fil .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x84.78908 -........\vbox(14.05243+6.02255)x84.78908 +........\vbox(0.0+-0.00002)x84.78908 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x84.78908, glue set 42.39455fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 @@ -915,7 +924,10 @@ Completed box being shipped out [1] ........\glue 0.0 plus 1.0fil .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x131.73639 -........\vbox(14.05243+6.02255)x131.73639 +........\vbox(0.0+-0.00002)x131.73639 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x131.73639, glue set 65.8682fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 @@ -953,7 +965,10 @@ Completed box being shipped out [1] .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x78.24507 ........\rule(14.05243+6.02255)x0.0 -........\vbox(14.05243+6.02255)x78.24507 +........\vbox(0.0+-0.00002)x78.24507 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x78.24507, glue set 39.12254fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 @@ -1023,7 +1038,10 @@ Completed box being shipped out [1] .......\glue(\tabskip) 0.0 .......\hbox(14.05243+6.02255)x78.24507 ........\rule(14.05243+6.02255)x0.0 -........\vbox(14.05243+6.02255)x78.24507 +........\vbox(0.0+-0.00002)x78.24507 +.........\glue -20.075 +.........\glue(\parskip) 0.0 +.........\glue(\parskip) 0.0 .........\hbox(14.05243+6.02255)x78.24507, glue set 39.12254fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 diff --git a/testfiles/03-copyright-doctor.tlg b/testfiles/03-copyright-doctor.tlg index 10249557..b5db18a1 100644 --- a/testfiles/03-copyright-doctor.tlg +++ b/testfiles/03-copyright-doctor.tlg @@ -88,9 +88,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 36.135 plus -1.0 -...\marks1{关于学位论文使用授权的说明} -...\marks2{关于学位论文使用授权的说明} -...\marks3{关于学位论文使用授权的说明} +...\marks1{\__mark_id:n {1}关于学位论文使用授权的说明} +...\marks2{\__mark_id:n {2}关于学位论文使用授权的说明} +...\marks3{\__mark_id:n {3}关于学位论文使用授权的说明} ...\mark{{关于学位论文使用授权的说明}{关于学位论文使用授\ETC.} ...\penalty 10000 ...\glue 13.04874 diff --git a/testfiles/03-copyright-master.tlg b/testfiles/03-copyright-master.tlg index 7f5fdf39..fb1fe898 100644 --- a/testfiles/03-copyright-master.tlg +++ b/testfiles/03-copyright-master.tlg @@ -88,9 +88,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 36.135 plus -1.0 -...\marks1{关于学位论文使用授权的说明} -...\marks2{关于学位论文使用授权的说明} -...\marks3{关于学位论文使用授权的说明} +...\marks1{\__mark_id:n {1}关于学位论文使用授权的说明} +...\marks2{\__mark_id:n {2}关于学位论文使用授权的说明} +...\marks3{\__mark_id:n {3}关于学位论文使用授权的说明} ...\mark{{关于学位论文使用授权的说明}{关于学位论文使用授\ETC.} ...\penalty 10000 ...\glue 13.04874 diff --git a/testfiles/04-abstract.tlg b/testfiles/04-abstract.tlg index bd44ee7e..411c4f88 100644 --- a/testfiles/04-abstract.tlg +++ b/testfiles/04-abstract.tlg @@ -99,9 +99,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{摘\hskip 1em\relax 要} -...\marks2{摘\hskip 1em\relax 要} -...\marks3{摘\hskip 1em\relax 要} +...\marks1{\__mark_id:n {1}摘\hskip 1em\relax 要} +...\marks2{\__mark_id:n {2}摘\hskip 1em\relax 要} +...\marks3{\__mark_id:n {3}摘\hskip 1em\relax 要} ...\mark{{摘\hskip 1em\relax 要}{摘\hskip 1em\relax 要}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/testfiles/05-abstract-en.tlg b/testfiles/05-abstract-en.tlg index 7551dca9..5c8fbce5 100644 --- a/testfiles/05-abstract-en.tlg +++ b/testfiles/05-abstract-en.tlg @@ -90,9 +90,9 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Abstract} -...\marks2{Abstract} -...\marks3{Abstract} +...\marks1{\__mark_id:n {1}Abstract} +...\marks2{\__mark_id:n {2}Abstract} +...\marks3{\__mark_id:n {3}Abstract} ...\mark{{Abstract}{Abstract}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/testfiles/06-contents.tlg b/testfiles/06-contents.tlg index a075a584..a4d44818 100644 --- a/testfiles/06-contents.tlg +++ b/testfiles/06-contents.tlg @@ -8,7 +8,8 @@ Package fontspec Info: (fontspec) - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:language=dflt;" (fontspec) - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:language=dflt;" [1 -] [2 +] +[2 ] (06-contents.toc Completed box being shipped out [4] \vbox(710.18088+4.1104)x439.87962 @@ -100,9 +101,9 @@ Completed box being shipped out [4] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{目\hskip 1em\relax 录} -...\marks2{目\hskip 1em\relax 录} -...\marks3{目\hskip 1em\relax 录} +...\marks1{\__mark_id:n {7}目\hskip 1em\relax 录} +...\marks2{\__mark_id:n {8}目\hskip 1em\relax 录} +...\marks3{\__mark_id:n {9}目\hskip 1em\relax 录} ...\mark{{目\hskip 1em\relax 录}{目\hskip 1em\relax 录}} ...\penalty 10000 ...\penalty 10000 diff --git a/testfiles/07-1-figures-tables.tlg b/testfiles/07-1-figures-tables.tlg index b03cb990..7bdd4aa8 100644 --- a/testfiles/07-1-figures-tables.tlg +++ b/testfiles/07-1-figures-tables.tlg @@ -118,9 +118,9 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{插图和附表清单} -...\marks2{插图和附表清单} -...\marks3{插图和附表清单} +...\marks1{\__mark_id:n {1}插图和附表清单} +...\marks2{\__mark_id:n {2}插图和附表清单} +...\marks3{\__mark_id:n {3}插图和附表清单} ...\mark{{插图和附表清单}{插图和附表清单}} ...\penalty 10000 ...\glue 0.0 plus 0.1 diff --git a/testfiles/07-2-figures.tlg b/testfiles/07-2-figures.tlg index 3eb9690f..f62a1def 100644 --- a/testfiles/07-2-figures.tlg +++ b/testfiles/07-2-figures.tlg @@ -104,9 +104,9 @@ C.} ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{插图清单} -...\marks2{插图清单} -...\marks3{插图清单} +...\marks1{\__mark_id:n {1}插图清单} +...\marks2{\__mark_id:n {2}插图清单} +...\marks3{\__mark_id:n {3}插图清单} ...\mark{{插图清单}{插图清单}} ...\penalty 10000 ...\glue 0.0 plus 0.1 diff --git a/testfiles/07-3-tables.tlg b/testfiles/07-3-tables.tlg index 07ede494..d6c957e0 100644 --- a/testfiles/07-3-tables.tlg +++ b/testfiles/07-3-tables.tlg @@ -104,9 +104,9 @@ C.} ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{附表清单} -...\marks2{附表清单} -...\marks3{附表清单} +...\marks1{\__mark_id:n {1}附表清单} +...\marks2{\__mark_id:n {2}附表清单} +...\marks3{\__mark_id:n {3}附表清单} ...\mark{{附表清单}{附表清单}} ...\penalty 10000 ...\glue 0.0 plus 0.1 diff --git a/testfiles/08-notation-nomencl/08-notation-nomencl.tlg b/testfiles/08-notation-nomencl/08-notation-nomencl.tlg index d4c36d29..06ef6549 100644 --- a/testfiles/08-notation-nomencl/08-notation-nomencl.tlg +++ b/testfiles/08-notation-nomencl/08-notation-nomencl.tlg @@ -137,9 +137,9 @@ Completed box being shipped out [8] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{符号和缩略语说明} -...\marks2{符号和缩略语说明} -...\marks3{符号和缩略语说明} +...\marks1{\__mark_id:n {1}符号和缩略语说明} +...\marks2{\__mark_id:n {2}符号和缩略语说明} +...\marks3{\__mark_id:n {3}符号和缩略语说明} ...\mark{{符号和缩略语说明}{符号和缩略语说明}} ...\penalty 10000 ...\glue -30.11249 diff --git a/testfiles/08-notation.tlg b/testfiles/08-notation.tlg index 8286a235..d0242194 100644 --- a/testfiles/08-notation.tlg +++ b/testfiles/08-notation.tlg @@ -136,9 +136,9 @@ Completed box being shipped out [8] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{符号和缩略语说明} -...\marks2{符号和缩略语说明} -...\marks3{符号和缩略语说明} +...\marks1{\__mark_id:n {1}符号和缩略语说明} +...\marks2{\__mark_id:n {2}符号和缩略语说明} +...\marks3{\__mark_id:n {3}符号和缩略语说明} ...\mark{{符号和缩略语说明}{符号和缩略语说明}} ...\penalty 10000 ...\glue -30.11249 diff --git a/testfiles/09-main-en.tlg b/testfiles/09-main-en.tlg index 9bb5efb2..8f941281 100644 --- a/testfiles/09-main-en.tlg +++ b/testfiles/09-main-en.tlg @@ -96,9 +96,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 49.18375 plus -1.0 -...\marks1{学位论文指导小组、公开评阅人和答辩委员会名单} -...\marks2{学位论文指导小组、公开评阅人和答辩委员会名单} -...\marks3{学位论文指导小组、公开评阅人和答辩委员会名单} +...\marks1{\__mark_id:n {1}学位论文指导小组、公开评阅人和答辩委\ETC.} +...\marks2{\__mark_id:n {2}学位论文指导小组、公开评阅人和答辩委\ETC.} +...\marks3{\__mark_id:n {3}学位论文指导小组、公开评阅人和答辩委\ETC.} ...\mark{{学位论文指导小组、公开评阅人和答辩委员会名单}{\ETC.} ...\penalty 10000 ...\glue 0.0 plus 1.0fil @@ -263,9 +263,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{摘\hskip 1em\relax 要} -...\marks2{摘\hskip 1em\relax 要} -...\marks3{摘\hskip 1em\relax 要} +...\marks1{\__mark_id:n {4}摘\hskip 1em\relax 要} +...\marks2{\__mark_id:n {5}摘\hskip 1em\relax 要} +...\marks3{\__mark_id:n {6}摘\hskip 1em\relax 要} ...\mark{{摘\hskip 1em\relax 要}{摘\hskip 1em\relax 要}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -515,9 +515,9 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Abstract} -...\marks2{Abstract} -...\marks3{Abstract} +...\marks1{\__mark_id:n {7}Abstract} +...\marks2{\__mark_id:n {8}Abstract} +...\marks3{\__mark_id:n {9}Abstract} ...\mark{{Abstract}{Abstract}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -733,9 +733,9 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Table of Contents} -...\marks2{Table of Contents} -...\marks3{Table of Contents} +...\marks1{\__mark_id:n {10}Table of Contents} +...\marks2{\__mark_id:n {11}Table of Contents} +...\marks3{\__mark_id:n {12}Table of Contents} ...\mark{{Table of Contents}{Table of Contents}} ...\penalty 10000 ...\penalty 10000 @@ -1597,9 +1597,9 @@ Completed box being shipped out [4] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{List of Figures and Tables} -...\marks2{List of Figures and Tables} -...\marks3{List of Figures and Tables} +...\marks1{\__mark_id:n {13}List of Figures and Tables} +...\marks2{\__mark_id:n {14}List of Figures and Tables} +...\marks3{\__mark_id:n {15}List of Figures and Tables} ...\mark{{List of Figures and Tables}{List of Figures and Tables}} ...\penalty 10000 ...\glue 0.0 plus 0.1 @@ -1869,9 +1869,9 @@ Completed box being shipped out [5] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{List of Symbols and Acronyms} -...\marks2{List of Symbols and Acronyms} -...\marks3{List of Symbols and Acronyms} +...\marks1{\__mark_id:n {16}List of Symbols and Acronyms} +...\marks2{\__mark_id:n {17}List of Symbols and Acronyms} +...\marks3{\__mark_id:n {18}List of Symbols and Acronyms} ...\mark{{List of Symbols and Acronyms}{List of Symbols and Acronyms}} ...\penalty 10000 ...\glue -30.11249 @@ -2539,8 +2539,8 @@ Completed box being shipped out [1] ...\write-{} ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{Chapter 1 Title} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {19}Chapter 1 Title} +...\marks2{\__mark_id:n {20}} ...\mark{{Chapter 1 Title}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* @@ -3697,9 +3697,9 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{References} -...\marks2{References} -...\marks3{References} +...\marks1{\__mark_id:n {21}References} +...\marks2{\__mark_id:n {22}References} +...\marks3{\__mark_id:n {23}References} ...\mark{{References}{References}} ...\penalty 10000 ...\glue 0.0 plus 1.0 @@ -6309,8 +6309,8 @@ Completed box being shipped out [4] ...\write-{} ...\write1{\pp@pagectr{footnote}{2}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{Appendix A Title} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {24}Appendix A Title} +...\marks2{\__mark_id:n {25}} ...\mark{{Appendix A Title}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* @@ -7325,9 +7325,9 @@ Completed box being shipped out [6] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Acknowledgements} -...\marks2{Acknowledgements} -...\marks3{Acknowledgements} +...\marks1{\__mark_id:n {26}Acknowledgements} +...\marks2{\__mark_id:n {27}Acknowledgements} +...\marks3{\__mark_id:n {28}Acknowledgements} ...\mark{{Acknowledgements}{Acknowledgements}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -7493,9 +7493,9 @@ Completed box being shipped out [7] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{声\protect \hspace {1em}明} -...\marks2{声\protect \hspace {1em}明} -...\marks3{声\protect \hspace {1em}明} +...\marks1{\__mark_id:n {29}声\protect \hspace {1em}明} +...\marks2{\__mark_id:n {30}声\protect \hspace {1em}明} +...\marks3{\__mark_id:n {31}声\protect \hspace {1em}明} ...\mark{{声\protect \hspace {1em}明}{声\protect \hspace {1em}明}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -7982,9 +7982,9 @@ Completed box being shipped out [8] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Resume} -...\marks2{Resume} -...\marks3{Resume} +...\marks1{\__mark_id:n {32}Resume} +...\marks2{\__mark_id:n {33}Resume} +...\marks3{\__mark_id:n {34}Resume} ...\mark{{Resume}{Resume}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -8128,8 +8128,8 @@ Completed box being shipped out [9] ..\vbox(674.33032+0.0)x426.79135, glue set 599.99681fil ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{Comments from Thesi\ETC.} -...\marks1{Comments from Thesis Supervisor} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {35}Comments from Thesis Supervisor} +...\marks2{\__mark_id:n {36}} ...\mark{{Comments from Thesis Supervisor}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* @@ -8299,8 +8299,8 @@ Completed box being shipped out [10] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{Resolution of Thesi\ETC.} -...\marks1{Resolution of Thesis Defense Committee} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {37}Resolution of Thesis Defense Committee} +...\marks2{\__mark_id:n {38}} ...\mark{{Resolution of Thesis Defense Committee}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* diff --git a/testfiles/09-main-postdoc.tlg b/testfiles/09-main-postdoc.tlg index 02371279..0db39270 100644 --- a/testfiles/09-main-postdoc.tlg +++ b/testfiles/09-main-postdoc.tlg @@ -97,9 +97,9 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{摘\hskip 1em\relax 要} -...\marks2{摘\hskip 1em\relax 要} -...\marks3{摘\hskip 1em\relax 要} +...\marks1{\__mark_id:n {1}摘\hskip 1em\relax 要} +...\marks2{\__mark_id:n {2}摘\hskip 1em\relax 要} +...\marks3{\__mark_id:n {3}摘\hskip 1em\relax 要} ...\mark{{摘\hskip 1em\relax 要}{摘\hskip 1em\relax 要}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -1405,9 +1405,9 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{Abstract} -...\marks2{Abstract} -...\marks3{Abstract} +...\marks1{\__mark_id:n {4}Abstract} +...\marks2{\__mark_id:n {5}Abstract} +...\marks3{\__mark_id:n {6}Abstract} ...\mark{{Abstract}{Abstract}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -2045,9 +2045,9 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{目\hskip 2em\relax 次} -...\marks2{目\hskip 2em\relax 次} -...\marks3{目\hskip 2em\relax 次} +...\marks1{\__mark_id:n {7}目\hskip 2em\relax 次} +...\marks2{\__mark_id:n {8}目\hskip 2em\relax 次} +...\marks3{\__mark_id:n {9}目\hskip 2em\relax 次} ...\mark{{目\hskip 2em\relax 次}{目\hskip 2em\relax 次}} ...\penalty 10000 ...\penalty 10000 diff --git a/testfiles/09-main.tlg b/testfiles/09-main.tlg index 90da23d2..ec81af59 100644 --- a/testfiles/09-main.tlg +++ b/testfiles/09-main.tlg @@ -132,8 +132,8 @@ Completed box being shipped out [1] ...\write-{} ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{第3章\hskip 1em\relax 对等网络中宽松约束的一般性搜索\ETC.} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {1}第3章\hskip 1em\relax 对等网络中宽松约束的\ETC.} +...\marks2{\__mark_id:n {2}} ...\mark{{第3章\hskip 1em\relax 对等网络中宽松约束的一般性搜索\ETC.} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* @@ -14138,8 +14138,8 @@ Completed box being shipped out [7] ...\write-{} ...\write1{\pp@pagectr{footnote}{3}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{第4章\hskip 1em\relax 对等网络中宽松约束的一般性搜索\ETC.} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {3}第4章\hskip 1em\relax 对等网络中宽松约束的\ETC.} +...\marks2{\__mark_id:n {4}} ...\mark{{第4章\hskip 1em\relax 对等网络中宽松约束的一般性搜索\ETC.} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* diff --git a/testfiles/10-bibtex/10-bibtex-apa-natbib.tlg b/testfiles/10-bibtex/10-bibtex-apa-natbib.tlg index bec3c9e2..84e3ced5 100644 --- a/testfiles/10-bibtex/10-bibtex-apa-natbib.tlg +++ b/testfiles/10-bibtex/10-bibtex-apa-natbib.tlg @@ -1,6 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -(10-bibtex-apa-natbib.bbl [1 +(10-bibtex-apa-natbib.bbl +[1 ] Package fontspec Info: (fontspec) Font family 'FandolHei(0)' created for font 'FandolHei' with options [Extension={.otf},UprightFont={*-Regular},BoldFont={*-Bold}]. @@ -9,5 +10,6 @@ Package fontspec Info: (fontspec) (fontspec) - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:language=dflt;" (fontspec) - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:language=dflt;" -) [2 +) +[2 ] diff --git a/testfiles/10-bibtex/10-bibtex-apa.tlg b/testfiles/10-bibtex/10-bibtex-apa.tlg index 37732a6e..0d400e2b 100644 --- a/testfiles/10-bibtex/10-bibtex-apa.tlg +++ b/testfiles/10-bibtex/10-bibtex-apa.tlg @@ -9,5 +9,6 @@ Package fontspec Info: (fontspec) (fontspec) - 'normal' (m/n) with NFSS spec.: <->"[FandolHei-Regular.otf]/OT:language=dflt;" (fontspec) - 'bold' (b/n) with NFSS spec.: <->"[FandolHei-Bold.otf]/OT:language=dflt;" -) [2 +) +[2 ] diff --git a/testfiles/11-appendix.tlg b/testfiles/11-appendix.tlg index e522627c..26dd5203 100644 --- a/testfiles/11-appendix.tlg +++ b/testfiles/11-appendix.tlg @@ -198,8 +198,8 @@ Completed box being shipped out [115] ...\write-{} ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{附录 A\hskip 1em\relax 工程领导力调查问卷} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {1}附录 A\hskip 1em\relax 工程领导力调查问卷} +...\marks2{\__mark_id:n {2}} ...\mark{{附录 A\hskip 1em\relax 工程领导力调查问卷}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* diff --git a/testfiles/12-acknowledgements.tlg b/testfiles/12-acknowledgements.tlg index 07b5bc40..94128e21 100644 --- a/testfiles/12-acknowledgements.tlg +++ b/testfiles/12-acknowledgements.tlg @@ -101,9 +101,9 @@ Completed box being shipped out [115] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{致\hskip 1em\relax 谢} -...\marks2{致\hskip 1em\relax 谢} -...\marks3{致\hskip 1em\relax 谢} +...\marks1{\__mark_id:n {1}致\hskip 1em\relax 谢} +...\marks2{\__mark_id:n {2}致\hskip 1em\relax 谢} +...\marks3{\__mark_id:n {3}致\hskip 1em\relax 谢} ...\mark{{致\hskip 1em\relax 谢}{致\hskip 1em\relax 谢}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/testfiles/13-statement.tlg b/testfiles/13-statement.tlg index 18b598de..336fa12e 100644 --- a/testfiles/13-statement.tlg +++ b/testfiles/13-statement.tlg @@ -113,9 +113,9 @@ Completed box being shipped out [116] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{声\protect \hspace {1em}明} -...\marks2{声\protect \hspace {1em}明} -...\marks3{声\protect \hspace {1em}明} +...\marks1{\__mark_id:n {1}声\protect \hspace {1em}明} +...\marks2{\__mark_id:n {2}声\protect \hspace {1em}明} +...\marks3{\__mark_id:n {3}声\protect \hspace {1em}明} ...\mark{{声\protect \hspace {1em}明}{声\protect \hspace {1em}明}} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/testfiles/14-resume.tlg b/testfiles/14-resume.tlg index aeb52130..6043e5d2 100644 --- a/testfiles/14-resume.tlg +++ b/testfiles/14-resume.tlg @@ -164,9 +164,9 @@ Completed box being shipped out [116] ....\glue(\rightskip) 0.0 plus 1.0fil ...\penalty 10000 ...\glue 27.10124 plus -1.0 -...\marks1{个人简历、在学期间完成的相关学术成果} -...\marks2{个人简历、在学期间完成的相关学术成果} -...\marks3{个人简历、在学期间完成的相关学术成果} +...\marks1{\__mark_id:n {1}个人简历、在学期间完成的相关学术成果} +...\marks2{\__mark_id:n {2}个人简历、在学期间完成的相关学术成果} +...\marks3{\__mark_id:n {3}个人简历、在学期间完成的相关学术成果} ...\mark{{个人简历、在学期间完成的相关学术成果}{个人简历\ETC.} ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/testfiles/package-amsthm.tlg b/testfiles/package-amsthm.tlg index f71cbe62..e821df9f 100644 --- a/testfiles/package-amsthm.tlg +++ b/testfiles/package-amsthm.tlg @@ -48,8 +48,8 @@ Completed box being shipped out [1] ...\write-{} ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{第1章\hskip 1em\relax 定理} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {1}第1章\hskip 1em\relax 定理} +...\marks2{\__mark_id:n {2}} ...\mark{{第1章\hskip 1em\relax 定理}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* diff --git a/testfiles/package-hyperref.tlg b/testfiles/package-hyperref.tlg index 4b6ac36b..c1e19d20 100644 --- a/testfiles/package-hyperref.tlg +++ b/testfiles/package-hyperref.tlg @@ -144,7 +144,10 @@ Completed box being shipped out [1] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 49.18375 plus -1.0 -....\marks1{学位论文指导小组、公开评阅人和答辩委员会名单}....\marks2{学位论文指导小组、公开评阅人和答辩委员会名单}....\marks3{学位论文指导小组、公开评阅人和答辩委员会名单}....\mark{{学位论文指导小组、公开评阅人和答辩委员会名单}{\ETC.} +....\marks1{\__mark_id:n {1}学位论文指导小组、公开评阅人和答辩委\ETC.} +....\marks2{\__mark_id:n {2}学位论文指导小组、公开评阅人和答辩委\ETC.} +....\marks3{\__mark_id:n {3}学位论文指导小组、公开评阅人和答辩委\ETC.} +....\mark{{学位论文指导小组、公开评阅人和答辩委员会名单}{\ETC.} ....\penalty 10000 ....\glue 0.0 plus 1.0fil ....\glue 0.0 plus -1.0fil @@ -340,9 +343,9 @@ Completed box being shipped out [1] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{摘\hskip 1em\relax 要} -....\marks2{摘\hskip 1em\relax 要} -....\marks3{摘\hskip 1em\relax 要} +....\marks1{\__mark_id:n {4}摘\hskip 1em\relax 要} +....\marks2{\__mark_id:n {5}摘\hskip 1em\relax 要} +....\marks3{\__mark_id:n {6}摘\hskip 1em\relax 要} ....\mark{{摘\hskip 1em\relax 要}{摘\hskip 1em\relax 要}} ....\penalty 10000 ....\glue(\parskip) 0.0 plus 1.0 @@ -609,9 +612,9 @@ Completed box being shipped out [2] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{Abstract} -....\marks2{Abstract} -....\marks3{Abstract} +....\marks1{\__mark_id:n {7}Abstract} +....\marks2{\__mark_id:n {8}Abstract} +....\marks3{\__mark_id:n {9}Abstract} ....\mark{{Abstract}{Abstract}} ....\penalty 10000 ....\glue(\parskip) 0.0 plus 1.0 @@ -844,9 +847,9 @@ Completed box being shipped out [3] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{Table of Contents} -....\marks2{Table of Contents} -....\marks3{Table of Contents} +....\marks1{\__mark_id:n {10}Table of Contents} +....\marks2{\__mark_id:n {11}Table of Contents} +....\marks3{\__mark_id:n {12}Table of Contents} ....\mark{{Table of Contents}{Table of Contents}} ....\penalty 10000 ....\penalty 10000 @@ -1754,9 +1757,9 @@ Completed box being shipped out [4] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{List of Figures and Tables} -....\marks2{List of Figures and Tables} -....\marks3{List of Figures and Tables} +....\marks1{\__mark_id:n {13}List of Figures and Tables} +....\marks2{\__mark_id:n {14}List of Figures and Tables} +....\marks3{\__mark_id:n {15}List of Figures and Tables} ....\mark{{List of Figures and Tables}{List of Figures and Tables}} ....\penalty 10000 ....\glue 0.0 plus 0.1 @@ -2039,9 +2042,9 @@ Completed box being shipped out [5] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{List of Symbols and Acronyms} -....\marks2{List of Symbols and Acronyms} -....\marks3{List of Symbols and Acronyms} +....\marks1{\__mark_id:n {16}List of Symbols and Acronyms} +....\marks2{\__mark_id:n {17}List of Symbols and Acronyms} +....\marks3{\__mark_id:n {18}List of Symbols and Acronyms} ....\mark{{List of Symbols and Acronyms}{List of Symbols and Acronyms}} ....\penalty 10000 ....\glue -30.11249 @@ -4366,9 +4369,9 @@ Completed box being shipped out [3] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{References} -....\marks2{References} -....\marks3{References} +....\marks1{\__mark_id:n {19}References} +....\marks2{\__mark_id:n {20}References} +....\marks3{\__mark_id:n {21}References} ....\mark{{References}{References}} ....\penalty 10000 ....\glue 0.0 plus 1.0 @@ -4579,8 +4582,8 @@ Completed box being shipped out [4] ....\special{pdf:dest (appendix.A) [@thispage /XYZ @xpos @ypos null]} ....\write4{\protect \BOOKMARK [0][]{appendix.A}{\376\377\000A\000p\000p\000e\000\ETC.} ....\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -....\marks1{Appendix A Title} -....\marks2{\prg_do_nothing: } +....\marks1{\__mark_id:n {22}Appendix A Title} +....\marks2{\__mark_id:n {23}} ....\mark{{Appendix A Title}{}} ....\glue(\topskip) 12.0 ....\rule(0.0+0.0)x* @@ -5601,9 +5604,9 @@ Completed box being shipped out [6] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{Acknowledgements} -....\marks2{Acknowledgements} -....\marks3{Acknowledgements} +....\marks1{\__mark_id:n {24}Acknowledgements} +....\marks2{\__mark_id:n {25}Acknowledgements} +....\marks3{\__mark_id:n {26}Acknowledgements} ....\mark{{Acknowledgements}{Acknowledgements}} ....\penalty 10000 ....\glue(\parskip) 0.0 plus 1.0 @@ -5786,9 +5789,9 @@ Completed box being shipped out [7] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{声\protect \hspace {1em}明} -....\marks2{声\protect \hspace {1em}明} -....\marks3{声\protect \hspace {1em}明} +....\marks1{\__mark_id:n {27}声\protect \hspace {1em}明} +....\marks2{\__mark_id:n {28}声\protect \hspace {1em}明} +....\marks3{\__mark_id:n {29}声\protect \hspace {1em}明} ....\mark{{声\protect \hspace {1em}明}{声\protect \hspace {1em}明}} ....\penalty 10000 ....\glue(\parskip) 0.0 plus 1.0 @@ -6292,9 +6295,9 @@ Completed box being shipped out [8] .....\glue(\rightskip) 0.0 plus 1.0fil ....\penalty 10000 ....\glue 27.10124 plus -1.0 -....\marks1{Resume} -....\marks2{Resume} -....\marks3{Resume} +....\marks1{\__mark_id:n {30}Resume} +....\marks2{\__mark_id:n {31}Resume} +....\marks3{\__mark_id:n {32}Resume} ....\mark{{Resume}{Resume}} ....\penalty 10000 ....\glue(\parskip) 0.0 plus 1.0 @@ -6454,8 +6457,8 @@ Completed box being shipped out [9] ....\special{pdf:dest (appendix*.25) [@thispage /XYZ @xpos @ypos null]} ....\write4{\protect \BOOKMARK [0][]{appendix*.25}{\376\377\000C\000o\000m\000m\0\ETC.} ....\write1{\@writefile{toc}{\protect \contentsline {chapter}{Comments from Thesi\ETC.} -....\marks1{Comments from Thesis Supervisor} -....\marks2{\prg_do_nothing: } +....\marks1{\__mark_id:n {33}Comments from Thesis Supervisor} +....\marks2{\__mark_id:n {34}} ....\mark{{Comments from Thesis Supervisor}{}} ....\glue(\topskip) 12.0 ....\rule(0.0+0.0)x* @@ -6641,8 +6644,8 @@ Completed box being shipped out [10] ....\special{pdf:dest (appendix*.26) [@thispage /XYZ @xpos @ypos null]} ....\write4{\protect \BOOKMARK [0][]{appendix*.26}{\376\377\000R\000e\000s\000o\0\ETC.} ....\write1{\@writefile{toc}{\protect \contentsline {chapter}{Resolution of Thesi\ETC.} -....\marks1{Resolution of Thesis Defense Committee} -....\marks2{\prg_do_nothing: } +....\marks1{\__mark_id:n {35}Resolution of Thesis Defense Committee} +....\marks2{\__mark_id:n {36}} ....\mark{{Resolution of Thesis Defense Committee}{}} ....\glue(\topskip) 12.0 ....\rule(0.0+0.0)x* diff --git a/testfiles/package-longtable.tlg b/testfiles/package-longtable.tlg index 68432243..910e9c81 100644 --- a/testfiles/package-longtable.tlg +++ b/testfiles/package-longtable.tlg @@ -26,6 +26,7 @@ Completed box being shipped out [2] ..\glue(\lineskip) 0.0 ..\vbox(674.33032+0.0)x426.79135, glue set 6.9768fil ...\write-{} +...\special{} ...\glue(\topskip) 0.0 ...\vbox(52.30777+0.0)x426.79135 ....\hbox(14.26741+6.32367)x426.79135, glue set 128.66878fill @@ -3265,6 +3266,7 @@ Completed box being shipped out [5] ..\glue(\lineskip) 0.0 ..\vbox(674.33032+0.0)x426.79135, glue set 6.13176fil ...\write-{} +...\special{} ...\glue(\topskip) 0.0 ...\vbox(48.66495+0.0)x426.79135 ....\hbox(13.06558+5.5996)x426.79135, glue set 109.08162fill diff --git a/testfiles/package-ntheorem.tlg b/testfiles/package-ntheorem.tlg index ea14d630..2d580d4c 100644 --- a/testfiles/package-ntheorem.tlg +++ b/testfiles/package-ntheorem.tlg @@ -48,8 +48,8 @@ Completed box being shipped out [1] ...\write-{} ...\write1{\pp@pagectr{footnote}{1}{\theabspage }{\thepage }} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.} -...\marks1{第1章\hskip 1em\relax 定理} -...\marks2{\prg_do_nothing: } +...\marks1{\__mark_id:n {1}第1章\hskip 1em\relax 定理} +...\marks2{\__mark_id:n {2}} ...\mark{{第1章\hskip 1em\relax 定理}{}} ...\glue(\topskip) 12.0 ...\rule(0.0+0.0)x* diff --git a/thuthesis.dtx b/thuthesis.dtx index 375901e0..9403c80a 100644 --- a/thuthesis.dtx +++ b/thuthesis.dtx @@ -813,7 +813,7 @@ % } % \end{latex} % -% 用户也可以逐项修改数学样式。 +% 用户也可以逐项修改数学样式,包括: % \newcommand\dif{\mathop{}\!\mathrm{d}} % \begin{enumerate} % \item \DescribeOption{uppercase-greek} @@ -885,12 +885,16 @@ % 模板作了处理,用户可以直接使用这些宏包的命令,如 \cs{bm}、\cs{mathscr}、 % \cs{uppi}。 % -% 另外,模板还为 `math-font` 提供了传统的 Type 1 字体 \option{newtx}。 +% 另外,模板还为 |math-font| 提供了传统的 Type 1 字体 \option{newtx}。 % 该选项会调用 \pkg{newtxmath} 宏包。 % 但是,如果西文字体已经使用了 OpenType 的 Times New Roman, % 混用 Type 1 字体可能会导致问题,尤其是使用 \pkg{siunitx} 宏包时。 % 该选项还处于测试阶段,需要谨慎使用。 % +% \DescribeOption{eqn-paren-style} +% 控制中文论文中,数学公式编号两边的括号样式。可选项包括:\option{full}(全角,默认) / \option{half}(半角)。 +% 在语言为英语(|language = english|)时,此选项无效,仅使用半角括号。 +% % \subsubsection{定理环境} % \label{sec:theorem} % \thuthesis{} 定义了常用的数学环境: @@ -1658,6 +1662,17 @@ }, default = print, }, +% \end{macrocode} +% +% 数学公式编号的括号使用全角还是半角。 +% \begin{macrocode} + eqn-paren-style = { + name = eqn@paren@style, + choices = { + full, + half, + } + }, } \newif\ifthu@degree@graduate \newcommand\thu@set@graduate{% @@ -3511,10 +3526,23 @@ % 中文模板的公式编号使用中文括号。需要修改 \pkg{amsmath} 的 \cs{tagform@}。 % 这里中文的 \cs{unskip} 是为了“|式~\eqref|”这样的写法不产生额外的空格。 % \begin{macrocode} +\newcommand\thu@eqn@left@paren{(} +\newcommand\thu@eqn@right@paren{)} +\newcommand\thu@set@eqn@paren@style{% + \ifthu@eqn@paren@style@full + \renewcommand\thu@eqn@left@paren{(}% + \renewcommand\thu@eqn@right@paren{)}% + \else + \renewcommand\thu@eqn@left@paren{(}% + \renewcommand\thu@eqn@right@paren{)}% + \fi +} +\thu@set@eqn@paren@style +\thu@option@hook{eqn-paren-style}{\thu@set@eqn@paren@style} \newcommand\thu@put@parentheses[1]{% \ifthu@language@chinese \unskip - (#1)% + \thu@eqn@left@paren#1\thu@eqn@right@paren \else (#1)% \fi