Skip to content

Commit 09cdf7d

Browse files
mparkmpark
committed
Upgrade to Pandoc 2.18
1 parent 2269dc8 commit 09cdf7d

File tree

15 files changed

+1217
-154
lines changed

15 files changed

+1217
-154
lines changed

‎TEST.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
---
22
title: "Test document for mpark/wg21"
33
subtitle: "Visual inspection of various features of the framework"
4-
document: D0000R0
4+
document: D0000R1
55
date: today
66
audience:
77
- Library Evolution
88
- Library
9+
revises: D0000R0
910
author:
10-
- name: Michael Park
11-
email: <[email protected]>
11+
- name: Author 0
12+
email: <[email protected]>
13+
- name: Author 1
14+
email: <[email protected]>
1215
toc: true
1316
toc-depth: 2
1417
---
@@ -210,7 +213,7 @@ inspect (x) {
210213
211214
::: cmptable
212215
213-
### Before
216+
### Before {width=.6}
214217
```cpp
215218
switch (x) {
216219
case 0: std::cout << "got zero"; break;
@@ -219,7 +222,7 @@ switch (x) {
219222
}
220223
```
221224

222-
### After
225+
### After {width=.4}
223226
```cpp
224227
inspect (x) {
225228
0: std::cout << "got zero";

‎data/csl/acm.csl‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
3+
<info>
4+
<title>Association for Computing Machinery</title>
5+
<title-short>ACM</title-short>
6+
<id>http://www.zotero.org/styles/association-for-computing-machinery</id>
7+
<link href="http://www.zotero.org/styles/association-for-computing-machinery" rel="self"/>
8+
<link href="http://www.zotero.org/styles/acm-sigchi-proceedings" rel="template"/>
9+
<link href="https://www.acm.org/publications/authors/reference-formatting" rel="documentation"/>
10+
<author>
11+
<name>Patrick O'Brien</name>
12+
<email>[email protected]</email>
13+
</author>
14+
<category citation-format="numeric"/>
15+
<category field="engineering"/>
16+
<updated>2019-12-18T14:04:18+00:00</updated>
17+
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
18+
</info>
19+
<macro name="author">
20+
<group suffix=".">
21+
<names variable="author">
22+
<name delimiter=", " and="text" sort-separator=", "/>
23+
<label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
24+
<substitute>
25+
<names variable="editor"/>
26+
</substitute>
27+
</names>
28+
</group>
29+
</macro>
30+
<macro name="editor">
31+
<names variable="editor">
32+
<name delimiter=", " and="text" delimiter-precedes-last="never"/>
33+
<label form="short" prefix=" (" suffix=")"/>
34+
</names>
35+
</macro>
36+
<macro name="title">
37+
<choose>
38+
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
39+
<group delimiter=" ">
40+
<text variable="title" font-style="italic"/>
41+
<group delimiter=" " prefix="(" suffix=")">
42+
<number variable="edition" form="ordinal"/>
43+
<text term="edition" form="short"/>
44+
</group>
45+
</group>
46+
</if>
47+
<else>
48+
<text variable="title"/>
49+
</else>
50+
</choose>
51+
</macro>
52+
<macro name="year">
53+
<date variable="issued">
54+
<date-part name="year"/>
55+
</date>
56+
</macro>
57+
<macro name="journal">
58+
<group delimiter=", ">
59+
<group delimiter=" ">
60+
<text variable="container-title" form="short" font-style="italic"/>
61+
<text variable="volume" suffix=","/>
62+
<group>
63+
<text variable="issue" suffix=" "/>
64+
<date date-parts="year-month" form="text" variable="issued" prefix="(" suffix=")"/>
65+
</group>
66+
</group>
67+
</group>
68+
</macro>
69+
<macro name="edition">
70+
<choose>
71+
<if is-numeric="edition">
72+
<group delimiter=" ">
73+
<number variable="edition" form="ordinal"/>
74+
<text term="edition" form="short"/>
75+
</group>
76+
</if>
77+
<else>
78+
<text variable="edition"/>
79+
</else>
80+
</choose>
81+
</macro>
82+
<macro name="book-publisher">
83+
<group delimiter=", ">
84+
<text variable="publisher"/>
85+
<text variable="publisher-place"/>
86+
</group>
87+
</macro>
88+
<macro name="access">
89+
<choose>
90+
<if variable="DOI">
91+
<text variable="DOI" prefix="DOI:https://doi.org/"/>
92+
</if>
93+
<else-if variable="URL">
94+
<group delimiter=" ">
95+
<text term="retrieved" text-case="capitalize-first"/>
96+
<date variable="accessed" form="text"/>
97+
<text term="from"/>
98+
<text variable="URL"/>
99+
</group>
100+
</else-if>
101+
</choose>
102+
</macro>
103+
<citation collapse="citation-number">
104+
<sort>
105+
<key variable="citation-number"/>
106+
</sort>
107+
<layout prefix="[" suffix="]" delimiter=",">
108+
<group delimiter=":">
109+
<text variable="citation-number"/>
110+
<text variable="locator"/>
111+
</group>
112+
</layout>
113+
</citation>
114+
<bibliography second-field-align="flush" entry-spacing="0">
115+
<sort>
116+
<key macro="author"/>
117+
<key variable="issued"/>
118+
</sort>
119+
<layout>
120+
<text variable="citation-number" prefix="[" suffix="]"/>
121+
<group delimiter=". " suffix=". ">
122+
<text macro="author"/>
123+
<text macro="year"/>
124+
<text macro="title"/>
125+
</group>
126+
<group suffix=".">
127+
<choose>
128+
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
129+
<text macro="book-publisher" suffix="."/>
130+
</if>
131+
<else-if type="paper-conference">
132+
<group suffix="." delimiter=", ">
133+
<group delimiter=" ">
134+
<text term="in" text-case="capitalize-first"/>
135+
<group delimiter=" ">
136+
<text variable="container-title" font-style="italic"/>
137+
<text variable="collection-title" prefix="(" suffix=")"/>
138+
</group>
139+
</group>
140+
<text macro="book-publisher"/>
141+
<text variable="page"/>
142+
</group>
143+
</else-if>
144+
<else-if type="chapter" match="any">
145+
<group delimiter=" ">
146+
<text term="in" text-case="capitalize-first"/>
147+
<group delimiter=", ">
148+
<group delimiter=" ">
149+
<text variable="container-title" font-style="italic"/>
150+
<text macro="edition" prefix="(" suffix=")"/>
151+
</group>
152+
<text macro="editor"/>
153+
</group>
154+
</group>
155+
<group suffix="." delimiter=", " prefix=". ">
156+
<text macro="book-publisher"/>
157+
<text variable="page"/>
158+
</group>
159+
</else-if>
160+
<else-if type="speech" match="any">
161+
<group delimiter=". ">
162+
<group delimiter=" ">
163+
<text term="in" text-case="capitalize-first"/>
164+
<group delimiter=", ">
165+
<group delimiter=" ">
166+
<text variable="event" font-style="italic"/>
167+
<text macro="edition" prefix="(" suffix=")"/>
168+
</group>
169+
<text macro="editor"/>
170+
</group>
171+
</group>
172+
<group delimiter=", " suffix=".">
173+
<text macro="book-publisher"/>
174+
<text variable="page"/>
175+
</group>
176+
</group>
177+
</else-if>
178+
<else-if type="article-journal">
179+
<group delimiter=", " suffix=".">
180+
<text macro="journal"/>
181+
<text variable="page"/>
182+
</group>
183+
</else-if>
184+
<else-if type="thesis" match="any">
185+
<group delimiter=". ">
186+
<text variable="genre"/>
187+
<text macro="book-publisher"/>
188+
</group>
189+
</else-if>
190+
<else>
191+
<group suffix="." delimiter=", ">
192+
<group delimiter=" " font-style="italic">
193+
<text variable="container-title"/>
194+
<text variable="volume"/>
195+
</group>
196+
<text variable="page"/>
197+
</group>
198+
</else>
199+
</choose>
200+
</group>
201+
<text macro="access" prefix=" "/>
202+
</layout>
203+
</bibliography>
204+
</style>

‎data/csl/wg21.csl‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</author>
1414
<category citation-format="label"/>
1515
<category field="engineering"/>
16-
<updated>2017-07-03T15:22:45+00:00</updated>
16+
<updated>2019-12-18T14:04:18+00:00</updated>
1717
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
1818
</info>
1919
<macro name="author">
@@ -108,7 +108,7 @@
108108
</group>
109109
</layout>
110110
</citation>
111-
<bibliography hanging-indent="true" second-field-align="flush" entry-spacing="0">
111+
<bibliography hanging-indent="true" entry-spacing="0">
112112
<sort>
113113
<key variable="citation-label"/>
114114
</sort>
@@ -121,7 +121,7 @@
121121
</group>
122122
<group suffix=".">
123123
<choose>
124-
<if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
124+
<if type="bill book graphic legal_case legislation motion_picture report song" match="any">
125125
<text macro="book-publisher" suffix="."/>
126126
</if>
127127
<else-if type="paper-conference">
@@ -133,6 +133,7 @@
133133
<text variable="collection-title" prefix="(" suffix=")"/>
134134
</group>
135135
</group>
136+
<text macro="book-publisher"/>
136137
<text variable="page"/>
137138
</group>
138139
</else-if>
@@ -176,6 +177,12 @@
176177
<text variable="page"/>
177178
</group>
178179
</else-if>
180+
<else-if type="thesis" match="any">
181+
<group delimiter=". ">
182+
<text variable="genre"/>
183+
<text macro="book-publisher"/>
184+
</group>
185+
</else-if>
179186
<else>
180187
<group suffix="." delimiter=", ">
181188
<group delimiter=" " font-style="italic">

‎data/csl/wg21.csl.patch‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
diff --git a/acm.csl b/wg21.csl
2+
index 4247262..45ffe25 100644
3+
--- a/acm.csl
4+
+++ b/wg21.csl
5+
@@ -11,7 +11,7 @@
6+
<name>Patrick O'Brien</name>
7+
<email>[email protected]</email>
8+
</author>
9+
- <category citation-format="numeric"/>
10+
+ <category citation-format="label"/>
11+
<category field="engineering"/>
12+
<updated>2019-12-18T14:04:18+00:00</updated>
13+
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
14+
@@ -49,9 +49,11 @@
15+
</else>
16+
</choose>
17+
</macro>
18+
- <macro name="year">
19+
+ <macro name="date">
20+
<date variable="issued">
21+
<date-part name="year"/>
22+
+ <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
23+
+ <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
24+
</date>
25+
</macro>
26+
<macro name="journal">
27+
@@ -91,36 +93,30 @@
28+
<text variable="DOI" prefix="DOI:https://doi.org/"/>
29+
</if>
30+
<else-if variable="URL">
31+
- <group delimiter=" ">
32+
- <text term="retrieved" text-case="capitalize-first"/>
33+
- <date variable="accessed" form="text"/>
34+
- <text term="from"/>
35+
- <text variable="URL"/>
36+
- </group>
37+
+ <text display="block" variable="URL"/>
38+
</else-if>
39+
</choose>
40+
</macro>
41+
- <citation collapse="citation-number">
42+
+ <citation collapse="citation-label">
43+
<sort>
44+
- <key variable="citation-number"/>
45+
+ <key variable="citation-label"/>
46+
</sort>
47+
<layout prefix="[" suffix="]" delimiter=",">
48+
<group delimiter=":">
49+
- <text variable="citation-number"/>
50+
+ <text variable="citation-label"/>
51+
<text variable="locator"/>
52+
</group>
53+
</layout>
54+
</citation>
55+
- <bibliography second-field-align="flush" entry-spacing="0">
56+
+ <bibliography hanging-indent="true" entry-spacing="0">
57+
<sort>
58+
- <key macro="author"/>
59+
- <key variable="issued"/>
60+
+ <key variable="citation-label"/>
61+
</sort>
62+
<layout>
63+
- <text variable="citation-number" prefix="[" suffix="]"/>
64+
+ <text variable="citation-label" prefix="[" suffix="] "/>
65+
<group delimiter=". " suffix=". ">
66+
<text macro="author"/>
67+
- <text macro="year"/>
68+
+ <text macro="date"/>
69+
<text macro="title"/>
70+
</group>
71+
<group suffix=".">

‎data/defaults.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ self-contained: true
1717
data-dir: ${DATADIR}
1818
1919
filters:
20-
- pandoc-citeproc
20+
- citeproc
2121
- wg21.py
2222
2323
template: wg21

0 commit comments

Comments
 (0)