From 3c23d7b62533a54fb22ddb72868b66dbe2ec7218 Mon Sep 17 00:00:00 2001
From: Frank Steinberg <steinberg@ibr.cs.tu-bs.de>
Date: Sat, 5 Oct 2019 11:30:02 +0200
Subject: [PATCH] Shorter bold/italic/underline tags.
---
Makefile | 2 +-
fix/25B.xml | 2 +-
xsl/bjcp-2015-styleguide-doc-to-xml.xsl | 9 +++------
xsl/bjcp-2015-styleguide-html.xsl | 6 +++---
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 26647f7..54feeb9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ bjcp-2015-styleguide-orig.xml: $(FIXFILES) cache/bjcp-2015-styleguide-word.xml x
if [ ! -d orig ] ; then mkdir orig ; fi
xsltproc xsl/bjcp-2015-styleguide-split.xsl bjcp-2015-styleguide-orig.xml
-bjcp-2015-styleguide-de.xml: bjcp-2015-styleguide-orig.xml $(DEFILES) xsl/bjcp-2015-styleguide-translate.xsl
+bjcp-2015-styleguide-de.xml: de bjcp-2015-styleguide-orig.xml $(DEFILES) xsl/bjcp-2015-styleguide-translate.xsl
-xsltproc --stringparam lang de --output bjcp-2015-styleguide-de.xml xsl/bjcp-2015-styleguide-translate.xsl bjcp-2015-styleguide-orig.xml 2>&1 | grep -v "failed to load external entity"
bjcp-2015-styleguide-orig.html: xsl/bjcp-2015-styleguide-html.xsl bjcp-2015-styleguide-orig.xml
diff --git a/fix/25B.xml b/fix/25B.xml
index 73736bc..6480205 100644
--- a/fix/25B.xml
+++ b/fix/25B.xml
@@ -3,7 +3,7 @@
<category id="25">
<subcategory id="25B">
<!-- This subcategory is the only one that sub-groups the style in the vital statistics section. For a consistent machine readable specs section, we would like to have pure numbers here. Therefore we move the "sub-specs" to the entry instructions section, where we think it really belongs. -->
- <entry-instructions>The entrant <span class="bold">must</span> specify the <span class="italic">strength</span> (<span class="italic">table</span>: 3.5 – 5.0%, <span class="italic">standard</span>: 5.0 – 7.0%, <span class="italic">super</span>: 7.0 – 9.5%) and the <span class="italic">color</span> (<span class="italic">pale</span>: SRM 5 – 14, <span class="italic">dark</span>: SRM 15 – 22).</entry-instructions>
+ <entry-instructions>The entrant <b>must</b> specify the <i>strength</i> (<i>table</i>: 3.5 – 5.0%, <i>standard</i>: 5.0 – 7.0%, <i>super</i>: 7.0 – 9.5%) and the <i>color</i> (<i>pale</i>: SRM 5 – 14, <i>dark</i>: SRM 15 – 22).</entry-instructions>
<specs>
<ibu min="20" max="35"/>
<srm min="5" max="22" ebc-min="10" ebc-max="43"/>
diff --git a/xsl/bjcp-2015-styleguide-doc-to-xml.xsl b/xsl/bjcp-2015-styleguide-doc-to-xml.xsl
index ba158ae..cc3babd 100644
--- a/xsl/bjcp-2015-styleguide-doc-to-xml.xsl
+++ b/xsl/bjcp-2015-styleguide-doc-to-xml.xsl
@@ -579,21 +579,18 @@
<xsl:if test="string-length($t) > 0">
<xsl:choose>
<xsl:when test="w:rPr/w:b[not(@w:val='0')]">
- <xsl:element name="span">
- <xsl:attribute name="class">bold</xsl:attribute>
+ <xsl:element name="b">
<xsl:value-of select="$t"/>
</xsl:element>
</xsl:when>
<xsl:when test="w:rPr/w:u[not(@w:val='0')]">
- <xsl:element name="span">
- <xsl:attribute name="class">underline</xsl:attribute>
+ <xsl:element name="u">
<xsl:value-of select="$t"/>
</xsl:element>
</xsl:when>
<!-- WTF, some ° chars are italic in the original document -->
<xsl:when test="(w:rPr/w:i) and ($t != '°')">
- <xsl:element name="span">
- <xsl:attribute name="class">italic</xsl:attribute>
+ <xsl:element name="i">
<xsl:value-of select="$t"/>
</xsl:element>
</xsl:when>
diff --git a/xsl/bjcp-2015-styleguide-html.xsl b/xsl/bjcp-2015-styleguide-html.xsl
index fc67072..bc98198 100644
--- a/xsl/bjcp-2015-styleguide-html.xsl
+++ b/xsl/bjcp-2015-styleguide-html.xsl
@@ -43,15 +43,15 @@ styleguide p {
margin-top:1em;
}
-styleguide span.bold {
+styleguide b {
font-weight: bold;
}
-styleguide span.italic {
+styleguide i {
font-style: italic;
}
-styleguide span.underline {
+styleguide u {
text-decoration: underline;
}
--
GitLab