Skip to content

Commit 2416fc7

Browse files
zepingleezepinglee
committed
xits new file names by default (ustctug#236)
1 parent ba41950 commit 2416fc7

10 files changed

+47
-45
lines changed

‎test/testfiles-bib/bib-authoryear.tlg

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Underfull \hbox (badness 2050) in paragraph at lines 12--14
5454
.\kern -0.00021
5555
.\kern 0.0
5656
.\glue(\rightskip) 0.0
57-
) (bib-authoryear.bbl
57+
(bib-authoryear.bbl
5858
Completed box being shipped out [1]
5959
\vbox(722.98453+3.6135)x435.04271
6060
.\glue -29.59084
@@ -717,7 +717,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
717717
(Font) scaled to size 7.37663pt on input line ....
718718
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
719719
(Font) scaled to size 5.26906pt on input line ....
720-
)
720+
))
721721
Completed box being shipped out [2]
722722
\vbox(722.98453+3.6135)x435.04271
723723
.\glue -29.59084

‎test/testfiles-bib/bib-bachelor.tlg

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1515
(Font) scaled to size 8.43044pt on input line ....
1616
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1717
(Font) scaled to size 6.02177pt on input line ....
18-
) (bib-bachelor.bbl
18+
(bib-bachelor.bbl
1919
Completed box being shipped out [1]
2020
\vbox(722.98453+3.6135)x435.04271
2121
.\glue -29.59084
@@ -592,7 +592,7 @@ Completed box being shipped out [1]
592592
..........\glue(\rightskip) 0.0
593593
....\glue 0.0 plus 1.0fil minus 1.0fil
594594
...\special{color pop}
595-
)
595+
))
596596
Completed box being shipped out [2]
597597
\vbox(722.98453+3.6135)x435.04271
598598
.\glue -29.59084

‎test/testfiles-bib/bib-numbers.tlg

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1515
(Font) scaled to size 8.43044pt on input line ....
1616
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1717
(Font) scaled to size 6.02177pt on input line ....
18-
) (bib-numbers.bbl
18+
(bib-numbers.bbl
1919
Completed box being shipped out [1]
2020
\vbox(722.98453+3.6135)x435.04271
2121
.\glue -29.59084
@@ -508,7 +508,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
508508
(Font) scaled to size 7.37663pt on input line ....
509509
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
510510
(Font) scaled to size 5.26906pt on input line ....
511-
)
511+
))
512512
Completed box being shipped out [2]
513513
\vbox(722.98453+3.6135)x435.04271
514514
.\glue -29.59084

