Skip to content

Commit d5b61f4

Browse files
pre-commit (#5)
typstyle via pre-commit --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2 parents 22d5cc4 + 8fcf3d5 commit d5b61f4

File tree

2 files changed

+23
-39
lines changed

2 files changed

+23
-39
lines changed

template/paper.typ

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -116,52 +116,26 @@ It takes the column alignment as first argument (here `lcrl` means left, center,
116116
The optional `header` argument allows to adjust the appearance of the JACoW table style as shown in @table:specs.
117117

118118
#figure(
119-
jacow-table(
120-
"lcrl",
121-
[No.],
122-
[$x$ / mm],
123-
[$y$],
124-
[Note],
125-
[1],
126-
[0.32],
127-
qty(70, "cm"),
128-
[Small],
129-
[2],
130-
[2.5],
131-
qty(3, "dm"),
132-
[Medium],
133-
[3],
134-
[18],
135-
qty(1.5, "m"),
136-
[*Large*],
119+
// @typstyle off
120+
jacow-table("lcrl",
121+
[No.], [$x$ / mm], [$y$], [Note],
122+
[1], [0.32], qty(70, "cm"), [Small],
123+
[2], [2.5], qty(3, "dm"), [Medium],
124+
[3], [18], qty(1.5, "m"), [*Large*],
137125
),
138126
//placement: none, // `top`, `bottom` or `auto` for floating placement or `none` for inline placement
139127
caption: [Dimensions],
140128
) <table:xydata>
141129

142130

143131
#figure(
144-
jacow-table(
145-
"lccc",
146-
header: top + left, // top, left or none
147-
[],
148-
[Gen A],
149-
[Gen B],
150-
[Gen C],
151-
[Frequency],
152-
table.cell(qty(1234567.89, "Hz"), colspan: 3, align: center),
153-
[Voltage],
154-
qty(1, "kV"),
155-
qty(3, "kV"),
156-
qty(3, "kV"),
157-
[Cells],
158-
[3],
159-
[5],
160-
[9],
161-
[Quality],
162-
[100],
163-
[500],
164-
num(1000),
132+
// @typstyle off
133+
jacow-table("lccc", header: top+left, // top, left or none
134+
[], [Gen A], [Gen B], [Gen C],
135+
[Frequency], table.cell(qty(1234567.89, "Hz"), colspan: 3, align: center),
136+
[Voltage], qty(1, "kV"), qty(3, "kV"), qty(3, "kV"),
137+
[Cells], [3], [5], [9],
138+
[Quality], [100], [500], num(1000),
165139
),
166140
//placement: none, // `top`, `bottom` or `auto` for floating placement or `none` for inline placement
167141
caption: [

tests/guide/test.typ

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ should flow from top to bottom in each column).
9090

9191

9292
#figure(
93+
<<<<<<< HEAD
9394
jacow-table(
9495
"lcc",
9596
[Margin],
@@ -107,6 +108,15 @@ should flow from top to bottom in each column).
107108
[Right],
108109
[20 mm (0.79 in)],
109110
[1.02 in (26 mm)],
111+
=======
112+
// @typstyle off
113+
jacow-table("lcc",
114+
[Margin], [A4 Paper], [US Letter Paper],
115+
[Top], [37 mm (1.46 in)], [0.75 in (19 mm)],
116+
[Bottom], [19 mm (0.75 in)], [0.75 in (19 mm)],
117+
[Left], [20 mm (0.79 in)], [0.79 in (20 mm)],
118+
[Right], [20 mm (0.79 in)], [1.02 in (26 mm)],
119+
>>>>>>> main
110120
),
111121
placement: top, // top, bottom or auto
112122
caption: [Margin Specifications],

0 commit comments

Comments
 (0)