Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge a11y with latest changes from oop #1

Merged
merged 21 commits into from
Oct 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
46a3b0e
add option a11y in document class as initial commit for a11y branch
polypunkt Sep 24, 2024
89bc451
merged with oop branch, added a11y option and ccaStructStart/End
polypunkt Oct 7, 2024
32e89e3
fundingTexts, https://redmine.le-tex.de/issues/17515
polypunkt Oct 7, 2024
9796eb5
paragraph tagging, https://redmine.le-tex.de/issues/17290
polypunkt Oct 7, 2024
8c5c92f
corrected a11y option in document class
polypunkt Oct 8, 2024
bc0d6f1
corrected para structure for simple paras
polypunkt Oct 9, 2024
16ec6fb
suppress duplicate ids in abstracts, https://redmine.le-tex.de/issue…
polypunkt Oct 9, 2024
f581bec
avoid break after ccaStructEnd to prevent empty lines if \selectlangu…
polypunkt Oct 9, 2024
85e4a19
ccaStruct in verses
polypunkt Oct 10, 2024
6a89fda
improved suppressing duplicate structures
polypunkt Oct 10, 2024
c4a1089
only add structure if a11y option is set
polypunkt Oct 10, 2024
0a4677c
preserving spaces when suppressed structure
polypunkt Oct 10, 2024
9770007
corrected variable type
polypunkt Oct 10, 2024
78898b0
cca-tagging test, https://redmine.le-tex.de/issues/17290
polypunkt Oct 16, 2024
0967830
changed cca-variables to tr:add-cca function
polypunkt Oct 18, 2024
4d8d910
changed structures in verse
polypunkt Oct 18, 2024
7e4547e
minor: discarded inline-comments
polypunkt Oct 21, 2024
460909a
minor: whitespace changes
polypunkt Oct 21, 2024
c6984a8
minor: whitespace
polypunkt Oct 21, 2024
a671415
minor: whitespace
polypunkt Oct 21, 2024
51e79b9
Merge branch 'main' into a11y
polypunkt Oct 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed cca-variables to tr:add-cca function
  • Loading branch information
polypunkt committed Oct 18, 2024
commit 0967830e6847941032dcd008194bb26bc0d4a220
12 changes: 6 additions & 6 deletions xml2tex/latex.conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@
</xsl:param>
<!--\ccaStructStart{P}-->
<rule break-before="0" break-after="0">
<text select="$cca-start[not($suppress-cca) and not($already-structured)], node(), $cca-end[not($suppress-cca) and not($already-structured)]"/>
<text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)], node(), tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
</rule>

<!--<xsl:if test="not($suppress-cca) and not($already-structured)">
Expand Down Expand Up @@ -2075,7 +2075,7 @@
'caption-number', 'caption-numtext-separator')]])]"
as="node()*"/>
<rule name="tpCaption" type="cmd" break-before="1" break-after="1">
<param select="$cca-start, $caption-nodes-without-num, $cca-end"/>
<param select="tr:add-cca('Start', 'P'), $caption-nodes-without-num, tr:add-cca('End', 'P')"/>
</rule>
<xsl:if test="descendant::dbk:footnote or descendant::dbk:anchor[@role eq 'start' or not(@role)]
[@xml:id = $link-refs]
Expand Down Expand Up @@ -2396,13 +2396,13 @@
<xsl:apply-templates select="dbk:title/node()" mode="#current"/>
<xsl:text>\par&#xa;</xsl:text>
</xsl:if>
<text select="$cca-start, *[not(self::dbk:title or self::dbk:attribution)], $cca-end"/>
<text select="tr:add-cca('Start', 'P'), *[not(self::dbk:title or self::dbk:attribution)], tr:add-cca('End', 'P')"/>
</rule>
</template>

<template context="dbk:blockquote[matches(@role, $verse-centered-style)]">
<rule name="versecentered" type="env" break-after="1" break-before="1">
<text select="$cca-start, *[not(self::dbk:title or self::dbk:attribution)], $cca-end"/>
<text select="tr:add-cca('Start', 'P'), *[not(self::dbk:title or self::dbk:attribution)], tr:add-cca('End', 'P')"/>
</rule>
</template>

Expand Down Expand Up @@ -2431,7 +2431,7 @@
</xsl:if>
<rule name="item" type="cmd" break-before="1">
<option select="dbk:phrase[@role = 'speaker']"/>
<text select="$cca-start, node() except dbk:phrase[@role = 'speaker'], $cca-end "/>
<text select="tr:add-cca('Start', 'P'), node() except dbk:phrase[@role = 'speaker'], tr:add-cca('End', 'P') "/>
</rule>
<!-- A11Y? -->
</template>
Expand Down Expand Up @@ -2549,7 +2549,7 @@
<template context="dbk:para[dbk:personname[@role eq 'speaker']]">
<rule name="item" type="cmd" break-before="1">
<option select="dbk:personname[@role eq 'speaker']/normalize-space(string-join(node(), ''))"/>
<text select="$cca-start, node() except dbk:personname[@role eq 'speaker'], $cca-end"/>
<text select="tr:add-cca('Start', 'P'), node() except dbk:personname[@role eq 'speaker'], tr:add-cca('End', 'P')"/>
</rule>
</template>

Expand Down