Skip to content
Snippets Groups Projects
Commit 4ee04f0a authored by Frank Steinberg's avatar Frank Steinberg
Browse files

Minor fixes.

parent 3efd281a
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ cache/2015_Guidelines_Beer.docx: ...@@ -8,7 +8,7 @@ cache/2015_Guidelines_Beer.docx:
cache/bjcp-2015-styleguide-word.xml: cache/2015_Guidelines_Beer.docx cache/bjcp-2015-styleguide-word.xml: cache/2015_Guidelines_Beer.docx
unzip -p cache/2015_Guidelines_Beer.docx word/document.xml | xmllint --format - > cache/bjcp-2015-styleguide-word.xml unzip -p cache/2015_Guidelines_Beer.docx word/document.xml | xmllint --format - > cache/bjcp-2015-styleguide-word.xml
bjcp-2015-styleguide-orig.xml: cache/bjcp-2015-styleguide-word.xml xsl/bjcp-2015-styleguide-doc-to-xml.xsl bjcp-2015-styleguide-orig.xml: fix cache/bjcp-2015-styleguide-word.xml xsl/bjcp-2015-styleguide-doc-to-xml.xsl
xsltproc xsl/bjcp-2015-styleguide-doc-to-xml.xsl cache/bjcp-2015-styleguide-word.xml > bjcp-2015-styleguide-orig.xml xsltproc xsl/bjcp-2015-styleguide-doc-to-xml.xsl cache/bjcp-2015-styleguide-word.xml > bjcp-2015-styleguide-orig.xml
orig: bjcp-2015-styleguide-orig.xml xsl/bjcp-2015-styleguide-split.xsl orig: bjcp-2015-styleguide-orig.xml xsl/bjcp-2015-styleguide-split.xsl
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<category id="25"> <category id="25">
<subcategory id="25B"> <subcategory id="25B">
<!-- This subcategory is the only one that sub-groups the style in the vital statistics section. For a consistent machine readbale 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. --> <!-- This subcategory is the only one that sub-groups the style in the vital statistics section. For a consistent machine readbale 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> (table: 3.5-5.0%, standard: 5.0-7.0%, super: 7.0-9.5%) and the <span class="italic">color</span> (pale: SRM 5-14, dark: SRM 15-22).</entry-instructions> <entry-instructions>The entrant <span class="bold">must</span> specify the <span class="italic">strength</span> (<span class="italic">table</span>: 3.55.0%, <span class="italic">standard</span>: 5.07.0%, <span class="italic">super</span>: 7.09.5%) and the <span class="italic">color</span> (<span class="italic">pale</span>: SRM 514, <span class="italic">dark</span>: SRM 1522).</entry-instructions>
<specs> <specs>
<ibu min="20" max="35"/> <ibu min="20" max="35"/>
<srm min="5" max="22" ebc-min="10" ebc-max="43"/> <srm min="5" max="22" ebc-min="10" ebc-max="43"/>
......
...@@ -183,7 +183,7 @@ styleguide specs div * { ...@@ -183,7 +183,7 @@ styleguide specs div * {
<xsl:attribute name="class">ibu</xsl:attribute> <xsl:attribute name="class">ibu</xsl:attribute>
<xsl:if test="ibu/@min"> <xsl:if test="ibu/@min">
<xsl:value-of select="ibu/@min"/> <xsl:value-of select="ibu/@min"/>
<xsl:text> - </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="ibu/@max"/> <xsl:value-of select="ibu/@max"/>
</xsl:if> </xsl:if>
<xsl:value-of select="normalize-space(ibu/text())"/> <xsl:value-of select="normalize-space(ibu/text())"/>
...@@ -194,7 +194,7 @@ styleguide specs div * { ...@@ -194,7 +194,7 @@ styleguide specs div * {
<xsl:attribute name="class">srm</xsl:attribute> <xsl:attribute name="class">srm</xsl:attribute>
<xsl:if test="srm/@min"> <xsl:if test="srm/@min">
<xsl:value-of select="srm/@min"/> <xsl:value-of select="srm/@min"/>
<xsl:text> - </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="srm/@max"/> <xsl:value-of select="srm/@max"/>
</xsl:if> </xsl:if>
<xsl:value-of select="normalize-space(srm/text())"/> <xsl:value-of select="normalize-space(srm/text())"/>
...@@ -205,7 +205,7 @@ styleguide specs div * { ...@@ -205,7 +205,7 @@ styleguide specs div * {
<xsl:attribute name="class">og</xsl:attribute> <xsl:attribute name="class">og</xsl:attribute>
<xsl:if test="og/@min"> <xsl:if test="og/@min">
<xsl:value-of select="og/@min"/> <xsl:value-of select="og/@min"/>
<xsl:text> - </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="og/@max"/> <xsl:value-of select="og/@max"/>
</xsl:if> </xsl:if>
<xsl:value-of select="normalize-space(og/text())"/> <xsl:value-of select="normalize-space(og/text())"/>
...@@ -216,7 +216,7 @@ styleguide specs div * { ...@@ -216,7 +216,7 @@ styleguide specs div * {
<xsl:attribute name="class">fg</xsl:attribute> <xsl:attribute name="class">fg</xsl:attribute>
<xsl:if test="fg/@min"> <xsl:if test="fg/@min">
<xsl:value-of select="fg/@min"/> <xsl:value-of select="fg/@min"/>
<xsl:text> - </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="fg/@max"/> <xsl:value-of select="fg/@max"/>
</xsl:if> </xsl:if>
<xsl:value-of select="normalize-space(fg/text())"/> <xsl:value-of select="normalize-space(fg/text())"/>
...@@ -227,7 +227,7 @@ styleguide specs div * { ...@@ -227,7 +227,7 @@ styleguide specs div * {
<xsl:attribute name="class">abv</xsl:attribute> <xsl:attribute name="class">abv</xsl:attribute>
<xsl:if test="abv/@min"> <xsl:if test="abv/@min">
<xsl:value-of select="abv/@min"/> <xsl:value-of select="abv/@min"/>
<xsl:text> - </xsl:text> <xsl:text> </xsl:text>
<xsl:value-of select="abv/@max"/> <xsl:value-of select="abv/@max"/>
</xsl:if> </xsl:if>
<xsl:value-of select="normalize-space(abv/text())"/> <xsl:value-of select="normalize-space(abv/text())"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment