Skip to content

Commit df52280

Browse files
authored
chore: refactor deprecated syntax for Typst 0.13 compatibility
1 parent 6d9beae commit df52280

File tree

1 file changed

+73
-70
lines changed

1 file changed

+73
-70
lines changed

template.typ

Lines changed: 73 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#import "@preview/tablex:0.0.8": tablex, colspanx, rowspanx, hlinex, vlinex, cellx
1+
#import "@preview/tablex:0.0.9": tablex, colspanx, rowspanx, hlinex, vlinex, cellx
22
#import "@preview/showybox:2.0.1": showybox
33

44
#let state_course = state("course", none)
@@ -20,7 +20,7 @@
2020
h
2121
}
2222
},
23-
columns: (1fr),
23+
columns: 1fr,
2424
content,
2525
)
2626
}
@@ -127,9 +127,7 @@
127127
show raw: set text(font: font_mono)
128128
show math.equation: set text(weight: 400)
129129

130-
show par: set block(above: 1.2em, below: 1.2em)
131-
132-
set par(leading: 0.75em)
130+
set par(spacing: 1.2em, leading: 0.75em)
133131

134132
// Update global state
135133
state_course.update(course)
@@ -190,25 +188,24 @@
190188
box(width: 75%)[
191189
#set text(size: 1.2em)
192190
#tablex(
193-
columns: (6.5em + 5pt, 1fr),
194-
align: center + horizon,
195-
stroke: 0pt,
196-
// stroke: 0.5pt + red, // this line is just for testing
197-
inset: 1pt,
198-
map-cells: cell => {
199-
if (cell.x == 0) {
200-
_underlined_cell([#cell.content#""], color: white)
201-
} else {
202-
_underlined_cell(cell.content, color: black)
203-
}
204-
},
205-
..rows,
206-
)
191+
columns: (6.5em + 5pt, 1fr),
192+
align: center + horizon,
193+
stroke: 0pt,
194+
// stroke: 0.5pt + red, // this line is just for testing
195+
inset: 1pt,
196+
map-cells: cell => {
197+
if (cell.x == 0) {
198+
_underlined_cell([#cell.content#""], color: white)
199+
} else {
200+
_underlined_cell(cell.content, color: black)
201+
}
202+
},
203+
..rows,
204+
)
207205
],
208206
)
209207
v(2fr)
210208
pagebreak()
211-
212209
} else if (theme == "project") {
213210
v(1fr)
214211
box(
@@ -245,10 +242,8 @@
245242
)
246243
v(4fr)
247244
pagebreak()
248-
249245
} else if (theme == "nocover") {
250246
// no cover page
251-
252247
} else {
253248
set text(fill: red, size: 3em, weight: 900)
254249
align(center)[Theme not found!]
@@ -264,16 +259,18 @@
264259
set table(align: center + horizon, stroke: 0.5pt)
265260

266261
if (theme == "lab") {
267-
set heading(numbering: (..args) => {
268-
let nums = args.pos()
269-
if nums.len() == 1 {
270-
return none
271-
} else if nums.len() == 2 {
272-
return numbering("一、", ..nums.slice(1))
273-
} else {
274-
return numbering("1.1)", ..nums.slice(1))
275-
}
276-
})
262+
set heading(
263+
numbering: (..args) => {
264+
let nums = args.pos()
265+
if nums.len() == 1 {
266+
return none
267+
} else if nums.len() == 2 {
268+
return numbering("一、", ..nums.slice(1))
269+
} else {
270+
return numbering("1.1)", ..nums.slice(1))
271+
}
272+
},
273+
)
277274

278275
show heading.where(level: 1): it => block(
279276
width: 100%,
@@ -287,14 +284,16 @@
287284

288285
body
289286
} else {
290-
set heading(numbering: (..args) => {
291-
let nums = args.pos()
292-
if nums.len() == 1 {
293-
return none
294-
} else {
295-
return numbering("1.1)", ..nums)
296-
}
297-
})
287+
set heading(
288+
numbering: (..args) => {
289+
let nums = args.pos()
290+
if nums.len() == 1 {
291+
return none
292+
} else {
293+
return numbering("1.1)", ..nums)
294+
}
295+
},
296+
)
298297

299298
body
300299
}
@@ -374,7 +373,7 @@
374373
colspanx(
375374
2,
376375
_underlined_cell(if course == none {
377-
state_course.display()
376+
context state_course.get()
378377
} else {
379378
course
380379
}),
@@ -393,7 +392,7 @@
393392
colspanx(
394393
2,
395394
_underlined_cell(if author == none {
396-
state_author.display()
395+
context state_author.get()
397396
} else {
398397
author
399398
}),
@@ -403,7 +402,7 @@
403402
colspanx(
404403
2,
405404
_underlined_cell(if school_id == none {
406-
state_school_id.display()
405+
context state_school_id.get()
407406
} else {
408407
school_id
409408
}),
@@ -416,7 +415,7 @@
416415
colspanx(
417416
2,
418417
_underlined_cell(if date == none {
419-
state_date.display()
418+
context state_date.get()
420419
} else {
421420
date
422421
}),
@@ -435,14 +434,18 @@
435434
grade: none,
436435
name: none,
437436
) = {
438-
439-
align(center)[
440-
#grid(columns: 3, column-gutter: (-15pt, 20pt),[
437+
align(center)[
438+
#grid(
439+
columns: 3,
440+
column-gutter: (-15pt, 20pt),
441+
[
441442
#pad(y: -4pt)[]
442443
#image("./images/ZJU-Banner.png", width: 75%)
443-
],[
444-
#text(size: -10pt)[] \ #text(size: 30pt, stroke: 1pt)[实验报告]
445-
], [
444+
],
445+
[
446+
#text(size: -10pt)[] \ #text(size: 30pt, stroke: 1pt)[实验报告]
447+
],
448+
[
446449
#align(left)[
447450
#text(size: 1em)[
448451
专业:#major\
@@ -451,46 +454,46 @@
451454
日期:#date\
452455
]
453456
]
454-
])
455-
]
456-
457+
],
458+
)
459+
]
460+
457461
tablex(
458462
columns: (1.3fr, 2fr, 1.3fr, 1fr, 1fr, 0.5fr),
459463
align: left,
460464
stroke: 0pt,
461465
inset: 1pt,
462466
_underlined_cell("课程名称:", color: white),
463-
colspanx(1, _underlined_cell(
464-
if course == none {
465-
state_course.display()
467+
colspanx(
468+
1,
469+
_underlined_cell(if course == none {
470+
context state_course.get()
466471
} else {
467472
course
468-
}
469-
)),
473+
}),
474+
),
470475
_underlined_cell("指导老师:", color: white),
471-
colspanx(1, _underlined_cell(
472-
teacher
473-
)),
476+
colspanx(1, _underlined_cell(teacher)),
474477
_underlined_cell("成绩:", color: white),
475-
colspanx(1, _underlined_cell(
476-
grade
477-
)),
478+
colspanx(1, _underlined_cell(grade)),
478479
_underlined_cell("实验名称:", color: white),
479-
colspanx(4, _underlined_cell(
480-
name
481-
)), (), (), (),
480+
colspanx(4, _underlined_cell(name)),
481+
(),
482+
(),
483+
(),
482484
)
483485
}
484486

485-
#let table3( // 三线表
487+
#let table3(
488+
// 三线表
486489
..args,
487490
inset: 0.5em,
488491
stroke: 0.5pt,
489492
align: center + horizon,
490-
columns: (1fr),
493+
columns: 1fr,
491494
) = {
492495
tablex(
493-
columns: (1fr),
496+
columns: 1fr,
494497
inset: 0pt,
495498
stroke: 0pt,
496499
map-hlines: h => {

0 commit comments

Comments
 (0)