From 2a4d339e53d6438e1b6dfc2ed892f6a0f61f9eab Mon Sep 17 00:00:00 2001
From: Jeroen Hellingman <jeroen@bohol.ph>
Date: Sat, 2 Jul 2016 21:23:39 +0200
Subject: [PATCH] Move some experimental files out of the way.

---
 .gitignore                                   |   3 +
 inclusions.xsl                               |   4 +-
 sandbox/README.md                            |   2 +
 breaklines.pl => sandbox/breaklines.pl       |  22 +-
 breaklines.xsl => sandbox/breaklines.xsl     | 288 +++----
 css2xml.xsl => sandbox/css2xml.xsl           | 638 +++++++--------
 extract-page.xsl => sandbox/extract-page.xsl | 554 ++++++-------
 extract-segs.xsl => sandbox/extract-segs.xsl |  72 +-
 fb2tei.xsl => sandbox/fb2tei.xsl             | 786 +++++++++----------
 html2tei.xsl => sandbox/html2tei.xsl         | 694 ++++++++--------
 10 files changed, 1534 insertions(+), 1529 deletions(-)
 create mode 100644 sandbox/README.md
 rename breaklines.pl => sandbox/breaklines.pl (97%)
 rename breaklines.xsl => sandbox/breaklines.xsl (97%)
 rename css2xml.xsl => sandbox/css2xml.xsl (96%)
 rename extract-page.xsl => sandbox/extract-page.xsl (97%)
 rename extract-segs.xsl => sandbox/extract-segs.xsl (96%)
 rename fb2tei.xsl => sandbox/fb2tei.xsl (96%)
 rename html2tei.xsl => sandbox/html2tei.xsl (96%)

diff --git a/.gitignore b/.gitignore
index 05389ea4..221f0c8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,6 @@ images/stock_book_yellow-16.png
 images/stock_book-16.png
 images/stock_volume-16.png
 images/thumbs/cover500.jpg
+attic/
+test-kwic.html
+metadata.xml
diff --git a/inclusions.xsl b/inclusions.xsl
index e964318e..f3a1ca37 100644
--- a/inclusions.xsl
+++ b/inclusions.xsl
@@ -9,8 +9,8 @@
     >
 
     <xd:doc type="stylesheet">
-        <xd:short>Stylesheet to align paragraphs in two TEI documents.</xd:short>
-        <xd:detail><p>Stylesheet to align paragraphs in two TEI documents.</p>
+        <xd:short>Stylesheet to include external files into TEI documents.</xd:short>
+        <xd:detail><p>Stylesheet to include external files into TEI documents.</p>
         </xd:detail>
     </xd:doc>
 
