diff --git a/.gitignore b/.gitignore index cb86c0fc..33f0de64 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ package-lock.json node_modules/ dist/ +thuthesis*.zip +thuthesis-ctan/ ## generated files: dtx-style.sty diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd76e7a..4ccfabe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,20 @@ ## [Unreleased] +## [v6.1.2] - 2020-06-14 +### Changed +- `\statement` 和 `\copyrightpage` 命令都会在 PDF 中生成相应位置的书签。 +- `\statement` 命令编译生成声明页默认不含页码。 +- `\statement[xxx.pdf]` 插入扫描页时在页脚生成页码，以解决打印版与电子版页码不一致的情况。 +- 使用 `l3build` 编译的版本，在提交到 CTAN 时提供 TDS 结构，以解决编译时 `tsinghua-name-bachelor.pdf` 找不到的问题。 + +### Added +- 添加 `\record` 命令用于本科生插入综合论文训练记录表，同时在 PDF 中生成对应书签。 +- 添加选项 `statement-page-number` 控制编译声明页时是否含页码。 + +### Fixed +- 修正示例代码中关于 `\statement` 的 typo。 + ## [v6.1.1] - 2020-06-12 ### Changed - 书脊中的西文不再需要调整高度。 @@ -24,7 +38,7 @@ ## [v6.1.0] - 2020-06-08 ### Changed -- 在`translation` 环境中使用 `\bibliography` 改为生成参考文献， +- 在 `translation` 环境中使用 `\bibliography` 改为生成参考文献， 对应的原文索引改为 `translation-index` 环境（#529）。 - 附录的图、表不再加入索引。 - 使用 `threeparttable` 示例表内脚注。 @@ -579,7 +593,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v6.1.1...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v6.1.2...HEAD +[v6.1.2]: https://github.com/tuna/thuthesis/compare/v6.1.1...v6.1.2 [v6.1.1]: https://github.com/tuna/thuthesis/compare/v6.1.0...v6.1.1 [v6.1.0]: https://github.com/tuna/thuthesis/compare/v6.0.2...v6.1.0 [v6.0.2]: https://github.com/tuna/thuthesis/compare/v6.0.1...v6.0.2 diff --git a/Makefile b/Makefile index 5500053e..1b75fed1 100644 --- a/Makefile +++ b/Makefile @@ -82,4 +82,7 @@ else endif dist: check all-dev + # use l3build for CTAN release (zip with .tds.zip) + l3build ctan --config build-ctan + # use gulp for GitHub release (zip with generated file) $(NPM) run build -- --version=$(version) diff --git a/build-ctan.lua b/build-ctan.lua new file mode 100644 index 00000000..6ebca817 --- /dev/null +++ b/build-ctan.lua @@ -0,0 +1,4 @@ +#!/usr/bin/env texlua + +-- skip all tests +includetests = {} diff --git a/build.lua b/build.lua index 9c4076f8..6b8ac4bc 100644 --- a/build.lua +++ b/build.lua @@ -27,18 +27,21 @@ checkconfigs = { "testfiles/config-bib", } -typesetexe = "xelatex" -unpackexe = "xetex" - -checkopts = "-file-line-error -halt-on-error -interaction=nonstopmode" -typesetopts = "-shell-escape -file-line-error -halt-on-error -interaction=nonstopmode" - +-- include .tds.zip in build output packtdszip = true +-- specify some files of their correct TDS locations tdslocations = { "bibtex/bst/thuthesis/*.bst", + "tex/latex/thuthesis/tsinghua-name-bachelor.pdf", } +typesetexe = "xelatex" +unpackexe = "xetex" + +checkopts = "-file-line-error -halt-on-error -interaction=nonstopmode" +typesetopts = "-shell-escape -file-line-error -halt-on-error -interaction=nonstopmode" + lvtext = ".tex" function docinit_hook() diff --git a/figures/scan-auth.pdf b/figures/scan-copyright.pdf similarity index 100% rename from figures/scan-auth.pdf rename to figures/scan-copyright.pdf diff --git a/figures/scan-statement.pdf b/figures/scan-statement.pdf index 8b4933af..25e1494d 100644 Binary files a/figures/scan-statement.pdf and b/figures/scan-statement.pdf differ diff --git a/gulpfile.js b/gulpfile.js index 3fb5f7a9..c2d7d851 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -121,7 +121,7 @@ function init_ctan(callback) { const build_self = gulp.series(init_self, copy, compress, cleanup); const build_ctan = gulp.series(init_ctan, copy, compress, cleanup); -const build = gulp.series(bootstrap, build_self, build_ctan); +const build = gulp.series(bootstrap, build_self); exports.default = _default; exports.build = build; diff --git a/latexmkrc b/latexmkrc index d5134325..b924b9d8 100644 --- a/latexmkrc +++ b/latexmkrc @@ -10,11 +10,6 @@ $bibtex_use = 1.5; $clean_ext = "hd loe ptc synctex.gz thm xdv"; $makeindex = "makeindex -s gind.ist %O -o %D %S"; -add_cus_dep('glo', 'gls', 0, 'glo2gls'); -sub glo2gls { - system("makeindex -s gglo.ist -o \"$_[0].gls\" \"$_[0].glo\""); -} -push @generated_exts, 'glo', 'gls'; add_cus_dep('nlo', 'nls', 0, 'nlo2nls'); sub nlo2nls { diff --git a/package.json b/package.json index c164180c..f2f885dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "thuthesis", - "version": "6.1.1", + "version": "6.1.2", "description": "Tsinghua University Thesis LaTeX Template", "main": "gulpfile.js", "scripts": { diff --git a/testfiles/01-cover/bachelor-english.tlg b/testfiles/01-cover/bachelor-english.tlg index 6882f989..3c511b68 100644 --- a/testfiles/01-cover/bachelor-english.tlg +++ b/testfiles/01-cover/bachelor-english.tlg @@ -60,39 +60,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x417.11752 ....\special{color push gray 0} -....\hbox(0.0+0.0)x417.11752, glue set - 3.98337fil -.....\hbox(0.0+0.0)x421.10089 -......\vbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x421.10089 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x417.11752 ....\special{color pop} ..\glue 51.21504 ..\glue(\lineskip) 0.0 @@ -914,42 +882,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 35.23386 -..\hbox(6.02255+0.0)x417.11752 +..\glue(\baselineskip) 41.25641 +..\hbox(0.0+0.0)x417.11752 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x417.11752, glue set - 3.98337fil -....\hbox(6.02255+0.0)x421.10089 -.....\vbox(6.02255+0.0)x421.10089 -......\rule(0.0+0.0)x421.10089 -......\glue 6.02255 -......\hbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x417.11752 ...\special{color pop} .\kern 0.0 .\kern -741.76346 diff --git a/testfiles/01-cover/bachelor-secret.tlg b/testfiles/01-cover/bachelor-secret.tlg index 57eda35b..99356f79 100644 --- a/testfiles/01-cover/bachelor-secret.tlg +++ b/testfiles/01-cover/bachelor-secret.tlg @@ -60,39 +60,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x417.11752 ....\special{color push gray 0} -....\hbox(0.0+0.0)x417.11752, glue set - 3.98337fil -.....\hbox(0.0+0.0)x421.10089 -......\vbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x421.10089 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x417.11752 ....\special{color pop} ..\glue 51.21504 ..\glue(\lineskip) 0.0 @@ -813,42 +781,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 35.23386 -..\hbox(6.02255+0.0)x417.11752 +..\glue(\baselineskip) 41.25641 +..\hbox(0.0+0.0)x417.11752 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x417.11752, glue set - 3.98337fil -....\hbox(6.02255+0.0)x421.10089 -.....\vbox(6.02255+0.0)x421.10089 -......\rule(0.0+0.0)x421.10089 -......\glue 6.02255 -......\hbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x417.11752 ...\special{color pop} .\kern 0.0 .\kern -741.76346 diff --git a/testfiles/01-cover/bachelor.tlg b/testfiles/01-cover/bachelor.tlg index 08e48785..f7f9813c 100644 --- a/testfiles/01-cover/bachelor.tlg +++ b/testfiles/01-cover/bachelor.tlg @@ -60,39 +60,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x417.11752 ....\special{color push gray 0} -....\hbox(0.0+0.0)x417.11752, glue set - 3.98337fil -.....\hbox(0.0+0.0)x421.10089 -......\vbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x421.10089 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x417.11752 ....\special{color pop} ..\glue 51.21504 ..\glue(\lineskip) 0.0 @@ -800,42 +768,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 35.23386 -..\hbox(6.02255+0.0)x417.11752 +..\glue(\baselineskip) 41.25641 +..\hbox(0.0+0.0)x417.11752 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x417.11752, glue set - 3.98337fil -....\hbox(6.02255+0.0)x421.10089 -.....\vbox(6.02255+0.0)x421.10089 -......\rule(0.0+0.0)x421.10089 -......\glue 6.02255 -......\hbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x417.11752 ...\special{color pop} .\kern 0.0 .\kern -741.76346 diff --git a/testfiles/01-cover/doctor-1-1.tlg b/testfiles/01-cover/doctor-1-1.tlg index 87d2afdc..c51750a6 100644 --- a/testfiles/01-cover/doctor-1-1.tlg +++ b/testfiles/01-cover/doctor-1-1.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -492,42 +460,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-2.tlg b/testfiles/01-cover/doctor-1-2.tlg index ed2e4411..a77d0cd0 100644 --- a/testfiles/01-cover/doctor-1-2.tlg +++ b/testfiles/01-cover/doctor-1-2.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -538,42 +506,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-3.tlg b/testfiles/01-cover/doctor-1-3.tlg index 33dc0467..f6bbcc91 100644 --- a/testfiles/01-cover/doctor-1-3.tlg +++ b/testfiles/01-cover/doctor-1-3.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -458,42 +426,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-4.tlg b/testfiles/01-cover/doctor-1-4.tlg index 812a0dab..7de616db 100644 --- a/testfiles/01-cover/doctor-1-4.tlg +++ b/testfiles/01-cover/doctor-1-4.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -525,42 +493,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-5.tlg b/testfiles/01-cover/doctor-1-5.tlg index c09d6194..e0647793 100644 --- a/testfiles/01-cover/doctor-1-5.tlg +++ b/testfiles/01-cover/doctor-1-5.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -507,42 +475,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-6.tlg b/testfiles/01-cover/doctor-1-6.tlg index 394d12c8..fab4fdc8 100644 --- a/testfiles/01-cover/doctor-1-6.tlg +++ b/testfiles/01-cover/doctor-1-6.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -516,42 +484,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-7.tlg b/testfiles/01-cover/doctor-1-7.tlg index fab5012b..7c197573 100644 --- a/testfiles/01-cover/doctor-1-7.tlg +++ b/testfiles/01-cover/doctor-1-7.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -452,42 +420,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-1-8.tlg b/testfiles/01-cover/doctor-1-8.tlg index 935fb882..ccb80f9a 100644 --- a/testfiles/01-cover/doctor-1-8.tlg +++ b/testfiles/01-cover/doctor-1-8.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -467,42 +435,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/doctor-2-1.tlg b/testfiles/01-cover/doctor-2-1.tlg index 6ac9bc75..bf89cc4e 100644 --- a/testfiles/01-cover/doctor-2-1.tlg +++ b/testfiles/01-cover/doctor-2-1.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x392.6477 ....\special{color push gray 0} -....\hbox(0.0+0.0)x392.6477, glue set - 34.14365fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x392.6477 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -462,42 +430,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x392.6477 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x392.6477 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x392.6477, glue set - 34.14365fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x392.6477 ...\special{color pop} .\kern 0.0 .\kern -653.27536 diff --git a/testfiles/01-cover/doctor-2-2.tlg b/testfiles/01-cover/doctor-2-2.tlg index abd1c22e..b9318a81 100644 --- a/testfiles/01-cover/doctor-2-2.tlg +++ b/testfiles/01-cover/doctor-2-2.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x392.6477 ....\special{color push gray 0} -....\hbox(0.0+0.0)x392.6477, glue set - 34.14365fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x392.6477 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -438,42 +406,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x392.6477 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x392.6477 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x392.6477, glue set - 34.14365fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x392.6477 ...\special{color pop} .\kern 0.0 .\kern -653.27536 diff --git a/testfiles/01-cover/master-1-1.tlg b/testfiles/01-cover/master-1-1.tlg index acfe6794..7265cb5f 100644 --- a/testfiles/01-cover/master-1-1.tlg +++ b/testfiles/01-cover/master-1-1.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -564,42 +532,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-1-2.tlg b/testfiles/01-cover/master-1-2.tlg index 9054349d..e12382dc 100644 --- a/testfiles/01-cover/master-1-2.tlg +++ b/testfiles/01-cover/master-1-2.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -536,42 +504,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-1-3.tlg b/testfiles/01-cover/master-1-3.tlg index f2dfe213..87407414 100644 --- a/testfiles/01-cover/master-1-3.tlg +++ b/testfiles/01-cover/master-1-3.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -522,42 +490,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-1-4.tlg b/testfiles/01-cover/master-1-4.tlg index 71321b11..f9e3380a 100644 --- a/testfiles/01-cover/master-1-4.tlg +++ b/testfiles/01-cover/master-1-4.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -579,42 +547,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-1-5.tlg b/testfiles/01-cover/master-1-5.tlg index 1c13d516..3f11fb03 100644 --- a/testfiles/01-cover/master-1-5.tlg +++ b/testfiles/01-cover/master-1-5.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -551,42 +519,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-1-6.tlg b/testfiles/01-cover/master-1-6.tlg index 6cb1293a..167f7701 100644 --- a/testfiles/01-cover/master-1-6.tlg +++ b/testfiles/01-cover/master-1-6.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x398.3386 ....\special{color push gray 0} -....\hbox(0.0+0.0)x398.3386, glue set - 28.45276fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x398.3386 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -537,42 +505,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x398.3386 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x398.3386 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x398.3386, glue set - 28.45276fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x398.3386 ...\special{color pop} .\kern 0.0 .\kern -624.82262 diff --git a/testfiles/01-cover/master-2-1.tlg b/testfiles/01-cover/master-2-1.tlg index 302c6309..31e26c67 100644 --- a/testfiles/01-cover/master-2-1.tlg +++ b/testfiles/01-cover/master-2-1.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x392.6477 ....\special{color push gray 0} -....\hbox(0.0+0.0)x392.6477, glue set - 34.14365fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x392.6477 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -462,42 +430,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x392.6477 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x392.6477 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x392.6477, glue set - 34.14365fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x392.6477 ...\special{color pop} .\kern 0.0 .\kern -653.27536 diff --git a/testfiles/01-cover/master-2-2.tlg b/testfiles/01-cover/master-2-2.tlg index 3010019c..9af3b1c1 100644 --- a/testfiles/01-cover/master-2-2.tlg +++ b/testfiles/01-cover/master-2-2.tlg @@ -70,39 +70,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x392.6477 ....\special{color push gray 0} -....\hbox(0.0+0.0)x392.6477, glue set - 34.14365fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil +....\hbox(0.0+0.0)x392.6477 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -454,42 +422,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x392.6477 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x392.6477 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x392.6477, glue set - 34.14365fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x392.6477 ...\special{color pop} .\kern 0.0 .\kern -653.27536 diff --git a/testfiles/01-cover/postdoc-1.tlg b/testfiles/01-cover/postdoc-1.tlg index 9996f222..2b41de88 100644 --- a/testfiles/01-cover/postdoc-1.tlg +++ b/testfiles/01-cover/postdoc-1.tlg @@ -40,38 +40,6 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x426.79135 ....\special{color push gray 0} ....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -1105,42 +1073,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x426.79135 ...\special{color pop} .\kern 0.0 .\kern -710.18088 diff --git a/testfiles/01-cover/postdoc-2.tlg b/testfiles/01-cover/postdoc-2.tlg index 2f484564..b572c54b 100644 --- a/testfiles/01-cover/postdoc-2.tlg +++ b/testfiles/01-cover/postdoc-2.tlg @@ -40,38 +40,6 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x426.79135 ....\special{color push gray 0} ....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -593,42 +561,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x426.79135 ...\special{color pop} .\kern 0.0 .\kern -710.18088 diff --git a/testfiles/02-copyright-bachelor.tlg b/testfiles/02-copyright-bachelor.tlg index 04a8d840..5914f53d 100644 --- a/testfiles/02-copyright-bachelor.tlg +++ b/testfiles/02-copyright-bachelor.tlg @@ -40,38 +40,6 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x421.10089 ....\special{color push gray 0} ....\hbox(0.0+0.0)x421.10089 -.....\hbox(0.0+0.0)x421.10089 -......\vbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x421.10089 -..........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x421.10089 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 51.21504 ..\glue(\lineskip) 0.0 @@ -487,42 +455,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 35.23386 -..\hbox(6.02255+0.0)x421.10089 +..\glue(\baselineskip) 41.25641 +..\hbox(0.0+0.0)x421.10089 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x421.10089 -....\hbox(6.02255+0.0)x421.10089 -.....\vbox(6.02255+0.0)x421.10089 -......\rule(0.0+0.0)x421.10089 -......\glue 6.02255 -......\hbox(0.0+0.0)x421.10089 -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x421.10089 -........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x421.10089 -.........\hbox(0.0+0.0)x421.10089, glue set 421.10089fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x421.10089 ...\special{color pop} .\kern 0.0 .\kern -722.98454 diff --git a/testfiles/02-copyright-doctor.tlg b/testfiles/02-copyright-doctor.tlg index be146995..6eef5e78 100644 --- a/testfiles/02-copyright-doctor.tlg +++ b/testfiles/02-copyright-doctor.tlg @@ -40,38 +40,6 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x426.79135 ....\special{color push gray 0} ....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -869,42 +837,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x426.79135 ...\special{color pop} .\kern 0.0 .\kern -710.18088 diff --git a/testfiles/02-copyright-master.tlg b/testfiles/02-copyright-master.tlg index f3d7f740..738b700c 100644 --- a/testfiles/02-copyright-master.tlg +++ b/testfiles/02-copyright-master.tlg @@ -40,38 +40,6 @@ Completed box being shipped out [1] ...\hbox(0.0+0.0)x426.79135 ....\special{color push gray 0} ....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 plus 1.0fil -...........\glue(\rightskip) 0.0 plus 1.0fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fill -........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -.........\glue 0.0 plus 1.0fil minus 1.0fil -.........\vbox(0.0+0.0)x426.79135 -..........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -...........\glue(\leftskip) 0.0 plus 1.0fil -...........\hbox(0.0+0.0)x0.0 -...........\penalty 10000 -...........\glue(\parfillskip) 0.0 -...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 -.....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -771,42 +739,10 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 22.76228 +..\hbox(0.0+0.0)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 -......\rule(0.0+0.0)x426.79135 -......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 plus 1.0fil -..........\glue(\rightskip) 0.0 plus 1.0fil -........\glue 0.0 plus 1.0fil minus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil -.........\glue(\leftskip) 0.0 plus 1.0fil -.........\hbox(0.0+0.0)x0.0 -.........\penalty 10000 -.........\glue(\parfillskip) 0.0 -.........\glue(\rightskip) 0.0 plus 1.0fil -.......\glue 0.0 plus 1.0fill -.......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil -........\glue 0.0 plus 1.0fil minus 1.0fil -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 426.79135fil -..........\glue(\leftskip) 0.0 plus 1.0fil -..........\hbox(0.0+0.0)x0.0 -..........\penalty 10000 -..........\glue(\parfillskip) 0.0 -..........\glue(\rightskip) 0.0 -....\glue 0.0 plus 1.0fil minus 1.0fil +...\hbox(0.0+0.0)x426.79135 ...\special{color pop} .\kern 0.0 .\kern -710.18088 diff --git a/testfiles/03-abstract.tlg b/testfiles/03-abstract.tlg index 8f97e4ef..74efca95 100644 --- a/testfiles/03-abstract.tlg +++ b/testfiles/03-abstract.tlg @@ -67,8 +67,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/04-abstract-en.tlg b/testfiles/04-abstract-en.tlg index da6309a2..4868b536 100644 --- a/testfiles/04-abstract-en.tlg +++ b/testfiles/04-abstract-en.tlg @@ -64,8 +64,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 diff --git a/testfiles/05-toc.tlg b/testfiles/05-toc.tlg index 92dad3e3..7540a881 100644 --- a/testfiles/05-toc.tlg +++ b/testfiles/05-toc.tlg @@ -66,8 +66,8 @@ Completed box being shipped out [3] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -1900,8 +1900,8 @@ Completed box being shipped out [4] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -3977,8 +3977,8 @@ Completed box being shipped out [5] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -5916,8 +5916,8 @@ Completed box being shipped out [6] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 diff --git a/testfiles/06-notation-nomencl/06-notation-nomencl.tlg b/testfiles/06-notation-nomencl/06-notation-nomencl.tlg index 2ea799a7..9253e21a 100644 --- a/testfiles/06-notation-nomencl/06-notation-nomencl.tlg +++ b/testfiles/06-notation-nomencl/06-notation-nomencl.tlg @@ -93,8 +93,8 @@ Completed box being shipped out [8] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -1859,8 +1859,8 @@ Completed box being shipped out [9] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/06-notation.tlg b/testfiles/06-notation.tlg index 3e0eeb64..94b4d90d 100644 --- a/testfiles/06-notation.tlg +++ b/testfiles/06-notation.tlg @@ -92,8 +92,8 @@ Completed box being shipped out [8] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -1847,8 +1847,8 @@ Completed box being shipped out [9] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/07-main-bachelor.tlg b/testfiles/07-main-bachelor.tlg index 915cd7d7..36058d59 100644 --- a/testfiles/07-main-bachelor.tlg +++ b/testfiles/07-main-bachelor.tlg @@ -7095,7 +7095,7 @@ Completed box being shipped out [10] ...\glue 0.0 plus 1.0fil minus 1.0fil .\kern 722.98454 Completed box being shipped out [11] -\vbox(722.98454+3.5232)x439.87962 +\vbox(722.98454+0.0)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x421.10089, glue set 72.27fil @@ -7116,7 +7116,7 @@ Completed box being shipped out [11] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -29.59085 -.\vbox(752.5754+3.5232)x421.10089, shifted 18.77873 +.\vbox(752.5754+0.0)x421.10089, shifted 18.77873 ..\vbox(14.22636+0.0)x421.10089, glue set 14.22636fil ...\glue 0.0 plus 1.0fil ...\hbox(0.0+0.0)x421.10089 @@ -7537,15 +7537,15 @@ Completed box being shipped out [11] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 27.01318 -..\hbox(14.24323+3.5232)x421.10089 +..\glue(\baselineskip) 35.23386 +..\hbox(6.02255+0.0)x421.10089 ...\special{color push gray 0} -...\hbox(14.24323+3.5232)x421.10089 -....\hbox(14.24323+3.5232)x421.10089 -.....\vbox(14.24323+3.5232)x421.10089 +...\hbox(6.02255+0.0)x421.10089 +....\hbox(6.02255+0.0)x421.10089 +.....\vbox(6.02255+0.0)x421.10089 ......\rule(0.0+0.0)x421.10089 ......\glue 6.02255 -......\hbox(8.22067+3.5232)x421.10089 +......\hbox(0.0+0.0)x421.10089 .......\hbox(0.0+0.0)x0.0, glue set - 421.10089fil ........\vbox(0.0+0.0)x421.10089 .........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil @@ -7555,14 +7555,10 @@ Completed box being shipped out [11] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(8.22067+3.5232)x421.10089 -........\hbox(8.22067+3.5232)x421.10089, glue set 206.03358fil +.......\vbox(0.0+0.0)x421.10089 +........\hbox(0.0+0.0)x421.10089, glue set 210.55045fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 -.........\TU/texgyretermes(0)/m/n/9.03374 11 -.........\kern -0.0002 -.........\kern 0.0002 -.........\rule(8.22067+3.5232)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -7579,7 +7575,7 @@ Completed box being shipped out [11] ....\glue 0.0 plus 1.0fil minus 1.0fil ...\special{color pop} .\kern 0.0 -.\kern -726.50774 +.\kern -722.98454 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x421.10089, glue set 72.27fil @@ -7599,7 +7595,7 @@ Completed box being shipped out [11] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 726.50774 +.\kern 722.98454 Completed box being shipped out [12] \vbox(722.98454+0.0)x434.18916 .\hbox(0.0+0.0)x0.0 diff --git a/testfiles/07-main.tlg b/testfiles/07-main.tlg index aeb27007..9a0d49ad 100644 --- a/testfiles/07-main.tlg +++ b/testfiles/07-main.tlg @@ -124,8 +124,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -2545,8 +2545,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -5048,8 +5048,8 @@ Completed box being shipped out [3] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -7389,8 +7389,8 @@ Completed box being shipped out [4] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -9551,8 +9551,8 @@ Completed box being shipped out [5] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -12795,8 +12795,8 @@ Completed box being shipped out [6] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -14265,8 +14265,8 @@ Completed box being shipped out [7] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/08-bib/08-bib-author-year.tlg b/testfiles/08-bib/08-bib-author-year.tlg index 7ff2caf9..89a68a56 100644 --- a/testfiles/08-bib/08-bib-author-year.tlg +++ b/testfiles/08-bib/08-bib-author-year.tlg @@ -80,8 +80,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -2977,8 +2977,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 diff --git a/testfiles/08-bib/08-bib-bachelor.tlg b/testfiles/08-bib/08-bib-bachelor.tlg index 1a23dcf4..f32b16fb 100644 --- a/testfiles/08-bib/08-bib-bachelor.tlg +++ b/testfiles/08-bib/08-bib-bachelor.tlg @@ -80,8 +80,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -3415,8 +3415,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 diff --git a/testfiles/08-bib/08-bib-inline.tlg b/testfiles/08-bib/08-bib-inline.tlg index 3f38d091..be1caea1 100644 --- a/testfiles/08-bib/08-bib-inline.tlg +++ b/testfiles/08-bib/08-bib-inline.tlg @@ -58,8 +58,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -257,8 +257,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -2939,8 +2939,8 @@ Completed box being shipped out [3] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/08-bib/08-bib.tlg b/testfiles/08-bib/08-bib.tlg index e51c827c..3bd83982 100644 --- a/testfiles/08-bib/08-bib.tlg +++ b/testfiles/08-bib/08-bib.tlg @@ -80,8 +80,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -2771,8 +2771,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 diff --git a/testfiles/09-acknowledgements.tlg b/testfiles/09-acknowledgements.tlg index 2242ea12..d8bfa395 100644 --- a/testfiles/09-acknowledgements.tlg +++ b/testfiles/09-acknowledgements.tlg @@ -65,8 +65,8 @@ Completed box being shipped out [115] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 diff --git a/testfiles/10-statement.tlg b/testfiles/10-statement.tlg index 98e67657..cbbf9f8f 100644 --- a/testfiles/10-statement.tlg +++ b/testfiles/10-statement.tlg @@ -13,7 +13,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be (Font) scaled to size 7.22623pt on input line .... Completed box being shipped out [116] -\vbox(710.18088+4.1104)x439.87962 +\vbox(710.18088+0.0)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -34,7 +34,7 @@ Completed box being shipped out [116] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 ..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil ...\hbox(13.70119+0.0)x426.79135 @@ -78,8 +78,8 @@ Completed box being shipped out [116] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -465,16 +465,16 @@ Completed box being shipped out [116] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 7.14894 -..\hbox(15.61334+4.1104)x426.79135 +..\glue(\baselineskip) 16.73973 +..\hbox(6.02255+0.0)x426.79135 ...\special{color push gray 0} -...\hbox(15.61334+4.1104)x426.79135 +...\hbox(6.02255+0.0)x426.79135 ....\glue 0.0 plus 1.0fil minus 1.0fil -....\hbox(15.61334+4.1104)x426.79135 -.....\vbox(15.61334+4.1104)x426.79135 +....\hbox(6.02255+0.0)x426.79135 +.....\vbox(6.02255+0.0)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(9.59079+4.1104)x426.79135 +......\hbox(0.0+0.0)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -484,14 +484,10 @@ Completed box being shipped out [116] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(9.59079+4.1104)x426.79135 -........\hbox(9.59079+4.1104)x426.79135, glue set 205.49115fil +.......\vbox(0.0+0.0)x426.79135 +........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 -.........\TU/texgyretermes(0)/m/n/10.53937 116 -.........\kern -0.0002 -.........\kern 0.0002 -.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -507,7 +503,7 @@ Completed box being shipped out [116] ..........\glue(\rightskip) 0.0 ...\special{color pop} .\kern 0.0 -.\kern -714.29128 +.\kern -710.18088 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -527,4 +523,4 @@ Completed box being shipped out [116] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 714.29128 +.\kern 710.18088 diff --git a/testfiles/11-resume.tlg b/testfiles/11-resume.tlg index 08ef7330..35b295b4 100644 --- a/testfiles/11-resume.tlg +++ b/testfiles/11-resume.tlg @@ -104,8 +104,8 @@ Completed box being shipped out [116] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -1549,7 +1549,7 @@ Completed box being shipped out [116] ...\glue 0.0 plus 1.0fil minus 1.0fil .\kern 714.29128 Completed box being shipped out [117] -\vbox(710.18088+0.0)x439.87962 +\vbox(710.18088+4.1104)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -1570,15 +1570,15 @@ Completed box being shipped out [117] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 -..\vbox(14.22636+0.0)x426.79135, glue set 14.22636fil +.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil -...\hbox(0.0+0.0)x426.79135 +...\hbox(13.70119+0.0)x426.79135 ....\special{color push gray 0} -....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 +....\hbox(13.70119+0.0)x426.79135 +.....\hbox(13.70119+0.0)x426.79135 +......\vbox(13.70119+0.0)x426.79135 +.......\hbox(9.59079+4.1104)x426.79135 ........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil .........\vbox(0.0+0.0)x426.79135 ..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -1588,10 +1588,56 @@ Completed box being shipped out [117] ...........\glue(\rightskip) 0.0 plus 1.0fil .........\glue 0.0 plus 1.0fil minus 1.0fil ........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +........\vbox(9.59079+4.1104)x426.79135 +.........\hbox(9.59079+4.1104)x426.79135, glue set 102.73232fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 +..........\TU/FandolSong(0)/m/n/10.53937 个 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 人 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 简 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 历 +..........\penalty 10000 +..........\TU/FandolSong(0)/m/n/10.53937 、 +..........\rule(0.0+0.0)x-6.87167 +..........\glue 6.87167 minus 5.26968 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 在 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 学 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 期 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 间 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 发 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 表 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 的 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 学 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 术 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 论 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 文 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 与 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 研 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 究 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 成 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 果 +..........\kern -0.00017 +..........\kern 0.00017 +..........\rule(9.59079+4.1104)x0.0 ..........\penalty 10000 ..........\glue(\parfillskip) 0.0 ..........\glue(\rightskip) 0.0 plus 1.0fil @@ -1605,8 +1651,8 @@ Completed box being shipped out [117] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -1746,15 +1792,15 @@ Completed box being shipped out [117] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 7.14894 +..\hbox(15.61334+4.1104)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 +...\hbox(15.61334+4.1104)x426.79135 +....\hbox(15.61334+4.1104)x426.79135 +.....\vbox(15.61334+4.1104)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 +......\hbox(9.59079+4.1104)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -1764,10 +1810,14 @@ Completed box being shipped out [117] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +.......\vbox(9.59079+4.1104)x426.79135 +........\hbox(9.59079+4.1104)x426.79135, glue set 205.49115fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 +.........\TU/texgyretermes(0)/m/n/10.53937 117 +.........\kern -0.0002 +.........\kern 0.0002 +.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -1784,7 +1834,7 @@ Completed box being shipped out [117] ....\glue 0.0 plus 1.0fil minus 1.0fil ...\special{color pop} .\kern 0.0 -.\kern -710.18088 +.\kern -714.29128 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -1804,4 +1854,4 @@ Completed box being shipped out [117] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 710.18088 +.\kern 714.29128 diff --git a/testfiles/package-amsthm.tlg b/testfiles/package-amsthm.tlg index 20085e4f..9f96ffcb 100644 --- a/testfiles/package-amsthm.tlg +++ b/testfiles/package-amsthm.tlg @@ -84,8 +84,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -2337,7 +2337,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil minus 1.0fil .\kern 714.29128 Completed box being shipped out [2] -\vbox(710.18088+0.0)x439.87962 +\vbox(710.18088+4.1104)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -2358,16 +2358,16 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 -..\vbox(14.22636+0.0)x426.79135, glue set 14.22636fil +.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil -...\hbox(0.0+0.0)x426.79135 +...\hbox(13.70119+0.0)x426.79135 ....\special{color push gray 0} -....\hbox(0.0+0.0)x426.79135 +....\hbox(13.70119+0.0)x426.79135 .....\glue 0.0 plus 1.0fil minus 1.0fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 +.....\hbox(13.70119+0.0)x426.79135 +......\vbox(13.70119+0.0)x426.79135 +.......\hbox(9.59079+4.1104)x426.79135 ........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil .........\vbox(0.0+0.0)x426.79135 ..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -2377,10 +2377,24 @@ Completed box being shipped out [2] ...........\glue(\rightskip) 0.0 plus 1.0fil .........\glue 0.0 plus 1.0fil minus 1.0fil ........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +........\vbox(9.59079+4.1104)x426.79135 +.........\hbox(9.59079+4.1104)x426.79135, glue set 181.77757fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 +..........\TU/FandolSong(0)/m/n/10.53937 第 +..........\glue 2.63484 plus 1.31741 minus 0.87828 +..........\TU/texgyretermes(0)/m/n/10.53937 1 +..........\glue 2.63484 plus 1.31741 minus 0.87828 +..........\TU/FandolSong(0)/m/n/10.53937 章 +..........\kern -0.00017 +..........\kern 0.00017 +..........\glue 10.53937 +..........\TU/FandolSong(0)/m/n/10.53937 定 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 理 +..........\kern -0.00017 +..........\kern 0.00017 +..........\rule(9.59079+4.1104)x0.0 ..........\penalty 10000 ..........\glue(\parfillskip) 0.0 ..........\glue(\rightskip) 0.0 plus 1.0fil @@ -2394,8 +2408,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -3043,16 +3057,16 @@ Completed box being shipped out [2] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 7.14894 +..\hbox(15.61334+4.1104)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 +...\hbox(15.61334+4.1104)x426.79135 ....\glue 0.0 plus 1.0fil minus 1.0fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 +....\hbox(15.61334+4.1104)x426.79135 +.....\vbox(15.61334+4.1104)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 +......\hbox(9.59079+4.1104)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -3062,10 +3076,14 @@ Completed box being shipped out [2] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +.......\vbox(9.59079+4.1104)x426.79135 +........\hbox(9.59079+4.1104)x426.79135, glue set 210.76083fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 +.........\TU/texgyretermes(0)/m/n/10.53937 2 +.........\kern -0.0002 +.........\kern 0.0002 +.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -3081,7 +3099,7 @@ Completed box being shipped out [2] ..........\glue(\rightskip) 0.0 ...\special{color pop} .\kern 0.0 -.\kern -710.18088 +.\kern -714.29128 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -3101,4 +3119,4 @@ Completed box being shipped out [2] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 710.18088 +.\kern 714.29128 diff --git a/testfiles/package-ntheorem.tlg b/testfiles/package-ntheorem.tlg index 18b59986..069f6ba1 100644 --- a/testfiles/package-ntheorem.tlg +++ b/testfiles/package-ntheorem.tlg @@ -84,8 +84,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.4+0.0)x426.79135 -.......\glue -0.4 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -2204,7 +2204,7 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil minus 1.0fil .\kern 714.29128 Completed box being shipped out [2] -\vbox(710.18088+0.0)x439.87962 +\vbox(710.18088+4.1104)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -2225,16 +2225,16 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 -..\vbox(14.22636+0.0)x426.79135, glue set 14.22636fil +.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil -...\hbox(0.0+0.0)x426.79135 +...\hbox(13.70119+0.0)x426.79135 ....\special{color push gray 0} -....\hbox(0.0+0.0)x426.79135 +....\hbox(13.70119+0.0)x426.79135 .....\glue 0.0 plus 1.0fil minus 1.0fil -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 +.....\hbox(13.70119+0.0)x426.79135 +......\vbox(13.70119+0.0)x426.79135 +.......\hbox(9.59079+4.1104)x426.79135 ........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil .........\vbox(0.0+0.0)x426.79135 ..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -2244,10 +2244,24 @@ Completed box being shipped out [2] ...........\glue(\rightskip) 0.0 plus 1.0fil .........\glue 0.0 plus 1.0fil minus 1.0fil ........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +........\vbox(9.59079+4.1104)x426.79135 +.........\hbox(9.59079+4.1104)x426.79135, glue set 181.77757fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 +..........\TU/FandolSong(0)/m/n/10.53937 第 +..........\glue 2.63484 plus 1.31741 minus 0.87828 +..........\TU/texgyretermes(0)/m/n/10.53937 1 +..........\glue 2.63484 plus 1.31741 minus 0.87828 +..........\TU/FandolSong(0)/m/n/10.53937 章 +..........\kern -0.00017 +..........\kern 0.00017 +..........\glue 10.53937 +..........\TU/FandolSong(0)/m/n/10.53937 定 +..........\glue 0.0 plus 0.41463 +..........\TU/FandolSong(0)/m/n/10.53937 理 +..........\kern -0.00017 +..........\kern 0.00017 +..........\rule(9.59079+4.1104)x0.0 ..........\penalty 10000 ..........\glue(\parfillskip) 0.0 ..........\glue(\rightskip) 0.0 plus 1.0fil @@ -2261,8 +2275,8 @@ Completed box being shipped out [2] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 ....\special{color pop} ..\glue 8.5359 ..\glue(\lineskip) 0.0 @@ -3167,16 +3181,16 @@ Completed box being shipped out [2] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 7.14894 +..\hbox(15.61334+4.1104)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 +...\hbox(15.61334+4.1104)x426.79135 ....\glue 0.0 plus 1.0fil minus 1.0fil -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 +....\hbox(15.61334+4.1104)x426.79135 +.....\vbox(15.61334+4.1104)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 +......\hbox(9.59079+4.1104)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -3186,10 +3200,14 @@ Completed box being shipped out [2] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +.......\vbox(9.59079+4.1104)x426.79135 +........\hbox(9.59079+4.1104)x426.79135, glue set 210.76083fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 +.........\TU/texgyretermes(0)/m/n/10.53937 2 +.........\kern -0.0002 +.........\kern 0.0002 +.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -3205,7 +3223,7 @@ Completed box being shipped out [2] ..........\glue(\rightskip) 0.0 ...\special{color pop} .\kern 0.0 -.\kern -710.18088 +.\kern -714.29128 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -3225,4 +3243,4 @@ Completed box being shipped out [2] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 710.18088 +.\kern 714.29128 diff --git a/testfiles/package-siunitx-english.tlg b/testfiles/package-siunitx-english.tlg index 888575c7..9c1df789 100644 --- a/testfiles/package-siunitx-english.tlg +++ b/testfiles/package-siunitx-english.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. Completed box being shipped out [1] -\vbox(710.18088+0.0)x439.87962 +\vbox(710.18088+4.1104)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -22,15 +22,15 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 -..\vbox(14.22636+0.0)x426.79135, glue set 14.22636fil +.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil -...\hbox(0.0+0.0)x426.79135 +...\hbox(13.70119+0.0)x426.79135 ....\special{color push gray 0} -....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 +....\hbox(13.70119+0.0)x426.79135 +.....\hbox(13.70119+0.0)x426.79135 +......\vbox(13.70119+0.0)x426.79135 +.......\hbox(9.59079+4.1104)x426.79135 ........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil .........\vbox(0.0+0.0)x426.79135 ..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -40,10 +40,11 @@ Completed box being shipped out [1] ...........\glue(\rightskip) 0.0 plus 1.0fil .........\glue 0.0 plus 1.0fil minus 1.0fil ........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +........\vbox(9.59079+4.1104)x426.79135 +.........\hbox(9.59079+4.1104)x426.79135, glue set 213.39568fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 +..........\rule(9.59079+4.1104)x0.0 ..........\penalty 10000 ..........\glue(\parfillskip) 0.0 ..........\glue(\rightskip) 0.0 plus 1.0fil @@ -57,8 +58,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -457,15 +458,15 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 7.14894 +..\hbox(15.61334+4.1104)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 +...\hbox(15.61334+4.1104)x426.79135 +....\hbox(15.61334+4.1104)x426.79135 +.....\vbox(15.61334+4.1104)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 +......\hbox(9.59079+4.1104)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -475,10 +476,14 @@ Completed box being shipped out [1] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +.......\vbox(9.59079+4.1104)x426.79135 +........\hbox(9.59079+4.1104)x426.79135, glue set 210.76083fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 +.........\TU/texgyretermes(0)/m/n/10.53937 1 +.........\kern -0.0002 +.........\kern 0.0002 +.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -495,7 +500,7 @@ Completed box being shipped out [1] ....\glue 0.0 plus 1.0fil minus 1.0fil ...\special{color pop} .\kern 0.0 -.\kern -710.18088 +.\kern -714.29128 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -515,4 +520,4 @@ Completed box being shipped out [1] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 710.18088 +.\kern 714.29128 diff --git a/testfiles/package-siunitx.tlg b/testfiles/package-siunitx.tlg index 0aa9e034..54d590bc 100644 --- a/testfiles/package-siunitx.tlg +++ b/testfiles/package-siunitx.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. Completed box being shipped out [1] -\vbox(710.18088+0.0)x439.87962 +\vbox(710.18088+4.1104)x439.87962 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -22,15 +22,15 @@ Completed box being shipped out [1] ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil .\glue -9.674 -.\vbox(719.85487+0.0)x426.79135, shifted 13.08827 -..\vbox(14.22636+0.0)x426.79135, glue set 14.22636fil +.\vbox(719.85487+4.1104)x426.79135, shifted 13.08827 +..\vbox(14.22636+0.0)x426.79135, glue set 0.52518fil ...\glue 0.0 plus 1.0fil -...\hbox(0.0+0.0)x426.79135 +...\hbox(13.70119+0.0)x426.79135 ....\special{color push gray 0} -....\hbox(0.0+0.0)x426.79135 -.....\hbox(0.0+0.0)x426.79135 -......\vbox(0.0+0.0)x426.79135 -.......\hbox(0.0+0.0)x426.79135 +....\hbox(13.70119+0.0)x426.79135 +.....\hbox(13.70119+0.0)x426.79135 +......\vbox(13.70119+0.0)x426.79135 +.......\hbox(9.59079+4.1104)x426.79135 ........\hbox(0.0+0.0)x0.0, glue set - 426.79135fil .........\vbox(0.0+0.0)x426.79135 ..........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -40,10 +40,11 @@ Completed box being shipped out [1] ...........\glue(\rightskip) 0.0 plus 1.0fil .........\glue 0.0 plus 1.0fil minus 1.0fil ........\glue 0.0 plus 1.0fill -........\vbox(0.0+0.0)x426.79135 -.........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +........\vbox(9.59079+4.1104)x426.79135 +.........\hbox(9.59079+4.1104)x426.79135, glue set 213.39568fil ..........\glue(\leftskip) 0.0 plus 1.0fil ..........\hbox(0.0+0.0)x0.0 +..........\rule(9.59079+4.1104)x0.0 ..........\penalty 10000 ..........\glue(\parfillskip) 0.0 ..........\glue(\rightskip) 0.0 plus 1.0fil @@ -57,8 +58,8 @@ Completed box being shipped out [1] ...........\penalty 10000 ...........\glue(\parfillskip) 0.0 ...........\glue(\rightskip) 0.0 -.......\rule(0.0+0.0)x426.79135 -.......\glue 0.0 +.......\rule(0.7528+0.0)x426.79135 +.......\glue -0.7528 .....\glue 0.0 plus 1.0fil minus 1.0fil ....\special{color pop} ..\glue 8.5359 @@ -467,15 +468,15 @@ Completed box being shipped out [1] ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil -..\glue(\baselineskip) 16.73973 -..\hbox(6.02255+0.0)x426.79135 +..\glue(\baselineskip) 7.14894 +..\hbox(15.61334+4.1104)x426.79135 ...\special{color push gray 0} -...\hbox(6.02255+0.0)x426.79135 -....\hbox(6.02255+0.0)x426.79135 -.....\vbox(6.02255+0.0)x426.79135 +...\hbox(15.61334+4.1104)x426.79135 +....\hbox(15.61334+4.1104)x426.79135 +.....\vbox(15.61334+4.1104)x426.79135 ......\rule(0.0+0.0)x426.79135 ......\glue 6.02255 -......\hbox(0.0+0.0)x426.79135 +......\hbox(9.59079+4.1104)x426.79135 .......\hbox(0.0+0.0)x0.0, glue set - 426.79135fil ........\vbox(0.0+0.0)x426.79135 .........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil @@ -485,10 +486,14 @@ Completed box being shipped out [1] ..........\glue(\rightskip) 0.0 plus 1.0fil ........\glue 0.0 plus 1.0fil minus 1.0fil .......\glue 0.0 plus 1.0fill -.......\vbox(0.0+0.0)x426.79135 -........\hbox(0.0+0.0)x426.79135, glue set 213.39568fil +.......\vbox(9.59079+4.1104)x426.79135 +........\hbox(9.59079+4.1104)x426.79135, glue set 210.76083fil .........\glue(\leftskip) 0.0 plus 1.0fil .........\hbox(0.0+0.0)x0.0 +.........\TU/texgyretermes(0)/m/n/10.53937 1 +.........\kern -0.0002 +.........\kern 0.0002 +.........\rule(9.59079+4.1104)x0.0 .........\penalty 10000 .........\glue(\parfillskip) 0.0 .........\glue(\rightskip) 0.0 plus 1.0fil @@ -505,7 +510,7 @@ Completed box being shipped out [1] ....\glue 0.0 plus 1.0fil minus 1.0fil ...\special{color pop} .\kern 0.0 -.\kern -710.18088 +.\kern -714.29128 .\hbox(0.0+0.0)x0.0 ..\kern -72.27 ..\vbox(0.0+0.0)x426.79135, glue set 72.27fil @@ -525,4 +530,4 @@ Completed box being shipped out [1] ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 ...\glue 0.0 plus 1.0fil minus 1.0fil -.\kern 710.18088 +.\kern 714.29128 diff --git a/thusetup.tex b/thusetup.tex index 3da51944..c1545ad8 100644 --- a/thusetup.tex +++ b/thusetup.tex @@ -85,10 +85,16 @@ % % date = {2019-07-07}, % - % 是否在中文封面后的空白页生成书脊 + % 是否在中文封面后的空白页生成书脊（默认 false） % include-spine = false, % + % 生成的声明页是否要插入页码（默认 false） + % 仅在需要进行电子签名时，才需要打开这一选项 + % 插入的扫描声明页总是会有页码，不受这一选项影响 + % + statement-page-number = false, + % % 密级和年限 % 秘密, 机密, 绝密 % diff --git a/thuthesis-example.tex b/thuthesis-example.tex index 93113b7a..24d38279 100644 --- a/thuthesis-example.tex +++ b/thuthesis-example.tex @@ -20,8 +20,8 @@ % 使用授权的说明 \copyrightpage -% 将签字扫描后授权文件 scan-auth.pdf 替换原始页面 -% \copyrightpage[scan-auth.pdf] +% 将签字扫描后授权文件 scan-copyright.pdf 替换原始页面 +% \copyrightpage[scan-copyright.pdf] \frontmatter \input{data/abstract.tex} @@ -57,8 +57,8 @@ % 声明 \statement -% 将签字扫描后的声明n'g statement.pdf 替换原始页面 -% \copyrightpage[statement.pdf] +% 将签字扫描后的声明文件 scan-statement.pdf 替换原始页面 +% \statement[scan-statement.pdf] % 附录 \appendix @@ -69,7 +69,7 @@ % 个人简历 \input{data/resume} -% 本科生的综合论文训练记录表 -% \includepdf[pages=-]{scan-record.pdf} +% 本科生的综合论文训练记录表（扫描版） +% \record{scan-record.pdf} \end{document} diff --git a/thuthesis.dtx b/thuthesis.dtx index 6d7d046b..fe1a16b6 100644 --- a/thuthesis.dtx +++ b/thuthesis.dtx @@ -17,7 +17,7 @@ % % \iffalse %<*driver> -\ProvidesFile{thuthesis.dtx}[2020/06/12 6.1.1 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2020/06/14 6.1.2 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -268,7 +268,6 @@ % \begin{shell} % $ xelatex -shell-escape thuthesis.dtx % $ makeindex -s gind.ist -o thuthesis.ind thuthesis.idx -% $ makeindex -s gglo.ist -o thuthesis.gls thuthesis.glo % $ xelatex -shell-escape thuthesis.dtx % $ xelatex -shell-escape thuthesis.dtx # 生成说明文档 thuthesis.pdf % \end{shell} @@ -395,7 +394,8 @@ % 选择输出的格式是打印版还是电子版（用于提交），可选：\option{print}（默认）、\option{electronic}。 % 一些院系要求提交的电子版不含空白页，但是这对打印并不友好， % 比如正文第一页可能会在左侧；以及一些部分需要单面打印，需要插入空白页。 -% 注意在不同选项下，生成的\textbf{声明页码很可能不同}，需要打印签字并扫描后插入的用户请特别关注这一情况。 +% 注意在不同选项下，生成的声明页码很可能不同。为了避免页码错误， +% \thuthesis{}将会在插入扫描的 PDF 文件时自动生成页码，因此\textbf{扫描声明页时请移除底部的页码}，以防重叠。 % % \begin{latex} % \thusetup{ @@ -578,8 +578,8 @@ % 生成授权说明。用法：\cs{copyrightpage}\oarg{file}。 % 可选参数为扫描得到的 PDF 文件名，例如： % \begin{latex} -% % 将签字扫描后授权文件 scan-auth.pdf 替换原始页面 -% \copyrightpage[scan-auth.pdf] +% % 将签字扫描后授权文件 scan-copyright.pdf 替换原始页面 +% \copyrightpage[scan-copyright.pdf] % \end{latex} % % \subsubsection{摘要} @@ -877,6 +877,18 @@ % \statement[scan-statement.pdf] % \end{latex} % +% 由于打印版和电子版有空白页的差别，声明的页码可能不同。所以编译声明页时默认不加页码， +% 在签字后插入扫描页时再补上页码，防止页码冲突。 +% +% \DescribeOption{statement-page-number} +% 如果需要编译时也加页码（如直接对电子版进行签名而不是插入扫描页），可以使用在 \cs{statement} 前设置 +% \begin{latex} +% \thusetup{ +% statement-page-number = true, +% } +% \end{latex} +% 注意，插入扫描页总是会加页码，不受该选项控制。 +% % \subsubsection{附录} % % 附录由 \cs{appendix} 命令开启，然后像正文一样书写。 @@ -1001,6 +1013,15 @@ % % 具体用法请参看示例文档 \file{data/resume.tex}。 % +% \subsubsection{综合论文训练记录表} +% \DescribeMacro{\record} +% 本科生需要在最后附上综合论文训练记录表，可以用如下命令： +% +% \begin{latex} +% \record{scan-record.pdf} +% \end{latex} +% +% % \subsection{书脊} % \DescribeMacro{\spine} % \DescribeOption{spine-font} @@ -1061,7 +1082,7 @@ % \begin{macrocode} %\NeedsTeXFormat{LaTeX2e}[2017/04/15] %\ProvidesClass{thuthesis} -%[2020/06/12 6.1.1 Tsinghua University Thesis Template] +%[2020/06/14 6.1.2 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1095,7 +1116,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{6.1.1} +\def\version{6.1.2} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -1570,7 +1591,7 @@ \ifodd\c@page \else \thispagestyle{empty}% - \hbox{} + \hbox{}% \newpage \if@twocolumn \hbox{}\newpage @@ -1589,11 +1610,6 @@ % \begin{macrocode} \renewcommand\frontmatter{% \cleardoublepage - \ifthu@degree@bachelor - \pagestyle{thu@plain} - \else - \pagestyle{thu@headings} - \fi \@mainmatterfalse \pagenumbering{Roman}% \let\@tabular\thu@tabular @@ -1601,10 +1617,14 @@ \renewcommand\mainmatter{% \cleardoublepage \@mainmattertrue - \pagenumbering{arabic} - \ifthu@degree@bachelor\pagestyle{thu@plain}\else\pagestyle{thu@headings}\fi} + \pagenumbering{arabic}% +} \renewcommand\backmatter{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openright + \cleardoublepage + \else + \clearpage + \fi \@mainmattertrue} % \end{macrocode} % \end{macro} @@ -2281,38 +2301,57 @@ % \subsubsection{页眉页脚} % \label{sec:headerfooter} % +% \pkg{fancyhdr} 定义页眉页脚很方便，但是有一个非常隐蔽的坑。 +% 第一次调用 \pkg{fancyhdr} 定义的样式时会修改 \cs{chaptermark}， +% 这会导致页眉信息错误（多余章号并且英文大写）。 +% 这是因为在 \cs{ps@fancy} 中对 \cs{chaptermark} 进行重定义， +% 所以我们先调用 \cs{ps@fancy}，再修改 \cs{chaptermark}。 +% \begin{macrocode} +\pagestyle{fancy} +% \end{macrocode} +% % 定义页眉和页脚。 -% \begin{macro}{\ps@thu@empty} -% \begin{macro}{\ps@thu@plain} -% \begin{macro}{\ps@thu@headings} -% 定义三种页眉页脚格式： -% \begin{itemize} -% \item \texttt{thu@empty}：页眉页脚都没有 -% \item \texttt{thu@plain}：只显示页脚的页码。\cs{chapter} 自动调用 -% \cs{thispagestyle\{thu@plain\}}。 -% \item \texttt{thu@headings}：页眉页脚同时显示 -% \end{itemize} +% 研究生要求： +% 页眉宋体五号字，宋体五号字居中书写； +% 页码五号 Times New Roman 体。 +% +% 本科生要求： +% 页眉：无； +% 页码：位于页面底端，居中书写。 +% +% 本科外文专业要求页码字号 12pt。 +% \begin{macrocode} +\fancypagestyle{plain}{% + \fancyhf{}% + \renewcommand\footrulewidth{0pt}% + \ifthu@degree@bachelor + \renewcommand\headrulewidth{0pt}% + \fancyfoot[C]{\xiaowu\thepage}% + \let\@mkboth\@gobbletwo + \else + \renewcommand\headrulewidth{0.75bp}% + \fancyhead[C]{\wuhao\leftmark}% + \fancyfoot[C]{\wuhao\thepage}% + \let\@mkboth\markboth + \fi + \def\chaptermark##1{% + \markboth{\CTEXifname{\CTEXthechapter\hskip\ccwd}{}##1}{}% + }% +} +\pagestyle{plain} +% \end{macrocode} +% +% 用于声明页，不含页脚。 % \begin{macrocode} -\fancypagestyle{thu@empty}{% - \fancyhf{} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt}} -\fancypagestyle{thu@plain}{% - \fancyhead{} - \fancyfoot[C]{\xiaowu\thepage} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt}} -\fancypagestyle{thu@headings}{% - \fancyhead{} - \fancyhead[C]{\wuhao\normalfont\leftmark} - \fancyfoot{} - \fancyfoot[C]{\wuhao\thepage} - \renewcommand{\headrulewidth}{0.4pt} - \renewcommand{\footrulewidth}{0pt}} +\fancypagestyle{nofooter}{% + \fancyfoot{}% +} +% \end{macrocode} +% +% \cs{chapter} 会调用特殊的 page style。 +% \begin{macrocode} +\ctexset{chapter/pagestyle = plain} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} % % % \subsubsection{段落} @@ -2611,35 +2650,6 @@ \fi % \end{macrocode} % -% \pkg{fancyhdr} 定义页眉页脚很方便，但是有一个非常隐蔽的坑。通过 \pkg{fancyhdr} -% 定义的样式在第一次被调用时会修改 \cs{chaptermark}，这会导致页眉信息错误（多余 -% 章号并且英文大写）。这是因为在原始的 \file{book.cls} 中定义如下（大意）： -% \begin{latex} -% \newcommand\chaptername{Chapter} -% \newcommand\@chapapp{\chaptername} -% \def\chaptermark#1{ -% \markboth{\MakeUppercase{\@chapapp\ \thechapter}}{}} -% \end{latex} -% 很显然这个 \cs{\@chapapp} 不适合中文，因此我们使用\cs{CTEXthechapter}（ -% 如，“第 x 章”），同时会将 \cs{MakeUppercase} 去掉。也就是说我们会做如下动作： -% \begin{latex} -% \renewcommand{\chaptermark}[1]{\@mkboth{\CTEXthechapter\hskip\ccwd#1}{}} -% \end{latex} -% 但，\pkg{fancyhdr} 不知何故在 \cs{ps@fancy} 中对 \cs{chaptermark} 进行重定义 -% （其实一模一样），而这个 \cs{ps@fancy} 会在 \cs{fancypagestyle} 中使用，如下： -% \begin{latex} -% \newcommand{\fancypagestyle}[2]{% -% \@namedef{ps@#1}{\let\fancy@gbl\relax#2\relax\ps@fancy}} -% \end{latex} -% 这样的话，\cs{ps@fancy} 会在 \pkg{fancyhdr} 定义的任何样式首次样被激活时调用，从 -% 而覆盖我们的 \cs{chaptermark} 定义（后续样式再激活不会重复覆盖）。所以我们采用如下 -% 方法解决： -% \begin{macrocode} -\AtBeginDocument{% - \pagestyle{thu@empty} - \renewcommand{\chaptermark}[1]{\@mkboth{\CTEXthechapter\hskip\ccwd#1}{}}} -% \end{macrocode} -% % 各级标题格式设置。 % \begin{description} % \item[chapter] 章序号与章名之间空一个汉字符 黑体三号字，居中书写，单倍行距，段 @@ -2669,7 +2679,6 @@ \ctexset{% chapter={ afterindent=true, - pagestyle={\ifthu@degree@bachelor thu@plain\else thu@headings\fi}, beforeskip={\ifthu@degree@bachelor 15bp\else 9bp\fi}, aftername=\hskip\ccwd, afterskip={\ifthu@degree@bachelor 20bp\else 24bp\fi}, @@ -3068,7 +3077,6 @@ % \begin{macrocode} \renewcommand\maketitle{% \cleardoublepage - \pagestyle{thu@empty}% \pagenumbering{Alph}% \thu@pdfbookmark{-1}{\thu@title}% \thu@titlepage @@ -3128,6 +3136,7 @@ bottom = 6cm, hmargin = 3.5cm, }% + \thispagestyle{empty}% \null\vskip 0.2cm% \begingroup \centering @@ -3156,6 +3165,7 @@ bottom = 6cm, hmargin = 3.5cm, }% + \thispagestyle{empty}% \null\vskip 0.45cm% \begingroup \centering @@ -3315,6 +3325,7 @@ bottom = 5cm, hmargin = 3.6cm, }% + \thispagestyle{empty}% \ifthu@degree@type@academic \thu@titlepage@en@graduate@academic \else @@ -3435,6 +3446,7 @@ vmargin = 2.54cm, hmargin = 3.17cm, }% + \thispagestyle{empty}% \null\vskip 0.44cm% \begingroup \centering @@ -3500,6 +3512,7 @@ % \myentry{博士后封面} % \begin{macrocode} \newcommand\thu@cover@postdoc{% + \thispagestyle{empty}% \begin{center}% \renewcommand\ULthickness{0.7pt}% \vspace*{0.35cm}% @@ -3542,6 +3555,7 @@ % \myentry{博士后题名页} % \begin{macrocode} \newcommand\thu@titlepage@postdoc{% + \thispagestyle{empty}% \begin{center}% \vspace*{1.5cm}% \parbox[t][3cm][c]{\textwidth}{% @@ -3604,6 +3618,7 @@ \newcommand\copyrightpage[1][]{% \ifthu@degree@postdoc\relax\else \cleardoublepage + \thispagestyle{empty}% \thu@pdfbookmark{0}{\thu@authorization@title}% \def\thu@@tmp{#1} \ifx\thu@@tmp\@empty @@ -3618,6 +3633,7 @@ \end{list}% \fi% \else + \thu@phantomsection \includepdf{#1}% \fi \fi @@ -3777,7 +3793,7 @@ % \label{sec:ackanddeclare} % % \begin{environment}{acknowledgements} -% 支持扫描文件替换。 +% 定义致谢环境 % \begin{macrocode} \newcommand\thu@statement@name{声\hspace{\ccwd}明} \newcommand{\thu@statement@text}{本人郑重声明：所呈交的学位论文，是本人在导师指导下 @@ -3802,8 +3818,20 @@ } % \end{macrocode} % -% 声明部分 +% \end{environment} +% \begin{environment}{statement} +% 声明部分（支持扫描文件替换） % \begin{macrocode} +\thu@define@key{ + statement-page-number = { + name = statement@page@number, + choices = { + false, + true, + }, + default = false, + }, +} \newcommand\statement[1][]{% \ifthu@degree@bachelor \cleardoublepage @@ -3811,6 +3839,9 @@ \def\thu@@tmp{#1}% \ifx\thu@@tmp\@empty \thu@chapter*{\thu@statement@name}% + \ifthu@statement@page@number@false + \thispagestyle{nofooter}% + \fi \thu@statement@text\par \ifthu@degree@graduate \vskip 2cm% @@ -3820,7 +3851,8 @@ {\hfill\thu@signature\thu@underline[2.5cm]\relax \thu@backdate\thu@underline[2.5cm]\relax}% \else - \includepdf[pagecommand={\thispagestyle{thu@empty}% + \includepdf[pagecommand={% + \thu@phantomsection \addcontentsline{toc}{chapter}{\thu@statement@name}% }]{#1}% \fi @@ -4053,7 +4085,7 @@ \g@addto@macro\appendix{% \thusetup{ toc-depth = 0, - } + }% } % \end{macrocode} % @@ -4234,6 +4266,21 @@ % \end{macrocode} % \end{macro} % +% \subsection{综合论文训练记录表} +% +% \begin{macro}{\record} +% （本科生专用）插入综合论文训练记录表的 PDF 版本，并加入书签。 +% +% \begin{macrocode} +\newcommand{\record}[1]{% + \clearpage + \thu@pdfbookmark{0}{综合论文训练记录表}% + \includepdf[pages=-]{#1}% +} +% \end{macrocode} +% +% \end{macro} +% % \subsection{其他宏包的设置} % % 这些宏包并非格式要求，但是为了方便同学们使用，在这里进行简单设置。