‎test/testfiles-bib/bib-super.tlg

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1515
(Font) scaled to size 8.43044pt on input line ....
1616
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
1717
(Font) scaled to size 6.02177pt on input line ....
18-
) (bib-super.bbl
18+
(bib-super.bbl
1919
Completed box being shipped out [1]
2020
\vbox(722.98453+3.6135)x435.04271
2121
.\glue -29.59084
@@ -587,7 +587,7 @@ LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
587587
(Font) scaled to size 7.37663pt on input line ....
588588
LaTeX Font Info: Font shape `TU/XITSMath-Regular(3)/m/n' will be
589589
(Font) scaled to size 5.26906pt on input line ....
590-
)
590+
))
591591
Completed box being shipped out [2]
592592
\vbox(722.98453+3.6135)x435.04271
593593
.\glue -29.59084

‎test/testfiles-nomencl/package-nomencl.tlg

+5-5
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Completed box being shipped out [1]
113113
.....\hbox(5.1552+0.13249)x28.45274, glue set 21.3824fil
114114
......\special{color push Black}
115115
......\mathon
116-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#3176
116+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#3180
117117
......\kern0.60225
118118
......\mathoff
119119
......\glue 0.0 plus 1.0fil
@@ -166,7 +166,7 @@ Completed box being shipped out [1]
166166
.....\hbox(8.03392+0.0)x28.45274, glue set 19.81657fil
167167
......\special{color push Black}
168168
......\mathon
169-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2472
169+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2476
170170
......\mathoff
171171
......\glue 0.0 plus 1.0fil
172172
......\special{color pop}
@@ -210,7 +210,7 @@ Completed box being shipped out [1]
210210
.....\hbox(5.31178+0.12045)x28.45274, glue set 22.40622fil
211211
......\special{color push Black}
212212
......\mathon
213-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2498
213+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2502
214214
......\mathoff
215215
......\glue 0.0 plus 1.0fil
216216
......\special{color pop}
@@ -258,7 +258,7 @@ Completed box being shipped out [1]
258258
.....\hbox(5.31178+0.09636)x28.45274, glue set 19.9009fil
259259
......\special{color push Black}
260260
......\mathon
261-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2509
261+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2513
262262
......\mathoff
263263
......\glue 0.0 plus 1.0fil
264264
......\special{color pop}
@@ -298,7 +298,7 @@ Completed box being shipped out [1]
298298
.....\hbox(7.8653+0.0)x28.45274, glue set 17.11853fil
299299
......\special{color push Black}
300300
......\mathon
301-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2485
301+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#2489
302302
......\kern1.08403
303303
......\mathoff
304304
......\glue 0.0 plus 1.0fil

‎test/testfiles/package-siunitx.tlg

+5-5
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,20 @@ Completed box being shipped out [1]
175175
......\TU/texgyretermes(1)/m/n/12.04486 glyph#60
176176
......\hbox(0.0+0.0)x0.0
177177
......\glue(\medmuskip) 2.67688 plus 1.33844 minus 2.67688
178-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1330
178+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1334
179179
......\glue(\medmuskip) 2.67688 plus 1.33844 minus 2.67688
180180
......\hbox(0.0+0.0)x0.0
181181
......\TU/texgyretermes(1)/m/n/12.04486 glyph#76
182182
......\hbox(0.0+0.0)x0.0
183183
......\glue(\medmuskip) 2.67688 plus 1.33844 minus 2.67688
184-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1330
184+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1334
185185
......\glue(\medmuskip) 2.67688 plus 1.33844 minus 2.67688
186186
......\hbox(0.0+0.0)x0.0
187187
......\TU/texgyretermes(1)/m/n/12.04486 glyph#99
188188
......\hbox(5.6996+0.0)x10.49117, shifted -4.81845
189189
.......\mathon
190190
.......\hbox(5.6996+0.0)x9.99117
191-
........\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1151
191+
........\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1155
192192
........\TU/texgyretermes(1)/m/n/8.43135 glyph#83
193193
.......\mathoff
194194
.....\mathoff
@@ -399,7 +399,7 @@ Completed box being shipped out [1]
399399
.....\hbox(8.14233+0.16862)x10.9849
400400
......\hbox(0.0+0.0)x0.0
401401
......\hbox(3.26294+0.0)x3.45097, shifted -4.81845
402-
.......\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1157
402+
.......\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1161
403403
......\kern -0.5
404404
......\TU/texgyretermes(1)/m/n/12.04486 glyph#43
405405
.....\mathoff
@@ -426,7 +426,7 @@ Completed box being shipped out [1]
426426
.....\hbox(8.14233+0.16862)x10.9849
427427
......\hbox(0.0+0.0)x0.0
428428
......\hbox(3.26294+0.0)x3.45097, shifted -4.81845
429-
.......\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1157
429+
.......\TU/XITSMath-Regular(1)/m/n/8.43135 glyph#1161
430430
......\kern -0.5
431431
......\TU/texgyretermes(1)/m/n/12.04486 glyph#43
432432
.....\mathoff

‎test/testfiles/statement-secret.tlg

+3-3
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ Completed box being shipped out [1]
867867
...\hbox(9.6359+4.14299)x417.11752, glue set 251.25017fil
868868
....\hbox(0.0+0.0)x24.08972
869869
....\mathon
870-
....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1596
870+
....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1600
871871
....\mathoff
872872
....\glue 3.01122 plus 1.5056 minus 1.00374
873873
....\TU/FandolSong-Regular(0)/m/n/12.04486 公
@@ -878,14 +878,14 @@ Completed box being shipped out [1]
878878
....\glue 12.04486
879879
....\hbox(7.9737+1.90309)x0.0, glue set - 10.96083fil
880880
.....\mathon
881-
.....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1596
881+
.....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1600
882882
.....\mathoff
883883
.....\glue 0.0 plus 1.0fil minus 1.0fil
884884
....\hbox(7.4317+1.22855)x10.29843
885885
.....\hbox(8.51572+0.14453)x10.29843, shifted 1.08401
886886
......\glue 1.20456
887887
......\mathon
888-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1748
888+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1752
889889
......\mathoff
890890
....\glue 3.01122 plus 1.5056 minus 1.00374
891891
....\TU/FandolSong-Regular(0)/m/n/12.04486 保

‎test/testfiles/statement.tlg

+3-3
Original file line numberDiff line numberDiff line change
@@ -868,14 +868,14 @@ Completed box being shipped out [1]
868868
....\hbox(0.0+0.0)x24.08972
869869
....\hbox(7.9737+1.90309)x0.0, glue set - 10.96083fil
870870
.....\mathon
871-
.....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1596
871+
.....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1600
872872
.....\mathoff
873873
.....\glue 0.0 plus 1.0fil minus 1.0fil
874874
....\hbox(7.4317+1.22855)x10.29843
875875
.....\hbox(8.51572+0.14453)x10.29843, shifted 1.08401
876876
......\glue 1.20456
877877
......\mathon
878-
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1748
878+
......\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1752
879879
......\mathoff
880880
....\glue 3.01122 plus 1.5056 minus 1.00374
881881
....\TU/FandolSong-Regular(0)/m/n/12.04486 公
@@ -885,7 +885,7 @@ Completed box being shipped out [1]
885885
....\kern 0.00017
886886
....\glue 12.04486
887887
....\mathon
888-
....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1596
888+
....\TU/XITSMath-Regular(1)/m/n/12.04486 glyph#1600
889889
....\mathoff
890890
....\glue 3.01122 plus 1.5056 minus 1.00374
891891
....\TU/FandolSong-Regular(0)/m/n/12.04486 保

‎ustcthesis.cls

+6-5
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,12 @@
172172
nabla = upright,
173173
partial = upright,
174174
}
175-
\newif\ifustc@xitsnew
176-
\IfFontExistsTF{XITSMath-Regular.otf}{
177-
\ustc@xitsnewtrue
175+
\newif\ifustc@xits@new
176+
\ustc@xits@newtrue
177+
\IfFontExistsTF{xits-math.otf}{
178+
\ustc@xits@newfalse
178179
}{}
179-
\ifustc@xitsnew
180+
\ifustc@xits@new
180181
\setmathfont[
181182
Extension = .otf,
182183
BoldFont = XITSMath-Bold,
@@ -197,7 +198,7 @@
197198
\ustc@strifeq{\ustc@fontset}{windows}{
198199
\newfontfamily\ustc@circlefont{SimSun}
199200
}{
200-
\ifustc@xitsnew
201+
\ifustc@xits@new
201202
\newfontfamily\ustc@circlefont{XITS-Regular.otf}
202203
\else
203204
\newfontfamily\ustc@circlefont{xits-regular.otf}

‎ustcthesis.dtx

+17-16
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ version 2005/12/01 or later.
7676
math-style=ISO,
7777
bold-style=ISO,
7878
}
79-
\IfFontExistsTF{XITSMath-Regular.otf}{
79+
\IfFontExistsTF{xits-math.otf}{
8080
\setmathfont[
8181
Extension = .otf,
82-
BoldFont = XITSMath-Bold,
82+
BoldFont = *bold,
8383
StylisticSet = 8,
84-
]{XITSMath-Regular}
85-
\setmathfont[range={cal,bfcal},StylisticSet=1]{XITSMath-Regular.otf}
84+
]{xits-math}
85+
\setmathfont[range={cal,bfcal},StylisticSet=1]{xits-math.otf}
8686
}{
8787
\setmathfont[
8888
Extension = .otf,
89-
BoldFont = *bold,
89+
BoldFont = XITSMath-Bold,
9090
StylisticSet = 8,
91-
]{xits-math}
92-
\setmathfont[range={cal,bfcal},StylisticSet=1]{xits-math.otf}
91+
]{XITSMath-Regular}
92+
\setmathfont[range={cal,bfcal},StylisticSet=1]{XITSMath-Regular.otf}
9393
}
9494

9595
% 定义一些命令用于写文档
@@ -883,15 +883,16 @@ version 2005/12/01 or later.
883883
% \end{macrocode}
884884
%
885885
% 使用 XITS Math 作为数学字体。
886-
%
887-
% 注意，\cs{IfFontExistsTF} 是 \pkg{fontspec} 2017/01/20 v2.5c 才提供的；
888-
% 而 XITS 字体于 2018-10-03 更改了字体的文件名。
889-
% \begin{macrocode}
890-
\newif\ifustc@xitsnew
891-
\IfFontExistsTF{XITSMath-Regular.otf}{
892-
\ustc@xitsnewtrue
886+
% 注意 XITS 字体于 2018-10-03 更改了字体的文件名，所以需要判断。
887+
% 原文件名为 \file{xits-regular.otf}、\file{xits-math.otf} 等，
888+
% 后改为 \file{XITS-Regular.otf}、\file{XITSMath-Regular.otf} 等。
889+
% \begin{macrocode}
890+
\newif\ifustc@xits@new
891+
\ustc@xits@newtrue
892+
\IfFontExistsTF{xits-math.otf}{
893+
\ustc@xits@newfalse
893894
}{}
894-
\ifustc@xitsnew
895+
\ifustc@xits@new
895896
\setmathfont[
896897
Extension = .otf,
897898
BoldFont = XITSMath-Bold,
@@ -919,7 +920,7 @@ version 2005/12/01 or later.
919920
\ustc@strifeq{\ustc@fontset}{windows}{
920921
\newfontfamily\ustc@circlefont{SimSun}
921922
}{
922-
\ifustc@xitsnew
923+
\ifustc@xits@new
923924
\newfontfamily\ustc@circlefont{XITS-Regular.otf}
924925
\else
925926
\newfontfamily\ustc@circlefont{xits-regular.otf}

0 commit comments

Comments
 (0)