diff --git a/sandbox/README.md b/sandbox/README.md
new file mode 100644
index 00000000..b7bfc690
--- /dev/null
+++ b/sandbox/README.md
@@ -0,0 +1,2 @@
+
+This directory contains unfinished or experimental stylesheets.
\ No newline at end of file
diff --git a/breaklines.pl b/sandbox/breaklines.pl
similarity index 97%
rename from breaklines.pl
rename to sandbox/breaklines.pl
index 29e31c32..f23c93a3 100644
--- a/breaklines.pl
+++ b/sandbox/breaklines.pl
@@ -1,11 +1,11 @@
-# Perl script to test the the tei2wl.xsl stylesheet with Saxon.
-
-use strict;
-
-my $xsldir = "C:\\Users\\Jeroen\\Documents\\eLibrary\\Tools\\tei2html";  # location of xsl stylesheets
-my $saxon = "\"C:\\Program Files\\Java\\jre6\\bin\\java.exe\" -jar C:\\bin\\saxonhe9\\saxon9he.jar ";
-
-my $filename = $ARGV[0];
-
-system ("$saxon $filename $xsldir/breaklines.xsl");
-
+# Perl script to test the the tei2wl.xsl stylesheet with Saxon.
+
+use strict;
+
+my $xsldir = "C:\\Users\\Jeroen\\Documents\\eLibrary\\Tools\\tei2html";  # location of xsl stylesheets
+my $saxon = "\"C:\\Program Files\\Java\\jre6\\bin\\java.exe\" -jar C:\\bin\\saxonhe9\\saxon9he.jar ";
+
+my $filename = $ARGV[0];
+
+system ("$saxon $filename $xsldir/breaklines.xsl");
+
diff --git a/breaklines.xsl b/sandbox/breaklines.xsl
similarity index 97%
rename from breaklines.xsl
rename to sandbox/breaklines.xsl
index 3add5bc0..fee3253a 100644
--- a/breaklines.xsl
+++ b/sandbox/breaklines.xsl
@@ -1,144 +1,144 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- An experimental XSLT stylesheet to break a paragraph into lines. -->
-
-<xsl:stylesheet
-    version="2.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-
-    <xsl:template match="/">
-        <xsl:call-template name="breaklines">
-            <xsl:with-param name="text" select="'Dit is een kleine test van de functie break-lines. Hiermee moeten we regels in stukjes kunnen breken, zodat de zinnen netjes in een smalle kolom passen.'"/>
-        </xsl:call-template>
-    </xsl:template>
-
-
-    <xsl:template name="breaklines">
-        <xsl:param name="text"/>
-
-        <xsl:variable name="tokens">
-            <xsl:call-template name="tokenize">
-                <xsl:with-param name="text" select="$text"/>
-            </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:variable name="lines">
-            <xsl:call-template name="lines">
-                <xsl:with-param name="tokens" select="$tokens"/>
-            </xsl:call-template>
-        </xsl:variable>
-
-        <paragraph>
-            <xsl:copy-of select="$lines"/>
-        </paragraph>
-    </xsl:template>
-
-    <!--
-        Use analyze-string to split the string into lexical items.
-
-        1. box:         ([^\s-]+-?)
-        2. space:       (\s+)
-
-    -->
-    <xsl:template name="tokenize">
-        <xsl:param name="text"/>
-
-        <xsl:variable name="patterns" select="'([^-\s]+-?)','(\s+)'"/>
-
-        <xsl:analyze-string select="$text" regex="{string-join($patterns, '|')}" flags="s">
-            <xsl:matching-substring>
-                <xsl:choose>
-                    <!-- box -->
-                    <xsl:when test="regex-group(1)">
-                        <box>
-                            <xsl:value-of select="regex-group(1)"/>
-                        </box>
-                    </xsl:when>
-                    <!-- glue -->
-                    <xsl:when test="regex-group(2)">
-                        <glue>
-                            <xsl:value-of select="regex-group(2)"/>
-                        </glue>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:message terminate="yes" select="'internal error'"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:matching-substring>
-            <xsl:non-matching-substring>
-                <xsl:if test="normalize-space()!=''">
-                    <xsl:message select="concat('unknown token: ', .)"/>
-                </xsl:if>
-            </xsl:non-matching-substring>
-        </xsl:analyze-string>
-    </xsl:template>
-
-
-    <xsl:template name="lines">
-        <xsl:param name="tokens"/>
-
-        <xsl:variable name="breaks">
-            <xsl:call-template name="append-next">
-                <xsl:with-param name="tokens" select="$tokens/*"/>
-                <xsl:with-param name="max" select="44"/>
-                <xsl:with-param name="length" select="0"/>
-            </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:for-each-group select="$breaks/*" group-starting-with="break">
-          <line length="{string-length(string-join(current-group(), ''))}">
-            <xsl:apply-templates select="current-group()"/>
-          </line>
-        </xsl:for-each-group>
-
-
-    </xsl:template>
-
-    <xsl:template name="append-next">
-        <xsl:param name="tokens"/>
-        <xsl:param name="max"/>
-        <xsl:param name="length"/>
-
-        <!-- <d length="{$length}"/> -->
-        <xsl:if test="$tokens">
-            <xsl:variable name="head" select="$tokens[1]"/>
-            <xsl:variable name="next" select="$tokens[2]"/>
-            <xsl:variable name="tail" select="$tokens[position() != 1]"/>
-            <xsl:choose>
-
-                <!-- head is glue and next item does not fit anymore -->
-                <xsl:when test="$head/self::glue and $length + string-length($head) + string-length($next) &gt; $max ">
-                    <break/>
-                    <xsl:call-template name="append-next">
-                        <xsl:with-param name="tokens" select="$tail"/>
-                        <xsl:with-param name="max" select="$max"/>
-                        <xsl:with-param name="length" select="0"/>
-                    </xsl:call-template>
-                </xsl:when>
-
-                <!-- head is not glue and next not fit anymore -->
-                <xsl:when test="$length + string-length($head) + string-length($next) &gt; $max">
-                    <xsl:copy-of select="$head"/>
-                    <break/>
-                    <xsl:call-template name="append-next">
-                        <xsl:with-param name="tokens" select="if ($next/self::glue) then $tokens[position() &gt; 2] else $tail"/>
-                        <xsl:with-param name="max" select="$max"/>
-                        <xsl:with-param name="length" select="0"/>
-                    </xsl:call-template>
-                </xsl:when>
-
-                <!-- next does fit -->
-                <xsl:otherwise>
-                    <xsl:copy-of select="$head"/>
-                    <xsl:call-template name="append-next">
-                        <xsl:with-param name="tokens" select="$tail"/>
-                        <xsl:with-param name="max" select="$max"/>
-                        <xsl:with-param name="length" select="$length + string-length($head)"/>
-                    </xsl:call-template>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:if>
-    </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- An experimental XSLT stylesheet to break a paragraph into lines. -->
+
+<xsl:stylesheet
+    version="2.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+    <xsl:template match="/">
+        <xsl:call-template name="breaklines">
+            <xsl:with-param name="text" select="'Dit is een kleine test van de functie break-lines. Hiermee moeten we regels in stukjes kunnen breken, zodat de zinnen netjes in een smalle kolom passen.'"/>
+        </xsl:call-template>
+    </xsl:template>
+
+
+    <xsl:template name="breaklines">
+        <xsl:param name="text"/>
+
+        <xsl:variable name="tokens">
+            <xsl:call-template name="tokenize">
+                <xsl:with-param name="text" select="$text"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:variable name="lines">
+            <xsl:call-template name="lines">
+                <xsl:with-param name="tokens" select="$tokens"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <paragraph>
+            <xsl:copy-of select="$lines"/>
+        </paragraph>
+    </xsl:template>
+
+    <!--
+        Use analyze-string to split the string into lexical items.
+
+        1. box:         ([^\s-]+-?)
+        2. space:       (\s+)
+
+    -->
+    <xsl:template name="tokenize">
+        <xsl:param name="text"/>
+
+        <xsl:variable name="patterns" select="'([^-\s]+-?)','(\s+)'"/>
+
+        <xsl:analyze-string select="$text" regex="{string-join($patterns, '|')}" flags="s">
+            <xsl:matching-substring>
+                <xsl:choose>
+                    <!-- box -->
+                    <xsl:when test="regex-group(1)">
+                        <box>
+                            <xsl:value-of select="regex-group(1)"/>
+                        </box>
+                    </xsl:when>
+                    <!-- glue -->
+                    <xsl:when test="regex-group(2)">
+                        <glue>
+                            <xsl:value-of select="regex-group(2)"/>
+                        </glue>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message terminate="yes" select="'internal error'"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:matching-substring>
+            <xsl:non-matching-substring>
+                <xsl:if test="normalize-space()!=''">
+                    <xsl:message select="concat('unknown token: ', .)"/>
+                </xsl:if>
+            </xsl:non-matching-substring>
+        </xsl:analyze-string>
+    </xsl:template>
+
+
+    <xsl:template name="lines">
+        <xsl:param name="tokens"/>
+
+        <xsl:variable name="breaks">
+            <xsl:call-template name="append-next">
+                <xsl:with-param name="tokens" select="$tokens/*"/>
+                <xsl:with-param name="max" select="44"/>
+                <xsl:with-param name="length" select="0"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:for-each-group select="$breaks/*" group-starting-with="break">
+          <line length="{string-length(string-join(current-group(), ''))}">
+            <xsl:apply-templates select="current-group()"/>
+          </line>
+        </xsl:for-each-group>
+
+
+    </xsl:template>
+
+    <xsl:template name="append-next">
+        <xsl:param name="tokens"/>
+        <xsl:param name="max"/>
+        <xsl:param name="length"/>
+
+        <!-- <d length="{$length}"/> -->
+        <xsl:if test="$tokens">
+            <xsl:variable name="head" select="$tokens[1]"/>
+            <xsl:variable name="next" select="$tokens[2]"/>
+            <xsl:variable name="tail" select="$tokens[position() != 1]"/>
+            <xsl:choose>
+
+                <!-- head is glue and next item does not fit anymore -->
+                <xsl:when test="$head/self::glue and $length + string-length($head) + string-length($next) &gt; $max ">
+                    <break/>
+                    <xsl:call-template name="append-next">
+                        <xsl:with-param name="tokens" select="$tail"/>
+                        <xsl:with-param name="max" select="$max"/>
+                        <xsl:with-param name="length" select="0"/>
+                    </xsl:call-template>
+                </xsl:when>
+
+                <!-- head is not glue and next not fit anymore -->
+                <xsl:when test="$length + string-length($head) + string-length($next) &gt; $max">
+                    <xsl:copy-of select="$head"/>
+                    <break/>
+                    <xsl:call-template name="append-next">
+                        <xsl:with-param name="tokens" select="if ($next/self::glue) then $tokens[position() &gt; 2] else $tail"/>
+                        <xsl:with-param name="max" select="$max"/>
+                        <xsl:with-param name="length" select="0"/>
+                    </xsl:call-template>
+                </xsl:when>
+
+                <!-- next does fit -->
+                <xsl:otherwise>
+                    <xsl:copy-of select="$head"/>
+                    <xsl:call-template name="append-next">
+                        <xsl:with-param name="tokens" select="$tail"/>
+                        <xsl:with-param name="max" select="$max"/>
+                        <xsl:with-param name="length" select="$length + string-length($head)"/>
+                    </xsl:call-template>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/css2xml.xsl b/sandbox/css2xml.xsl
similarity index 96%
rename from css2xml.xsl
rename to sandbox/css2xml.xsl
index e0343fec..af032700 100644
--- a/css2xml.xsl
+++ b/sandbox/css2xml.xsl
@@ -1,320 +1,320 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- An experimental stylesheet to parse (a limited subset of) CSS, and to render it again in a more compact form -->
-
-<xsl:stylesheet
-    version="2.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-
-    <xsl:template match="style">
-        <xsl:call-template name="css2xml">
-            <xsl:with-param name="text" select="."/>
-        </xsl:call-template>
-    </xsl:template>
-
-
-    <xsl:template name="css2xml">
-        <xsl:param name="text"/>
-
-        <xsl:variable name="tokens">
-            <xsl:call-template name="tokenize">
-                <xsl:with-param name="text" select="$text"/>
-            </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:variable name="tokens">
-            <xsl:apply-templates mode="atkeyword" select="$tokens"/>
-        </xsl:variable>
-
-        <xsl:variable name="blocks">
-            <xsl:apply-templates mode="blocks" select="$tokens/*[1]"/>
-        </xsl:variable>
-
-        <xsl:variable name="rules">
-            <xsl:apply-templates mode="rules" select="$blocks"/>
-        </xsl:variable>
-
-        <xsl:variable name="properties">
-            <xsl:apply-templates mode="properties" select="$rules"/>
-        </xsl:variable>
-
-        <xsl:variable name="keyvalue">
-            <xsl:apply-templates mode="keyvalue" select="$properties"/>
-        </xsl:variable>
-
-        <xsl:variable name="selector">
-            <xsl:apply-templates mode="selector" select="$keyvalue"/>
-        </xsl:variable>
-
-        <xsl:variable name="cleanup">
-            <xsl:apply-templates mode="cleanup" select="$selector"/>
-        </xsl:variable>
-
-        <xsl:variable name="unparse">
-            <xsl:apply-templates mode="unparse" select="$cleanup"/>
-        </xsl:variable>
-
-        <stylesheet>
-            <xsl:copy-of select="$cleanup"/>
-
-            <xsl:copy-of select="$unparse"/>
-        </stylesheet>
-    </xsl:template>
-
-    <!--
-        Use analyze-string to split the string into lexical items.
-
-        1. comment:     /\*(.*?)\*/
-        2. string:      ('|&quot;)(.*?)\1
-        3. number:      (-?\d+(\.\d+)?)
-        4. ident:       ([\w-]+)
-        5. symbol:      ([:;,.#%@\{\}\[\]])
-        6. space:       (\s+)
-
-    -->
-    <xsl:template name="tokenize">
-        <xsl:param name="text"/>
-
-        <xsl:variable name="patterns"
-            select="'/\*(.*?)\*/','((''|&quot;).*?\3)','(-?\d+(\.\d+)?)','([\w-]+)','([:;,.#@\{\}\[\]])','(\s+)'"/>
-
-        <xsl:analyze-string select="$text" regex="{string-join($patterns,'|')}" flags="s">
-            <xsl:matching-substring>
-                <xsl:choose>
-                    <!-- comment -->
-                    <xsl:when test="regex-group(1)">
-                        <xsl:comment>
-                            <xsl:value-of select="regex-group(1)"/>
-                        </xsl:comment>
-                    </xsl:when>
-                    <!-- string -->
-                    <xsl:when test="regex-group(2)">
-                        <string>
-                            <xsl:value-of select="regex-group(2)"/>
-                        </string>
-                    </xsl:when>
-                    <!-- number -->
-                    <xsl:when test="regex-group(4)">
-                        <number>
-                            <xsl:value-of select="regex-group(4)"/>
-                        </number>
-                    </xsl:when>
-                    <!-- ident -->
-                    <xsl:when test="regex-group(6)">
-                        <ident>
-                            <xsl:value-of select="regex-group(6)"/>
-                        </ident>
-                    </xsl:when>
-                    <!-- symbol -->
-                    <xsl:when test="regex-group(7)">
-                        <symbol>
-                            <xsl:value-of select="regex-group(7)"/>
-                        </symbol>
-                    </xsl:when>
-                    <!-- space -->
-                    <xsl:when test="regex-group(8)">
-                        <space>
-                            <xsl:value-of select="regex-group(8)"/>
-                        </space>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:message terminate="yes" select="'internal error'"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:matching-substring>
-            <xsl:non-matching-substring>
-                <xsl:if test="normalize-space() != ''">
-                    <xsl:message select="concat('unknown token: ', .)"/>
-                </xsl:if>
-            </xsl:non-matching-substring>
-        </xsl:analyze-string>
-    </xsl:template>
-
-
-    <!-- atkeyword -->
-
-    <xsl:template mode="atkeyword" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="atkeyword" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="atkeyword" match="symbol[.='#'][following-sibling::*[1]/self::ident]">
-        <hash>
-            <xsl:text>#</xsl:text>
-            <xsl:value-of select="following-sibling::*[1]"/>
-        </hash>
-    </xsl:template>
-
-    <xsl:template mode="atkeyword" match="ident[preceding-sibling::*[1]/self::symbol[.='#']]"/>
-
-    <xsl:template mode="atkeyword" match="symbol[.='@'][following-sibling::*[1]/self::ident]">
-        <atkeyword>
-            <xsl:text>@</xsl:text>
-            <xsl:value-of select="following-sibling::*[1]"/>
-        </atkeyword>
-    </xsl:template>
-
-    <xsl:template mode="atkeyword" match="ident[preceding-sibling::*[1]/self::symbol[.='@']]"/>
-
-
-    <!-- use sibling recursion to group things between braces -->
-
-    <xsl:template mode="blocks" match="node()" priority="-9">
-        <xsl:copy-of select="."/>
-        <xsl:apply-templates mode="blocks" select="following-sibling::*[1]"/>
-    </xsl:template>
-
-    <xsl:template mode="blocks" match="symbol[.='}']"/>
-
-    <xsl:template mode="blocks" match="symbol[.='{']">
-        <block>
-            <xsl:apply-templates mode="blocks" select="following-sibling::*[1]"/>
-        </block>
-        <xsl:variable name="level" select="count(preceding-sibling::symbol[.='{']) - count(preceding-sibling::symbol[.='}']) + 1"/>
-        <xsl:variable name="closer"
-            select="following-sibling::symbol[.='}' and (count(preceding-sibling::symbol[.='{']) - count(preceding-sibling::symbol[.='}'])) = $level][1]"/>
-        <xsl:apply-templates mode="blocks" select="$closer/following-sibling::*[1]"/>
-    </xsl:template>
-
-
-    <!-- group rules -->
-
-    <xsl:template mode="rules" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="rules" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="rules" match="/">
-            <xsl:for-each-group select="*" group-ending-with="block">
-                <rule>
-                    <xsl:apply-templates mode="rules" select="current-group()"/>
-                </rule>
-            </xsl:for-each-group>
-    </xsl:template>
-
-
-    <!-- group properties -->
-
-    <xsl:template mode="properties" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="properties" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="properties" match="block">
-        <block>
-            <xsl:for-each-group select="*" group-ending-with="symbol[.=';']">
-                <property>
-                    <xsl:apply-templates mode="properties" select="current-group()"/>
-                </property>
-            </xsl:for-each-group>
-        </block>
-    </xsl:template>
-
-    <!-- eliminate empty rules -->
-    <xsl:template mode="properties" match="rule[normalize-space(.) = '']"/>
-
-
-    <!-- key-value properties -->
-
-    <xsl:template mode="keyvalue" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="keyvalue" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="keyvalue" match="property">
-        <xsl:apply-templates mode="keyvalue2" select="symbol[.=':']"/>
-    </xsl:template>
-
-    <xsl:template mode="keyvalue2" match="symbol[.=':']">
-        <property>
-            <key>
-                <xsl:apply-templates mode="keyvalue" select="preceding-sibling::*"/>
-            </key>
-            <value>
-                <xsl:apply-templates mode="keyvalue" select="following-sibling::*"/>
-            </value>
-        </property>
-    </xsl:template>
-
-    <xsl:template mode="keyvalue" match="symbol[.=';']"/>
-    <xsl:template mode="keyvalue" match="space[position() = 1]"/>
-
-
-    <!-- selector properties -->
-
-    <xsl:template mode="selector" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="selector" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="selector" match="*[following-sibling::block]"/>
-
-    <xsl:template mode="selector" match="block">
-        <selector>
-            <xsl:copy-of select="preceding-sibling::*"/>
-        </selector>
-        <properties>
-            <xsl:apply-templates mode="selector"/>
-        </properties>
-    </xsl:template>
-
-
-    <!-- selector properties -->
-
-    <xsl:template mode="cleanup" match="@*|node()" priority="-9">
-        <xsl:copy>
-            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="cleanup" match="selector | key | value">
-        <xsl:copy>
-            <xsl:value-of select="normalize-space(string-join(., ''))"/>
-        </xsl:copy>
-    </xsl:template>
-
-
-    <!-- unparse -->
-
-    <xsl:template mode="unparse" match="/">
-        <style type="text/css">
-            <xsl:apply-templates mode="unparse"/>
-        </style>
-    </xsl:template>
-
-    <xsl:template mode="unparse" match="rule">
-        <xsl:text>
-</xsl:text>
-            <xsl:apply-templates mode="unparse"/>
-        <xsl:text>
-</xsl:text>
-    </xsl:template>
-
-    <xsl:template mode="unparse" match="selector">
-        <xsl:value-of select="."/>
-    </xsl:template>
-
-    <xsl:template mode="unparse" match="properties">
-        <xsl:text>
-{</xsl:text>
-        <xsl:apply-templates mode="unparse"/>
-        <xsl:text>
-}</xsl:text>
-    </xsl:template>
-
-    <xsl:template mode="unparse" match="property">
-        <xsl:text>
-</xsl:text>
-        <xsl:value-of select="key"/>
-        <xsl:text>:</xsl:text>
-        <xsl:value-of select="value"/>
-        <xsl:text>;</xsl:text>
-    </xsl:template>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- An experimental stylesheet to parse (a limited subset of) CSS, and to render it again in a more compact form -->
+
+<xsl:stylesheet
+    version="2.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+    <xsl:template match="style">
+        <xsl:call-template name="css2xml">
+            <xsl:with-param name="text" select="."/>
+        </xsl:call-template>
+    </xsl:template>
+
+
+    <xsl:template name="css2xml">
+        <xsl:param name="text"/>
+
+        <xsl:variable name="tokens">
+            <xsl:call-template name="tokenize">
+                <xsl:with-param name="text" select="$text"/>
+            </xsl:call-template>
+        </xsl:variable>
+
+        <xsl:variable name="tokens">
+            <xsl:apply-templates mode="atkeyword" select="$tokens"/>
+        </xsl:variable>
+
+        <xsl:variable name="blocks">
+            <xsl:apply-templates mode="blocks" select="$tokens/*[1]"/>
+        </xsl:variable>
+
+        <xsl:variable name="rules">
+            <xsl:apply-templates mode="rules" select="$blocks"/>
+        </xsl:variable>
+
+        <xsl:variable name="properties">
+            <xsl:apply-templates mode="properties" select="$rules"/>
+        </xsl:variable>
+
+        <xsl:variable name="keyvalue">
+            <xsl:apply-templates mode="keyvalue" select="$properties"/>
+        </xsl:variable>
+
+        <xsl:variable name="selector">
+            <xsl:apply-templates mode="selector" select="$keyvalue"/>
+        </xsl:variable>
+
+        <xsl:variable name="cleanup">
+            <xsl:apply-templates mode="cleanup" select="$selector"/>
+        </xsl:variable>
+
+        <xsl:variable name="unparse">
+            <xsl:apply-templates mode="unparse" select="$cleanup"/>
+        </xsl:variable>
+
+        <stylesheet>
+            <xsl:copy-of select="$cleanup"/>
+
+            <xsl:copy-of select="$unparse"/>
+        </stylesheet>
+    </xsl:template>
+
+    <!--
+        Use analyze-string to split the string into lexical items.
+
+        1. comment:     /\*(.*?)\*/
+        2. string:      ('|&quot;)(.*?)\1
+        3. number:      (-?\d+(\.\d+)?)
+        4. ident:       ([\w-]+)
+        5. symbol:      ([:;,.#%@\{\}\[\]])
+        6. space:       (\s+)
+
+    -->
+    <xsl:template name="tokenize">
+        <xsl:param name="text"/>
+
+        <xsl:variable name="patterns"
+            select="'/\*(.*?)\*/','((''|&quot;).*?\3)','(-?\d+(\.\d+)?)','([\w-]+)','([:;,.#@\{\}\[\]])','(\s+)'"/>
+
+        <xsl:analyze-string select="$text" regex="{string-join($patterns,'|')}" flags="s">
+            <xsl:matching-substring>
+                <xsl:choose>
+                    <!-- comment -->
+                    <xsl:when test="regex-group(1)">
+                        <xsl:comment>
+                            <xsl:value-of select="regex-group(1)"/>
+                        </xsl:comment>
+                    </xsl:when>
+                    <!-- string -->
+                    <xsl:when test="regex-group(2)">
+                        <string>
+                            <xsl:value-of select="regex-group(2)"/>
+                        </string>
+                    </xsl:when>
+                    <!-- number -->
+                    <xsl:when test="regex-group(4)">
+                        <number>
+                            <xsl:value-of select="regex-group(4)"/>
+                        </number>
+                    </xsl:when>
+                    <!-- ident -->
+                    <xsl:when test="regex-group(6)">
+                        <ident>
+                            <xsl:value-of select="regex-group(6)"/>
+                        </ident>
+                    </xsl:when>
+                    <!-- symbol -->
+                    <xsl:when test="regex-group(7)">
+                        <symbol>
+                            <xsl:value-of select="regex-group(7)"/>
+                        </symbol>
+                    </xsl:when>
+                    <!-- space -->
+                    <xsl:when test="regex-group(8)">
+                        <space>
+                            <xsl:value-of select="regex-group(8)"/>
+                        </space>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:message terminate="yes" select="'internal error'"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:matching-substring>
+            <xsl:non-matching-substring>
+                <xsl:if test="normalize-space() != ''">
+                    <xsl:message select="concat('unknown token: ', .)"/>
+                </xsl:if>
+            </xsl:non-matching-substring>
+        </xsl:analyze-string>
+    </xsl:template>
+
+
+    <!-- atkeyword -->
+
+    <xsl:template mode="atkeyword" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="atkeyword" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="atkeyword" match="symbol[.='#'][following-sibling::*[1]/self::ident]">
+        <hash>
+            <xsl:text>#</xsl:text>
+            <xsl:value-of select="following-sibling::*[1]"/>
+        </hash>
+    </xsl:template>
+
+    <xsl:template mode="atkeyword" match="ident[preceding-sibling::*[1]/self::symbol[.='#']]"/>
+
+    <xsl:template mode="atkeyword" match="symbol[.='@'][following-sibling::*[1]/self::ident]">
+        <atkeyword>
+            <xsl:text>@</xsl:text>
+            <xsl:value-of select="following-sibling::*[1]"/>
+        </atkeyword>
+    </xsl:template>
+
+    <xsl:template mode="atkeyword" match="ident[preceding-sibling::*[1]/self::symbol[.='@']]"/>
+
+
+    <!-- use sibling recursion to group things between braces -->
+
+    <xsl:template mode="blocks" match="node()" priority="-9">
+        <xsl:copy-of select="."/>
+        <xsl:apply-templates mode="blocks" select="following-sibling::*[1]"/>
+    </xsl:template>
+
+    <xsl:template mode="blocks" match="symbol[.='}']"/>
+
+    <xsl:template mode="blocks" match="symbol[.='{']">
+        <block>
+            <xsl:apply-templates mode="blocks" select="following-sibling::*[1]"/>
+        </block>
+        <xsl:variable name="level" select="count(preceding-sibling::symbol[.='{']) - count(preceding-sibling::symbol[.='}']) + 1"/>
+        <xsl:variable name="closer"
+            select="following-sibling::symbol[.='}' and (count(preceding-sibling::symbol[.='{']) - count(preceding-sibling::symbol[.='}'])) = $level][1]"/>
+        <xsl:apply-templates mode="blocks" select="$closer/following-sibling::*[1]"/>
+    </xsl:template>
+
+
+    <!-- group rules -->
+
+    <xsl:template mode="rules" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="rules" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="rules" match="/">
+            <xsl:for-each-group select="*" group-ending-with="block">
+                <rule>
+                    <xsl:apply-templates mode="rules" select="current-group()"/>
+                </rule>
+            </xsl:for-each-group>
+    </xsl:template>
+
+
+    <!-- group properties -->
+
+    <xsl:template mode="properties" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="properties" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="properties" match="block">
+        <block>
+            <xsl:for-each-group select="*" group-ending-with="symbol[.=';']">
+                <property>
+                    <xsl:apply-templates mode="properties" select="current-group()"/>
+                </property>
+            </xsl:for-each-group>
+        </block>
+    </xsl:template>
+
+    <!-- eliminate empty rules -->
+    <xsl:template mode="properties" match="rule[normalize-space(.) = '']"/>
+
+
+    <!-- key-value properties -->
+
+    <xsl:template mode="keyvalue" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="keyvalue" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="keyvalue" match="property">
+        <xsl:apply-templates mode="keyvalue2" select="symbol[.=':']"/>
+    </xsl:template>
+
+    <xsl:template mode="keyvalue2" match="symbol[.=':']">
+        <property>
+            <key>
+                <xsl:apply-templates mode="keyvalue" select="preceding-sibling::*"/>
+            </key>
+            <value>
+                <xsl:apply-templates mode="keyvalue" select="following-sibling::*"/>
+            </value>
+        </property>
+    </xsl:template>
+
+    <xsl:template mode="keyvalue" match="symbol[.=';']"/>
+    <xsl:template mode="keyvalue" match="space[position() = 1]"/>
+
+
+    <!-- selector properties -->
+
+    <xsl:template mode="selector" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="selector" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="selector" match="*[following-sibling::block]"/>
+
+    <xsl:template mode="selector" match="block">
+        <selector>
+            <xsl:copy-of select="preceding-sibling::*"/>
+        </selector>
+        <properties>
+            <xsl:apply-templates mode="selector"/>
+        </properties>
+    </xsl:template>
+
+
+    <!-- selector properties -->
+
+    <xsl:template mode="cleanup" match="@*|node()" priority="-9">
+        <xsl:copy>
+            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="cleanup" match="selector | key | value">
+        <xsl:copy>
+            <xsl:value-of select="normalize-space(string-join(., ''))"/>
+        </xsl:copy>
+    </xsl:template>
+
+
+    <!-- unparse -->
+
+    <xsl:template mode="unparse" match="/">
+        <style type="text/css">
+            <xsl:apply-templates mode="unparse"/>
+        </style>
+    </xsl:template>
+
+    <xsl:template mode="unparse" match="rule">
+        <xsl:text>
+</xsl:text>
+            <xsl:apply-templates mode="unparse"/>
+        <xsl:text>
+</xsl:text>
+    </xsl:template>
+
+    <xsl:template mode="unparse" match="selector">
+        <xsl:value-of select="."/>
+    </xsl:template>
+
+    <xsl:template mode="unparse" match="properties">
+        <xsl:text>
+{</xsl:text>
+        <xsl:apply-templates mode="unparse"/>
+        <xsl:text>
+}</xsl:text>
+    </xsl:template>
+
+    <xsl:template mode="unparse" match="property">
+        <xsl:text>
+</xsl:text>
+        <xsl:value-of select="key"/>
+        <xsl:text>:</xsl:text>
+        <xsl:value-of select="value"/>
+        <xsl:text>;</xsl:text>
+    </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/extract-page.xsl b/sandbox/extract-page.xsl
similarity index 97%
rename from extract-page.xsl
rename to sandbox/extract-page.xsl
index 61a39aa4..7a2a1006 100644
--- a/extract-page.xsl
+++ b/sandbox/extract-page.xsl
@@ -1,277 +1,277 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    xmlns:f="urn:stylesheet-functions"
-    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="f xs xd"
-    version="2.0">
-
-    <xd:doc type="stylesheet">
-        <xd:short>Extract page from a TEI document.</xd:short>
-        <xd:detail>
-            <p>This stylesheet extracts a page from a TEI document, that is, all content between two pb-elements.</p>
-
-            <p>This is somewhat more complicated than it appears at first because page-break elements are milestones, that
-            do not follow any particular structure, and 
-            sometimes footnotes spread out over more than one page, and we only want the content that actually occurs on
-            the page indicated, that is, including any parts of footnotes on a previous page that are carried over to
-            the page being extracted, and excluding parts of footnotes that have been carried over to following pages.</p>
-
-            <p>To make the code to achieve this somewhat readable, we first pre-process the TEI document, such that
-            page-breaks in footnotes use a different element (fnpb), and all page-breaks have a @p attribute, indicating
-            their position (we clean this up later-on). Then we split-up the horrendous test required to achieve this
-            into several parts.</p>
-        </xd:detail>
-        <xd:author>Jeroen Hellingman</xd:author>
-        <xd:copyright>2011, Jeroen Hellingman</xd:copyright>
-    </xd:doc>
-
-
-    <xsl:output 
-        method="xml" 
-        indent="yes"
-        encoding="utf-8"/>
-
-
-    <xd:doc type="string">Number of page to extract (based on @n attribute).</xd:doc>
-
-    <xsl:param name="n" select="-1"/>
-
-
-    <xd:doc type="string">Number of page following the page to extract, determined by code.</xd:doc>
-
-    <xsl:variable name="m">
-        <xsl:value-of select="//pb[not(ancestor::note)][@n=$n]/following::pb[not(ancestor::note)][1]/@n"/>
-    </xsl:variable>
-
-
-    <xd:doc type="string">Number of page to extract (based on position).</xd:doc>
-
-    <xsl:param name="p" select="count(//pb[not(ancestor::note)][@n=$n]/preceding::pb[not(ancestor::note)])"/>
-
-    <xsl:variable name="q">
-        <xsl:value-of select="$p + 1"/>
-    </xsl:variable>
-
-
-    <xsl:template match="/">
-
-        <xsl:message>Extracting page '<xsl:value-of select="$n"/>' at position <xsl:value-of select="$p"/></xsl:message>
-
-        <xsl:variable name="text">
-            <xsl:apply-templates mode="preprocess"/>
-        </xsl:variable>
-
-        <xsl:variable name="text">
-            <xsl:apply-templates select="$text" mode="countnotes"/>
-        </xsl:variable>
-
-        <xsl:variable name="page">
-            <xsl:apply-templates select="$text" mode="extract-page-q"/>
-        </xsl:variable>
-
-        <xsl:variable name="page">
-            <xsl:apply-templates select="$page" mode="cleanup"/>
-        </xsl:variable>
-
-        <xsl:copy-of select="$page"/>
-
-    </xsl:template>
-
-
-    <xsl:template mode="preprocess" match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates mode="preprocess" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="preprocess" match="pb[ancestor::note]">
-        <fnpb>
-            <xsl:apply-templates mode="preprocess" select="@*|node()"/>
-        </fnpb>
-    </xsl:template>
-
-
-
-
-    <xsl:template mode="countnotes" match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="countnotes" match="pb">
-        <xsl:copy>
-            <xsl:attribute name="p" select="count(preceding::pb)"/>
-            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="countnotes" match="fnpb">
-        <xsl:copy>
-            <xsl:attribute name="p" select="count(preceding::pb) + count(preceding::fnpb[./descendant::note])"/>
-            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-
-
-
-    <xsl:template mode="cleanup" match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="cleanup" match="fnpb">
-        <pb>
-            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
-        </pb>
-    </xsl:template>
-
-    <xsl:template mode="cleanup" match="fnpb/@p | pb/@p"/>
- 
-
-
-
-    <xsl:template mode="extract-page-q" match="* | node()" priority="3">
-
-        <!-- Content not after pb/@p=q -->
-        <xsl:variable name="test" select="not(preceding::pb/@p=$q or self::pb/@p=$q)"/>
-
-        <!-- Content after pb/@p=p -->
-        <xsl:variable name="test" select="$test and ((self::* and descendant-or-self::pb/@p=$p) or preceding::pb/@p=$p)"/>
-
-        <!-- Content in note and not after fnpb/@p=q -->
-        <xsl:variable name="overflow" select="./ancestor::note and (preceding::fnpb/@p=$q or self::fnpb/@p=$q)"/>
-
-        <!-- Exclude the overflow of notes on this page -->
-        <xsl:variable name="test" select="$test and not($overflow)"/>
-
-        <!-- Content in a preceding note might overflow into this page -->
-        <xsl:variable name="previousoverflow" select="if ((ancestor::note or self::note) and following::pb/@p=$p) then true() else false()"/>
-
-        <!-- Content in a note not after fnpb/@p=q -->
-        <xsl:variable name="previousoverflow" select="$previousoverflow and not(preceding::fnpb/@p=$q or self::fnpb/@p=$q)"/>
-
-        <!-- Content in a note after fnpb/@p=p -->
-        <xsl:variable name="previousoverflow" select="$previousoverflow and ((self::* and descendant-or-self::fnpb/@p=$p) or preceding::fnpb/@p=$p)"/>
-
-        <!-- We want the content of the current page and those of notes overflown into this page -->
-        <xsl:variable name="test" select="$test or $previousoverflow"/>
-
-        <!-- Copy elements and text on given page -->
-        <xsl:choose>
-            <xsl:when test="$test">
-                <xsl:copy>
-                    <xsl:copy-of select="@*"/>
-                    <xsl:apply-templates mode="extract-page-q"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates mode="extract-page-q"/>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-
-
-
-
-
-    <!-- To make the below more readable, replace pb[not(ancestor::note)] with pb -->
-
-
-    <xsl:template mode="extract-page" match="node()" priority="1"/>
-
-    <xsl:template mode="extract-page" match="*[descendant-or-self::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$p]] | node()[preceding::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$p]]" priority="2">
-         <xsl:copy>
-            <xsl:copy-of select="@*"/>
-            <xsl:apply-templates mode="extract-page"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="extract-page" match="node()[preceding::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$q] or self::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$q]]" priority="3"/>
-
-
-
-
-    <xsl:template mode="extract-page-n" match="node()" priority="1"/>
-
-    <xsl:template mode="extract-page-n" match="*[descendant-or-self::pb[not(ancestor::note)][not(ancestor::note)]/@n=$n] | node()[preceding::pb[not(ancestor::note)][not(ancestor::note)]/@n=$n]" priority="2">
-         <xsl:copy>
-            <xsl:copy-of select="@*"/>
-            <xsl:apply-templates mode="extract-page-n"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template mode="extract-page-n" match="node()[preceding::pb[not(ancestor::note)][not(ancestor::note)]/@n=$m or self::pb[not(ancestor::note)][not(ancestor::note)]/@n=$m]" priority="3"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <xsl:template name="sample">
-
-Extracting a fragment between milestones from a complex structure.
-
-I am looking for a template which allows me to extract a single page, as marked by milestone
-elements <pb n="12"/> from a complex structure. Note that the milestone elements may occur in 
-different parents. I want all the parent nodes, and everything between the <pb n="12"/> and the next 
-<pb/> element
-
-For example, when applying the extract method with as parameter "12" on the following sample
-
-<TEI>
-    <front>...</front>
-    <body>
-        <div1>
-            <head>Blah</head>
-            Blah blah <pb n="12"/> blah blah.
-        </div1>
-        <div1>
-            Blah blah blah blah.
-        </div1>
-        <div1>
-            Blah <hi>blah <pb n="13"/> blah</hi> blah.
-        </div1>
-    </body>
-    <back>...</back>
-</TEI>
-
-It should return:
-
-<TEI.2>
-    <body>
-        <div1>
-            <pb n="12"/> blah blah.
-        </div1>
-        <div1>
-            Blah blah blah blah.
-        </div1>
-        <div1>
-            Blah <hi>blah <pb n="13"/></hi>
-        </div1>
-    </body>
-</TEI.2>
-
-The idea is that it will copy only elements that are a ancestor of either <pb/> and follow
-the first <pb/> and precede the second <pb/>. The problem I face is formulating a nice XPath to select
-those elements.
-
-    </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet
+    xmlns:f="urn:stylesheet-functions"
+    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    exclude-result-prefixes="f xs xd"
+    version="2.0">
+
+    <xd:doc type="stylesheet">
+        <xd:short>Extract page from a TEI document.</xd:short>
+        <xd:detail>
+            <p>This stylesheet extracts a page from a TEI document, that is, all content between two pb-elements.</p>
+
+            <p>This is somewhat more complicated than it appears at first because page-break elements are milestones, that
+            do not follow any particular structure, and 
+            sometimes footnotes spread out over more than one page, and we only want the content that actually occurs on
+            the page indicated, that is, including any parts of footnotes on a previous page that are carried over to
+            the page being extracted, and excluding parts of footnotes that have been carried over to following pages.</p>
+
+            <p>To make the code to achieve this somewhat readable, we first pre-process the TEI document, such that
+            page-breaks in footnotes use a different element (fnpb), and all page-breaks have a @p attribute, indicating
+            their position (we clean this up later-on). Then we split-up the horrendous test required to achieve this
+            into several parts.</p>
+        </xd:detail>
+        <xd:author>Jeroen Hellingman</xd:author>
+        <xd:copyright>2011, Jeroen Hellingman</xd:copyright>
+    </xd:doc>
+
+
+    <xsl:output 
+        method="xml" 
+        indent="yes"
+        encoding="utf-8"/>
+
+
+    <xd:doc type="string">Number of page to extract (based on @n attribute).</xd:doc>
+
+    <xsl:param name="n" select="-1"/>
+
+
+    <xd:doc type="string">Number of page following the page to extract, determined by code.</xd:doc>
+
+    <xsl:variable name="m">
+        <xsl:value-of select="//pb[not(ancestor::note)][@n=$n]/following::pb[not(ancestor::note)][1]/@n"/>
+    </xsl:variable>
+
+
+    <xd:doc type="string">Number of page to extract (based on position).</xd:doc>
+
+    <xsl:param name="p" select="count(//pb[not(ancestor::note)][@n=$n]/preceding::pb[not(ancestor::note)])"/>
+
+    <xsl:variable name="q">
+        <xsl:value-of select="$p + 1"/>
+    </xsl:variable>
+
+
+    <xsl:template match="/">
+
+        <xsl:message>Extracting page '<xsl:value-of select="$n"/>' at position <xsl:value-of select="$p"/></xsl:message>
+
+        <xsl:variable name="text">
+            <xsl:apply-templates mode="preprocess"/>
+        </xsl:variable>
+
+        <xsl:variable name="text">
+            <xsl:apply-templates select="$text" mode="countnotes"/>
+        </xsl:variable>
+
+        <xsl:variable name="page">
+            <xsl:apply-templates select="$text" mode="extract-page-q"/>
+        </xsl:variable>
+
+        <xsl:variable name="page">
+            <xsl:apply-templates select="$page" mode="cleanup"/>
+        </xsl:variable>
+
+        <xsl:copy-of select="$page"/>
+
+    </xsl:template>
+
+
+    <xsl:template mode="preprocess" match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates mode="preprocess" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="preprocess" match="pb[ancestor::note]">
+        <fnpb>
+            <xsl:apply-templates mode="preprocess" select="@*|node()"/>
+        </fnpb>
+    </xsl:template>
+
+
+
+
+    <xsl:template mode="countnotes" match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="countnotes" match="pb">
+        <xsl:copy>
+            <xsl:attribute name="p" select="count(preceding::pb)"/>
+            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="countnotes" match="fnpb">
+        <xsl:copy>
+            <xsl:attribute name="p" select="count(preceding::pb) + count(preceding::fnpb[./descendant::note])"/>
+            <xsl:apply-templates mode="countnotes" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+
+
+
+    <xsl:template mode="cleanup" match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="cleanup" match="fnpb">
+        <pb>
+            <xsl:apply-templates mode="cleanup" select="@*|node()"/>
+        </pb>
+    </xsl:template>
+
+    <xsl:template mode="cleanup" match="fnpb/@p | pb/@p"/>
+ 
+
+
+
+    <xsl:template mode="extract-page-q" match="* | node()" priority="3">
+
+        <!-- Content not after pb/@p=q -->
+        <xsl:variable name="test" select="not(preceding::pb/@p=$q or self::pb/@p=$q)"/>
+
+        <!-- Content after pb/@p=p -->
+        <xsl:variable name="test" select="$test and ((self::* and descendant-or-self::pb/@p=$p) or preceding::pb/@p=$p)"/>
+
+        <!-- Content in note and not after fnpb/@p=q -->
+        <xsl:variable name="overflow" select="./ancestor::note and (preceding::fnpb/@p=$q or self::fnpb/@p=$q)"/>
+
+        <!-- Exclude the overflow of notes on this page -->
+        <xsl:variable name="test" select="$test and not($overflow)"/>
+
+        <!-- Content in a preceding note might overflow into this page -->
+        <xsl:variable name="previousoverflow" select="if ((ancestor::note or self::note) and following::pb/@p=$p) then true() else false()"/>
+
+        <!-- Content in a note not after fnpb/@p=q -->
+        <xsl:variable name="previousoverflow" select="$previousoverflow and not(preceding::fnpb/@p=$q or self::fnpb/@p=$q)"/>
+
+        <!-- Content in a note after fnpb/@p=p -->
+        <xsl:variable name="previousoverflow" select="$previousoverflow and ((self::* and descendant-or-self::fnpb/@p=$p) or preceding::fnpb/@p=$p)"/>
+
+        <!-- We want the content of the current page and those of notes overflown into this page -->
+        <xsl:variable name="test" select="$test or $previousoverflow"/>
+
+        <!-- Copy elements and text on given page -->
+        <xsl:choose>
+            <xsl:when test="$test">
+                <xsl:copy>
+                    <xsl:copy-of select="@*"/>
+                    <xsl:apply-templates mode="extract-page-q"/>
+                </xsl:copy>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates mode="extract-page-q"/>
+            </xsl:otherwise>
+        </xsl:choose>
+
+    </xsl:template>
+
+
+
+
+
+
+    <!-- To make the below more readable, replace pb[not(ancestor::note)] with pb -->
+
+
+    <xsl:template mode="extract-page" match="node()" priority="1"/>
+
+    <xsl:template mode="extract-page" match="*[descendant-or-self::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$p]] | node()[preceding::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$p]]" priority="2">
+         <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="extract-page"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="extract-page" match="node()[preceding::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$q] or self::pb[not(ancestor::note)][count(preceding::pb[not(ancestor::note)])=$q]]" priority="3"/>
+
+
+
+
+    <xsl:template mode="extract-page-n" match="node()" priority="1"/>
+
+    <xsl:template mode="extract-page-n" match="*[descendant-or-self::pb[not(ancestor::note)][not(ancestor::note)]/@n=$n] | node()[preceding::pb[not(ancestor::note)][not(ancestor::note)]/@n=$n]" priority="2">
+         <xsl:copy>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="extract-page-n"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template mode="extract-page-n" match="node()[preceding::pb[not(ancestor::note)][not(ancestor::note)]/@n=$m or self::pb[not(ancestor::note)][not(ancestor::note)]/@n=$m]" priority="3"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <xsl:template name="sample">
+
+Extracting a fragment between milestones from a complex structure.
+
+I am looking for a template which allows me to extract a single page, as marked by milestone
+elements <pb n="12"/> from a complex structure. Note that the milestone elements may occur in 
+different parents. I want all the parent nodes, and everything between the <pb n="12"/> and the next 
+<pb/> element
+
+For example, when applying the extract method with as parameter "12" on the following sample
+
+<TEI>
+    <front>...</front>
+    <body>
+        <div1>
+            <head>Blah</head>
+            Blah blah <pb n="12"/> blah blah.
+        </div1>
+        <div1>
+            Blah blah blah blah.
+        </div1>
+        <div1>
+            Blah <hi>blah <pb n="13"/> blah</hi> blah.
+        </div1>
+    </body>
+    <back>...</back>
+</TEI>
+
+It should return:
+
+<TEI.2>
+    <body>
+        <div1>
+            <pb n="12"/> blah blah.
+        </div1>
+        <div1>
+            Blah blah blah blah.
+        </div1>
+        <div1>
+            Blah <hi>blah <pb n="13"/></hi>
+        </div1>
+    </body>
+</TEI.2>
+
+The idea is that it will copy only elements that are a ancestor of either <pb/> and follow
+the first <pb/> and precede the second <pb/>. The problem I face is formulating a nice XPath to select
+those elements.
+
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/extract-segs.xsl b/sandbox/extract-segs.xsl
similarity index 96%
rename from extract-segs.xsl
rename to sandbox/extract-segs.xsl
index c02da819..26f5f11b 100644
--- a/extract-segs.xsl
+++ b/sandbox/extract-segs.xsl
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet
-    xmlns:f="urn:stylesheet-functions"
-    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="f xs xd"
-    version="2.0">
-
-    <xd:doc type="stylesheet">
-        <xd:short>Extract segments from a TEI document.</xd:short>
-        <xd:detail>
-            <p>This stylesheet extracts segments from an XHTML document.</p>
-        </xd:detail>
-        <xd:author>Jeroen Hellingman</xd:author>
-        <xd:copyright>2014, Jeroen Hellingman</xd:copyright>
-    </xd:doc>
-
-    <xsl:output 
-        method="text" 
-        indent="no"
-        encoding="utf-8"/>
-
-    <xsl:template match="/">
-        <xsl:apply-templates select="//html:span[@class='seg']" />
-    </xsl:template>
-
-    <xsl:template match="html:span[@class='seg']">
-        <xsl:value-of select="@id"/>
-        <xsl:text>|</xsl:text>
-        <xsl:value-of select="normalize-space(.)"/>
-        <xsl:text>&#x0A;</xsl:text>
-    </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet
+    xmlns:f="urn:stylesheet-functions"
+    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="f xs xd"
+    version="2.0">
+
+    <xd:doc type="stylesheet">
+        <xd:short>Extract segments from a TEI document.</xd:short>
+        <xd:detail>
+            <p>This stylesheet extracts segments from an XHTML document.</p>
+        </xd:detail>
+        <xd:author>Jeroen Hellingman</xd:author>
+        <xd:copyright>2014, Jeroen Hellingman</xd:copyright>
+    </xd:doc>
+
+    <xsl:output 
+        method="text" 
+        indent="no"
+        encoding="utf-8"/>
+
+    <xsl:template match="/">
+        <xsl:apply-templates select="//html:span[@class='seg']" />
+    </xsl:template>
+
+    <xsl:template match="html:span[@class='seg']">
+        <xsl:value-of select="@id"/>
+        <xsl:text>|</xsl:text>
+        <xsl:value-of select="normalize-space(.)"/>
+        <xsl:text>&#x0A;</xsl:text>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/fb2tei.xsl b/sandbox/fb2tei.xsl
similarity index 96%
rename from fb2tei.xsl
rename to sandbox/fb2tei.xsl
index 595fcc10..99dac6af 100644
--- a/fb2tei.xsl
+++ b/sandbox/fb2tei.xsl
@@ -1,394 +1,394 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xsl:stylesheet [
-
-    <!ENTITY lf         "&#x0A;">
-    <!ENTITY cr         "&#x0D;">
-
-]>
-<xsl:stylesheet 
-    version="2.0"
-
-    xmlns:f="urn:stylesheet-functions"
-    xmlns:fb2="http://www.gribuser.ru/xml/fictionbook/2.0"
-    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-
-    exclude-result-prefixes="f fb2 xd xlink xs"
-    >
-
-    <xd:doc type="stylesheet">
-        <xd:short>XSLT stylesheet to convert a fictionbook format text to TEI.</xd:short>
-        <xd:detail>This stylesheet converts a fictionbook (.fb2) file to TEI.</xd:detail>
-        <xd:author>Jeroen Hellingman</xd:author>
-        <xd:copyright>2015, Jeroen Hellingman</xd:copyright>
-    </xd:doc>
-
-<xsl:template match="fb2:FictionBook">
-    <TEI.2>
-        <xsl:attribute name="lang" select="fb2:description/fb2:title-info/fb2:lang"/>
-        <xsl:apply-templates select="fb2:description"/>
-        <text>
-            <xsl:if test="/fb2:FictionBook/fb2:description/fb2:title-info/fb2:coverpage/fb2:image/@xlink:href">
-                <xsl:text>&lf;</xsl:text>
-                <front id="frontmatter">
-                    <div id="cover" type="Cover">
-                        <p>
-                            <xsl:variable name="coverFile" select="f:href2id(/fb2:FictionBook/fb2:description/fb2:title-info/fb2:coverpage/fb2:image/@xlink:href)"/>
-                            <figure id="cover-image">
-                                <xsl:attribute name="rend">
-                                    <xsl:text>image(</xsl:text><xsl:value-of select="$coverFile"/><xsl:text>)</xsl:text>
-                                </xsl:attribute>
-                                <figDesc>Front Cover.</figDesc>
-                            </figure>
-                        </p>
-                    </div>
-                </front>
-            </xsl:if>
-            <xsl:text>&lf;</xsl:text>
-            <xsl:apply-templates select="fb2:body"/>
-            <xsl:text>&lf;</xsl:text>
-            <back id="backmatter">
-                <divGen type="toc" id="toc"/>
-                <divGen type="Colophon"/>
-            </back>
-        </text>
-        <xsl:apply-templates select="fb2:binary"/>
-    </TEI.2>
-</xsl:template>
-
-
-<xsl:template match="fb2:description">
-    <teiHeader>
-        <fileDesc>
-            <titleStmt>
-                <title>
-                    <xsl:value-of select="fb2:title-info/fb2:book-title"/>
-                </title>
-                <author>
-                    <xsl:value-of select="f:concatName(fb2:title-info/fb2:author)"/>
-                 </author>
-            </titleStmt>
-            <publicationStmt>
-                <publisher>
-                    <xsl:value-of select="fb2:publish-info/fb2:publisher"/>
-                </publisher>
-                <pubPlace></pubPlace>
-                <idno type="isbn">
-                    <xsl:value-of select="fb2:publish-info/fb2:isbn"/>
-                </idno>
-                <idno type="epub-id">
-                    <xsl:value-of select="fb2:document-info/fb2:id"/>
-                </idno>
-                <date>
-                    <xsl:value-of select="fb2:publish-info/fb2:year"/>
-                </date>
-            </publicationStmt>
-            <notesStmt>
-                <note type="Description">
-                    <xsl:value-of select="fb2:title-info/fb2:annotation"/>
-                </note>
-            </notesStmt>
-            <sourceDesc>
-                <bibl>
-                    <author>
-                        <xsl:value-of select="f:concatName(fb2:title-info/fb2:author)"/>
-                    </author>
-                    <title>
-                        <xsl:value-of select="fb2:title-info/fb2:book-title"/>
-                    </title>
-                    <date>
-                        <xsl:value-of select="fb2:publish-info/fb2:year"/>
-                    </date>
-                </bibl>
-            </sourceDesc>
-        </fileDesc>
-        <encodingDesc>
-            <xsl:apply-templates select="fb2:title-info/fb2:annotation"/>
-        </encodingDesc>
-        <profileDesc>
-            <langUsage>
-                <language>
-                    <xsl:attribute name="id" select="//fb2:description/fb2:title-info/fb2:lang"/>
-                    <xsl:text>TODO: lookup main language name.</xsl:text>
-                </language>
-                <xsl:for-each-group select="//@xml:lang" group-by=".">
-                    <language id="{.}">TODO: lookup language name.</language>
-                </xsl:for-each-group>
-            </langUsage>
-            <xsl:apply-templates mode="keywords" select="fb2:title-info/fb2:keywords"/>
-        </profileDesc>
-    </teiHeader>
-</xsl:template>
-
-
-<xsl:template mode="keywords" match="fb2:keywords">
-    <textClass>
-        <keywords>
-            <list>
-                <xsl:for-each select="tokenize(current(), ',')">
-                    <item>
-                        <xsl:value-of select="normalize-space(.)"/>
-                    </item>
-                </xsl:for-each>
-            </list>
-        </keywords>
-    </textClass>
-</xsl:template>
-
-
-<xsl:function name="f:concatName" as="xs:string">
-    <xsl:param name="node"/>
-
-        <xsl:variable name="result">
-            <xsl:value-of select="$node/fb2:first-name"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="$node/fb2:middle-name"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="$node/fb2:last-name"/>
-        </xsl:variable>
-
-        <xsl:value-of select="normalize-space($result)"/>
-</xsl:function>
-
-
-<xsl:template match="fb2:*">
-    <xsl:message terminate="no">Unhandled fb2 element: <xsl:value-of select="name()"/></xsl:message>
-        <xsl:apply-templates/>
-</xsl:template>
-
-
-
-<xsl:template match="fb2:body">
-    <xsl:text>&lf;</xsl:text>
-    <body>
-        <xsl:apply-templates/>
-    </body>
-</xsl:template>
-
-
-<xsl:template match="fb2:section">
-    <xsl:text>&lf;</xsl:text>
-    <div>
-        <xsl:apply-templates/>
-    </div>
-</xsl:template>
-
-
-<xsl:template match="fb2:annotation">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-<xsl:template match="fb2:p">
-    <xsl:text>&lf;</xsl:text>
-    <p>
-        <xsl:if test="@xml:lang">
-            <xsl:attribute name="lang" select="@xml:lang"/>
-        </xsl:if>
-
-        <xsl:apply-templates/>
-    </p>
-</xsl:template>
-
-
-<xsl:template match="fb2:title">
-    <xsl:text>&lf;</xsl:text>
-    <head>
-        <xsl:apply-templates mode="head"/>
-    </head>
-</xsl:template>
-
-
-<xsl:template match="fb2:cite">
-    <xsl:text>&lf;</xsl:text>
-    <p rend="class(cite)">
-        <xsl:apply-templates/>
-    </p>
-</xsl:template>
-
-
-<xsl:template match="fb2:subtitle">
-    <xsl:text>&lf;&lf;</xsl:text>
-    <p rend="class(subtitle)">
-        <xsl:apply-templates/>
-    </p>
-</xsl:template>
-
-<xsl:template match="fb2:text-author">
-    <xsl:text>&lf;</xsl:text>
-    <p rend="class(text-author)">
-        <xsl:apply-templates/>
-    </p>
-</xsl:template>
-
-
-<!-- Skip p elements in titles -->
-<xsl:template mode="head" match="fb2:p">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template mode="head" match="*">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-<xsl:template match="fb2:epigraph">
-    <xsl:text>&lf;</xsl:text>
-    <epigraph>
-        <xsl:apply-templates/>
-    </epigraph>
-</xsl:template>
-
-
-<xsl:template match="fb2:empty-line">
-    <xsl:text>&lf;&lf;</xsl:text>
-    <milestone unit="tb" rend="space"/>
-    <xsl:text>&lf;</xsl:text>
-</xsl:template>
-
-
-<xsl:template match="fb2:style[@name='foreign lang']">
-    <foreign>
-        <xsl:if test="@xml:lang">
-            <xsl:attribute name="lang" select="@xml:lang"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-    </foreign>
-</xsl:template>
-
-
-
-<xsl:template match="fb2:strong">
-    <hi rend="bold">
-        <xsl:apply-templates/>
-    </hi>
-</xsl:template>
-
-
-<xsl:template match="fb2:emphasis">
-    <hi>
-        <xsl:apply-templates/>
-    </hi>
-</xsl:template>
-
-
-<xsl:template match="fb2:poem">
-    <xsl:text>&lf;</xsl:text>
-    <lg type="lgouter">
-        <xsl:apply-templates/>
-    </lg>
-</xsl:template>
-
-<xsl:template match="fb2:stanza">
-    <xsl:text>&lf;</xsl:text>
-    <lg>
-        <xsl:apply-templates/>
-    </lg>
-</xsl:template>
-
-<xsl:template match="fb2:v">
-    <l>
-        <xsl:apply-templates/>
-    </l>
-</xsl:template>
-
-
-
-<xsl:template match="fb2:a[@type='note']">
-    <note type="footnote">
-        <xsl:attribute name="n" select="."/>
-        <xsl:variable name="id" select="f:href2id(@xlink:href)"/>
-        <xsl:apply-templates mode="footnote" select="//*[@id=$id]"/>
-    </note>
-</xsl:template>
-
-
-<!-- Skip section elements in footnotes -->
-<xsl:template mode="footnote" match="fb2:section">
-    <xsl:apply-templates mode="footnote"/>
-</xsl:template>
-
-<!-- Remove title elements in footnotes (they are the footnote numbers!) -->
-<xsl:template mode="footnote" match="fb2:title"/>
-
-<xsl:template mode="footnote" match="*">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-<xsl:function name="f:href2id" as="xs:string">
-    <xsl:param name="href"/>
-    <xsl:value-of select="substring-after($href, '#')"/>
-</xsl:function>
-
-
-<!-- Drop section with footnotes; should be inlined by this template. -->
-<xsl:template match="fb2:body[@name='notes']"/>
-
-
-<xsl:template match="fb2:image">
-    <xsl:text>&lf;</xsl:text>
-    <figure>
-        <xsl:attribute name="rend">
-            <xsl:text>image(</xsl:text>
-            <xsl:value-of select="f:href2id(@xlink:href)"/>
-            <xsl:text>)</xsl:text>
-        </xsl:attribute>
-    </figure>
-</xsl:template>
-
-
-<xsl:template match="fb2:binary">
-    <xsl:variable name="filename" select="f:getFilename(.)"/>
-    <xsl:message terminate="no">Extracted binary file: <xsl:value-of select="$filename"/></xsl:message>
-    <xsl:result-document
-            href="{$filename}.hex"
-            method="text"
-            encoding="UTF-8"><xsl:value-of select="."/></xsl:result-document>
-</xsl:template>
-
-
-<xsl:function name="f:getFilename" as="xs:string">
-    <xsl:param name="node"/>
-
-    <xsl:variable name="basename" select="$node/@id"/>
-    <xsl:variable name="contentType" select="$node/@content-type"/>
-    <xsl:variable name="extension">
-        <xsl:choose>
-            <xsl:when test="$contentType = 'image/jpeg'">.jpg</xsl:when>
-            <xsl:when test="$contentType = 'image/png'">.png</xsl:when>
-            <xsl:when test="$contentType = 'image/gif'">.gif</xsl:when>
-            <xsl:otherwise></xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-
-    <xsl:value-of select="if (ends-with($basename, $extension)) then $basename else concat($basename, $extension)"/>
-</xsl:function>
-
-
-
-
-<xsl:template match="text()" >
-    <xsl:call-template name="hyperlink"/>
-</xsl:template>
-
-
-<xsl:template name="hyperlink">
-   <xsl:param name="string" select="string(.)" />
-   <xsl:analyze-string select="$string"
-        regex="(^|[ \s])((ftp|http|https|mailto):(([A-Za-z0-9$_.+!*(),;/?:@&amp;~=-])|%[A-Fa-f0-9]{{2}}){{2,}}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&amp;~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))">
-     <xsl:matching-substring>
-       <xref url="{normalize-space(.)}">
-         <xsl:value-of select="."/>
-       </xref>
-     </xsl:matching-substring>
-     <xsl:non-matching-substring>
-       <xsl:value-of select="."/>
-     </xsl:non-matching-substring>
-   </xsl:analyze-string>
- </xsl:template>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xsl:stylesheet [
+
+    <!ENTITY lf         "&#x0A;">
+    <!ENTITY cr         "&#x0D;">
+
+]>
+<xsl:stylesheet 
+    version="2.0"
+
+    xmlns:f="urn:stylesheet-functions"
+    xmlns:fb2="http://www.gribuser.ru/xml/fictionbook/2.0"
+    xmlns:xd="http://www.pnp-software.com/XSLTdoc"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+
+    exclude-result-prefixes="f fb2 xd xlink xs"
+    >
+
+    <xd:doc type="stylesheet">
+        <xd:short>XSLT stylesheet to convert a fictionbook format text to TEI.</xd:short>
+        <xd:detail>This stylesheet converts a fictionbook (.fb2) file to TEI.</xd:detail>
+        <xd:author>Jeroen Hellingman</xd:author>
+        <xd:copyright>2015, Jeroen Hellingman</xd:copyright>
+    </xd:doc>
+
+<xsl:template match="fb2:FictionBook">
+    <TEI.2>
+        <xsl:attribute name="lang" select="fb2:description/fb2:title-info/fb2:lang"/>
+        <xsl:apply-templates select="fb2:description"/>
+        <text>
+            <xsl:if test="/fb2:FictionBook/fb2:description/fb2:title-info/fb2:coverpage/fb2:image/@xlink:href">
+                <xsl:text>&lf;</xsl:text>
+                <front id="frontmatter">
+                    <div id="cover" type="Cover">
+                        <p>
+                            <xsl:variable name="coverFile" select="f:href2id(/fb2:FictionBook/fb2:description/fb2:title-info/fb2:coverpage/fb2:image/@xlink:href)"/>
+                            <figure id="cover-image">
+                                <xsl:attribute name="rend">
+                                    <xsl:text>image(</xsl:text><xsl:value-of select="$coverFile"/><xsl:text>)</xsl:text>
+                                </xsl:attribute>
+                                <figDesc>Front Cover.</figDesc>
+                            </figure>
+                        </p>
+                    </div>
+                </front>
+            </xsl:if>
+            <xsl:text>&lf;</xsl:text>
+            <xsl:apply-templates select="fb2:body"/>
+            <xsl:text>&lf;</xsl:text>
+            <back id="backmatter">
+                <divGen type="toc" id="toc"/>
+                <divGen type="Colophon"/>
+            </back>
+        </text>
+        <xsl:apply-templates select="fb2:binary"/>
+    </TEI.2>
+</xsl:template>
+
+
+<xsl:template match="fb2:description">
+    <teiHeader>
+        <fileDesc>
+            <titleStmt>
+                <title>
+                    <xsl:value-of select="fb2:title-info/fb2:book-title"/>
+                </title>
+                <author>
+                    <xsl:value-of select="f:concatName(fb2:title-info/fb2:author)"/>
+                 </author>
+            </titleStmt>
+            <publicationStmt>
+                <publisher>
+                    <xsl:value-of select="fb2:publish-info/fb2:publisher"/>
+                </publisher>
+                <pubPlace></pubPlace>
+                <idno type="isbn">
+                    <xsl:value-of select="fb2:publish-info/fb2:isbn"/>
+                </idno>
+                <idno type="epub-id">
+                    <xsl:value-of select="fb2:document-info/fb2:id"/>
+                </idno>
+                <date>
+                    <xsl:value-of select="fb2:publish-info/fb2:year"/>
+                </date>
+            </publicationStmt>
+            <notesStmt>
+                <note type="Description">
+                    <xsl:value-of select="fb2:title-info/fb2:annotation"/>
+                </note>
+            </notesStmt>
+            <sourceDesc>
+                <bibl>
+                    <author>
+                        <xsl:value-of select="f:concatName(fb2:title-info/fb2:author)"/>
+                    </author>
+                    <title>
+                        <xsl:value-of select="fb2:title-info/fb2:book-title"/>
+                    </title>
+                    <date>
+                        <xsl:value-of select="fb2:publish-info/fb2:year"/>
+                    </date>
+                </bibl>
+            </sourceDesc>
+        </fileDesc>
+        <encodingDesc>
+            <xsl:apply-templates select="fb2:title-info/fb2:annotation"/>
+        </encodingDesc>
+        <profileDesc>
+            <langUsage>
+                <language>
+                    <xsl:attribute name="id" select="//fb2:description/fb2:title-info/fb2:lang"/>
+                    <xsl:text>TODO: lookup main language name.</xsl:text>
+                </language>
+                <xsl:for-each-group select="//@xml:lang" group-by=".">
+                    <language id="{.}">TODO: lookup language name.</language>
+                </xsl:for-each-group>
+            </langUsage>
+            <xsl:apply-templates mode="keywords" select="fb2:title-info/fb2:keywords"/>
+        </profileDesc>
+    </teiHeader>
+</xsl:template>
+
+
+<xsl:template mode="keywords" match="fb2:keywords">
+    <textClass>
+        <keywords>
+            <list>
+                <xsl:for-each select="tokenize(current(), ',')">
+                    <item>
+                        <xsl:value-of select="normalize-space(.)"/>
+                    </item>
+                </xsl:for-each>
+            </list>
+        </keywords>
+    </textClass>
+</xsl:template>
+
+
+<xsl:function name="f:concatName" as="xs:string">
+    <xsl:param name="node"/>
+
+        <xsl:variable name="result">
+            <xsl:value-of select="$node/fb2:first-name"/>
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="$node/fb2:middle-name"/>
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="$node/fb2:last-name"/>
+        </xsl:variable>
+
+        <xsl:value-of select="normalize-space($result)"/>
+</xsl:function>
+
+
+<xsl:template match="fb2:*">
+    <xsl:message terminate="no">Unhandled fb2 element: <xsl:value-of select="name()"/></xsl:message>
+        <xsl:apply-templates/>
+</xsl:template>
+
+
+
+<xsl:template match="fb2:body">
+    <xsl:text>&lf;</xsl:text>
+    <body>
+        <xsl:apply-templates/>
+    </body>
+</xsl:template>
+
+
+<xsl:template match="fb2:section">
+    <xsl:text>&lf;</xsl:text>
+    <div>
+        <xsl:apply-templates/>
+    </div>
+</xsl:template>
+
+
+<xsl:template match="fb2:annotation">
+    <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:template match="fb2:p">
+    <xsl:text>&lf;</xsl:text>
+    <p>
+        <xsl:if test="@xml:lang">
+            <xsl:attribute name="lang" select="@xml:lang"/>
+        </xsl:if>
+
+        <xsl:apply-templates/>
+    </p>
+</xsl:template>
+
+
+<xsl:template match="fb2:title">
+    <xsl:text>&lf;</xsl:text>
+    <head>
+        <xsl:apply-templates mode="head"/>
+    </head>
+</xsl:template>
+
+
+<xsl:template match="fb2:cite">
+    <xsl:text>&lf;</xsl:text>
+    <p rend="class(cite)">
+        <xsl:apply-templates/>
+    </p>
+</xsl:template>
+
+
+<xsl:template match="fb2:subtitle">
+    <xsl:text>&lf;&lf;</xsl:text>
+    <p rend="class(subtitle)">
+        <xsl:apply-templates/>
+    </p>
+</xsl:template>
+
+<xsl:template match="fb2:text-author">
+    <xsl:text>&lf;</xsl:text>
+    <p rend="class(text-author)">
+        <xsl:apply-templates/>
+    </p>
+</xsl:template>
+
+
+<!-- Skip p elements in titles -->
+<xsl:template mode="head" match="fb2:p">
+    <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template mode="head" match="*">
+    <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:template match="fb2:epigraph">
+    <xsl:text>&lf;</xsl:text>
+    <epigraph>
+        <xsl:apply-templates/>
+    </epigraph>
+</xsl:template>
+
+
+<xsl:template match="fb2:empty-line">
+    <xsl:text>&lf;&lf;</xsl:text>
+    <milestone unit="tb" rend="space"/>
+    <xsl:text>&lf;</xsl:text>
+</xsl:template>
+
+
+<xsl:template match="fb2:style[@name='foreign lang']">
+    <foreign>
+        <xsl:if test="@xml:lang">
+            <xsl:attribute name="lang" select="@xml:lang"/>
+        </xsl:if>
+        <xsl:apply-templates/>
+    </foreign>
+</xsl:template>
+
+
+
+<xsl:template match="fb2:strong">
+    <hi rend="bold">
+        <xsl:apply-templates/>
+    </hi>
+</xsl:template>
+
+
+<xsl:template match="fb2:emphasis">
+    <hi>
+        <xsl:apply-templates/>
+    </hi>
+</xsl:template>
+
+
+<xsl:template match="fb2:poem">
+    <xsl:text>&lf;</xsl:text>
+    <lg type="lgouter">
+        <xsl:apply-templates/>
+    </lg>
+</xsl:template>
+
+<xsl:template match="fb2:stanza">
+    <xsl:text>&lf;</xsl:text>
+    <lg>
+        <xsl:apply-templates/>
+    </lg>
+</xsl:template>
+
+<xsl:template match="fb2:v">
+    <l>
+        <xsl:apply-templates/>
+    </l>
+</xsl:template>
+
+
+
+<xsl:template match="fb2:a[@type='note']">
+    <note type="footnote">
+        <xsl:attribute name="n" select="."/>
+        <xsl:variable name="id" select="f:href2id(@xlink:href)"/>
+        <xsl:apply-templates mode="footnote" select="//*[@id=$id]"/>
+    </note>
+</xsl:template>
+
+
+<!-- Skip section elements in footnotes -->
+<xsl:template mode="footnote" match="fb2:section">
+    <xsl:apply-templates mode="footnote"/>
+</xsl:template>
+
+<!-- Remove title elements in footnotes (they are the footnote numbers!) -->
+<xsl:template mode="footnote" match="fb2:title"/>
+
+<xsl:template mode="footnote" match="*">
+    <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:function name="f:href2id" as="xs:string">
+    <xsl:param name="href"/>
+    <xsl:value-of select="substring-after($href, '#')"/>
+</xsl:function>
+
+
+<!-- Drop section with footnotes; should be inlined by this template. -->
+<xsl:template match="fb2:body[@name='notes']"/>
+
+
+<xsl:template match="fb2:image">
+    <xsl:text>&lf;</xsl:text>
+    <figure>
+        <xsl:attribute name="rend">
+            <xsl:text>image(</xsl:text>
+            <xsl:value-of select="f:href2id(@xlink:href)"/>
+            <xsl:text>)</xsl:text>
+        </xsl:attribute>
+    </figure>
+</xsl:template>
+
+
+<xsl:template match="fb2:binary">
+    <xsl:variable name="filename" select="f:getFilename(.)"/>
+    <xsl:message terminate="no">Extracted binary file: <xsl:value-of select="$filename"/></xsl:message>
+    <xsl:result-document
+            href="{$filename}.hex"
+            method="text"
+            encoding="UTF-8"><xsl:value-of select="."/></xsl:result-document>
+</xsl:template>
+
+
+<xsl:function name="f:getFilename" as="xs:string">
+    <xsl:param name="node"/>
+
+    <xsl:variable name="basename" select="$node/@id"/>
+    <xsl:variable name="contentType" select="$node/@content-type"/>
+    <xsl:variable name="extension">
+        <xsl:choose>
+            <xsl:when test="$contentType = 'image/jpeg'">.jpg</xsl:when>
+            <xsl:when test="$contentType = 'image/png'">.png</xsl:when>
+            <xsl:when test="$contentType = 'image/gif'">.gif</xsl:when>
+            <xsl:otherwise></xsl:otherwise>
+        </xsl:choose>
+    </xsl:variable>
+
+    <xsl:value-of select="if (ends-with($basename, $extension)) then $basename else concat($basename, $extension)"/>
+</xsl:function>
+
+
+
+
+<xsl:template match="text()" >
+    <xsl:call-template name="hyperlink"/>
+</xsl:template>
+
+
+<xsl:template name="hyperlink">
+   <xsl:param name="string" select="string(.)" />
+   <xsl:analyze-string select="$string"
+        regex="(^|[ \s])((ftp|http|https|mailto):(([A-Za-z0-9$_.+!*(),;/?:@&amp;~=-])|%[A-Fa-f0-9]{{2}}){{2,}}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&amp;~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))">
+     <xsl:matching-substring>
+       <xref url="{normalize-space(.)}">
+         <xsl:value-of select="."/>
+       </xref>
+     </xsl:matching-substring>
+     <xsl:non-matching-substring>
+       <xsl:value-of select="."/>
+     </xsl:non-matching-substring>
+   </xsl:analyze-string>
+ </xsl:template>
+
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/html2tei.xsl b/sandbox/html2tei.xsl
similarity index 96%
rename from html2tei.xsl
rename to sandbox/html2tei.xsl
index 7517276b..ed5b1810 100644
--- a/html2tei.xsl
+++ b/sandbox/html2tei.xsl
@@ -1,348 +1,348 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xsl:stylesheet version="2.0" 
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-    xmlns:html="http://www.w3.org/1999/xhtml" 
-    exclude-result-prefixes="html">
-
-<xsl:output method="xml" indent="no"/>
-
-
-
-<!-- Main block-level conversions -->
-<xsl:template match="html:html">
-    <xsl:apply-templates select="html:body"/>
-</xsl:template>
-
-
-<!-- Reconstruct structure of divisions, based on HTML h1..h6 headings
-     Note that this will create correctly nested div1..div5 levels, even
-     if some h-levels are skipped in the source HTML. You may however get
-     more div-levels than you want, and post-processing will be required. -->
-<xsl:template match="html:body">
-    <body>
-        <xsl:call-template name="level1">
-            <xsl:with-param name="nodes" select="*|text()"/>
-            <xsl:with-param name="level" select="1"/>
-        </xsl:call-template>
-    </body>
-</xsl:template>
-
-
-<xsl:template name="level1">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-    
-    <xsl:choose>
-        <xsl:when test="$nodes/self::html:h1">
-            <xsl:for-each-group select="$nodes" group-starting-with="html:h1">
-                <xsl:element name="{concat('div', $level)}">
-                    <xsl:call-template name="level2">
-                        <xsl:with-param name="nodes" select="current-group()"/>
-                        <xsl:with-param name="level" select="$level + 1"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each-group>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="level2">
-                <xsl:with-param name="nodes" select="$nodes"/>
-                <xsl:with-param name="level" select="$level"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="level2">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-    
-    <xsl:choose>
-        <xsl:when test="$nodes/self::html:h2">
-            <xsl:for-each-group select="$nodes" group-starting-with="html:h2">
-                <xsl:element name="{concat('div', $level)}">
-                    <xsl:call-template name="level3">
-                        <xsl:with-param name="nodes" select="current-group()"/>
-                        <xsl:with-param name="level" select="$level + 1"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each-group>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="level3">
-                <xsl:with-param name="nodes" select="$nodes"/>
-                <xsl:with-param name="level" select="$level"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="level3">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-    
-    <xsl:choose>
-        <xsl:when test="$nodes/self::html:h3">
-            <xsl:for-each-group select="$nodes" group-starting-with="html:h3">
-                <xsl:element name="{concat('div', $level)}">
-                    <xsl:call-template name="level4">
-                        <xsl:with-param name="nodes" select="current-group()"/>
-                        <xsl:with-param name="level" select="$level + 1"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each-group>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="level4">
-                <xsl:with-param name="nodes" select="$nodes"/>
-                <xsl:with-param name="level" select="$level"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="level4">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-    
-    <xsl:choose>
-        <xsl:when test="$nodes/self::html:h4">
-            <xsl:for-each-group select="$nodes" group-starting-with="html:h4">
-                <xsl:element name="{concat('div', $level)}">
-                    <xsl:call-template name="level5">
-                        <xsl:with-param name="nodes" select="current-group()"/>
-                        <xsl:with-param name="level" select="$level + 1"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each-group>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="level5">
-                <xsl:with-param name="nodes" select="$nodes"/>
-                <xsl:with-param name="level" select="$level"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="level5">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-    
-    <xsl:choose>
-        <xsl:when test="$nodes/self::html:h5">
-            <xsl:for-each-group select="$nodes" group-starting-with="html:h5">
-                <xsl:element name="{concat('div', $level)}">
-                    <xsl:call-template name="level6">
-                        <xsl:with-param name="nodes" select="current-group()"/>
-                        <xsl:with-param name="level" select="$level + 1"/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:for-each-group>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="level6">
-                <xsl:with-param name="nodes" select="$nodes"/>
-                <xsl:with-param name="level" select="$level"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<xsl:template name="level6">
-    <xsl:param name="nodes" as="element()*"/>
-    <xsl:param name="level" as="xs:integer"/>
-
-    <xsl:apply-templates select="$nodes/self::*"/>
-</xsl:template>
-
-
-
-
-
-
-
-
-
-
-
-<!-- Paragraphs -->
-<xsl:template match="html:p">
-    <xsl:choose>
-        <xsl:when test="normalize-space(.) = ''">
-            <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:text>
-</xsl:text>
-            <p>
-                <xsl:apply-templates/>
-            </p>
-            <xsl:text>
-</xsl:text>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<!-- Ignore empty paragraphs -->
-<xsl:template match="html:p[normalize-space(.) = '' and count(*) = 0]"/>
-
-
-<xsl:template match="text()">
-    <xsl:copy/>
-</xsl:template>
-
-
-
-<!-- inline formatting -->
-<xsl:template match="html:b">
-    <hi rend="bold">
-        <xsl:apply-templates/>
-    </hi>
-</xsl:template>
-
-<xsl:template match="html:i">
- <hi>
-  <xsl:apply-templates/>
- </hi>
-</xsl:template>
-
-<xsl:template match="html:small">
-  <xsl:apply-templates/>
-</xsl:template>
-
-
-<xsl:template match="html:br">
-    <lb/>
-</xsl:template>
-
-
-
-<!-- External links -->
-<xsl:template match="html:a[contains(@href,'http://') or contains(@href,'ftp://')]">
- <xref>
-  <xsl:attribute name="url">
-   <xsl:value-of select="normalize-space(@href)"/>
-  </xsl:attribute>
-  <xsl:apply-templates/>
- </xref>
-</xsl:template>
-
-<!-- Internal cross references -->
-<xsl:template match="html:a[contains(@href,'#')]">
- <ref>
-  <xsl:attribute name="target">
-    <xsl:value-of select="substring-after(@href,'#')"/>
-  </xsl:attribute>
-  <xsl:apply-templates/>
- </ref>
-</xsl:template>
-
-<xsl:template match="html:a">
-  <xsl:apply-templates/>
-</xsl:template>
-
-
-
-<!-- Block level elements -->
-
-<xsl:template match="html:h1|html:h2|html:h3|html:h4">
-    <head>
-        <xsl:apply-templates/>
-    </head>
-</xsl:template>
-
-
-<xsl:template match="html:hr">
-    <milestone unit="tb"/>
-</xsl:template>
-
-
-<xsl:template match="html:div|html:span|html:pre">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-
-
-
-<!-- Images -->
-<xsl:template match="html:img">
- 
- 
-</xsl:template>
-
-
-
-
-<!-- Lists -->
-<xsl:template match="html:ul">
- <list>
-  <xsl:apply-templates/>
- </list>
-</xsl:template>
-
-<xsl:template match="html:ol">
- <list>
-  <xsl:apply-templates/>
- </list>
-</xsl:template>
-        
-<xsl:template match="html:li">
- <item>
-    <xsl:apply-templates/>
- </item>
-</xsl:template>
-        
-
-
-
-<!-- Tables -->
-<xsl:template match="html:table">
-    <table>
-        <xsl:apply-templates/>
-    </table>
-</xsl:template>
-
-
-<xsl:template match="html:tbody">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-<xsl:template match="html:tr">
-    <row>
-        <xsl:apply-templates/>
-    </row>
-</xsl:template>
-
-<xsl:template match="html:th|html:td">
- <xsl:variable name="position" select="count(preceding-sibling::*) + 1"/>
- <cell>
-  <xsl:if test="@colspan &gt; 1">
-   <xsl:attribute name="cols">
-    <xsl:value-of select="@colspan"/>
-   </xsl:attribute>
-  </xsl:if>
-  <xsl:if test="@rowspan &gt; 1">
-   <xsl:attribute name="rows">
-    <xsl:value-of select="@rowspan"/>
-   </xsl:attribute>
-  </xsl:if>
-  <xsl:apply-templates/>
- </cell>
-</xsl:template>
-
-
-<!-- Stop processing when an unknown element is encountered -->     
-<xsl:template match="*">
- <xsl:message>Unhandled element <xsl:value-of select="name()"/>
- </xsl:message>
- <xsl:apply-templates/>
-</xsl:template>
-
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet version="2.0" 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+    xmlns:html="http://www.w3.org/1999/xhtml" 
+    exclude-result-prefixes="html">
+
+<xsl:output method="xml" indent="no"/>
+
+
+
+<!-- Main block-level conversions -->
+<xsl:template match="html:html">
+    <xsl:apply-templates select="html:body"/>
+</xsl:template>
+
+
+<!-- Reconstruct structure of divisions, based on HTML h1..h6 headings
+     Note that this will create correctly nested div1..div5 levels, even
+     if some h-levels are skipped in the source HTML. You may however get
+     more div-levels than you want, and post-processing will be required. -->
+<xsl:template match="html:body">
+    <body>
+        <xsl:call-template name="level1">
+            <xsl:with-param name="nodes" select="*|text()"/>
+            <xsl:with-param name="level" select="1"/>
+        </xsl:call-template>
+    </body>
+</xsl:template>
+
+
+<xsl:template name="level1">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+    
+    <xsl:choose>
+        <xsl:when test="$nodes/self::html:h1">
+            <xsl:for-each-group select="$nodes" group-starting-with="html:h1">
+                <xsl:element name="{concat('div', $level)}">
+                    <xsl:call-template name="level2">
+                        <xsl:with-param name="nodes" select="current-group()"/>
+                        <xsl:with-param name="level" select="$level + 1"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:for-each-group>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="level2">
+                <xsl:with-param name="nodes" select="$nodes"/>
+                <xsl:with-param name="level" select="$level"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="level2">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+    
+    <xsl:choose>
+        <xsl:when test="$nodes/self::html:h2">
+            <xsl:for-each-group select="$nodes" group-starting-with="html:h2">
+                <xsl:element name="{concat('div', $level)}">
+                    <xsl:call-template name="level3">
+                        <xsl:with-param name="nodes" select="current-group()"/>
+                        <xsl:with-param name="level" select="$level + 1"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:for-each-group>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="level3">
+                <xsl:with-param name="nodes" select="$nodes"/>
+                <xsl:with-param name="level" select="$level"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="level3">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+    
+    <xsl:choose>
+        <xsl:when test="$nodes/self::html:h3">
+            <xsl:for-each-group select="$nodes" group-starting-with="html:h3">
+                <xsl:element name="{concat('div', $level)}">
+                    <xsl:call-template name="level4">
+                        <xsl:with-param name="nodes" select="current-group()"/>
+                        <xsl:with-param name="level" select="$level + 1"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:for-each-group>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="level4">
+                <xsl:with-param name="nodes" select="$nodes"/>
+                <xsl:with-param name="level" select="$level"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="level4">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+    
+    <xsl:choose>
+        <xsl:when test="$nodes/self::html:h4">
+            <xsl:for-each-group select="$nodes" group-starting-with="html:h4">
+                <xsl:element name="{concat('div', $level)}">
+                    <xsl:call-template name="level5">
+                        <xsl:with-param name="nodes" select="current-group()"/>
+                        <xsl:with-param name="level" select="$level + 1"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:for-each-group>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="level5">
+                <xsl:with-param name="nodes" select="$nodes"/>
+                <xsl:with-param name="level" select="$level"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="level5">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+    
+    <xsl:choose>
+        <xsl:when test="$nodes/self::html:h5">
+            <xsl:for-each-group select="$nodes" group-starting-with="html:h5">
+                <xsl:element name="{concat('div', $level)}">
+                    <xsl:call-template name="level6">
+                        <xsl:with-param name="nodes" select="current-group()"/>
+                        <xsl:with-param name="level" select="$level + 1"/>
+                    </xsl:call-template>
+                </xsl:element>
+            </xsl:for-each-group>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="level6">
+                <xsl:with-param name="nodes" select="$nodes"/>
+                <xsl:with-param name="level" select="$level"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+
+<xsl:template name="level6">
+    <xsl:param name="nodes" as="element()*"/>
+    <xsl:param name="level" as="xs:integer"/>
+
+    <xsl:apply-templates select="$nodes/self::*"/>
+</xsl:template>
+
+
+
+
+
+
+
+
+
+
+
+<!-- Paragraphs -->
+<xsl:template match="html:p">
+    <xsl:choose>
+        <xsl:when test="normalize-space(.) = ''">
+            <xsl:apply-templates/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>
+</xsl:text>
+            <p>
+                <xsl:apply-templates/>
+            </p>
+            <xsl:text>
+</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+
+<!-- Ignore empty paragraphs -->
+<xsl:template match="html:p[normalize-space(.) = '' and count(*) = 0]"/>
+
+
+<xsl:template match="text()">
+    <xsl:copy/>
+</xsl:template>
+
+
+
+<!-- inline formatting -->
+<xsl:template match="html:b">
+    <hi rend="bold">
+        <xsl:apply-templates/>
+    </hi>
+</xsl:template>
+
+<xsl:template match="html:i">
+ <hi>
+  <xsl:apply-templates/>
+ </hi>
+</xsl:template>
+
+<xsl:template match="html:small">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:template match="html:br">
+    <lb/>
+</xsl:template>
+
+
+
+<!-- External links -->
+<xsl:template match="html:a[contains(@href,'http://') or contains(@href,'ftp://')]">
+ <xref>
+  <xsl:attribute name="url">
+   <xsl:value-of select="normalize-space(@href)"/>
+  </xsl:attribute>
+  <xsl:apply-templates/>
+ </xref>
+</xsl:template>
+
+<!-- Internal cross references -->
+<xsl:template match="html:a[contains(@href,'#')]">
+ <ref>
+  <xsl:attribute name="target">
+    <xsl:value-of select="substring-after(@href,'#')"/>
+  </xsl:attribute>
+  <xsl:apply-templates/>
+ </ref>
+</xsl:template>
+
+<xsl:template match="html:a">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+
+<!-- Block level elements -->
+
+<xsl:template match="html:h1|html:h2|html:h3|html:h4">
+    <head>
+        <xsl:apply-templates/>
+    </head>
+</xsl:template>
+
+
+<xsl:template match="html:hr">
+    <milestone unit="tb"/>
+</xsl:template>
+
+
+<xsl:template match="html:div|html:span|html:pre">
+    <xsl:apply-templates/>
+</xsl:template>
+
+
+
+
+
+<!-- Images -->
+<xsl:template match="html:img">
+ 
+ 
+</xsl:template>
+
+
+
+
+<!-- Lists -->
+<xsl:template match="html:ul">
+ <list>
+  <xsl:apply-templates/>
+ </list>
+</xsl:template>
+
+<xsl:template match="html:ol">
+ <list>
+  <xsl:apply-templates/>
+ </list>
+</xsl:template>
+        
+<xsl:template match="html:li">
+ <item>
+    <xsl:apply-templates/>
+ </item>
+</xsl:template>
+        
+
+
+
+<!-- Tables -->
+<xsl:template match="html:table">
+    <table>
+        <xsl:apply-templates/>
+    </table>
+</xsl:template>
+
+
+<xsl:template match="html:tbody">
+    <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:template match="html:tr">
+    <row>
+        <xsl:apply-templates/>
+    </row>
+</xsl:template>
+
+<xsl:template match="html:th|html:td">
+ <xsl:variable name="position" select="count(preceding-sibling::*) + 1"/>
+ <cell>
+  <xsl:if test="@colspan &gt; 1">
+   <xsl:attribute name="cols">
+    <xsl:value-of select="@colspan"/>
+   </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="@rowspan &gt; 1">
+   <xsl:attribute name="rows">
+    <xsl:value-of select="@rowspan"/>
+   </xsl:attribute>
+  </xsl:if>
+  <xsl:apply-templates/>
+ </cell>
+</xsl:template>
+
+
+<!-- Stop processing when an unknown element is encountered -->     
+<xsl:template match="*">
+ <xsl:message>Unhandled element <xsl:value-of select="name()"/>
+ </xsl:message>
+ <xsl:apply-templates/>
+</xsl:template>
+
+
 </xsl:stylesheet>
\ No newline at end of file