Skip to content

Commit 29549bd

Browse files
committed
Merge branch 'feature/update-theme-wiki' into release/4.3
* feature/update-theme-wiki: Push `resources/theme` to wiki subrepo Move shared XSL-FO extension properties → Styles Sort inline styles alphabetically Remove unused block reference from inline styles Sort block styles alphabetically Pull wiki subrepo to `resources/theme`
2 parents f781b8f + 5e0c35f commit 29549bd

File tree

4 files changed

+202
-201
lines changed

4 files changed

+202
-201
lines changed

resources/theme/.gitrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/jelovirt/pdf-generator.wiki.git
88
branch = master
9-
commit = 23de8a9c0a07b47bd56bd7a495c56c3deb5c8a4b
10-
parent = c477080e9d1bae968490169af8aa1f388554fbd3
9+
commit = 19c02c94998210c2ab06ebcc7519a45befffbe17
10+
parent = 14f5e88d7753493033681948b2de04d76097ced3
1111
method = merge
1212
cmdver = 0.4.9

resources/theme/Block-styles.md

Lines changed: 87 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,27 @@ The presentation of block elements can be adjusted by setting `style` keys. Bloc
22

33
## Block keys
44

5-
### `body`
5+
### `appendix`
66

7-
Default body text, for example `<p>` elements.
7+
Appendix title.
88

9-
### `shortdesc`
9+
<!--
10+
- `title-numbering: 'true' | 'false'`
11+
-->
1012

11-
Short description and abstract styles.
13+
### `appendix-toc`
1214

13-
### `h<n>`
15+
Appendix table of contents.
1416

15-
Topic titles. `<n>` is a number ranging from 1 to 6, representing each of the six heading levels.
17+
- `maximum-level: <n>` — Number of TOC levels to show
1618

17-
- `title-numbering: 'true' | 'false'`
19+
### `appendix-toc-<n>`
20+
21+
TOC entry in appendix TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
22+
23+
### `body`
24+
25+
Default body text, for example `<p>` elements.
1826

1927
### `chapter`
2028

@@ -32,43 +40,12 @@ Chapter table of contents.
3240

3341
TOC entry in chapter TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
3442

35-
### `part`
36-
37-
Part title.
38-
39-
- `title-numbering: 'true' | 'false'`
40-
41-
### `part-toc`
42-
43-
Part table of contents.
44-
45-
- `maximum-level: <n>` — Number of TOC levels to show
46-
47-
### `part-toc-chapter`
48-
49-
Bookmap chapter TOC entry in part TOC.
50-
51-
### `part-toc-<n>`
52-
53-
TOC entry in part TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
54-
55-
### `appendix`
56-
57-
Appendix title.
58-
59-
<!--
60-
- `title-numbering: 'true' | 'false'`
61-
-->
62-
63-
### `appendix-toc`
64-
65-
Appendix table of contents.
66-
67-
- `maximum-level: <n>` — Number of TOC levels to show
43+
### `codeblock`
6844

69-
### `appendix-toc-<n>`
45+
Code block element.
7046

71-
TOC entry in appendix TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
47+
- `line-numbering: 'true' | 'false'` — Line numbering.
48+
- `show-whitespace: 'true' | 'false'` — Show whitespace characters.
7249

7350
### `cover`
7451

@@ -84,13 +61,11 @@ Cover page title.
8461

8562
Cover page subtitle or alternative title.
8663

87-
### `section`
88-
89-
Section element.
64+
### `dl`
9065

91-
### `section-title`
66+
Definition list element.
9267

93-
Section element title.
68+
- `dl-type: 'table' | 'list' | 'html'` — Style definition list as bulleted list or indented list.
9469

9570
### `example`
9671

@@ -115,6 +90,32 @@ Figure caption.
11590
- `number`: caption number
11691
- `title`: caption contents
11792

93+
### `glossary`
94+
95+
Glossary title.
96+
97+
### `h<n>`
98+
99+
Topic titles. `<n>` is a number ranging from 1 to 6, representing each of the six heading levels.
100+
101+
- `title-numbering: 'true' | 'false'`
102+
103+
### `hazardstatement`
104+
105+
Hazard statement element.
106+
107+
### `hazardstatement-label`
108+
109+
Hazard statement label element.
110+
111+
### `hazardstatement-<type>-label`
112+
113+
Label for hazard statement elements with `@type`.
114+
115+
### `index`
116+
117+
Index title.
118+
118119
### `note`
119120

120121
Note element with `@type` `note` or without `@type`.
@@ -162,46 +163,61 @@ Label for note elements with `@type`.
162163

163164
- `content` — Content template.
164165

165-
### `dl`
166+
### `ol`
166167

167-
Definition list element.
168+
Ordered list.
168169

169-
- `dl-type: 'table' | 'list' | 'html'` — Style definition list as bulleted list or indented list.
170+
### `parml`
170171

171-
### `ol`
172+
Parameter list element.
172173

173-
Ordered list.
174+
### `part`
174175

175-
### `ul`
176+
Part title.
176177

177-
Unordered list.
178+
- `title-numbering: 'true' | 'false'`
178179

179-
### `parml`
180+
### `part-toc`
180181

181-
Parameter list element.
182+
Part table of contents.
182183

183-
### `plentry`
184+
- `maximum-level: <n>` — Number of TOC levels to show
184185

185-
Parameter list entry element.
186+
### `part-toc-chapter`
186187

187-
### `pt`
188+
Bookmap chapter TOC entry in part TOC.
188189

189-
Parameter term element within a parameter list entry.
190+
### `part-toc-<n>`
191+
192+
TOC entry in part TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
190193

191194
### `pd`
192195

193196
Parameter definition element within a parameter list entry.
194197

198+
### `plentry`
199+
200+
Parameter list entry element.
201+
195202
### `pre`
196203

197204
Preformatted element.
198205

199-
### `codeblock`
206+
### `pt`
200207

201-
Code block element.
208+
Parameter term element within a parameter list entry.
202209

203-
- `line-numbering: 'true' | 'false'` — Line numbering.
204-
- `show-whitespace: 'true' | 'false'` — Show whitespace characters.
210+
### `section`
211+
212+
Section element.
213+
214+
### `section-title`
215+
216+
Section element title.
217+
218+
### `shortdesc`
219+
220+
Short description and abstract styles.
205221

206222
### `table`
207223

@@ -223,6 +239,10 @@ Table caption.
223239

224240
Table header row
225241

242+
### `task-labels`
243+
244+
Boolean key to generate default section labels for tasks.
245+
226246
### `toc`
227247

228248
Table of contents.
@@ -245,23 +265,9 @@ Bookmap part TOC entry.
245265

246266
TOC entry in main TOC. `<n>` is a number ranging from 1 to 6, representing each of the six TOC entry levels.
247267

248-
### `hazardstatement`
249-
250-
Hazard statement element.
251-
252-
### `hazardstatement-label`
253-
254-
Hazard statement label element.
255-
256-
### `hazardstatement-<type>-label`
257-
258-
Label for hazard statement elements with `@type`.
259-
260-
## XSL-FO extension properties
261-
262-
Themes support XSL-FO extension properties implemented by XSL formatters:
268+
### `ul`
263269

264-
- `background-size: [ <length> | <percentage> | auto ]{1,2}` — Size of background image.
270+
Unordered list.
265271

266272
[XSL fo:block]: https://www.w3.org/TR/xsl11/#fo_block
267-
[XSL extensions]: #xsl-fo-extension-properties
273+
[XSL extensions]: ./Styles.md#xsl-fo-extension-properties

0 commit comments

Comments
 (0)