From 897512f999d8dc9ad8b80391becf098128964b0b Mon Sep 17 00:00:00 2001 From: Zeping Lee Date: Sat, 27 Jan 2024 20:46:14 +0800 Subject: [PATCH] Fix caption font --- testfiles/09-main-medical.tex | 2 +- testfiles/09-main-medical.tlg | 338 +++++++++++++++++----------------- thuthesis.dtx | 54 +++++- 3 files changed, 217 insertions(+), 177 deletions(-) diff --git a/testfiles/09-main-medical.tex b/testfiles/09-main-medical.tex index f86b2581..fbad5a42 100644 --- a/testfiles/09-main-medical.tex +++ b/testfiles/09-main-medical.tex @@ -1,5 +1,5 @@ \input{regression-test.tex} -\documentclass[degree=doctor]{thuthesis} +\documentclass[degree=doctor, format=medical]{thuthesis} \begin{document} \START diff --git a/testfiles/09-main-medical.tlg b/testfiles/09-main-medical.tlg index cb17aae7..120d4ab4 100644 --- a/testfiles/09-main-medical.tlg +++ b/testfiles/09-main-medical.tlg @@ -16,14 +16,14 @@ Package fontspec Info: Font family 'FandolHei(0)' created for font 'FandolHei' (fontspec) - 'bold' (b/n) with NFSS spec.: (fontspec) <->"[FandolHei-Bold.otf]/OT:language=dflt;" (fontspec) - 'bold small caps' (b/sc) with NFSS spec.: -Missing character: There is no ∆ (U+2206) in font [texgyretermes-regular.otf]/O -T:script=latn;language=dflt;mapping=tex-text;! -Missing character: There is no ∆ (U+2206) in font [texgyretermes-regular.otf]/O -T:script=latn;language=dflt;mapping=tex-text;! -Missing character: There is no ∆ (U+2206) in font [texgyretermes-regular.otf]/O -T:script=latn;language=dflt;mapping=tex-text;! -Missing character: There is no ∆ (U+2206) in font [texgyretermes-regular.otf]/O -T:script=latn;language=dflt;mapping=tex-text;! +Missing character: There is no ∆ (U+2206) in font [texgyreheros-regular.otf]/OT +:script=latn;language=dflt;mapping=tex-text;! +Missing character: There is no ∆ (U+2206) in font [texgyreheros-regular.otf]/OT +:script=latn;language=dflt;mapping=tex-text;! +Missing character: There is no ∆ (U+2206) in font [texgyreheros-regular.otf]/OT +:script=latn;language=dflt;mapping=tex-text;! +Missing character: There is no ∆ (U+2206) in font [texgyreheros-regular.otf]/OT +:script=latn;language=dflt;mapping=tex-text;! LaTeX Font Info: Calculating math sizes for size <11.04124> on input line .... LaTeX Font Info: Font shape `TU/XITSMath-Regular(2)/m/n' will be (Font) scaled to size 11.04242pt on input line .... @@ -106,7 +106,7 @@ Completed box being shipped out [1] ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 -..\vbox(674.33032+0.0)x426.79135, glue set 169.26888fil +..\vbox(674.33032+0.0)x426.79135, glue set 182.09047fil ...\write-{} ...\special{color push gray 0} ...\write-{} @@ -309,9 +309,9 @@ Completed box being shipped out [1] ...\penalty 10000 ...\glue 12.0 plus 2.0 minus 2.0 ...\glue 0.0 plus 1.0 -...\vbox(112.26581+0.0)x426.79135 +...\vbox(101.09904+0.0)x426.79135 ....\special{color push gray 0} -....\vbox(112.26581+0.0)x426.79135 +....\vbox(101.09904+0.0)x426.79135 .....\hbox(28.45274+0.0)x426.79135, glue set 199.16931fil ......\glue(\leftskip) 0.0 plus 1.0fil ......\hbox(0.0+0.0)x0.0 @@ -326,48 +326,48 @@ Completed box being shipped out [1] .....\glue 6.02249 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 -.....\hbox(10.04749+4.30612)x426.79135 +.....\hbox(8.48415+3.63611)x426.79135 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(10.04749+4.30612)x426.79135 -.......\hbox(10.04749+4.30612)x426.79135, glue set 61.04855fil +......\vbox(8.48415+3.63611)x426.79135 +.......\hbox(8.48415+3.63611)x426.79135, glue set 54.74657fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/m/n/11.04124 图 +........\TU/FandolHei(0)/m/n/10.53937 图 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 1.1 +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 1.1 ........\kern -0.0002 ........\kern 0.0002 -........\glue 11.04124 -........\rule(10.04749+*)x0.0 +........\glue 10.53937 +........\rule(8.48415+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/m/n/11.04124 Viral -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 load -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 and -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 CD4+T -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 cells -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 changed -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 over -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 time -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (Zhang, -........\glue 2.76031 plus 1.72519 minus 0.73608 -........\TU/texgyretermes(0)/m/n/11.04124 San) +........\TU/texgyreheros(0)/m/n/10.53937 Viral +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 load +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 and +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 CD4+T +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 cells +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 changed +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 over +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 time +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (Zhang, +........\glue 2.92995 plus 1.8312 minus 0.78131 +........\TU/texgyreheros(0)/m/n/10.53937 San) ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+4.30612)x0.0 +........\rule(0.0+3.63611)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil @@ -381,138 +381,138 @@ Completed box being shipped out [1] .....\glue 6.02249 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 -.....\hbox(53.10835+4.30612)x426.79135 +.....\hbox(44.84496+3.63611)x426.79135 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(53.10835+4.30612)x426.79135 -.......\hbox(10.04749+2.40698)x426.79135, glue set 0.25887 +......\vbox(44.84496+3.63611)x426.79135 +.......\hbox(8.48415+2.29756)x426.79135, glue set - 0.36615 ........\hbox(0.0+0.0)x0.0 -........\rule(10.04749+*)x0.0 +........\rule(8.48415+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/m/n/11.04124 Viral -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 load -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 and -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 CD4+T -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 cells -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 changed -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 though -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 time -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 since -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 HAART -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 initiation -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 in -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 INR -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 group -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (a) -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 and +........\TU/texgyreheros(0)/m/n/10.53937 Viral +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 load +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 and +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 CD4+T +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 cells +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 changed +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 though +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 time +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 since +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 HAART +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 initiation +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 in +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 INR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 group +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (a) +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 and ........\glue(\rightskip) 0.0 .......\penalty 10000 -.......\glue(\baselineskip) 4.40547 -.......\hbox(7.54117+2.40698)x426.79135, glue set - 0.3041 -........\TU/texgyretermes(0)/m/n/11.04124 IR -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 group -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (b); -........\glue 2.76031 plus 2.07024 minus 0.6134 -........\TU/texgyretermes(0)/m/n/11.04124 the -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 increase -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 of -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 naïve -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 CD4+T -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 cell -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 count -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (∆n) -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 was -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 significantly -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 different -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 between -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 INR +.......\glue(\baselineskip) 1.9498 +.......\hbox(7.87291+2.29756)x426.79135, glue set 0.11263 +........\TU/texgyreheros(0)/m/n/10.53937 IR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 group +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (b); +........\glue 2.92995 plus 2.19745 minus 0.6511 +........\TU/texgyreheros(0)/m/n/10.53937 the +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 increase +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 of +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 naïve +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 CD4+T +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 cell +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 count +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (∆n) +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 was +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 significantly +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 different +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 between ........\glue(\rightskip) 0.0 -.......\glue(\baselineskip) 4.40547 -.......\hbox(7.54117+2.40698)x426.79135, glue set 0.2269 -........\TU/texgyretermes(0)/m/n/11.04124 group -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 and -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 IR -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 group -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (c); -........\glue 2.76031 plus 2.07024 minus 0.6134 -........\TU/texgyretermes(0)/m/n/11.04124 the -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 increase -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 of -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 memory -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 CD4+T -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 cell -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 count -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (∆m) -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 was -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 similar -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 in -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 INR -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 and +.......\glue(\baselineskip) 1.9498 +.......\hbox(7.87291+2.29756)x426.79135, glue set 0.49539 +........\TU/texgyreheros(0)/m/n/10.53937 INR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 group +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 and +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 IR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 group +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (c); +........\glue 2.92995 plus 2.19745 minus 0.6511 +........\TU/texgyreheros(0)/m/n/10.53937 the +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 increase +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 of +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 memory +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 CD4+T +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 cell +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 count +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (∆m) +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 was +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 similar +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 in ........\glue(\rightskip) 0.0 .......\penalty 150 -.......\glue(\baselineskip) 4.40547 -.......\hbox(7.54117+4.30612)x426.79135, glue set 256.9181fil -........\TU/texgyretermes(0)/m/n/11.04124 IR -........\glue 2.76031 plus 1.37877 minus 0.92102 -........\TU/texgyretermes(0)/m/n/11.04124 groups -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 (d). -........\glue 3.68042 plus 4.14047 minus 0.3067 -........\TU/texgyretermes(0)/m/n/11.04124 *, -........\glue 2.76031 plus 1.72519 minus 0.73608 -........\TU/texgyretermes(0)/m/n/11.04124 significant -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 difference +.......\glue(\baselineskip) 2.1079 +.......\hbox(7.71481+3.63611)x426.79135, glue set 211.23317fil +........\TU/texgyreheros(0)/m/n/10.53937 INR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 and +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 IR +........\glue 2.92995 plus 1.46349 minus 0.97762 +........\TU/texgyreheros(0)/m/n/10.53937 groups +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 (d). +........\glue 3.90659 plus 4.3949 minus 0.32555 +........\TU/texgyreheros(0)/m/n/10.53937 *, +........\glue 2.92995 plus 1.8312 minus 0.78131 +........\TU/texgyreheros(0)/m/n/10.53937 significant +........\glue 2.92995 plus 1.46497 minus 0.97664 +........\TU/texgyreheros(0)/m/n/10.53937 difference ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+4.30612)x0.0 +........\rule(0.0+3.63611)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 plus 1.0fil ........\glue(\rightskip) 0.0 @@ -551,38 +551,38 @@ Completed box being shipped out [1] ...\penalty 10000 ...\glue 12.0 plus 2.0 minus 2.0 ...\glue 0.0 plus 1.0 -...\vbox(116.82121+0.0)x426.79135 +...\vbox(115.16501+0.0)x426.79135 ....\special{color push gray 0} -....\vbox(116.82121+0.0)x426.79135 +....\vbox(115.16501+0.0)x426.79135 .....\write1{\@writefile{lot}{\protect \contentsline {table}{\protect \numberline \ETC.} .....\special{color push gray 0} .....\glue 0.0 .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 -.....\hbox(10.04749+4.30612)x426.79135 +.....\hbox(8.88815+3.80925)x426.79135 ......\hbox(0.0+0.0)x0.0 ......\glue 0.0 -......\vbox(10.04749+4.30612)x426.79135 -.......\hbox(10.04749+4.30612)x426.79135, glue set 169.84349fil +......\vbox(8.88815+3.80925)x426.79135 +.......\hbox(8.88815+3.80925)x426.79135, glue set 167.37024fil ........\glue(\leftskip) 0.0 plus 1.0fil ........\hbox(0.0+0.0)x0.0 -........\TU/FandolSong(0)/m/n/11.04124 表 +........\TU/FandolHei(0)/m/n/11.04124 表 ........\kern -0.00017 ........\kern 0.00017 ........\penalty 10000 -........\glue 2.76031 plus 1.38016 minus 0.9201 -........\TU/texgyretermes(0)/m/n/11.04124 1.1 +........\glue 3.06947 plus 1.53473 minus 1.02315 +........\TU/texgyreheros(0)/m/n/11.04124 1.1 ........\kern -0.0002 ........\kern 0.0002 ........\glue 11.04124 -........\rule(10.04749+*)x0.0 +........\rule(8.88815+*)x0.0 ........\penalty 10000 ........\glue 0.0 -........\TU/texgyretermes(0)/m/n/11.04124 Antibodies +........\TU/texgyreheros(0)/m/n/11.04124 Antibodies ........\kern -0.0002 ........\kern 0.0002 ........\penalty 10000 -........\rule(0.0+4.30612)x0.0 +........\rule(0.0+3.80925)x0.0 ........\penalty 10000 ........\glue(\parfillskip) 0.0 ........\glue(\rightskip) 0.0 plus 1.0fil diff --git a/thuthesis.dtx b/thuthesis.dtx index efd46910..500b33c2 100644 --- a/thuthesis.dtx +++ b/thuthesis.dtx @@ -1482,6 +1482,13 @@ }, name = degree@type, }, + format = { + choices = { + main, + medical, + }, + default = main, + }, % \end{macrocode} % % 论文的主要语言。 @@ -3565,27 +3572,49 @@ % \item 去掉图表号后面的冒号,图序与图名文字之间空一个汉字符宽度 % \item 图:caption 在下,段前空 6 磅,段后空 12 磅 % \item 表:caption 在上,段前空 12 磅,段后空 6 磅 +% +% 医学院:The name of the figure e.g. “Figure 3.1 xxx” should be in Arial, +% 10.5pt\dots +% E.g. “Table 3.1 xxx”, the sequence number and name of the table should be +% located above the table, in Arial, 11pt, align in center, single line-spacing % \end{itemize} % \begin{macrocode} -\DeclareCaptionFont{thu}{% +\newcommand\thu@figure@caption@font{} +\newcommand\thu@table@caption@font{} +\newcommand\thu@set@caption@font{% \ifthu@degree@bachelor - \fontsize{11bp}{15bp}\selectfont + \renewcommand\thu@figure@caption@font{\fontsize{11bp}{15bp}\selectfont}% + \let\thu@table@caption@font\thu@figure@caption@font \else - \ifthu@language@chinese - \fontsize{11bp}{14.3bp}\selectfont + \ifthu@format@medical + \renewcommand\thu@figure@caption@font{\sffamily\fontsize{10.5bp}{12.075bp}\selectfont}% + \renewcommand\thu@table@caption@font{\sffamily\fontsize{11bp}{12.65bp}\selectfont}% \else - \fontsize{11bp}{12.65bp}\selectfont + \ifthu@language@chinese + \renewcommand\thu@figure@caption@font{\fontsize{11bp}{14.3bp}\selectfont}% + \else + \renewcommand\thu@figure@caption@font{\fontsize{11bp}{12.65bp}\selectfont}% + + \fi + \let\thu@table@caption@font\thu@figure@caption@font \fi \fi } +\thu@set@caption@font +\thu@option@hook{degree}{\thu@set@caption@font} +\thu@option@hook{format}{\thu@set@caption@font} +\thu@option@hook{language}{\thu@set@caption@font} +\DeclareCaptionFont{thu@figure}{\thu@figure@caption@font} +\DeclareCaptionFont{thu@table}{\thu@table@caption@font} +\captionsetup[figure]{font = thu@figure} +\captionsetup[table]{font = thu@table} \captionsetup{ - font = thu, labelsep = quad, skip = 6bp, figureposition = bottom, tableposition = top, } -\captionsetup[sub]{font=thu} +\captionsetup[sub]{font=thu@figure} \renewcommand{\thesubfigure}{(\alph{subfigure})} \renewcommand{\thesubtable}{(\alph{subtable})} % \renewcommand{\p@subfigure}{:} @@ -4147,6 +4176,17 @@ } % \end{macrocode} % +% 用于处理医学院的特殊格式。 +% \begin{macrocode} +\newif\ifthu@discipline@medical +\thu@option@hook{degree-category}{% + \def\tmpa{医学实验班八年制}% + \ifx\thu@degree@category\tmpa + \thusetup{format = medical} + \fi +} +% \end{macrocode} +% % 院系中英文名称。 % \begin{macrocode} \thu@define@key{