diff --git a/testfiles/09-main-bachelor-en.tlg b/testfiles/09-main-bachelor-en.tlg
index a7071cc0..e129eeea 100644
--- a/testfiles/09-main-bachelor-en.tlg
+++ b/testfiles/09-main-bachelor-en.tlg
@@ -10294,7 +10294,7 @@ Completed box being shipped out [7]
 ....\special{color pop}
 ..\glue 54.06006
 ..\glue(\lineskip) 0.0
-..\vbox(645.87758+0.0)x421.10089, glue set - 0.52684
+..\vbox(645.87758+0.0)x421.10089, glue set >20000.0fil
 ...\glue(\topskip) 2.64104
 ...\hbox(9.35896+2.32468)x421.10089, glue set 41.75572fil
 ....\TU/FandolSong(0)/m/n/12.045 们
@@ -11817,12 +11817,6 @@ Completed box being shipped out [7]
 .....\glue 0.0
 ....\special{color pop}
 ...\penalty 0
-...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
-...\penalty 0
-...\glue 12.0 plus 2.0 minus 2.0
-...\penalty 0
 ...\glue 12.0 plus 2.0 minus 2.0
 ...\glue 0.0 plus 1.0
 ...\vbox(73.3258+0.0)x421.10089
@@ -11922,10 +11916,7 @@ Completed box being shipped out [7]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\penalty 0
-...\glue 12.0 plus 2.0 minus 2.0
 ...\penalty 10000
 ...\penalty 0
 ...\penalty 10000
diff --git a/testfiles/09-main-bachelor.tlg b/testfiles/09-main-bachelor.tlg
index 1c14c2ad..64d4d550 100644
--- a/testfiles/09-main-bachelor.tlg
+++ b/testfiles/09-main-bachelor.tlg
@@ -4808,7 +4808,7 @@ Completed box being shipped out [3]
 ....\special{color pop}
 ..\glue 54.06006
 ..\glue(\lineskip) 0.0
-..\vbox(645.87758+0.0)x421.10089, glue set 159.91304fil
+..\vbox(645.87758+0.0)x421.10089, glue set 163.65376fil
 ...\write-{}
 ...\write1{\pp@pagectr{footnote}{2}{\theabspage }{\thepage }}
 ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline \ETC.}
@@ -5273,9 +5273,9 @@ Completed box being shipped out [3]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 8.25887
 ...\hbox(9.40715+2.2283)x421.10089, glue set - 0.21962
 ....\hbox(0.0+0.0)x24.09
 ....\TU/FandolSong(0)/m/n/12.045 气
@@ -5914,7 +5914,7 @@ Completed box being shipped out [4]
 ....\special{color pop}
 ..\glue 54.06006
 ..\glue(\lineskip) 0.0
-..\vbox(645.87758+0.0)x421.10089, glue set 308.93164fill
+..\vbox(645.87758+0.0)x421.10089, glue set 303.98314fill
 ...\glue(\topskip) 2.6049
 ...\hbox(9.3951+2.32468)x421.10089, glue set - 0.00252
 ....\hbox(0.0+0.0)x24.09
@@ -6207,14 +6207,11 @@ Completed box being shipped out [4]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\penalty -300
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\glue 25.09375
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 4.9485
 ...\hbox(10.89069+2.48727)x421.10089, glue set 275.09552fil
 ....\hbox(9.96321+0.0)x33.58545
 .....\TU/texgyreheros(0)/m/n/14.05249 2.2
diff --git a/testfiles/09-main-en.tlg b/testfiles/09-main-en.tlg
index 4125a91c..a6922027 100644
--- a/testfiles/09-main-en.tlg
+++ b/testfiles/09-main-en.tlg
@@ -2680,14 +2680,11 @@ Completed box being shipped out [1]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\penalty -300
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\glue 12.045
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 7.72789
 ...\hbox(9.72131+0.11742)x426.79135, glue set 367.31522fil
 ....\hbox(9.25156+0.0)x32.64793
 .....\TU/texgyreheros(0)/b/n/13.04874 1.1.1
@@ -3056,7 +3053,7 @@ Completed box being shipped out [2]
 ....\special{color pop}
 ..\glue 8.5359
 ..\glue(\lineskip) 0.0
