Skip to content

Commit e368325

Browse files
infotextureinfotexture
committed
Merge branch 'release/5.3.5'
* release/5.3.5: (80 commits) Bump plug-in version attribute to 5.3.5 Normalize indentation Fix #235 - Use XPath when handlng strings Explicitly treat $newline variable as string Use line feed character code in $newline variable Bump lefthook from 1.8.5 to 1.10.10 (#233) Bump stylelint from 16.11.0 to 16.14.1 (#232) Bump JamesIves/github-pages-deploy-action from 4.7.1 to 4.7.2 (#231) Bump prettier from 3.4.1 to 3.4.2 (#229) Update Copyright Year Update Copyright Year Update Copyright year Override Prism top/bottom margin on tab pane code Fix redundant border-radius on list group items Edit to avoid starting sentence w/ lowercase link Contrast CSS Expand titles Prettifying files. Update documentation. ignore offcanvas ...
2 parents 6a3c640 + 85cfcdb commit e368325

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2953
-3292
lines changed

‎.github/dita-ot/footer.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</p>
3535
<p>
3636
<small>
37-
© 2017–2024
37+
© 2017–2025
3838
<a href="https://infotexture.net/">infotexture</a>
3939
</small>
4040
</p>

‎.github/dita-ot/header.xml‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
2+
<!-- Modify -xxl to change container size -->
23
<div class="container-xxl">
34
<!-- This shows the menu on mobile -->
45
<div class="bd-navbar-toggle">
@@ -112,7 +113,7 @@
112113
<span class="d-auto">
113114
<i class="bi bi-circle-half"/>
114115
</span>
115-
<span class="d-lg-none ms-2">Color mode</span>
116+
<span class="d-lg-none ms-2">Toggle color mode</span>
116117
</a>
117118
<ul
118119
class="dropdown-menu dropdown-menu-end"
@@ -180,7 +181,7 @@
180181
<button
181182
type="button"
182183
class="dropdown-item d-flex align-items-center"
183-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
184+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
184185
>
185186
Default
186187
</button>
@@ -192,7 +193,7 @@
192193
<button
193194
type="button"
194195
class="dropdown-item d-flex align-items-center"
195-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cerulean/bootstrap.min.css"
196+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/cerulean/bootstrap.min.css"
196197
>
197198
Cerulean
198199
</button>
@@ -201,7 +202,16 @@
201202
<button
202203
type="button"
203204
class="dropdown-item d-flex align-items-center"
204-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/cyborg/bootstrap.min.css"
205+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/cosmo/bootstrap.min.css"
206+
>
207+
Cosmo
208+
</button>
209+
</li>
210+
<li>
211+
<button
212+
type="button"
213+
class="dropdown-item d-flex align-items-center"
214+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/cyborg/bootstrap.min.css"
205215
>
206216
Cyborg
207217
</button>
@@ -210,7 +220,7 @@
210220
<button
211221
type="button"
212222
class="dropdown-item d-flex align-items-center"
213-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/darkly/bootstrap.min.css"
223+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/darkly/bootstrap.min.css"
214224
>
215225
Darkly
216226
</button>
@@ -219,7 +229,7 @@
219229
<button
220230
type="button"
221231
class="dropdown-item d-flex align-items-center"
222-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/flatly/bootstrap.min.css"
232+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/flatly/bootstrap.min.css"
223233
>
224234
Flatly
225235
</button>
@@ -228,7 +238,7 @@
228238
<button
229239
type="button"
230240
class="dropdown-item d-flex align-items-center"
231-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/journal/bootstrap.min.css"
241+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/journal/bootstrap.min.css"
232242
>
233243
Journal
234244
</button>
@@ -237,7 +247,7 @@
237247
<button
238248
type="button"
239249
class="dropdown-item d-flex align-items-center"
240-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/litera/bootstrap.min.css"
250+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/litera/bootstrap.min.css"
241251
>
242252
Litera
243253
</button>
@@ -246,7 +256,7 @@
246256
<button
247257
type="button"
248258
class="dropdown-item d-flex align-items-center"
249-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lumen/bootstrap.min.css"
259+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/lumen/bootstrap.min.css"
250260
>
251261
Lumen
252262
</button>
@@ -255,7 +265,7 @@
255265
<button
256266
type="button"
257267
class="dropdown-item d-flex align-items-center"
258-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/lux/bootstrap.min.css"
268+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/lux/bootstrap.min.css"
259269
>
260270
Lux
261271
</button>
@@ -264,7 +274,7 @@
264274
<button
265275
type="button"
266276
class="dropdown-item d-flex align-items-center"
267-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/materia/bootstrap.min.css"
277+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/materia/bootstrap.min.css"
268278
>
269279
Materia
270280
</button>
@@ -273,7 +283,7 @@
273283
<button
274284
type="button"
275285
class="dropdown-item d-flex align-items-center"
276-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/minty/bootstrap.min.css"
286+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/minty/bootstrap.min.css"
277287
>
278288
Minty
279289
</button>
@@ -282,7 +292,7 @@
282292
<button
283293
type="button"
284294
class="dropdown-item d-flex align-items-center"
285-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/morph/bootstrap.min.css"
295+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/morph/bootstrap.min.css"
286296
>
287297
Morph
288298
</button>
@@ -292,7 +302,7 @@
292302
<button
293303
type="button"
294304
class="dropdown-item d-flex align-items-center"
295-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/pulse/bootstrap.min.css"
305+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/pulse/bootstrap.min.css"
296306
>
297307
Pulse
298308
</button>
@@ -301,7 +311,7 @@
301311
<button
302312
type="button"
303313
class="dropdown-item d-flex align-items-center"
304-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/quartz/bootstrap.min.css"
314+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/quartz/bootstrap.min.css"
305315
>
306316
Quartz
307317
</button>
@@ -310,7 +320,7 @@
310320
<button
311321
type="button"
312322
class="dropdown-item d-flex align-items-center"
313-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sandstone/bootstrap.min.css"
323+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/sandstone/bootstrap.min.css"
314324
>
315325
Sandstone
316326
</button>
@@ -319,7 +329,7 @@
319329
<button
320330
type="button"
321331
class="dropdown-item d-flex align-items-center"
322-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/simplex/bootstrap.min.css"
332+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/simplex/bootstrap.min.css"
323333
>
324334
Simplex
325335
</button>
@@ -328,7 +338,7 @@
328338
<button
329339
type="button"
330340
class="dropdown-item d-flex align-items-center"
331-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/sketchy/bootstrap.min.css"
341+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/sketchy/bootstrap.min.css"
332342
>
333343
Sketchy
334344
</button>
@@ -337,7 +347,7 @@
337347
<button
338348
type="button"
339349
class="dropdown-item d-flex align-items-center"
340-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/slate/bootstrap.min.css"
350+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/slate/bootstrap.min.css"
341351
>
342352
Slate
343353
</button>
@@ -346,7 +356,7 @@
346356
<button
347357
type="button"
348358
class="dropdown-item d-flex align-items-center"
349-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/solar/bootstrap.min.css"
359+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/solar/bootstrap.min.css"
350360
>
351361
Solar
352362
</button>
@@ -355,7 +365,7 @@
355365
<button
356366
type="button"
357367
class="dropdown-item d-flex align-items-center"
358-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/spacelab/bootstrap.min.css"
368+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/spacelab/bootstrap.min.css"
359369
>
360370
SpaceLab
361371
</button>
@@ -364,7 +374,7 @@
364374
<button
365375
type="button"
366376
class="dropdown-item d-flex align-items-center"
367-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/superhero/bootstrap.min.css"
377+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/superhero/bootstrap.min.css"
368378
>
369379
Superhero
370380
</button>
@@ -373,7 +383,7 @@
373383
<button
374384
type="button"
375385
class="dropdown-item d-flex align-items-center"
376-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/united/bootstrap.min.css"
386+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/united/bootstrap.min.css"
377387
>
378388
United
379389
</button>
@@ -382,7 +392,7 @@
382392
<button
383393
type="button"
384394
class="dropdown-item d-flex align-items-center"
385-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/vapor/bootstrap.min.css"
395+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/vapor/bootstrap.min.css"
386396
>
387397
Vapor
388398
</button>
@@ -391,7 +401,7 @@
391401
<button
392402
type="button"
393403
class="dropdown-item d-flex align-items-center"
394-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/yeti/bootstrap.min.css"
404+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/yeti/bootstrap.min.css"
395405
>
396406
Yeti
397407
</button>
@@ -400,7 +410,7 @@
400410
<button
401411
type="button"
402412
class="dropdown-item d-flex align-items-center"
403-
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.2/dist/zephyr/bootstrap.min.css"
413+
data-bs-css-href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.3/dist/zephyr/bootstrap.min.css"
404414
>
405415
Zephyr
406416
</button>

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Calculate short SHA
18-
uses: benjlevesque/short-sha@v2.2
18+
uses: benjlevesque/short-sha@v3.0
1919
id: short-sha
2020
with:
2121
length: 7
@@ -45,7 +45,7 @@ jobs:
4545
project: .github/dita-ot/html.xml
4646

