From 07dd21fc3987245300fa0df35f3de1668c510215 Mon Sep 17 00:00:00 2001
From: Frans Englich <fenglich@fastmail.fm>
Date: Sun, 25 May 2008 22:49:10 +0200
Subject: [PATCH] Have xml:id on mor things, and print when we don't know the
 gravity.

---
 TODO                |  4 +++-
 pottery2docbook.xsl | 28 ++++++++++++++++++----------
 samples.xml         |  2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index f6b1b5e..ef625b6 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@
 * Add W226
 * Separate base glaze.
 * Reference glazes that have the same base glaze.
-* Format hydrometer gravity unknown, W184
 * T232 is sieved but T233 isn't?
 * Maybe manufacturer, can be used for the book?
 
@@ -25,5 +24,8 @@
     - Wollastonite
     - Potash feldspar
     - Talc
+    - Green glass
+    - White glass
+    - Blue glass
 
 vim: et:ts=4:sw=4:sts=4
diff --git a/pottery2docbook.xsl b/pottery2docbook.xsl
index 4e58f15..42b1fb1 100644
--- a/pottery2docbook.xsl
+++ b/pottery2docbook.xsl
@@ -70,7 +70,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
             <xsl:apply-templates select="p:pieces"/>
             <xsl:apply-templates select="p:glazes"/>
 
-            <chapter>
+            <chapter xml:id="NonGlazeSamples">
                 <title>Non-glaze Samples</title>
                 <para>This section contains samples which aren't of glazes,
                     such as melt tests. See also the samples that have at least
@@ -81,7 +81,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
                 <xsl:apply-templates select="p:samples/p:sample[not(p:glazing | p:brushon)]"/>
             </chapter>
 
-            <chapter>
+            <chapter xml:id="OvenPrograms">
                 <title>Oven Programs</title>
 
                 <para>Unless otherwise stated, all firings were done with the following settings.</para>
@@ -158,7 +158,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
     </xsl:template>
 
     <xsl:template match="p:pieces">
-        <chapter>
+        <chapter xml:id="Pieces">
             <title>Pieces</title>
 
             <para>A total of <xsl:value-of select="count(p:piece)"/> pieces.</para>
@@ -207,7 +207,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
     </xsl:template>
 
     <xsl:template match="p:glazes">
-        <chapter>
+        <chapter xml:id="Glazes">
             <title>Glazes by Color</title>
 
             <para>A total of <xsl:value-of select="count(//p:sample)"/> sample tiles.</para>
@@ -216,6 +216,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
                 <xsl:sort select="."/>
 
                 <section>
+                    <xsl:attribute name="xml:id"><xsl:value-of select="."/></xsl:attribute>
                     <title><xsl:value-of select="."/></title>
                     <xsl:apply-templates select="(/)//p:glaze[@category = current()]">
                         <xsl:sort select="@name"/>
@@ -299,9 +300,9 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
             <xsl:if test="position() &lt; last() - 1">
                 <xsl:text>, </xsl:text>
             </xsl:if>
-                <xsl:if test="position() = last()">
-                    <xsl:text>.</xsl:text>
-                </xsl:if>
+            <xsl:if test="position() = last()">
+                <xsl:text>.</xsl:text>
+            </xsl:if>
         </xsl:for-each>
     </xsl:template>
 
@@ -389,7 +390,14 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
     </xsl:template>
 
     <xsl:template match="p:glazing" mode="lowKeyGlazing">
-            <xsl:apply-templates select="@hydrometerGravity"/>
+            <xsl:choose>
+                <xsl:when test="@hydrometerGravity">
+                    <xsl:apply-templates select="@hydrometerGravity"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <emphasis>hydrometer gravity unknown</emphasis>,
+                </xsl:otherwise>
+            </xsl:choose>
             <xsl:apply-templates select="@sieved"/>
     </xsl:template>
 
@@ -416,7 +424,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
     </xsl:template>
 
     <xsl:template name="sourcesAppendix">
-        <appendix>
+        <appendix xml:id="SourceFiles">
             <title>Sources</title>
             <para>This document was generated from the following sources. The string following the file date is the git SHA1 checksum.</para>
             <itemizedlist>
@@ -438,7 +446,7 @@ Texts.  A copy of the license can be obtained at the <phrase xlink:href="http://
     </xsl:template>
 
     <xsl:template match="p:clays">
-        <chapter>
+        <chapter xml:id="Clays">
             <title>Clays</title>
             <xsl:apply-templates/>
         </chapter>
diff --git a/samples.xml b/samples.xml
index 2c40eea..0251101 100644
--- a/samples.xml
+++ b/samples.xml
@@ -1124,7 +1124,7 @@
     <sample date="2008-05-19" xml:id="W184">
         <glazing sieved="WithMixer" idref="NewGrassGreen"/>
         <clayref idref="WSW"/>
-        <db:para>From 200 g slurry, direct after mixing, second batch. Forgot to write this one down, hydrometer reading unknown, somewhere between 40 and 50.</db:para>
+        <db:para>From 200 g slurry, direct after mixing, second batch. I estimate the hydrometer gravity is between 40 and 50.</db:para>
     </sample>
 
     <sample date="2008-05-24" xml:id="W429">
-- 
2.11.4.GIT