-..\vbox(674.33032+0.0)x426.79135, glue set 373.07082fil
+..\vbox(674.33032+0.0)x426.79135, glue set 385.23811fil
 ...\glue(\topskip) 2.27869
 ...\hbox(9.72131+0.11742)x426.79135, glue set 367.31522fil
 ....\hbox(9.25156+0.0)x32.64793
@@ -3532,7 +3529,7 @@ Completed box being shipped out [2]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
+...\glue -0.16861
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0 plus -1.0fil
 ...\glue 0.0 plus 1.0fil
@@ -6449,14 +6446,11 @@ Completed box being shipped out [4]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\penalty -300
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\glue 12.045
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 7.72789
 ...\hbox(9.72131+0.11742)x426.79135, glue set 364.88815fil
 ....\hbox(9.51253+0.0)x35.075
 .....\TU/texgyreheros(0)/b/n/13.04874 A.1.1
@@ -6834,7 +6828,7 @@ Completed box being shipped out [5]
 ....\special{color pop}
 ..\glue 8.5359
 ..\glue(\lineskip) 0.0
-..\vbox(674.33032+0.0)x426.79135, glue set 378.18726fil
+..\vbox(674.33032+0.0)x426.79135, glue set 368.75098fil
 ...\glue(\topskip) 2.27869
 ...\hbox(9.72131+0.11742)x426.79135, glue set 364.88815fil
 ....\hbox(9.51253+0.0)x35.075
@@ -7151,14 +7145,11 @@ Completed box being shipped out [5]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\penalty -300
-...\glue 12.0 plus 2.0 minus 2.0
-...\glue -12.0 plus -2.0 minus -2.0
 ...\glue 24.09
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 9.43729
 ...\hbox(10.4691+0.12645)x426.79135, glue set 371.84612fil
 ....\hbox(10.24426+0.12645)x26.05331
 .....\TU/texgyreheros(0)/b/n/14.05249 A.3
diff --git a/testfiles/09-main.tlg b/testfiles/09-main.tlg
index e0c98cad..cba411a0 100644
--- a/testfiles/09-main.tlg
+++ b/testfiles/09-main.tlg
@@ -14516,7 +14516,7 @@ Completed box being shipped out [8]
 ....\special{color pop}
 ..\glue 8.5359
 ..\glue(\lineskip) 0.0
-..\vbox(674.33032+0.0)x426.79135, glue set 448.01164fil
+..\vbox(674.33032+0.0)x426.79135, glue set 451.69215fil
 ...\vbox(63.18246+0.0)x426.79135
 ....\special{color push gray 0}
 ....\vbox(63.18246+0.0)x426.79135
@@ -15030,9 +15030,9 @@ Completed box being shipped out [8]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 8.31909
 ...\hbox(9.43123+2.61375)x426.79135, glue set - 0.32646
 ....\hbox(0.0+0.0)x24.09
 ....\TU/FandolSong(0)/m/n/12.045 图
@@ -15337,7 +15337,7 @@ Completed box being shipped out [9]
 ....\special{color pop}
 ..\glue 8.5359
 ..\glue(\lineskip) 0.0
-..\vbox(674.33032+0.0)x426.79135, glue set 230.52174fil
+..\vbox(674.33032+0.0)x426.79135, glue set 234.20227fil
 ...\vbox(171.93903+0.0)x426.79135
 ....\special{color push gray 0}
 ....\vbox(171.93903+0.0)x426.79135
@@ -16337,9 +16337,9 @@ Completed box being shipped out [9]
 ....\special{color pop}
 ...\penalty 0
 ...\penalty 10000
-...\glue 12.0 plus 2.0 minus 2.0
 ...\glue(\parskip) 0.0 plus 1.0
 ...\glue(\parskip) 0.0
+...\glue(\baselineskip) 8.31909
 ...\hbox(9.43123+2.61375)x426.79135, glue set - 0.32646
 ....\hbox(0.0+0.0)x24.09
 ....\TU/FandolSong(0)/m/n/12.045 表
diff --git a/testfiles/package-hyperref.tlg b/testfiles/package-hyperref.tlg
index 5032e7ef..28b6f30a 100644
--- a/testfiles/package-hyperref.tlg
+++ b/testfiles/package-hyperref.tlg
@@ -2373,7 +2373,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 19.29466fill
+...\vbox(674.33032+0.0)x426.79135, glue set 11.56677fill
 ....\special{pdf:dest (section.0.1) [@thispage /XYZ @xpos @ypos null]}
 ....\glue(\topskip) 1.17958
 ....\hbox(10.82042+2.43106)x426.79135, glue set 347.14185fil
@@ -3073,11 +3073,7 @@ Completed box being shipped out [1]
 .....\special{color pop}
 ....\penalty 0
 ....\penalty 10000
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\penalty -300
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\glue 12.045
 ....\special{pdf:dest (subsection.0.2.1) [@thispage /XYZ @xpos @ypos null]}
 ....\penalty 10000
@@ -3085,6 +3081,7 @@ Completed box being shipped out [1]
 ....\glue 12.045
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
+....\glue(\baselineskip) 7.72789
 ....\hbox(9.72131+0.11742)x426.79135, glue set 367.31522fil
 .....\hbox(9.44728+0.11742)x32.64793
 ......\TU/texgyreheros(0)/b/n/13.04874 0.2.1
@@ -3657,7 +3654,7 @@ Completed box being shipped out [2]
 .....\special{color pop}
 ...\glue 8.5359
 ...\glue(\lineskip) 0.0
-...\vbox(674.33032+0.0)x426.79135, glue set 337.21085fil
+...\vbox(674.33032+0.0)x426.79135, glue set 327.02686fil
 ....\special{pdf:dest (subsection.0.2.2) [@thispage /XYZ @xpos @ypos null]}
 ....\glue(\topskip) 2.27869
 ....\hbox(9.72131+0.11742)x426.79135, glue set 367.31522fil
@@ -4146,11 +4143,7 @@ Completed box being shipped out [2]
 .....\special{color pop}
 ....\penalty 0
 ....\penalty 10000
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\penalty -300
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\glue 12.045
 ....\special{pdf:dest (subsection.0.2.3) [@thispage /XYZ @xpos @ypos null]}
 ....\penalty 10000
@@ -4158,6 +4151,7 @@ Completed box being shipped out [2]
 ....\glue 12.045
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
+....\glue(\baselineskip) 10.18507
 ....\hbox(9.72131+0.11742)x426.79135, glue set 367.31522fil
 .....\hbox(9.44728+0.11742)x32.64793
 ......\TU/texgyreheros(0)/b/n/13.04874 0.2.3
@@ -4574,7 +4568,7 @@ Completed box being shipped out [4]
 .....\special{color pop}
 ...\glue 8.5359
 ...\glue(\lineskip) 0.0
-...\vbox(674.33032+0.0)x426.79135, glue set 7.58475fil
+...\vbox(674.33032+0.0)x426.79135, glue set - 0.07117
 ....\write-{}
 ....\write1{\pp@pagectr{footnote}{2}{\theabspage }{\thepage }}
 ....\special{pdf:dest (appendix.A) [@thispage /XYZ @xpos @ypos null]}
@@ -4738,11 +4732,7 @@ Completed box being shipped out [4]
 .....\special{color pop}
 ....\penalty 0
 ....\penalty 10000
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\penalty -300
-....\glue 12.0 plus 2.0 minus 2.0
-....\glue -12.0 plus -2.0 minus -2.0
 ....\glue 12.045
 ....\special{pdf:dest (subsection.A.1.1) [@thispage /XYZ @xpos @ypos null]}
 ....\penalty 10000
@@ -4750,6 +4740,7 @@ Completed box being shipped out [4]
 ....\glue 12.045
 ....\glue(\parskip) 0.0 plus 1.0
 ....\glue(\parskip) 0.0
+....\glue(\baselineskip) 7.72789
 ....\hbox(9.72131+0.11742)x426.79135, glue set 364.88815fil
 .....\hbox(9.51253+0.0)x35.075
 ......\TU/texgyreheros(0)/b/n/13.04874 A.1.1