4747
- name: Deploy HTML 🚀
48-
uses: JamesIves/github-pages-deploy-action@v4.5.0
48+
uses: JamesIves/github-pages-deploy-action@v4.7.2
4949
with:
5050
token: ${{ secrets.GITHUB_TOKEN }}
5151
branch: gh-pages # The branch the action should deploy to.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,6 @@ $RECYCLE.BIN/
6767
# End of https://www.gitignore.io/api/linux,macos,windows
6868

6969
build_dita2html5-bootstrap.xml
70+
xsl/dita2html5-bootstrapImpl.xsl
71+
xsl/dita2html5-legacy-3.0.xsl
7072
node_modules

‎.lefthook.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Manage Git hooks with Lefthook
2+
# https://evilmartians.com/chronicles/lefthook-knock-your-teams-code-back-into-shape
3+
# https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
4+
5+
pre-commit:
6+
parallel: true
7+
commands:
8+
prettier:
9+
glob: '*.{css,dita*,json,md,xml,xsl,yml}'
10+
run: prettier --write {staged_files}
11+
stage_fixed: true
12+
stylelint:
13+
glob: '*.{css}'
14+
run: stylelint {staged_files}
15+
stage_fixed: true

‎Customization/xsl/accordion.xsl‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,21 @@
2424

2525
<xsl:template name="expand-accordion-head">
2626
<xsl:attribute name="aria-expanded" select="contains(@outputclass,'show')"/>
27-
<xsl:attribute name="class">
28-
<xsl:choose>
29-
<xsl:when test="contains(@outputclass,'show')">
30-
<xsl:text>accordion-button</xsl:text>
31-
</xsl:when>
32-
<xsl:otherwise>
33-
<xsl:text>accordion-button collapsed</xsl:text>
34-
</xsl:otherwise>
35-
</xsl:choose>
36-
</xsl:attribute>
27+
<xsl:attribute
28+
name="class"
29+
select="
30+
if (contains(@outputclass,'show')) then 'accordion-button'
31+
else 'accordion-button collapsed'"
32+
/>
3733
</xsl:template>
3834

3935
<xsl:template name="expand-accordion-body">
40-
<xsl:attribute name="class">
41-
<xsl:text>accordion-collapse collapse</xsl:text>
42-
<xsl:if test="contains(@outputclass,'show')">
43-
<xsl:text> show</xsl:text>
44-
</xsl:if>
45-
</xsl:attribute>
36+
<xsl:attribute
37+
name="class"
38+
select="
39+
if (contains(@outputclass,'show')) then 'accordion-collapse collapse show'
40+
else 'accordion-collapse collapse'"
41+
/>
4642
</xsl:template>
4743

4844
<xsl:template match="*[contains(@class, ' topic/section ')]" mode="accordion">
@@ -80,9 +76,6 @@
8076
</xsl:otherwise>
8177
</xsl:choose>
8278
<div class="accordion-body">
83-
<!--xsl:call-template name="commonattributes">
84-
<xsl:with-param name="default-output-class" select="'accordion-body'"/>
85-
</xsl:call-template-->
8679
<xsl:call-template name="gen-toc-id"/>
8780
<xsl:call-template name="setidaname"/>
8881
<xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]" mode="out-of-line"/>

‎Customization/xsl/card.xsl‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,12 @@
4848
</xsl:choose>
4949
</xsl:param>
5050

51-
<xsl:variable name="bootstrap-class">
52-
<xsl:choose>
53-
<xsl:when
54-
test="count(preceding-sibling::*[contains(@class, ' topic/title ')]) > 0"
55-
>sectiontitle card-subtitle text-body-secondary</xsl:when>
56-
<xsl:otherwise>sectiontitle card-title</xsl:otherwise>
57-
</xsl:choose>
58-
</xsl:variable>
51+
<xsl:variable
52+
name="bootstrap-class"
53+
select="
54+
if (count(preceding-sibling::*[contains(@class, ' topic/title ')]) > 0) then 'sectiontitle card-subtitle text-body-secondary'
55+
else 'sectiontitle card-title'"
56+
/>
5957
<xsl:element name="{$headLevel}">
6058
<xsl:attribute name="class">
6159
<xsl:value-of select="$bootstrap-class"/>

‎Customization/xsl/carousel.xsl‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -150,22 +150,14 @@
150150
<xsl:template match="*[contains(@class,' topic/image ')]" mode="carousel">
151151
<xsl:apply-templates select="*[contains(@class, ' ditaot-d/ditaval-startprop ')]" mode="out-of-line"/>
152152
<xsl:variable name="images" select="count(../*[contains(@class, ' topic/image ')])"/>
153-
<xsl:variable name="imageWidth">
154-
<xsl:choose>
155-
<xsl:when test="$images=1">
156-
<xsl:text>col-12</xsl:text>
157-
</xsl:when>
158-
<xsl:when test="$images=2">
159-
<xsl:text>col-6</xsl:text>
160-
</xsl:when>
161-
<xsl:when test="$images=3">
162-
<xsl:text>col-4</xsl:text>
163-
</xsl:when>
164-
<xsl:otherwise>
165-
<xsl:text>col-3</xsl:text>
166-
</xsl:otherwise>
167-
</xsl:choose>
168-
</xsl:variable>
153+
<xsl:variable
154+
name="imageWidth"
155+
select="
156+
if ($images=1) then 'col-12'
157+
else if ($images=2) then 'col-6'
158+
else if ($images=3) then 'col-4'
159+
else 'col-3'"
160+
/>
169161

170162
<div>
171163
<xsl:attribute name="class" select="$imageWidth"/>

0 commit comments

Comments
 (0)