From ldr at codespeak.net  Mon Jul  5 20:11:36 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon,  5 Jul 2010 20:11:36 +0200 (CEST)
Subject: [z3-checkins] r75852 - in z3/xdv/branches/multistage-compiler: .
	lib/xdv lib/xdv/tests/modify-theme
Message-ID: <20100705181136.363C0282BFC@codespeak.net>

Author: ldr
Date: Mon Jul  5 20:11:33 2010
New Revision: 75852

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/dummy.html
   z3/xdv/branches/multistage-compiler/lib/xdv/identity.xsl
Modified:
   z3/xdv/branches/multistage-compiler/buildout.cfg
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/defaults.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/modify-theme/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
Log:
All but the output doctype test passes now. Probably still some whitespace problems (untested as the tests pretty print). Some stray xmlns should probably be stripped out so never making it into the compiled output.

Modified: z3/xdv/branches/multistage-compiler/buildout.cfg
==============================================================================
--- z3/xdv/branches/multistage-compiler/buildout.cfg	(original)
+++ z3/xdv/branches/multistage-compiler/buildout.cfg	Mon Jul  5 20:11:33 2010
@@ -12,3 +12,4 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = xdv
+defaults = ['--auto-color']

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	Mon Jul  5 20:11:33 2010
@@ -3,6 +3,7 @@
     xmlns:dyn="http://exslt.org/dynamic"
     xmlns:esi="http://www.edge-delivery.org/esi/1.0"
     xmlns:exsl="http://exslt.org/common"
+    xmlns:str="http://exslt.org/strings"
     xmlns:xdv="http://namespaces.plone.org/xdv"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -78,7 +79,7 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template  match="/" mode="matches">
+    <xsl:template match="/" mode="matches">
         <xsl:param name="themexpath"/>
         <xsl:param name="themeid"/>
         <xsl:for-each select="dyn:evaluate($themexpath)">
@@ -105,7 +106,7 @@
         </xsl:element>
     </xsl:template>
     
-    <xsl:template test="*[@method = 'ssi']" mode="include">
+    <xsl:template match="*[@method = 'ssi']" mode="include">
         <!-- Assumptions:
             * When using ssiprefix, @href should be an absolute local path (i.e.  /foo/bar)
         -->
@@ -117,7 +118,7 @@
             </xsl:choose>" wait="yes" </xsl:element>
     </xsl:template>
     
-    <xsl:template test="*[@method = 'esi']" mode="include">
+    <xsl:template match="*[@method = 'esi']" mode="include">
         <!-- Assumptions:
             * When using esiprefix, @href should be an absolute local path (i.e.  /foo/bar)
         -->
@@ -129,7 +130,7 @@
             </xsl:choose></xsl:attribute></esi:include>
     </xsl:template>
     
-    <xsl:template test="*" mode="include">
+    <xsl:template match="*" mode="include">
         <xsl:message terminate="yes">
             ERROR: Unknown includemode or @method attribute
         </xsl:message>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	Mon Jul  5 20:11:33 2010
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
     xmlns:esi="http://www.edge-delivery.org/esi/1.0"
+    xmlns:str="http://exslt.org/strings"
     xmlns:xdv="http://namespaces.plone.org/xdv"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl	Mon Jul  5 20:11:33 2010
@@ -6,62 +6,47 @@
     xmlns:exsl="http://exslt.org/common"
     xmlns:str="http://exslt.org/strings"
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="exsl str dv xhtml" >
+    exclude-result-prefixes="exsl str dv xhtml">
   <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
       media-type="text/html" encoding="utf-8"
       doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
       doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
+    
     <xsl:template match="/">
+        <dv:insert/>
+        <xsl:choose>
+            <xsl:when test="use-theme1">
+                <xsl:apply-templates select="." mode="theme1-id"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 
-        <!-- Pass incoming content through initial-stage filter. -->
-        <xsl:variable name="initial-stage-rtf">
-            <xsl:apply-templates select="/" mode="initial-stage"/>
-        </xsl:variable>
-        <xsl:variable name="initial-stage" select="exsl:node-set($initial-stage-rtf)"/>
-
-        <!-- Now apply the theme to the initial-stage content -->
-        <xsl:variable name="themedcontent-rtf">
-            <xsl:apply-templates select="$initial-stage" mode="apply-theme"/>
-        </xsl:variable>
-        <xsl:variable name="content" select="exsl:node-set($themedcontent-rtf)"/>
-
-        <!-- We're done, so generate some output by passing 
-            through a final stage. -->
-        <xsl:apply-templates select="$content" mode="final-stage"/>
-
+    <xsl:template match="none" mode="insert-drop-rules">
+        <!-- The compiler looks for this and replaces 
+        the @match and @mode. -->
     </xsl:template>
 
     <!-- 
     
         Utility templates
     -->
-    <xsl:template match="none" mode="insert-drop-rules">
-        <!-- The compiler looks for this and replaces 
-        the @match and @mode. -->
-    </xsl:template>
-    <xsl:template match="node()|@*" mode="initial-stage">
+    
+    <xsl:template match="node()|@*">
         <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="initial-stage"/>
+            <xsl:apply-templates select="node()|@*"/>
         </xsl:copy>
     </xsl:template>
-    <xsl:template match="pre/text()" mode="initial-stage">
+
+    <xsl:template match="pre/text()">
         <!-- Filter out quoted &#13; -->
         <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
     </xsl:template>
-    <xsl:template match="/" mode="apply-theme">
-        <dv:insert/>
-    </xsl:template>
-    <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}">
-            <xsl:apply-templates select="@*" mode="final-stage"/>
-            <xsl:value-of select="text()" disable-output-escaping="yes"/>
-        </xsl:element>
-    </xsl:template>
-    <xsl:template match="node()|@*" priority="1" mode="final-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="final-stage"/>
-        </xsl:copy>
+
+    <xsl:template match="style/text()|script/text()">
+        <xsl:value-of select="." disable-output-escaping="yes"/>
     </xsl:template>
 
     <!-- 

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/defaults.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/defaults.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/defaults.xsl	Mon Jul  5 20:11:33 2010
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
     xmlns:dv="http://namespaces.plone.org/xdv"
+    xmlns:dyn="http://exslt.org/dynamic"
     xmlns:esi="http://www.edge-delivery.org/esi/1.0"
     xmlns:exsl="http://exslt.org/common"
     xmlns:str="http://exslt.org/strings"
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="exsl str dv xhtml">
+    exclude-result-prefixes="exsl str css dv dyn xhtml">
 
     <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
         media-type="text/html" encoding="UTF-8"

Added: z3/xdv/branches/multistage-compiler/lib/xdv/dummy.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/dummy.html	Mon Jul  5 20:11:33 2010
@@ -0,0 +1 @@
+<html></html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Mon Jul  5 20:11:33 2010
@@ -13,6 +13,7 @@
 
     <xsl:param name="defaultsurl">defaults.xsl</xsl:param>
     <xsl:variable name="rules" select="//dv:*[@theme]"/>
+    <xsl:variable name="drop-content-rules" select="//dv:drop[@content]"/>
     <xsl:variable name="themes" select="//dv:theme"/>
     <xsl:variable name="conditional" select="//dv:theme[@if-content]"/>
     <xsl:variable name="unconditional" select="//dv:theme[not(@if-content)]"/>
@@ -87,7 +88,7 @@
                 <xsl:message>THEME <xsl:value-of select="$themeid"/></xsl:message>
                 <!-- If there are any <drop @content> rules, put it in 
                 here. -->
-                <xsl:for-each select="$rules/dv:rules/dv:drop[@content]">
+                <xsl:for-each select="$drop-content-rules">
                     <xsl:element name="xsl:template">
                         <xsl:attribute name="match">
                             <xsl:value-of select="@content"/>
@@ -140,7 +141,7 @@
 
     <xsl:template match="xsl:stylesheet/@exclude-result-prefixes">
         <xsl:choose>
-            <xsl:when test="$rules//*[@method='esi']">
+            <xsl:when test="$rules[@method='esi']">
                 <xsl:copy/>
             </xsl:when>
             <xsl:otherwise>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/identity.xsl
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/identity.xsl	Mon Jul  5 20:11:33 2010
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xdv="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    xmlns:xhtml="http://www.w3.org/1999/xhtml"
+    >
+    <xsl:param name="docurl"/>
+    <xsl:variable name="doc" select="document($docurl)"/>
+
+    <xsl:template match="/">
+        <xsl:apply-templates select="$doc" mode="identity"/>
+    </xsl:template>
+
+    <xsl:template match="@*|node()" mode="identity">
+       <xsl:copy>
+          <xsl:apply-templates select="@*|node()" mode="identity"/>
+       </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Mon Jul  5 20:11:33 2010
@@ -15,14 +15,14 @@
 from urlparse import urljoin
 
 from xdv.cssrules import convert_css_selectors
-from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE
+from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE, CustomResolver
 
 logger = logging.getLogger('xdv')
 
 IMPORT_STYLESHEET = re.compile(r'''(@import\s+(?:url\(['"]?|['"]))(.+)(['"]?\)|['"])''', re.IGNORECASE)
 
-def pkg_xsl(name):
-    return etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name)))
+def pkg_xsl(name, parser=None):
+    return etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser))
 
 update_transform = pkg_xsl('update-namespace.xsl')
 normalize_rules  = pkg_xsl('normalize-rules.xsl')
@@ -31,7 +31,6 @@
 apply_rules      = pkg_xsl('apply-rules.xsl')
 emit_stylesheet  = pkg_xsl('emit-stylesheet.xsl')
 
-
 def update_namespace(rules_doc):
     """Convert old namespace to new namespace in place
     """
@@ -58,6 +57,10 @@
     return rules_doc
 
 def apply_absolute_prefix(theme_doc, absolute_prefix):
+    if not absolute_prefix:
+        return
+    if not absolute_prefix.endswith('/'):
+        absolute_prefix = absolute_prefix + '/'
     for node in theme_doc.xpath('//*[@src]'):
         url = urljoin(absolute_prefix, node.get('src'))
         node.set('src', url)
@@ -88,11 +91,24 @@
     root.append(element)
     return rules_doc
 
+def set_parser(stylesheet, parser, compiler_parser=None):
+    dummy_doc = etree.parse(pkg_resources.resource_filename('xdv', 'dummy.html'), parser=parser)
+    name = 'file:///__xdv__'
+    resolver = CustomResolver({name: stylesheet})
+    if compiler_parser is None:
+        compiler_parser = etree.XMLParser()
+    compiler_parser.resolvers.add(resolver)
+    identity = pkg_xsl('identity.xsl', compiler_parser)
+    output_doc = identity(dummy_doc, docurl="'%s'"%name)
+    compiler_parser.resolvers.remove(resolver)
+    return output_doc
+
 def process_rules(rules, theme=None, extra=None, trace=None, css=True, xinclude=True, absolute_prefix=None, includemode=None, update=True, parser=None, rules_parser=None, compiler_parser=None, access_control=None):
     if rules_parser is None:
         rules_parser = etree.XMLParser(recover=False)
     rules_doc = etree.parse(rules, parser=rules_parser)
-
+    if parser is None:
+        parser = etree.HTMLParser()
     if xinclude:
         rules_doc.xinclude()
     if update:
@@ -106,11 +122,12 @@
         includemode = 'document'
     includemode = "'%s'" % includemode
     rules_doc = normalize_rules(rules_doc, includemode=includemode)
+    #import pdb; pdb.set_trace()
     rules_doc = annotate_themes(rules_doc)
     rules_doc = annotate_rules(rules_doc)
     rules_doc = apply_rules(rules_doc)
     compiled_doc = emit_stylesheet(rules_doc)
-    #import pdb; pdb.set_trace()
+    compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
     return compiled_doc
 
 

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/modify-theme/rules.xml
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/modify-theme/rules.xml	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/modify-theme/rules.xml	Mon Jul  5 20:11:33 2010
@@ -12,7 +12,7 @@
         </p>
     </xdv:before>
     
-    <xdv:append theme="/html/head">
+    <xdv:append css:theme="head">
         <style type="text/css">
             /* From the rules */
             body > h1 { color: red; }

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	Mon Jul  5 20:11:33 2010
@@ -15,3 +15,12 @@
 
 AC_READ_FILE = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=False, write_network=False)
 AC_READ_NET = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=True, write_network=False)
+
+class CustomResolver(etree.Resolver):
+    def __init__(self, data):
+        self.data = data
+        
+    def resolve(self, url, pubid, context):
+        output = self.data.get(url)
+        if output is not None:
+            return self.resolve_string(output, context)

From ldr at codespeak.net  Tue Jul  6 15:23:30 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 15:23:30 +0200 (CEST)
Subject: [z3-checkins] r75905 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100706132330.29901282BF7@codespeak.net>

Author: ldr
Date: Tue Jul  6 15:23:29 2010
New Revision: 75905

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
Log:
Inline xsl output rules (note these must be unconditional due to limitations of xslt)

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Tue Jul  6 15:23:29 2010
@@ -14,6 +14,7 @@
     <xsl:param name="defaultsurl">defaults.xsl</xsl:param>
     <xsl:variable name="rules" select="//dv:*[@theme]"/>
     <xsl:variable name="drop-content-rules" select="//dv:drop[@content]"/>
+    <xsl:variable name="inline-xsl" select="/dv:rules/xsl:*"/>
     <xsl:variable name="themes" select="//dv:theme"/>
     <xsl:variable name="conditional" select="//dv:theme[@if-content]"/>
     <xsl:variable name="unconditional" select="//dv:theme[not(@if-content)]"/>
@@ -114,7 +115,10 @@
                     <xsl:with-param name="mode" select="$themeid"/>
                 </xsl:apply-templates>
             </xsl:for-each>
-            <!-- XXX extra xsl in rules -->
+            <!-- Copy the inline xsl from rules (usually xsl:output) -->
+            <xsl:for-each select="$inline-xsl">
+                <xsl:copy-of select="."/>
+            </xsl:for-each>
         </xsl:copy>
     </xsl:template>
 

From ldr at codespeak.net  Tue Jul  6 16:33:23 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 16:33:23 +0200 (CEST)
Subject: [z3-checkins] r75919 - in
	z3/xdv/branches/multistage-compiler/lib/xdv/tests: .
	absolute-prefix absolute-prefix-disabled
Message-ID: <20100706143323.490F1282B9C@codespeak.net>

Author: ldr
Date: Tue Jul  6 16:33:21 2010
New Revision: 75919

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/options.cfg
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html
      - copied unchanged from r74961, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_theme.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/content.html
      - copied unchanged from r75852, z3/xdv/branches/multistage-compiler/lib/xdv/dummy.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/options.cfg
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/rules.xml
      - copied unchanged from r74961, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html
      - copied unchanged from r74961, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_theme.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/default-options.cfg
Removed:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_theme.html
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/tests.py
Log:
refactor test to have options, this allows the absolute theme tests to fit the normal pattern

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/content.html	Tue Jul  6 16:33:21 2010
@@ -0,0 +1 @@
+<html></html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/options.cfg	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+absolute-prefix =

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Absolute prefix</title>
+    <style type="text/css">
+            @import "foo.css";        
+            @import url("foo.css");
+            @import url('./foo.css');
+            @import url('../foo.css');
+            @import url('/foo.css');
+            @import url('http://site.com/foo.css');
+        </style>
+    <link rel="stylesheet" href="foo.css" />
+    <link rel="stylesheet" href="./foo.css" />
+    <link rel="stylesheet" href="../foo.css" />
+    <link rel="stylesheet" href="/foo.css" />
+    <link rel="stylesheet" href="http://site.com/foo.css" />
+    <script type="text/javascript" src="foo.js"></script>
+    <script type="text/javascript" src="./foo.js"></script>
+    <script type="text/javascript" src="../foo.js"></script>
+    <script type="text/javascript" src="/foo.js"></script>
+    <script type="text/javascript" src="http://site.com/foo.js"></script>
+  </head>
+  <body>
+    <img src="foo.jpg" />
+    <img src="./foo.jpg" />
+    <img src="../foo.jpg" />
+    <img src="/foo.jpg" />
+    <img src="http://site.com/foo.jpg" />
+    <input type="submit" src="foo.jpg" />
+    <input type="submit" src="./foo.jpg" />
+    <input type="submit" src="../foo.jpg" />
+    <input type="submit" src="/foo.jpg" />
+    <input type="submit" src="http://site.com/foo.jpg" />
+    <a href="foo.html">Link</a>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/rules.xml	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/options.cfg	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+absolute-prefix = /abs

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Absolute prefix</title>
+    <style type="text/css">
+            @import "/abs/foo.css";        
+            @import url("/abs/foo.css");
+            @import url('/abs/foo.css');
+            @import url('/foo.css');
+            @import url('/foo.css');
+            @import url('http://site.com/foo.css');
+        </style>
+    <link rel="stylesheet" href="/abs/foo.css" />
+    <link rel="stylesheet" href="/abs/foo.css" />
+    <link rel="stylesheet" href="/foo.css" />
+    <link rel="stylesheet" href="/foo.css" />
+    <link rel="stylesheet" href="http://site.com/foo.css" />
+    <script type="text/javascript" src="/abs/foo.js"></script>
+    <script type="text/javascript" src="/abs/foo.js"></script>
+    <script type="text/javascript" src="/foo.js"></script>
+    <script type="text/javascript" src="/foo.js"></script>
+    <script type="text/javascript" src="http://site.com/foo.js"></script>
+  </head>
+  <body>
+    <img src="/abs/foo.jpg" />
+    <img src="/abs/foo.jpg" />
+    <img src="/foo.jpg" />
+    <img src="/foo.jpg" />
+    <img src="http://site.com/foo.jpg" />
+    <input type="submit" src="/abs/foo.jpg" />
+    <input type="submit" src="/abs/foo.jpg" />
+    <input type="submit" src="/foo.jpg" />
+    <input type="submit" src="/foo.jpg" />
+    <input type="submit" src="http://site.com/foo.jpg" />
+    <a href="/abs/foo.html">Link</a>
+  </body>
+</html>

Deleted: /z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_rules.xml
==============================================================================
--- /z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_rules.xml	Tue Jul  6 16:33:21 2010
+++ (empty file)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://namespaces.plone.org/xdv">
-    
-</rules>

Deleted: /z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_theme.html
==============================================================================
--- /z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute_theme.html	Tue Jul  6 16:33:21 2010
+++ (empty file)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>Absolute prefix</title>
-        
-        <style type="text/css">
-            @import "foo.css";        
-            @import url("foo.css");
-            @import url('./foo.css');
-            @import url('../foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
-        
-        <link rel="stylesheet" href="foo.css" />
-        <link rel="stylesheet" href="./foo.css" />
-        <link rel="stylesheet" href="../foo.css" />
-        <link rel="stylesheet" href="/foo.css" />
-        <link rel="stylesheet" href="http://site.com/foo.css" />
-        
-        <script type="text/javascript" src="foo.js" />
-        <script type="text/javascript" src="./foo.js" />
-        <script type="text/javascript" src="../foo.js" />
-        <script type="text/javascript" src="/foo.js" />
-        <script type="text/javascript" src="http://site.com/foo.js" />
-        
-    </head>
-    <body>
-        <img src="foo.jpg" />
-        <img src="./foo.jpg" />
-        <img src="../foo.jpg" />
-        <img src="/foo.jpg" />
-        <img src="http://site.com/foo.jpg" />
-        
-        <input type="submit" src="foo.jpg" />
-        <input type="submit" src="./foo.jpg" />
-        <input type="submit" src="../foo.jpg" />
-        <input type="submit" src="/foo.jpg" />
-        <input type="submit" src="http://site.com/foo.jpg" />
-        
-        <a href="foo.html">Link</a>
-        
-    </body>
-</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/default-options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/default-options.cfg	Tue Jul  6 16:33:21 2010
@@ -0,0 +1,5 @@
+[xdvtest]
+pretty-print = true
+absolute-prefix =
+includemode = document
+theme = theme.html

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/tests.py	Tue Jul  6 16:33:21 2010
@@ -9,6 +9,8 @@
 import difflib
 from StringIO import StringIO
 import unittest
+import ConfigParser
+import pkg_resources
 
 import xdv.compiler
 import xdv.run
@@ -18,6 +20,8 @@
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
+defaultsfn = pkg_resources.resource_filename('xdv.tests', 'default-options.cfg')
+
 class XDVTestCase(unittest.TestCase):
     
     writefiles = os.environ.get('XDVTESTS_WRITE_FILES', False)
@@ -27,7 +31,12 @@
     
     def testAll(self):
         self.errors = StringIO()
-        themefn = os.path.join(self.testdir, "theme.html")
+        config = ConfigParser.ConfigParser()
+        config.read([defaultsfn, os.path.join(self.testdir, "options.cfg")])
+        
+        themefn = None
+        if config.get('xdvtest', 'theme'):
+            themefn = os.path.join(self.testdir, config.get('xdvtest', 'theme'))
         contentfn = os.path.join(self.testdir, "content.html")
         rulesfn = os.path.join(self.testdir, "rules.xml")
         xpathsfn = os.path.join(self.testdir, "xpaths.txt")
@@ -39,7 +48,13 @@
 
         # Make a compiled version
         theme_parser = etree.HTMLParser()
-        ct = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, parser=theme_parser)
+        ct = xdv.compiler.compile_theme(
+            rules=rulesfn,
+            theme=themefn,
+            parser=theme_parser,
+            absolute_prefix=config.get('xdvtest', 'absolute-prefix'),
+            includemode=config.get('xdvtest', 'includemode'),
+            )
         
         # Serialize / parse the theme - this can catch problems with escaping.
         cts = etree.tostring(ct)
@@ -69,7 +84,7 @@
 
         # Read the whole thing to strip off xhtml namespace.
         # If we had xslt 2.0 then we could use xpath-default-namespace.
-        self.themed_string = etree.tostring(result, encoding="UTF-8", pretty_print=True)
+        self.themed_string = etree.tostring(result, encoding="UTF-8", pretty_print=config.getboolean('xdvtest', 'pretty-print'))
         self.themed_content = etree.ElementTree(file=StringIO(self.themed_string), 
                                                 parser=etree.HTMLParser())
 
@@ -103,118 +118,6 @@
         # Write out the result to catch unexpected changes
         if self.writefiles:
             open(outputfn, 'w').write(self.themed_string)
-    
-class TestAbsolutePrefix(unittest.TestCase):
-    
-    def testEnabled(self):
-        themefn = os.path.join(HERE, "absolute_theme.html")
-        rulesfn = os.path.join(HERE, "absolute_rules.xml")
-        
-        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, absolute_prefix="/abs")
-        
-        styleTag = compiled.xpath('//style')[0]
-        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        expectedLines = [
-            '@import "/abs/foo.css";',
-            '@import url("/abs/foo.css");',
-            "@import url('/abs/foo.css');",
-            "@import url('/foo.css');",
-            "@import url('/foo.css');",
-            "@import url('http://site.com/foo.css');"
-            ]
-        for line, expected in zip(styleLines, expectedLines):
-            self.assertEquals(line, expected)
-        
-        linkTags = compiled.xpath('//link')
-        self.assertEquals([
-            '/abs/foo.css',
-            '/abs/foo.css',
-            '/foo.css',
-            '/foo.css',
-            'http://site.com/foo.css'
-        ], [x.get('href') for x in linkTags])
-        
-        scriptTags = compiled.xpath('//script')
-        self.assertEquals([
-            '/abs/foo.js',
-            '/abs/foo.js',
-            '/foo.js',
-            '/foo.js',
-            'http://site.com/foo.js'
-        ], [x.get('src') for x in scriptTags])
-        
-        imgTags = compiled.xpath('//img')
-        self.assertEquals([
-            '/abs/foo.jpg',
-            '/abs/foo.jpg',
-            '/foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in imgTags])
-        
-        inputTags = compiled.xpath('//input')
-        self.assertEquals([
-            '/abs/foo.jpg',
-            '/abs/foo.jpg',
-            '/foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in inputTags])
-    
-    def testDisabled(self):
-        themefn = os.path.join(HERE, "absolute_theme.html")
-        rulesfn = os.path.join(HERE, "absolute_rules.xml")
-        
-        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn)
-        
-        styleTag = compiled.xpath('//style')[0]
-        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        expectedLines = [
-            '@import "foo.css";',
-            '@import url("foo.css");',
-            "@import url('./foo.css');",
-            "@import url('../foo.css');",
-            "@import url('/foo.css');",
-            "@import url('http://site.com/foo.css');"
-            ]
-        for line, expected in zip(styleLines, expectedLines):
-            self.assertEquals(line, expected)
-        
-        linkTags = compiled.xpath('//link')
-        self.assertEquals([
-            'foo.css',
-            './foo.css',
-            '../foo.css',
-            '/foo.css',
-            'http://site.com/foo.css'
-        ], [x.get('href') for x in linkTags])
-        
-        scriptTags = compiled.xpath('//script')
-        self.assertEquals([
-            'foo.js',
-            './foo.js',
-            '../foo.js',
-            '/foo.js',
-            'http://site.com/foo.js'
-        ], [x.get('src') for x in scriptTags])
-        
-        imgTags = compiled.xpath('//img')
-        self.assertEquals([
-            'foo.jpg',
-            './foo.jpg',
-            '../foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in imgTags])
-        
-        inputTags = compiled.xpath('//input')
-        self.assertEquals([
-            'foo.jpg',
-            './foo.jpg',
-            '../foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in inputTags])
 
 
 def test_suite():
@@ -227,5 +130,4 @@
             continue
         cls = type('Test-%s'%name, (XDVTestCase,), dict(testdir=path))
         suite.addTest(unittest.makeSuite(cls))
-    suite.addTest(unittest.makeSuite(TestAbsolutePrefix))
     return suite

From ldr at codespeak.net  Tue Jul  6 16:33:56 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 16:33:56 +0200 (CEST)
Subject: [z3-checkins] r75920 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100706143356.1C763282B9C@codespeak.net>

Author: ldr
Date: Tue Jul  6 16:33:54 2010
New Revision: 75920

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/run.py
Log:
add more options to xdvrun (these should really be shared with xdvcompile)

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/run.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/run.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/run.py	Tue Jul  6 16:33:54 2010
@@ -51,6 +51,12 @@
     op.add_option("-n", "--network", action="store_true",
                   help="Allow reads to the network to fetch resources",
                   dest="read_network", default=False)
+    op.add_option("-a", "--absolute-prefix", metavar="/",
+                  help="relative urls in the theme file will be made into absolute links with this prefix.",
+                  dest="absolute_prefix", default=None)
+    op.add_option("-i", "--includemode", metavar="INC",
+                  help="include mode (document, ssi or esi)",
+                  dest="includemode", default=None)
     (options, args) = op.parse_args()
 
     if options.read_network:
@@ -66,7 +72,7 @@
         if options.theme and options.rules:
             content, = args
             parser = etree.HTMLParser()
-            output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, parser=parser, access_control=access_control)
+            output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, parser=parser, access_control=access_control, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
         else:
             op.error("Theme and rules must be supplied.")
     else:

From ldr at codespeak.net  Tue Jul  6 16:40:31 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 16:40:31 +0200 (CEST)
Subject: [z3-checkins] r75921 - in
	z3/xdv/branches/multistage-compiler/lib/xdv/tests:
	absolute-prefix absolute-prefix-disabled
Message-ID: <20100706144031.8E8A7282C02@codespeak.net>

Author: ldr
Date: Tue Jul  6 16:40:30 2010
New Revision: 75921

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html
Log:
tidy absolute theme tests

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html	Tue Jul  6 16:40:30 2010
@@ -4,13 +4,13 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>Absolute prefix</title>
     <style type="text/css">
-            @import "foo.css";        
-            @import url("foo.css");
-            @import url('./foo.css');
-            @import url('../foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
+      @import "foo.css";      
+      @import url("foo.css");
+      @import url('./foo.css');
+      @import url('../foo.css');
+      @import url('/foo.css');
+      @import url('http://site.com/foo.css');
+    </style>
     <link rel="stylesheet" href="foo.css" />
     <link rel="stylesheet" href="./foo.css" />
     <link rel="stylesheet" href="../foo.css" />

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html	Tue Jul  6 16:40:30 2010
@@ -1,44 +1,38 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>Absolute prefix</title>
-        
-        <style type="text/css">
-            @import "foo.css";        
-            @import url("foo.css");
-            @import url('./foo.css');
-            @import url('../foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
-        
-        <link rel="stylesheet" href="foo.css" />
-        <link rel="stylesheet" href="./foo.css" />
-        <link rel="stylesheet" href="../foo.css" />
-        <link rel="stylesheet" href="/foo.css" />
-        <link rel="stylesheet" href="http://site.com/foo.css" />
-        
-        <script type="text/javascript" src="foo.js" />
-        <script type="text/javascript" src="./foo.js" />
-        <script type="text/javascript" src="../foo.js" />
-        <script type="text/javascript" src="/foo.js" />
-        <script type="text/javascript" src="http://site.com/foo.js" />
-        
-    </head>
-    <body>
-        <img src="foo.jpg" />
-        <img src="./foo.jpg" />
-        <img src="../foo.jpg" />
-        <img src="/foo.jpg" />
-        <img src="http://site.com/foo.jpg" />
-        
-        <input type="submit" src="foo.jpg" />
-        <input type="submit" src="./foo.jpg" />
-        <input type="submit" src="../foo.jpg" />
-        <input type="submit" src="/foo.jpg" />
-        <input type="submit" src="http://site.com/foo.jpg" />
-        
-        <a href="foo.html">Link</a>
-        
-    </body>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Absolute prefix</title>
+    <style type="text/css">
+      @import "foo.css";      
+      @import url("foo.css");
+      @import url('./foo.css');
+      @import url('../foo.css');
+      @import url('/foo.css');
+      @import url('http://site.com/foo.css');
+    </style>
+    <link rel="stylesheet" href="foo.css" />
+    <link rel="stylesheet" href="./foo.css" />
+    <link rel="stylesheet" href="../foo.css" />
+    <link rel="stylesheet" href="/foo.css" />
+    <link rel="stylesheet" href="http://site.com/foo.css" />
+    <script type="text/javascript" src="foo.js"></script>
+    <script type="text/javascript" src="./foo.js"></script>
+    <script type="text/javascript" src="../foo.js"></script>
+    <script type="text/javascript" src="/foo.js"></script>
+    <script type="text/javascript" src="http://site.com/foo.js"></script>
+  </head>
+  <body>
+    <img src="foo.jpg" />
+    <img src="./foo.jpg" />
+    <img src="../foo.jpg" />
+    <img src="/foo.jpg" />
+    <img src="http://site.com/foo.jpg" />
+    <input type="submit" src="foo.jpg" />
+    <input type="submit" src="./foo.jpg" />
+    <input type="submit" src="../foo.jpg" />
+    <input type="submit" src="/foo.jpg" />
+    <input type="submit" src="http://site.com/foo.jpg" />
+    <a href="foo.html">Link</a>
+  </body>
 </html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html	Tue Jul  6 16:40:30 2010
@@ -4,13 +4,13 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>Absolute prefix</title>
     <style type="text/css">
-            @import "/abs/foo.css";        
-            @import url("/abs/foo.css");
-            @import url('/abs/foo.css');
-            @import url('/foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
+      @import "/abs/foo.css";      
+      @import url("/abs/foo.css");
+      @import url('/abs/foo.css');
+      @import url('/foo.css');
+      @import url('/foo.css');
+      @import url('http://site.com/foo.css');
+    </style>
     <link rel="stylesheet" href="/abs/foo.css" />
     <link rel="stylesheet" href="/abs/foo.css" />
     <link rel="stylesheet" href="/foo.css" />

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html	Tue Jul  6 16:40:30 2010
@@ -1,44 +1,38 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>Absolute prefix</title>
-        
-        <style type="text/css">
-            @import "foo.css";        
-            @import url("foo.css");
-            @import url('./foo.css');
-            @import url('../foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
-        
-        <link rel="stylesheet" href="foo.css" />
-        <link rel="stylesheet" href="./foo.css" />
-        <link rel="stylesheet" href="../foo.css" />
-        <link rel="stylesheet" href="/foo.css" />
-        <link rel="stylesheet" href="http://site.com/foo.css" />
-        
-        <script type="text/javascript" src="foo.js" />
-        <script type="text/javascript" src="./foo.js" />
-        <script type="text/javascript" src="../foo.js" />
-        <script type="text/javascript" src="/foo.js" />
-        <script type="text/javascript" src="http://site.com/foo.js" />
-        
-    </head>
-    <body>
-        <img src="foo.jpg" />
-        <img src="./foo.jpg" />
-        <img src="../foo.jpg" />
-        <img src="/foo.jpg" />
-        <img src="http://site.com/foo.jpg" />
-        
-        <input type="submit" src="foo.jpg" />
-        <input type="submit" src="./foo.jpg" />
-        <input type="submit" src="../foo.jpg" />
-        <input type="submit" src="/foo.jpg" />
-        <input type="submit" src="http://site.com/foo.jpg" />
-        
-        <a href="foo.html">Link</a>
-        
-    </body>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Absolute prefix</title>
+    <style type="text/css">
+      @import "foo.css";      
+      @import url("foo.css");
+      @import url('./foo.css');
+      @import url('../foo.css');
+      @import url('/foo.css');
+      @import url('http://site.com/foo.css');
+    </style>
+    <link rel="stylesheet" href="foo.css" />
+    <link rel="stylesheet" href="./foo.css" />
+    <link rel="stylesheet" href="../foo.css" />
+    <link rel="stylesheet" href="/foo.css" />
+    <link rel="stylesheet" href="http://site.com/foo.css" />
+    <script type="text/javascript" src="foo.js"></script>
+    <script type="text/javascript" src="./foo.js"></script>
+    <script type="text/javascript" src="../foo.js"></script>
+    <script type="text/javascript" src="/foo.js"></script>
+    <script type="text/javascript" src="http://site.com/foo.js"></script>
+  </head>
+  <body>
+    <img src="foo.jpg" />
+    <img src="./foo.jpg" />
+    <img src="../foo.jpg" />
+    <img src="/foo.jpg" />
+    <img src="http://site.com/foo.jpg" />
+    <input type="submit" src="foo.jpg" />
+    <input type="submit" src="./foo.jpg" />
+    <input type="submit" src="../foo.jpg" />
+    <input type="submit" src="/foo.jpg" />
+    <input type="submit" src="http://site.com/foo.jpg" />
+    <a href="foo.html">Link</a>
+  </body>
 </html>

From ldr at codespeak.net  Tue Jul  6 17:33:32 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 17:33:32 +0200 (CEST)
Subject: [z3-checkins] r75926 -
	z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang
Message-ID: <20100706153332.73CB1282C05@codespeak.net>

Author: ldr
Date: Tue Jul  6 17:33:30 2010
New Revision: 75926

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/theme.html
Log:
XDV 0.3 seems to get confused with lang and xml:lang on the theme. Somehow this got fixed along the way.

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/content.html	Tue Jul  6 17:33:30 2010
@@ -0,0 +1 @@
+<html></html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/output.html	Tue Jul  6 17:33:30 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    Check that xml:lang is not duplicated.
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/rules.xml	Tue Jul  6 17:33:30 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/theme.html	Tue Jul  6 17:33:30 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    Check that xml:lang is not duplicated.
+  </body>
+</html>

From ldr at codespeak.net  Tue Jul  6 17:48:31 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 17:48:31 +0200 (CEST)
Subject: [z3-checkins] r75929 - in
	z3/xdv/branches/multistage-compiler/lib/xdv: . tests/html-xml-lang-2
Message-ID: <20100706154831.C7F32282C08@codespeak.net>

Author: ldr
Date: Tue Jul  6 17:48:30 2010
New Revision: 75929

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/
      - copied from r75926, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/theme.html
Log:
Check that xml:lang is always set to value of lang

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	Tue Jul  6 17:48:30 2010
@@ -50,6 +50,10 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template match="html/@*[name() = 'xml:lang']" priority="5">
+        <!-- Filter it out, rely on lang attribute -->
+    </xsl:template>
+
     <xsl:template match="pre/text()">
         <!-- Filter out quoted &#13; -->
         <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/content.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/content.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/content.html	Tue Jul  6 17:48:30 2010
@@ -1 +1 @@
-<html></html>
+<html lang="no"></html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/output.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/output.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/output.html	Tue Jul  6 17:48:30 2010
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="no" xml:lang="no">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
   <body>
-    Check that xml:lang is not duplicated.
+    Check that xml:lang is always set to value of lang
   </body>
 </html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/rules.xml
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/rules.xml	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/rules.xml	Tue Jul  6 17:48:30 2010
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rules xmlns="http://namespaces.plone.org/xdv">
-    
+    <prepend theme="/html" content="/html/@lang"/>
 </rules>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/theme.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/theme.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/theme.html	Tue Jul  6 17:48:30 2010
@@ -4,6 +4,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
   <body>
-    Check that xml:lang is not duplicated.
+    Check that xml:lang is always set to value of lang
   </body>
 </html>

From ldr at codespeak.net  Tue Jul  6 19:00:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 19:00:58 +0200 (CEST)
Subject: [z3-checkins] r75933 - in
	z3/xdv/branches/multistage-compiler/lib/xdv: .
	tests/drop-content tests/esi tests/ssi
Message-ID: <20100706170058.A37C5282C05@codespeak.net>

Author: ldr
Date: Tue Jul  6 19:00:57 2010
New Revision: 75933

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/theme.html
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/cssrules.py
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/esi/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/ssi/output.html
Log:
Change the css selector prefix so they are relative rather than absolute to the root (normally they are run relative to the root node anyway, so it makes no odds). <drop css:content=... continues to use the // prefix.

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/cssrules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/cssrules.py	Tue Jul  6 19:00:57 2010
@@ -20,7 +20,7 @@
 import logging
 logger = logging.getLogger('xdv')
 
-def convert_css_selectors(rules, prefix='//'):
+def convert_css_selectors(rules):
     """Convert css rules to xpath rules element tree in place
     """
     #XXX: There is a :root pseudo-class - http://www.w3.org/TR/css3-selectors/#root-pseudo
@@ -28,10 +28,16 @@
     for element in rules.xpath("//@*[namespace-uri()='%s']/.." % utils.namespaces['css']):
         for name, value in element.attrib.items():
             if name.startswith('{%s}' % utils.namespaces['css']):
-                if value:
-                    element.attrib[utils.localname(name)] = css_to_xpath(value, prefix=prefix)
+                localname = utils.localname(name)
+                if not value:
+                    element.attrib[localname] = ""
+                    continue
+                if localname == 'content' and element.tag == '{%s}drop' % utils.namespaces['xdv']:
+                    prefix = '//'
                 else:
-                    element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
+                    prefix = 'descendant-or-self::'                    
+                element.attrib[localname] = css_to_xpath(value, prefix=prefix)
+
     return rules
 
 def main():

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/content.html	Tue Jul  6 19:00:57 2010
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div id="outer">
+      <div id="inner">
+        Drop this
+      </div>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/output.html	Tue Jul  6 19:00:57 2010
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <div id="outer">
+      
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/rules.xml	Tue Jul  6 19:00:57 2010
@@ -0,0 +1,7 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <replace theme="/html/body" content="/html/body"/>
+    <drop css:content="div#outer > div#inner"/>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/theme.html	Tue Jul  6 19:00:57 2010
@@ -0,0 +1,3 @@
+<html>
+  <body></body>
+</html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/esi/output.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/esi/output.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/esi/output.html	Tue Jul  6 19:00:57 2010
@@ -2,7 +2,7 @@
 <html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-    <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>
+    <esi:include src="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']"></esi:include>
     <esi:include src="fragment.html"></esi:include>
   </body>
 </html>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/tests/ssi/output.html
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/ssi/output.html	Tue Jul  6 19:00:57 2010
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']" wait="yes" -->
+<!--# include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']" wait="yes" -->
 <!--# include  virtual="fragment.html" wait="yes" -->
   </body>
 </html>

From ldr at codespeak.net  Tue Jul  6 19:18:19 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  6 Jul 2010 19:18:19 +0200 (CEST)
Subject: [z3-checkins] r75936 - in
	z3/xdv/branches/multistage-compiler/lib/xdv: .
	tests/multi-theme-1 tests/multi-theme-2
Message-ID: <20100706171819.DD5C8282C05@codespeak.net>

Author: ldr
Date: Tue Jul  6 19:18:18 2010
New Revision: 75936

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/options.cfg
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme1.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme2.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/options.cfg
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme1.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme2.html
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py
   z3/xdv/branches/multistage-compiler/lib/xdv/run.py
Log:
test for multiple theme support

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py	Tue Jul  6 19:18:18 2010
@@ -135,13 +135,13 @@
                       dest="extra", default=None)
     (options, args) = parser.parse_args()
 
-    if options.rules is None and options.theme is None:
-        if len(args) == 2:
+    if options.rules is None:
+        if len(args) == 2 and options.theme is None:
             options.rules, options.theme = args
+        elif len(args) == 1:
+            options.rules, = args
         else:
             parser.error("Wrong number of arguments.")
-    elif not(options.rules is not None and options.theme is not None):
-        parser.error("Both theme and rules must be supplied as options or as arguments.")
 
     if options.trace:
         logger.setLevel(logging.DEBUG)

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/run.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/run.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/run.py	Tue Jul  6 19:18:18 2010
@@ -69,12 +69,12 @@
         parser = etree.XMLParser()
         output_xslt = etree.parse(transform_path, parser=parser)
     elif len(args) == 1:
-        if options.theme and options.rules:
+        if options.rules:
             content, = args
             parser = etree.HTMLParser()
             output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, parser=parser, access_control=access_control, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
         else:
-            op.error("Theme and rules must be supplied.")
+            op.error("Rules must be supplied.")
     else:
         op.error("Wrong number of arguments.")
 

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/content.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="theme1">
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/options.cfg	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+theme =

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/output.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>This is theme 1</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/rules.xml	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,9 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    
+    <theme css:if-content="body.theme1" href="theme1.html"/>
+    <theme css:if-content="body.theme2" href="theme2.html"/>
+    <copy css:theme="#content" css:content="body > *"/>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme1.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme1.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 1</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme2.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme2.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 2</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/content.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="theme2">
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/options.cfg	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+theme =

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/output.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>This is theme 2</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/rules.xml	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,9 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    
+    <theme css:if-content="body.theme1" href="theme1.html"/>
+    <theme css:if-content="body.theme2" href="theme2.html"/>
+    <copy css:theme="#content" css:content="body > *"/>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme1.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme1.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 1</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme2.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme2.html	Tue Jul  6 19:18:18 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 2</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

From ldr at codespeak.net  Wed Jul  7 17:07:30 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  7 Jul 2010 17:07:30 +0200 (CEST)
Subject: [z3-checkins] r75974 - in
	z3/xdv/branches/multistage-compiler/lib/xdv: .
	tests/nested-rules-merge-conditions-1
	tests/nested-rules-merge-conditions-2
	tests/nested-rules-merge-conditions-3
Message-ID: <20100707150730.EC50A282B9E@codespeak.net>

Author: ldr
Date: Wed Jul  7 17:07:29 2010
New Revision: 75974

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/theme.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/theme.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/content.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/output.html
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/rules.xml
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/theme.html
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
Log:
nested conditions

Added: z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xdv="http://namespaces.plone.org/xdv"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    >
+
+    <xsl:template match="xdv:*[@if-content]">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:attribute name="condition">
+                <xsl:value-of select="@if-content"/>
+            </xsl:attribute>
+            <xsl:apply-templates select="node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	Wed Jul  7 17:07:29 2010
@@ -83,13 +83,13 @@
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
         <xsl:choose>
-            <xsl:when test="$matching-this[not(@if-content)]">
+            <xsl:when test="$matching-this[not(@merged-condition)]">
                 <!--
                     Do nothing.  We want to get rid of this node
                     in the theme. Next rule is `after`.
                 -->
             </xsl:when>
-            <xsl:when test="$matching-this/@if-content">
+            <xsl:when test="$matching-this/@merged-condition">
                 <!--
                     <drop condition="content" ...
                     When the rule matches, toss out the theme node.
@@ -98,7 +98,7 @@
                 <xsl:element name="xsl:choose">
                     <xsl:element name="xsl:when">
                         <xsl:attribute name="test">
-                            <xsl:for-each select="$matching-this/@if-content">
+                            <xsl:for-each select="$matching-this/@merged-condition">
                                 <xsl:text>(</xsl:text><xsl:value-of select="."/><xsl:text>)</xsl:text>
                                 <xsl:if test="position() != last()">
                                     <xsl:text> or </xsl:text>
@@ -135,8 +135,8 @@
         <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
         <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
 
-        <xsl:variable name="unconditional" select="$matching-this[not(@if-content)]"/>
-        <xsl:variable name="conditional" select="$matching-this[@if-content]"/>
+        <xsl:variable name="unconditional" select="$matching-this[not(@merged-condition)]"/>
+        <xsl:variable name="conditional" select="$matching-this[@merged-condition]"/>
         <xsl:if test="count($unconditional) > 1">
             <xsl:message terminate="yes">
                 ERROR: Multiple unconditional replace rules may not match a single theme node.
@@ -152,7 +152,7 @@
                     <xsl:for-each select="$conditional">
                         <xsl:element name="xsl:when">
                             <xsl:attribute name="test">
-                                <xsl:value-of select="@if-content"/>
+                                <xsl:value-of select="@merged-condition"/>
                             </xsl:attribute>
                             <xsl:apply-templates select="." mode="include"/>
                         </xsl:element>
@@ -208,8 +208,8 @@
                     <xsl:apply-templates select="$matching-this[local-name()='prepend']" mode="conditional-include"/>
 
                     <!-- Copy -->
-                    <xsl:variable name="unconditional" select="$matching-this[local-name()='copy' and not(@if-content)]"/>
-                    <xsl:variable name="conditional" select="$matching-this[local-name()='copy' and @if-content]"/>
+                    <xsl:variable name="unconditional" select="$matching-this[local-name()='copy' and not(@merged-condition)]"/>
+                    <xsl:variable name="conditional" select="$matching-this[local-name()='copy' and @merged-condition]"/>
                     <xsl:if test="count($unconditional) > 1">
                         <xsl:message terminate="yes">
                             ERROR: Multiple unconditional copy rules may not match a single theme node.
@@ -224,26 +224,31 @@
                             Otherwise keep theme node. -->
                             <xsl:element name="xsl:choose">
                                 <xsl:for-each select="$conditional">
+                                    <xsl:text>&#10;</xsl:text>
                                     <xsl:element name="xsl:when">
                                         <xsl:attribute name="test">
-                                            <xsl:value-of select="@if-content"/>
+                                            <xsl:value-of select="@merged-condition"/>
                                         </xsl:attribute>
                                         <xsl:apply-templates select="." mode="include"/>
                                     </xsl:element>
                                 </xsl:for-each>
                                 <xsl:choose>
                                     <xsl:when test="$unconditional">
+                                        <xsl:text>&#10;</xsl:text>
                                         <xsl:element name="xsl:otherwise">
                                             <!-- unconditional <copy. Simply include the @content. -->
                                             <xsl:apply-templates select="$unconditional" mode="include"/>
                                         </xsl:element>
+                                        <xsl:text>&#10;</xsl:text>
                                     </xsl:when>
                                     <xsl:otherwise>
+                                        <xsl:text>&#10;</xsl:text>
                                         <xsl:element name="xsl:otherwise">
                                             <xsl:apply-templates select="node()">
                                                 
                                             </xsl:apply-templates>
                                         </xsl:element>
+                                        <xsl:text>&#10;</xsl:text>
                                     </xsl:otherwise>
                                 </xsl:choose>
                             </xsl:element>
@@ -273,10 +278,10 @@
 
     <xsl:template match="*" mode="conditional-include">
         <xsl:choose>
-            <xsl:when test="@if-content">
+            <xsl:when test="@merged-condition">
                 <xsl:element name="xsl:if">
                     <xsl:attribute name="test">
-                        <xsl:value-of select="@if-content"/>
+                        <xsl:value-of select="@merged-condition"/>
                     </xsl:attribute>
                     <xsl:apply-templates mode="include" select="."/>
                 </xsl:element>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Wed Jul  7 17:07:29 2010
@@ -16,8 +16,8 @@
     <xsl:variable name="drop-content-rules" select="//dv:drop[@content]"/>
     <xsl:variable name="inline-xsl" select="/dv:rules/xsl:*"/>
     <xsl:variable name="themes" select="//dv:theme"/>
-    <xsl:variable name="conditional" select="//dv:theme[@if-content]"/>
-    <xsl:variable name="unconditional" select="//dv:theme[not(@if-content)]"/>
+    <xsl:variable name="conditional" select="//dv:theme[@merged-condition]"/>
+    <xsl:variable name="unconditional" select="//dv:theme[not(@merged-condition)]"/>
     <xsl:variable name="defaults" select="document($defaultsurl)"/>
 
     <xsl:template match="@*|node()">
@@ -37,6 +37,7 @@
     <xsl:template match="xsl:stylesheet">
         <xsl:copy>
             <xsl:apply-templates select="@*|node()"/>
+            <xsl:text>&#10;</xsl:text>
             <xsl:element name="xsl:template">
                 <xsl:attribute name="match">/</xsl:attribute>
                 <xsl:choose>
@@ -44,9 +45,10 @@
                         <xsl:element name="xsl:choose">
                             <xsl:for-each select="$conditional">
                                 <xsl:variable name="themeid" select="@xml:id"/>
+                                <xsl:text>&#10;</xsl:text>
                                 <xsl:element name="xsl:when">
                                     <xsl:attribute name="test">
-                                        <xsl:value-of select="@if-content"/>
+                                        <xsl:value-of select="@merged-condition"/>
                                     </xsl:attribute>
                                     <xsl:element name="xsl:apply-templates">
                                         <xsl:attribute name="select">.</xsl:attribute>
@@ -55,7 +57,9 @@
                                         </xsl:attribute>
                                     </xsl:element>
                                 </xsl:element>
+                                <xsl:text>&#10;</xsl:text>
                             </xsl:for-each>
+                            <xsl:text>&#10;</xsl:text>
                             <xsl:element name="xsl:otherwise">
                                 <xsl:element name="xsl:apply-templates">
                                     <xsl:attribute name="select">.</xsl:attribute>
@@ -69,6 +73,7 @@
                                     </xsl:if>
                                 </xsl:element>
                             </xsl:element>
+                            <xsl:text>&#10;</xsl:text>
                         </xsl:element>
                     </xsl:when>
                     <xsl:when test="$unconditional"> <!-- assert unconditional = 1 -->
@@ -84,12 +89,16 @@
                     </xsl:when>
                 </xsl:choose>
             </xsl:element>
+            <xsl:text>&#10;</xsl:text>
             <xsl:for-each select="$themes">
                 <xsl:variable name="themeid" select="@xml:id"/>
-                <xsl:message>THEME <xsl:value-of select="$themeid"/></xsl:message>
+                <xsl:text>&#10;</xsl:text>
+                <xsl:comment>THEME <xsl:value-of select="$themeid"/> <xsl:value-of select="@href"/></xsl:comment>
+                <xsl:text>&#10;</xsl:text>
                 <!-- If there are any <drop @content> rules, put it in 
                 here. -->
                 <xsl:for-each select="$drop-content-rules">
+                    <xsl:text>&#10;</xsl:text>
                     <xsl:element name="xsl:template">
                         <xsl:attribute name="match">
                             <xsl:value-of select="@content"/>
@@ -99,8 +108,10 @@
                         </xsl:attribute>
                         <xsl:comment>Do nothing, skip these nodes</xsl:comment>
                     </xsl:element>
+                    <xsl:text>&#10;</xsl:text>
                 </xsl:for-each>
                 <!-- template for this theme -->
+                <xsl:text>&#10;</xsl:text>
                 <xsl:element name="xsl:template">
                     <xsl:attribute name="match">/</xsl:attribute>
                     <xsl:attribute name="mode">
@@ -110,14 +121,19 @@
                         <xsl:with-param name="mode" select="$themeid"/>
                     </xsl:apply-templates>
                 </xsl:element>
+                <xsl:text>&#10;</xsl:text>
                 <!-- Copy the default templates into this theme's mode -->
+                <xsl:text>&#10;</xsl:text>
                 <xsl:apply-templates select="$defaults/xsl:stylesheet/xsl:template[not(@mode)]" mode="rewrite-mode">
                     <xsl:with-param name="mode" select="$themeid"/>
                 </xsl:apply-templates>
+                <xsl:text>&#10;</xsl:text>
             </xsl:for-each>
             <!-- Copy the inline xsl from rules (usually xsl:output) -->
             <xsl:for-each select="$inline-xsl">
+                <xsl:text>&#10;</xsl:text>
                 <xsl:copy-of select="."/>
+                <xsl:text>&#10;</xsl:text>
             </xsl:for-each>
         </xsl:copy>
     </xsl:template>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xdv="http://namespaces.plone.org/xdv"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    >
+
+    <xsl:template match="xdv:*">
+        <xsl:variable name="conditions" select="ancestor-or-self::xdv:*[@condition]"/>
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:if test="$conditions">
+                <xsl:attribute name="merged-condition">
+                    <xsl:for-each select="$conditions">(<xsl:value-of select="@if-content"/>)<xsl:if test="position() != last()"> and </xsl:if></xsl:for-each>
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:apply-templates select="node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Wed Jul  7 17:07:29 2010
@@ -26,6 +26,8 @@
 
 update_transform = pkg_xsl('update-namespace.xsl')
 normalize_rules  = pkg_xsl('normalize-rules.xsl')
+apply_conditions = pkg_xsl('apply-conditions.xsl')
+merge_conditions = pkg_xsl('merge-conditions.xsl')
 annotate_themes  = pkg_xsl('annotate-themes.xsl')
 annotate_rules   = pkg_xsl('annotate-rules.xsl')
 apply_rules      = pkg_xsl('apply-rules.xsl')
@@ -122,7 +124,8 @@
         includemode = 'document'
     includemode = "'%s'" % includemode
     rules_doc = normalize_rules(rules_doc, includemode=includemode)
-    #import pdb; pdb.set_trace()
+    rules_doc = apply_conditions(rules_doc)
+    rules_doc = merge_conditions(rules_doc)
     rules_doc = annotate_themes(rules_doc)
     rules_doc = annotate_rules(rules_doc)
     rules_doc = apply_rules(rules_doc)

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/content.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="test1 test2">
+    <p>From the content</p>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/output.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <div id="target">
+      <p>From the content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/rules.xml	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
+    <rules css:if-content="body.test1">
+        <copy css:if-content="body.test2"
+              css:theme="#target" css:content="body > *"/>
+    </rules>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/theme.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,3 @@
+<div id="target">
+    <div>Content</div>
+</div>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/content.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="test1">
+    <p>From the content</p>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/output.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <div id="target">
+      <div>Theme</div>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/rules.xml	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
+    <rules css:if-content="body.test1">
+        <copy css:if-content="body.test2"
+              css:theme="#target" css:content="body > *"/>
+    </rules>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/theme.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,3 @@
+<div id="target">
+    <div>Theme</div>
+</div>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/content.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="test2">
+    <p>From the content</p>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/output.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <div id="target">
+      <div>Theme</div>
+    </div>
+  </body>
+</html>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/rules.xml	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
+    <rules css:if-content="body.test1">
+        <copy css:if-content="body.test2"
+              css:theme="#target" css:content="body > *"/>
+    </rules>
+</rules>

Added: z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/theme.html	Wed Jul  7 17:07:29 2010
@@ -0,0 +1,3 @@
+<div id="target">
+    <div>Theme</div>
+</div>

From ldr at codespeak.net  Wed Jul  7 17:08:44 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  7 Jul 2010 17:08:44 +0200 (CEST)
Subject: [z3-checkins] r75976 - in
	z3/xdv/branches/multistage-compiler/lib/xdv/tests:
	nested-conditions-1 nested-conditions-2 nested-conditions-3
	nested-rules-merge-conditions-1 nested-rules-merge-conditions-2
	nested-rules-merge-conditions-3
Message-ID: <20100707150844.D77C5282BF5@codespeak.net>

Author: ldr
Date: Wed Jul  7 17:08:43 2010
New Revision: 75976

Added:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/
      - copied from r75974, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/
      - copied from r75974, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/
      - copied from r75974, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/
Removed:
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-1/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-2/
   z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-rules-merge-conditions-3/
Log:
rename test

From ldr at codespeak.net  Wed Jul  7 17:26:39 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  7 Jul 2010 17:26:39 +0200 (CEST)
Subject: [z3-checkins] r75984 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100707152639.E4538282B9E@codespeak.net>

Author: ldr
Date: Wed Jul  7 17:26:38 2010
New Revision: 75984

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl
Log:
fix null-if-content problem from nested conditions

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	Wed Jul  7 17:26:38 2010
@@ -22,11 +22,6 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="xdv:*/@if-content[. = '']">
-        <!-- if-content="" shortcut -->
-        <xsl:attribute name="if-content"><xsl:value-of select="../@content"/></xsl:attribute>
-    </xsl:template>
-
     <xsl:template match="xdv:drop[@content]">
         <xsl:if test="@theme">
             <xsl:message terminate="yes">

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl	Wed Jul  7 17:26:38 2010
@@ -9,7 +9,14 @@
         <xsl:copy>
             <xsl:apply-templates select="@*"/>
             <xsl:attribute name="condition">
-                <xsl:value-of select="@if-content"/>
+                <xsl:choose>
+                    <xsl:when test="@if-content = ''">
+                        <xsl:value-of select="@content"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="@if-content"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </xsl:attribute>
             <xsl:apply-templates select="node()"/>
         </xsl:copy>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl	Wed Jul  7 17:26:38 2010
@@ -11,7 +11,7 @@
             <xsl:apply-templates select="@*"/>
             <xsl:if test="$conditions">
                 <xsl:attribute name="merged-condition">
-                    <xsl:for-each select="$conditions">(<xsl:value-of select="@if-content"/>)<xsl:if test="position() != last()"> and </xsl:if></xsl:for-each>
+                    <xsl:for-each select="$conditions">(<xsl:value-of select="@condition"/>)<xsl:if test="position() != last()"> and </xsl:if></xsl:for-each>
                 </xsl:attribute>
             </xsl:if>
             <xsl:apply-templates select="node()"/>

From ldr at codespeak.net  Wed Jul  7 18:48:44 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  7 Jul 2010 18:48:44 +0200 (CEST)
Subject: [z3-checkins] r75996 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100707164844.12C8F282B9E@codespeak.net>

Author: ldr
Date: Wed Jul  7 18:48:42 2010
New Revision: 75996

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
Log:
tidy up

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl	Wed Jul  7 18:48:42 2010
@@ -19,11 +19,7 @@
             <xsl:apply-templates select="node()|@*"/>
         </xsl:copy>
     </xsl:template>   
-<!--
-    <xsl:template match="//xdv:theme//comment()">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
--->
+
     <xsl:template match="//xdv:theme//*">
         <xsl:copy>
             <xsl:attribute name="xml:id">

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	Wed Jul  7 18:48:42 2010
@@ -20,7 +20,6 @@
         </xsl:copy>
     </xsl:template>
 
-
     <!--
         Apply the rules
     -->
@@ -58,20 +57,7 @@
     <xsl:template match="//dv:theme/*//@xml:id" priority="5">
         <!-- Filter this out -->
     </xsl:template>
-<!--
-    <xsl:template priority="5"
-        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
-        <! Emit xsl that avoids escaping >
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>
-    </xsl:template>
--->
+
     <!--
         Rule templates
     -->
@@ -271,7 +257,6 @@
 
     </xsl:template>
 
-
     <!--
         Content inclusion
     -->
@@ -343,5 +328,4 @@
         </xsl:if>
     </xsl:template>
 
-
 </xsl:stylesheet>

From ldr at codespeak.net  Thu Jul  8 15:14:33 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  8 Jul 2010 15:14:33 +0200 (CEST)
Subject: [z3-checkins] r76022 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100708131433.ED971282BFB@codespeak.net>

Author: ldr
Date: Thu Jul  8 15:14:29 2010
New Revision: 76022

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
Log:
tidy up generated stylesheet indentation

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Thu Jul  8 15:14:29 2010
@@ -37,7 +37,7 @@
     <xsl:template match="xsl:stylesheet">
         <xsl:copy>
             <xsl:apply-templates select="@*|node()"/>
-            <xsl:text>&#10;</xsl:text>
+            <xsl:text>&#10;    </xsl:text>
             <xsl:element name="xsl:template">
                 <xsl:attribute name="match">/</xsl:attribute>
                 <xsl:choose>
@@ -92,13 +92,17 @@
             <xsl:text>&#10;</xsl:text>
             <xsl:for-each select="$themes">
                 <xsl:variable name="themeid" select="@xml:id"/>
-                <xsl:text>&#10;</xsl:text>
-                <xsl:comment>THEME <xsl:value-of select="$themeid"/> <xsl:value-of select="@href"/></xsl:comment>
+                <xsl:text>&#10;    </xsl:text>
+                <xsl:comment>THEME <xsl:value-of select="$themeid"/>: <xsl:choose>
+                        <xsl:when test="@href"><xsl:value-of select="@href"/></xsl:when>
+                        <xsl:otherwise>(inline)</xsl:otherwise>
+                    </xsl:choose>
+                </xsl:comment>
                 <xsl:text>&#10;</xsl:text>
                 <!-- If there are any <drop @content> rules, put it in 
                 here. -->
                 <xsl:for-each select="$drop-content-rules">
-                    <xsl:text>&#10;</xsl:text>
+                    <xsl:text>&#10;    </xsl:text>
                     <xsl:element name="xsl:template">
                         <xsl:attribute name="match">
                             <xsl:value-of select="@content"/>
@@ -111,7 +115,7 @@
                     <xsl:text>&#10;</xsl:text>
                 </xsl:for-each>
                 <!-- template for this theme -->
-                <xsl:text>&#10;</xsl:text>
+                <xsl:text>&#10;    </xsl:text>
                 <xsl:element name="xsl:template">
                     <xsl:attribute name="match">/</xsl:attribute>
                     <xsl:attribute name="mode">
@@ -123,15 +127,17 @@
                 </xsl:element>
                 <xsl:text>&#10;</xsl:text>
                 <!-- Copy the default templates into this theme's mode -->
-                <xsl:text>&#10;</xsl:text>
-                <xsl:apply-templates select="$defaults/xsl:stylesheet/xsl:template[not(@mode)]" mode="rewrite-mode">
-                    <xsl:with-param name="mode" select="$themeid"/>
-                </xsl:apply-templates>
-                <xsl:text>&#10;</xsl:text>
+                <xsl:for-each select="$defaults/xsl:stylesheet/xsl:template[not(@mode)]">
+                    <xsl:text>&#10;    </xsl:text>
+                    <xsl:apply-templates select="." mode="rewrite-mode">
+                        <xsl:with-param name="mode" select="$themeid"/>
+                    </xsl:apply-templates>
+                    <xsl:text>&#10;</xsl:text>
+                </xsl:for-each>
             </xsl:for-each>
             <!-- Copy the inline xsl from rules (usually xsl:output) -->
             <xsl:for-each select="$inline-xsl">
-                <xsl:text>&#10;</xsl:text>
+                <xsl:text>&#10;    </xsl:text>
                 <xsl:copy-of select="."/>
                 <xsl:text>&#10;</xsl:text>
             </xsl:for-each>

From ldr at codespeak.net  Thu Jul  8 16:19:56 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  8 Jul 2010 16:19:56 +0200 (CEST)
Subject: [z3-checkins] r76030 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100708141956.8BA52282BFA@codespeak.net>

Author: ldr
Date: Thu Jul  8 16:19:55 2010
New Revision: 76030

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
Log:
fix inline xsl

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Thu Jul  8 16:19:55 2010
@@ -127,7 +127,7 @@
                 </xsl:element>
                 <xsl:text>&#10;</xsl:text>
                 <!-- Copy the default templates into this theme's mode -->
-                <xsl:for-each select="$defaults/xsl:stylesheet/xsl:template[not(@mode)]">
+                <xsl:for-each select="$defaults/xsl:stylesheet/xsl:template[not(@mode)] | $inline-xsl[local-name()='template' and not(@mode)]">
                     <xsl:text>&#10;    </xsl:text>
                     <xsl:apply-templates select="." mode="rewrite-mode">
                         <xsl:with-param name="mode" select="$themeid"/>
@@ -136,7 +136,7 @@
                 </xsl:for-each>
             </xsl:for-each>
             <!-- Copy the inline xsl from rules (usually xsl:output) -->
-            <xsl:for-each select="$inline-xsl">
+            <xsl:for-each select="$inline-xsl[not(local-name()='template' and @mode)]">
                 <xsl:text>&#10;    </xsl:text>
                 <xsl:copy-of select="."/>
                 <xsl:text>&#10;</xsl:text>

From ldr at codespeak.net  Thu Jul  8 16:20:20 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  8 Jul 2010 16:20:20 +0200 (CEST)
Subject: [z3-checkins] r76031 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100708142020.53E59282BFA@codespeak.net>

Author: ldr
Date: Thu Jul  8 16:20:16 2010
New Revision: 76031

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
Log:
restore the trace support

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl	Thu Jul  8 16:20:16 2010
@@ -24,11 +24,19 @@
         Apply the rules
     -->
 
+    <xsl:template match="dv:theme">
+        <xsl:call-template name="trace-tags">
+            <xsl:with-param name="title" select="'THEME'"/>
+            <xsl:with-param name="tags" select="."/>
+        </xsl:call-template>
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+
     <xsl:template match="//dv:theme//*">
         <xsl:variable name="thisxmlid" select="@xml:id"/>
         <xsl:variable name="matching-rules" select="$rules[./dv:matches/dv:xmlid=$thisxmlid]"/>
-        <xsl:message><xsl:value-of select="$thisxmlid"/></xsl:message>
-        <xsl:message><xsl:value-of select="count($matching-rules)"/></xsl:message>
         <xsl:choose>
             <xsl:when test="$matching-rules">
                 <xsl:call-template name="trace-path"/>
@@ -314,18 +322,29 @@
         <xsl:param name="matching" select="/.."/>
         <xsl:if test="$trace">
             <xsl:if test="not($matching)"><xsl:message>TRACE: (<xsl:value-of select="$rule-name"/>)</xsl:message></xsl:if>
-            <xsl:for-each select="$matching">
-                <xsl:message>RULE: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
-                    <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
-            </xsl:for-each>
+            <xsl:call-template name="trace-tags">
+                <xsl:with-param name="title" select="'RULE'"/>
+                <xsl:with-param name="tags" select="$matching"/>
+            </xsl:call-template>
         </xsl:if>
     </xsl:template>
 
     <xsl:template name="trace-path">
         <xsl:if test="$trace">
-            <xsl:message>THEME: <xsl:for-each select="ancestor-or-self::*"><xsl:variable name="this" select="."
+            <xsl:message>THEME: <xsl:for-each select="ancestor-or-self::*[namespace-uri() != 'http://namespaces.plone.org/xdv']"><xsl:variable name="this" select="."
                 />/<xsl:value-of select="name()"/><xsl:choose><xsl:when test="@id">[@id='<xsl:value-of select="@id"/>']</xsl:when><xsl:when test="preceding-sibling::*[name()=name($this)]|following-sibling::*[name()=name($this)]">[<xsl:number/>]</xsl:when></xsl:choose></xsl:for-each></xsl:message>
         </xsl:if>
     </xsl:template>
 
+    <xsl:template name="trace-tags">
+        <xsl:param name="title"/>
+        <xsl:param name="tags"/>
+        <xsl:if test="$trace">
+            <xsl:for-each select="$tags">
+                <xsl:message><xsl:value-of select="$title"/>: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
+                    <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
+            </xsl:for-each>
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Thu Jul  8 16:20:16 2010
@@ -22,7 +22,17 @@
 IMPORT_STYLESHEET = re.compile(r'''(@import\s+(?:url\(['"]?|['"]))(.+)(['"]?\)|['"])''', re.IGNORECASE)
 
 def pkg_xsl(name, parser=None):
-    return etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser))
+    xslt = etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser))
+    def wrapped(*args, **kw):
+        result = xslt(*args, **kw)
+        for msg in xslt.error_log:
+            if msg.type == etree.ErrorTypes.ERR_OK:
+                logger.debug(msg.message)
+            else:
+                logger.debug(msg)
+        return result
+    wrapped.xslt = xslt
+    return wrapped
 
 update_transform = pkg_xsl('update-namespace.xsl')
 normalize_rules  = pkg_xsl('normalize-rules.xsl')
@@ -106,6 +116,10 @@
     return output_doc
 
 def process_rules(rules, theme=None, extra=None, trace=None, css=True, xinclude=True, absolute_prefix=None, includemode=None, update=True, parser=None, rules_parser=None, compiler_parser=None, access_control=None):
+    if trace:
+        trace = '1'
+    else:
+        trace = '0'
     if rules_parser is None:
         rules_parser = etree.XMLParser(recover=False)
     rules_doc = etree.parse(rules, parser=rules_parser)
@@ -128,7 +142,7 @@
     rules_doc = merge_conditions(rules_doc)
     rules_doc = annotate_themes(rules_doc)
     rules_doc = annotate_rules(rules_doc)
-    rules_doc = apply_rules(rules_doc)
+    rules_doc = apply_rules(rules_doc, trace=trace)
     compiled_doc = emit_stylesheet(rules_doc)
     compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
     return compiled_doc

From ldr at codespeak.net  Thu Jul  8 20:06:28 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  8 Jul 2010 20:06:28 +0200 (CEST)
Subject: [z3-checkins] r76049 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100708180628.621EA282BFA@codespeak.net>

Author: ldr
Date: Thu Jul  8 20:06:26 2010
New Revision: 76049

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
   z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
Log:
logging wrapper

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Thu Jul  8 20:06:26 2010
@@ -2,7 +2,7 @@
 """\
 Usage: %prog RULES
 
-Preprocess RULES, and xdv rules file
+Preprocess RULES, an xdv rules file
 """
 usage = __doc__
 
@@ -15,24 +15,12 @@
 from urlparse import urljoin
 
 from xdv.cssrules import convert_css_selectors
-from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE, CustomResolver
+from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE, CustomResolver, pkg_xsl
 
 logger = logging.getLogger('xdv')
 
 IMPORT_STYLESHEET = re.compile(r'''(@import\s+(?:url\(['"]?|['"]))(.+)(['"]?\)|['"])''', re.IGNORECASE)
 
-def pkg_xsl(name, parser=None):
-    xslt = etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser))
-    def wrapped(*args, **kw):
-        result = xslt(*args, **kw)
-        for msg in xslt.error_log:
-            if msg.type == etree.ErrorTypes.ERR_OK:
-                logger.debug(msg.message)
-            else:
-                logger.debug(msg)
-        return result
-    wrapped.xslt = xslt
-    return wrapped
 
 update_transform = pkg_xsl('update-namespace.xsl')
 normalize_rules  = pkg_xsl('normalize-rules.xsl')

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	Thu Jul  8 20:06:26 2010
@@ -1,4 +1,8 @@
 from lxml import etree
+import logging
+import pkg_resources
+
+logger=logging.getLogger('xdv')
 
 namespaces = dict(
     xdv="http://namespaces.plone.org/xdv",
@@ -24,3 +28,21 @@
         output = self.data.get(url)
         if output is not None:
             return self.resolve_string(output, context)
+
+
+class LoggingXSLTWrapper:
+    def __init__(self, xslt, logger):
+        self.xslt = xslt
+        self.logger = logger
+    def __call__(self, *args, **kw):
+        result = self.xslt(*args, **kw)
+        for msg in self.xslt.error_log:
+            if msg.type == etree.ErrorTypes.ERR_OK:
+                self.logger.debug(msg.message)
+            else:
+                self.logger.debug(msg)
+        return result
+
+
+def pkg_xsl(name, parser=None):
+    return LoggingXSLTWrapper(etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser)), logger)

From ldr at codespeak.net  Thu Jul  8 20:24:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  8 Jul 2010 20:24:58 +0200 (CEST)
Subject: [z3-checkins] r76052 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100708182458.1B6C0282BFA@codespeak.net>

Author: ldr
Date: Thu Jul  8 20:24:55 2010
New Revision: 76052

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
Log:
document includes base tag evasion

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl	Thu Jul  8 20:24:55 2010
@@ -97,7 +97,7 @@
     
     <xsl:template match="*[@method = 'document']" mode="include">
         <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', .)<xsl:value-of select="@content"/></xsl:attribute>
+            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', $base)<xsl:value-of select="@content"/></xsl:attribute>
         </xsl:element>
     </xsl:template>
     

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl	Thu Jul  8 20:24:55 2010
@@ -12,6 +12,7 @@
     exclude-result-prefixes="dv dyn exsl xml">
 
     <xsl:param name="defaultsurl">defaults.xsl</xsl:param>
+    <xsl:param name="usebase"/>
     <xsl:variable name="rules" select="//dv:*[@theme]"/>
     <xsl:variable name="drop-content-rules" select="//dv:drop[@content]"/>
     <xsl:variable name="inline-xsl" select="/dv:rules/xsl:*"/>
@@ -36,7 +37,35 @@
 
     <xsl:template match="xsl:stylesheet">
         <xsl:copy>
-            <xsl:apply-templates select="@*|node()"/>
+            <xsl:apply-templates select="@*"/>
+            <xsl:if test="$rules[@method='document']">
+                <xsl:choose>
+                    <xsl:when test="$usebase">
+                        <!-- When usebase is true, document() includes are resolved internally using the base tag -->
+                        <xsl:text>&#10;    </xsl:text>
+                        <xsl:element name="xsl:variable">
+                            <xsl:attribute name="name">base</xsl:attribute>
+                            <xsl:text>/</xsl:text>
+                        </xsl:element>
+                        <xsl:text>&#10;</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- otherwise use a hack to ensure the relative path is used -->
+                        <xsl:text>&#10;    </xsl:text>
+                        <xsl:element name="xsl:variable">
+                            <xsl:attribute name="name">base-rtf</xsl:attribute>
+                        </xsl:element>
+                        <xsl:text>&#10;</xsl:text>
+                        <xsl:text>&#10;    </xsl:text>
+                        <xsl:element name="xsl:variable">
+                            <xsl:attribute name="name">base</xsl:attribute>
+                            <xsl:attribute name="select">exsl:node-set($base-rtf)</xsl:attribute>
+                        </xsl:element>
+                        <xsl:text>&#10;</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+            <xsl:apply-templates select="node()"/>
             <xsl:text>&#10;    </xsl:text>
             <xsl:element name="xsl:template">
                 <xsl:attribute name="match">/</xsl:attribute>

From ldr at codespeak.net  Fri Jul  9 17:24:31 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  9 Jul 2010 17:24:31 +0200 (CEST)
Subject: [z3-checkins] r76079 - in z3/xdv/branches/multistage-compiler: .
	lib/xdv
Message-ID: <20100709152431.DB4C3282C07@codespeak.net>

Author: ldr
Date: Fri Jul  9 17:24:30 2010
New Revision: 76079

Removed:
   z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl
   z3/xdv/branches/multistage-compiler/lib/xdv/compiler.xsl
Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
   z3/xdv/branches/multistage-compiler/lib/xdv/run.py
   z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
   z3/xdv/branches/multistage-compiler/setup.py
Log:
tidy up

Deleted: /z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl
==============================================================================
--- /z3/xdv/branches/multistage-compiler/lib/xdv/boilerplate.xsl	Fri Jul  9 17:24:30 2010
+++ (empty file)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dv="http://namespaces.plone.org/xdv"
-    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
-    xmlns:exsl="http://exslt.org/common"
-    xmlns:str="http://exslt.org/strings"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="exsl str dv xhtml">
-  <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
-      media-type="text/html" encoding="utf-8"
-      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-    
-    <xsl:template match="/">
-        <dv:insert/>
-        <xsl:choose>
-            <xsl:when test="use-theme1">
-                <xsl:apply-templates select="." mode="theme1-id"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="."/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="none" mode="insert-drop-rules">
-        <!-- The compiler looks for this and replaces 
-        the @match and @mode. -->
-    </xsl:template>
-
-    <!-- 
-    
-        Utility templates
-    -->
-    
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="pre/text()">
-        <!-- Filter out quoted &#13; -->
-        <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
-    </xsl:template>
-
-    <xsl:template match="style/text()|script/text()">
-        <xsl:value-of select="." disable-output-escaping="yes"/>
-    </xsl:template>
-
-    <!-- 
-    
-        Extra templates
-    -->
-    <dv:insert-extra/>
-</xsl:stylesheet>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/compiler.py	Fri Jul  9 17:24:30 2010
@@ -12,19 +12,31 @@
 usage = __doc__
 
 import logging
+import pkg_resources
 import sys
 
 from lxml import etree
-from optparse import OptionParser
-from urlparse import urljoin
 
 from xdv.rules import process_rules
-from xdv.utils import namespaces, AC_READ_NET, AC_READ_FILE
+from xdv.utils import namespaces, AC_READ_NET, AC_READ_FILE, pkg_xsl, _createOptionParser, CustomResolver
 
 logger = logging.getLogger('xdv')
 
+emit_stylesheet = pkg_xsl('emit-stylesheet.xsl')
 
-def compile_theme(rules, theme=None, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None):
+def set_parser(stylesheet, parser, compiler_parser=None):
+    dummy_doc = etree.parse(pkg_resources.resource_filename('xdv', 'dummy.html'), parser=parser)
+    name = 'file:///__xdv__'
+    resolver = CustomResolver({name: stylesheet})
+    if compiler_parser is None:
+        compiler_parser = etree.XMLParser()
+    compiler_parser.resolvers.add(resolver)
+    identity = pkg_xsl('identity.xsl', compiler_parser)
+    output_doc = identity(dummy_doc, docurl="'%s'"%name)
+    compiler_parser.resolvers.remove(resolver)
+    return output_doc
+
+def compile_theme(rules, theme=None, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None, read_network=False):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
@@ -55,84 +67,31 @@
     * ``rules_parser`` can be set to an lxml parser instance; the default is a
       XMLParser.
     """
-    return process_rules(rules, theme=theme, extra=extra, css=css, xinclude=xinclude, absolute_prefix=absolute_prefix, update=update, trace=trace, includemode=includemode, parser=parser, compiler_parser=compiler_parser, rules_parser=rules_parser, access_control=access_control)
-    if rules_parser is None:
-        rules_parser = etree.XMLParser(recover=False)
-    rules_doc = etree.parse(rules, parser=rules_parser)
-    
-    if xinclude:
-        rules_doc.xinclude()
-    if update:
-        rules_doc = update_namespace(rules_doc)
-    if css:
-        convert_css_selectors(rules_doc)
-    
-    if parser is None:
-        parser = etree.HTMLParser()
-    if theme is None:
-        theme_doc = etree.parse(DUMMY_PATH, parser=parser)
-    else:
-        theme_doc = etree.parse(theme, parser=parser)
-    
-    if absolute_prefix:
-        apply_absolute_prefix(theme_doc, absolute_prefix)
-    
-    if compiler_parser is None:
-        compiler_parser = etree.XMLParser()
-    if access_control is None:
-        access_control = AC_READ_FILE
-    compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser), access_control=access_control)
-
-    params = dict(rulesuri="'file:///__xdv__rules'")
-    if extra:
-        params['extraurl'] = "'file:///__xdv__extra'"
-        resolver = CompileResolver(etree.tostring(rules_doc), etree.tostring(etree.parse(extra)))
-    else:
-        resolver = CompileResolver(etree.tostring(rules_doc))
-    if trace:
-        params['trace'] = '1'
-    if includemode:
-        params['includemode'] = "'%s'" % includemode
-
-    #compiled = compiler_transform(theme_doc, **params)
-    #for msg in compiler_transform.error_log:
-    #    logger.info(msg)
-    return compiled
+    if access_control is not None:
+        read_network = access_control.options['read_network']
+    rules_doc = process_rules(
+        rules=rules,
+        theme=theme,
+        extra=extra,
+        css=css,
+        xinclude=xinclude,
+        absolute_prefix=absolute_prefix,
+        update=update,
+        trace=trace,
+        includemode=includemode,
+        parser=parser,
+        rules_parser=rules_parser,
+        read_network=read_network,
+        )
+    compiled_doc = emit_stylesheet(rules_doc)
+    compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
+    return compiled_doc
+
 
 def main():
     """Called from console script
     """
-    parser = OptionParser(usage=usage)
-    parser.add_option("-o", "--output", metavar="output.xsl",
-                      help="Output filename (instead of stdout)",
-                      dest="output", default=sys.stdout)
-    parser.add_option("-p", "--pretty-print", action="store_true",
-                      help="Pretty print output (may alter rendering in browser)",
-                      dest="pretty_print", default=False)
-    parser.add_option("--trace", action="store_true",
-                      help="Compiler trace logging",
-                      dest="trace", default=False)
-    parser.add_option("--xinclude", action="store_true",
-                      help="Run XInclude on rules.xml (depracated, xinclude is always run)",
-                      dest="xinclude", default=True)
-    parser.add_option("-a", "--absolute-prefix", metavar="/",
-                      help="relative urls in the theme file will be made into absolute links with this prefix.",
-                      dest="absolute_prefix", default=None)
-    parser.add_option("-i", "--includemode", metavar="INC",
-                      help="include mode (document, ssi or esi)",
-                      dest="includemode", default=None)
-    parser.add_option("-n", "--network", action="store_true",
-                      help="Allow reads to the network to fetch resources",
-                      dest="read_network", default=False)
-    parser.add_option("-t", "--theme", metavar="theme.html",
-                      help="Theme file",
-                      dest="theme", default=None)
-    parser.add_option("-r", "--rules", metavar="rules.xml",
-                      help="XDV rules file", 
-                      dest="rules", default=None)
-    parser.add_option("-e", "--extra", metavar="extra.xsl",
-                      help="Extra XSL to be included in the transform (depracated, use inline xsl in the rules instead)",
-                      dest="extra", default=None)
+    parser = _createOptionParser(usage=usage)
     (options, args) = parser.parse_args()
 
     if options.rules is None:
@@ -142,16 +101,21 @@
             options.rules, = args
         else:
             parser.error("Wrong number of arguments.")
+    elif args:
+        parser.error("Wrong number of arguments.")
 
     if options.trace:
         logger.setLevel(logging.DEBUG)
 
-    if options.read_network:
-        access_control = AC_READ_NET
-    else:
-        access_control = AC_READ_FILE
-
-    output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode, access_control=access_control)
+    output_xslt = compile_theme(
+        rules=options.rules,
+        theme=options.theme,
+        extra=options.extra,
+        trace=options.trace,
+        absolute_prefix=options.absolute_prefix,
+        includemode=options.includemode,
+        read_network=options.read_network,
+        )
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Deleted: /z3/xdv/branches/multistage-compiler/lib/xdv/compiler.xsl
==============================================================================
--- /z3/xdv/branches/multistage-compiler/lib/xdv/compiler.xsl	Fri Jul  9 17:24:30 2010
+++ (empty file)
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:dv="http://namespaces.plone.org/xdv"
-    xmlns:dyn="http://exslt.org/dynamic"
-    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
-    xmlns:exsl="http://exslt.org/common"
-    xmlns:set="http://exslt.org/sets"
-    xmlns:str="http://exslt.org/strings"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    xmlns:xml="http://www.w3.org/XML/1998/namespace"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="dv dyn exsl xml">
-    <xsl:output indent="yes" media-type="text/xml"/>
-
-    <xsl:param name="rulesuri">rules.xml</xsl:param>
-    <xsl:param name="boilerplateurl">boilerplate.xsl</xsl:param>
-    <xsl:param name="extraurl"/>
-    <xsl:param name="trace"/>
-    <xsl:param name="includemode">document</xsl:param>
-    <xsl:param name="ssiprefix"></xsl:param>
-    <xsl:param name="ssisuffix"></xsl:param>
-    <xsl:param name="ssiquerysuffix">;filter_xpath=</xsl:param>
-    <xsl:param name="esiprefix"></xsl:param>
-    <xsl:param name="esisuffix"></xsl:param>
-    <xsl:param name="esiquerysuffix">;filter_xpath=</xsl:param>
-    <xsl:variable name="theme" select="/"/>
-
-    <!--
-        Multi-stage theme compiler
-    -->
-
-    <xsl:template match="/">
-
-        <!-- Put unique xml:id values on all the theme html -->
-        <xsl:variable name="themehtml-rtf">
-            <xsl:apply-templates select="/html" mode="annotate-html"/>
-        </xsl:variable>
-        <xsl:variable name="themehtml" select="exsl:node-set($themehtml-rtf)"/>
-
-        <!-- Include the rules file, adding @xml:id attributes as it is included -->
-        <xsl:variable name="rules-rtf">
-            <xsl:apply-templates select="document($rulesuri, $theme)/*" mode="annotate-rules">
-                <xsl:with-param name="themehtml" select="$themehtml"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="rules" select="exsl:node-set($rules-rtf)"/>
-
-        <!-- Make a pass through all the theme html, filtering 
-            as we go. This is where rule generation happens. -->
-        <xsl:variable name="stage1-rtf">
-            <xsl:apply-templates select="$themehtml" mode="apply-rules">
-                <xsl:with-param name="rules" select="$rules"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="stage1" select="exsl:node-set($stage1-rtf)"/>
-
-        <!-- Stage 2, include the boilerplate and make a compiled
-            XSLT. -->
-        <xsl:variable name="stage2-rtf">
-            <xsl:apply-templates select="document($boilerplateurl)" mode="include-boilerplate">
-                <xsl:with-param name="stage1" select="$stage1"/>
-                <xsl:with-param name="rules" select="$rules"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="stage2" select="exsl:node-set($stage2-rtf)"/>
-
-        <!-- We're done, so generate some output -->
-        <xsl:copy-of select="$stage2"/>
-
-    </xsl:template>
-
-    <!--
-        Boilerplate
-    -->
-
-    <xsl:template match="node()|@*" mode="include-boilerplate">
-        <xsl:param name="stage1"/>
-        <xsl:param name="rules"/>
-        <xsl:choose>
-            <xsl:when test="@mode='insert-drop-rules'">
-                <!-- If there are any <drop @content> rules, put it in 
-                here. -->
-                <xsl:for-each select="$rules/dv:rules/dv:drop[@content]">
-                    <xsl:element name="xsl:template">
-                        <xsl:attribute name="match">
-                            <xsl:value-of select="@content"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="mode">initial-stage</xsl:attribute>
-                        <xsl:comment>Do nothing, skip these nodes</xsl:comment>
-                    </xsl:element>
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="name()='dv:insert'">
-                <!-- Put the compiled theme in at this spot of the boilerplate -->
-                <xsl:apply-templates select="$stage1" mode="include-boilerplate">
-                    <xsl:with-param name="stage1" select="$stage1"/>
-                </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="name()='dv:insert-extra'">
-                <!-- Put the extra templates in at this spot of the boilerplate -->
-                <xsl:if test="$extraurl">
-                    <xsl:copy-of select="document($extraurl, $theme)/xsl:stylesheet/node()" />
-                </xsl:if>
-                <xsl:copy-of select="$rules/dv:rules/xsl:*" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
-                        <xsl:with-param name="stage1" select="$stage1"/>
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-    <xsl:template match="/xsl:stylesheet/@exclude-result-prefixes" mode="include-boilerplate">
-        <xsl:param name="stage1"/>
-        <xsl:param name="rules"/>
-        <xsl:choose>
-            <xsl:when test="$includemode='esi' or $rules//*[@method='esi']">
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
-                        <xsl:with-param name="stage1" select="$stage1"/>
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!--
-        Annotate the rules for stage1
-    -->
-
-    <xsl:template match="dv:rules" mode="annotate-rules">
-        <xsl:param name="themehtml"/>
-        <xsl:copy>
-            <xsl:for-each select="//dv:rules/dv:*[local-name() != 'rules']">
-                <xsl:copy>
-                    <xsl:attribute name="xml:id">r<xsl:value-of select="position()"/></xsl:attribute>
-                    <xsl:copy-of select="@*[local-name() != 'if-content']"/>
-                    <xsl:choose>
-                        <xsl:when test="@if-content = ''">
-                            <xsl:attribute name="if-content"><xsl:value-of select="@content"/></xsl:attribute>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:copy-of select="@if-content"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="@href and not(@method)">
-                        <xsl:attribute name="method"><xsl:value-of select="$includemode"/></xsl:attribute>
-                    </xsl:if>
-                    <xsl:if test="node()">
-                        <dv:synthetic><xsl:apply-templates select="node()" mode="filter-synthetic"/></dv:synthetic>
-                    </xsl:if>
-                    <dv:matches>
-                        <xsl:variable name="themexpath" select="@theme"/>
-                        <xsl:for-each select="$themehtml">
-                            <xsl:for-each select="dyn:evaluate($themexpath)">
-                                <dv:xmlid>
-                                    <xsl:value-of select="@xml:id"/>
-                                </dv:xmlid>
-                            </xsl:for-each>
-                        </xsl:for-each>
-                    </dv:matches>
-                </xsl:copy>
-            </xsl:for-each>
-            <xsl:copy-of select="xsl:*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="node()|@*" mode="filter-synthetic">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="filter-synthetic"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match='//*[namespace-uri() = "http://www.w3.org/1999/xhtml"]' mode="filter-synthetic">
-        <xsl:element name="{local-name()}">
-            <xsl:apply-templates select="@*|node()" mode="filter-synthetic"/>
-        </xsl:element>
-    </xsl:template>
-
-
-    <!--
-        Annotate the theme html
-    -->
-
-    <xsl:template match="comment()" mode="annotate-html">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
-
-    <xsl:template match="node()|@*" mode="annotate-html">
-        <xsl:copy>
-            <xsl:attribute name="xml:id">
-                <xsl:value-of select="generate-id()"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*" mode="annotate-html"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="/html/@xmlns" mode="annotate-html" priority="5">
-        <!-- setting the namespace to xhtml mucks up the included namespaces, so cheat -->
-        <xsl:if test="document($rulesuri, $theme)//*/@method='esi' or $includemode='esi'">
-            <!-- when we have another namespace defined, libxml2/xmlsave.c will not magically add the xhtml ns for us -->
-            <xsl:element name="xsl:attribute">
-                <xsl:attribute name="name">xmlns</xsl:attribute>
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="pre/text()" mode="annotate-html">
-        <!-- Filter out quoted &#13; -->
-        <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
-    </xsl:template>
-
-    <!--
-        Apply the rules
-    -->
-
-    <xsl:template match="node()|@*" mode="apply-rules">
-        <xsl:param name="rules"/>
-        <xsl:variable name="thisxmlid" select="@xml:id"/>
-        <xsl:variable name="matching-rules" select="$rules//*[dv:matches/dv:xmlid=$thisxmlid]"/>
-        <xsl:choose>
-            <xsl:when test="$matching-rules">
-                <xsl:call-template name="trace-path"/>
-                <!-- Before -->
-                <xsl:call-template name="trace"><xsl:with-param name="rule-name">before</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='before']"/></xsl:call-template>
-                <xsl:apply-templates select="$matching-rules[local-name()='before']" mode="conditional-include"/>
-                <!--
-                    Pass control to first rule template
-                -->
-                <xsl:call-template name="drop">
-                    <xsl:with-param name="matching-rules" select="$matching-rules"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-                <!-- After -->
-                <xsl:call-template name="trace"><xsl:with-param name="rule-name">after</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='after']"/></xsl:call-template>
-                <xsl:apply-templates select="$matching-rules[local-name()='after']" mode="conditional-include"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="apply-rules">
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="@xml:id" mode="apply-rules" priority="5">
-        <!-- Filter this out -->
-    </xsl:template>
-
-    <xsl:template mode="apply-rules" priority="5"
-        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
-        <!-- Emit xsl that avoids escaping -->
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>
-    </xsl:template>
-
-    <!--
-        Rule templates
-    -->
-    <xsl:template name="drop">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">drop</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-        <xsl:choose>
-            <xsl:when test="$matching-this[not(@if-content)]">
-                <!--
-                    Do nothing.  We want to get rid of this node
-                    in the theme. Next rule is `after`.
-                -->
-            </xsl:when>
-            <xsl:when test="$matching-this/@if-content">
-                <!--
-                    <drop condition="content" ...
-                    When the rule matches, toss out the theme node.
-                    Otherwise keep theme node.
-                -->
-                <xsl:element name="xsl:choose">
-                    <xsl:element name="xsl:when">
-                        <xsl:attribute name="test">
-                            <xsl:for-each select="$matching-this/@if-content">
-                                <xsl:text>(</xsl:text><xsl:value-of select="."/><xsl:text>)</xsl:text>
-                                <xsl:if test="position() != last()">
-                                    <xsl:text> or </xsl:text>
-                                </xsl:if>
-                            </xsl:for-each>
-                        </xsl:attribute>
-                        <!--
-                            Do nothing.  We want to get rid of this node
-                            in the theme.
-                        -->
-                    </xsl:element>
-                    <xsl:element name="xsl:otherwise">
-                        <xsl:call-template name="replace">
-                            <xsl:with-param name="matching-rules" select="$matching-other"/>
-                            <xsl:with-param name="rules" select="$rules"/>
-                        </xsl:call-template>
-                    </xsl:element>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="replace">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="replace">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">replace</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-
-        <xsl:variable name="unconditional" select="$matching-this[not(@if-content)]"/>
-        <xsl:variable name="conditional" select="$matching-this[@if-content]"/>
-        <xsl:if test="count($unconditional) > 1">
-            <xsl:message terminate="yes">
-                ERROR: Multiple unconditional replace rules may not match a single theme node.
-            </xsl:message>
-        </xsl:if>
-
-        <xsl:choose>
-            <xsl:when test="$conditional">
-                <!-- conditional <replace ...
-                When the rule matches, toss out the theme node and
-                include the @content. Otherwise keep theme node. -->
-                <xsl:element name="xsl:choose">
-                    <xsl:for-each select="$conditional">
-                        <xsl:element name="xsl:when">
-                            <xsl:attribute name="test">
-                                <xsl:value-of select="@if-content"/>
-                            </xsl:attribute>
-                            <xsl:call-template name="include">
-                                <xsl:with-param name="rule" select="."/>
-                            </xsl:call-template>
-                        </xsl:element>
-                    </xsl:for-each>
-                    <xsl:choose>
-                        <xsl:when test="$unconditional">
-                            <xsl:element name="xsl:otherwise">
-                                <!-- unconditional <replace.
-                                Toss out the theme node.  Simply include the @content. -->
-                                <xsl:call-template name="include">
-                                    <xsl:with-param name="rule" select="$unconditional"/>
-                                </xsl:call-template>
-                            </xsl:element>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:element name="xsl:otherwise">
-                                <xsl:call-template name="prepend-copy-append">
-                                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                                    <xsl:with-param name="rules" select="$rules"/>
-                                </xsl:call-template>
-                            </xsl:element>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$unconditional">
-                <!-- unconditional <replace.
-                Toss out the theme node.  Simply include the @content. -->
-                <xsl:call-template name="include">
-                    <xsl:with-param name="rule" select="$unconditional"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="prepend-copy-append">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="prepend-copy-append">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">prepend-copy-append</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()='prepend' or local-name()='copy' or local-name()='append']"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-
-                <xsl:copy>
-                    <!-- Theme attributes -->
-                    <xsl:apply-templates select="@*" mode="apply-rules">
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-
-                    <!-- Prepend -->
-                    <xsl:apply-templates select="$matching-this[local-name()='prepend']" mode="conditional-include"/>
-
-                    <!-- Copy -->
-                    <xsl:variable name="unconditional" select="$matching-this[local-name()='copy' and not(@if-content)]"/>
-                    <xsl:variable name="conditional" select="$matching-this[local-name()='copy' and @if-content]"/>
-                    <xsl:if test="count($unconditional) > 1">
-                        <xsl:message terminate="yes">
-                            ERROR: Multiple unconditional copy rules may not match a single theme node.
-                        </xsl:message>
-                    </xsl:if>
-
-                    <xsl:choose>
-                        <xsl:when test="$conditional">
-                            <!-- conditional <copy ...
-                            When the rule matches, copy the node and its attributes,
-                            but clear the children and text, just include the @content.
-                            Otherwise keep theme node. -->
-                            <xsl:element name="xsl:choose">
-                                <xsl:for-each select="$conditional">
-                                    <xsl:element name="xsl:when">
-                                        <xsl:attribute name="test">
-                                            <xsl:value-of select="@if-content"/>
-                                        </xsl:attribute>
-                                        <xsl:call-template name="include">
-                                            <xsl:with-param name="rule" select="."/>
-                                        </xsl:call-template>
-                                    </xsl:element>
-                                </xsl:for-each>
-                                <xsl:choose>
-                                    <xsl:when test="$unconditional">
-                                        <xsl:element name="xsl:otherwise">
-                                            <!-- unconditional <copy. Simply include the @content. -->
-                                            <xsl:call-template name="include">
-                                                <xsl:with-param name="rule" select="$unconditional"/>
-                                            </xsl:call-template>
-                                        </xsl:element>
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:element name="xsl:otherwise">
-                                            <xsl:apply-templates select="node()" mode="apply-rules">
-                                                <xsl:with-param name="rules" select="$rules"/>
-                                            </xsl:apply-templates>
-                                        </xsl:element>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                            </xsl:element>
-                        </xsl:when>
-                        <xsl:when test="$unconditional">
-                            <!-- unconditional <copy. Simply include the @content. -->
-                            <xsl:call-template name="include">
-                                <xsl:with-param name="rule" select="$unconditional"/>
-                            </xsl:call-template>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:apply-templates select="node()" mode="apply-rules">
-                                <xsl:with-param name="rules" select="$rules"/>
-                            </xsl:apply-templates>
-                        </xsl:otherwise>
-                    </xsl:choose>
-
-                    <!-- Append -->
-                    <xsl:apply-templates select="$matching-rules[local-name()='append']" mode="conditional-include"/>
-
-                </xsl:copy>
-
-    </xsl:template>
-
-
-    <!--
-        Content inclusion
-    -->
-
-    <xsl:template match="@*|node()" mode="conditional-include">
-        <xsl:choose>
-            <xsl:when test="@if-content">
-                <xsl:element name="xsl:if">
-                    <xsl:attribute name="test">
-                        <xsl:value-of select="@if-content"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="include">
-                        <xsl:with-param name="rule" select="."/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="include">
-                    <xsl:with-param name="rule" select="."/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="include">
-        <xsl:param name="rule"/>
-        <xsl:variable name="href" select="$rule/@href"/>
-        <xsl:variable name="content" select="$rule/@content"/>
-        <xsl:variable name="content_quoted" select="str:encode-uri($content, false())"/>
-        <xsl:variable name="method" select="$rule/@method"/>
-        <xsl:choose>
-            <xsl:when test="$rule/dv:synthetic">
-                <xsl:if test="$content">
-                    <xsl:message terminate="yes">
-                        ERROR: @content attribute and inline content not allowed in same rule
-                    </xsl:message>
-                </xsl:if>
-                <xsl:if test="$href">
-                    <xsl:message terminate="yes">
-                        ERROR: @href attribute and inline content not allowed in same rule
-                    </xsl:message>
-                </xsl:if>
-                <xsl:apply-templates mode="include-synthetic" select="$rule/dv:synthetic/node()"/>
-            </xsl:when>
-            <xsl:when test="not($href)">
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">
-                        <xsl:value-of select="$content"/>
-                    </xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'document'">
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'ssi'">
-                <!-- Assumptions:
-                    * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
-                -->
-                <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
-                    <xsl:when test="not($content)"><xsl:value-of select="$href"/></xsl:when>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($ssisuffix, '?')), $ssiquerysuffix, $content_quoted)"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="concat($href, $ssisuffix, '?', $ssiquerysuffix, $content_quoted)"/></xsl:otherwise>
-                    </xsl:choose>" wait="yes" </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'esi'">
-                <!-- Assumptions:
-                    * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
-                -->
-                <esi:include><xsl:attribute name="src"><xsl:choose>
-                    <xsl:when test="not($content)"><xsl:value-of select="$href"/></xsl:when>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($esisuffix, '?')), $esiquerysuffix, $content_quoted)"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="concat($href, $esisuffix, '?', $esiquerysuffix, $content_quoted)"/></xsl:otherwise>
-                    </xsl:choose></xsl:attribute></esi:include>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    ERROR: Unknown includemode or @method attribute
-                </xsl:message>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="comment()" mode="include-synthetic">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
-
-    <xsl:template mode="include-synthetic"
-        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
-        <!-- Emit xsl that avoids escaping -->
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>        
-    </xsl:template>
-
-    <xsl:template match="@*|node()" mode="include-synthetic">
-        <xsl:copy>
-          <xsl:apply-templates select="@*|node()" mode="include-synthetic"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!--
-        Debugging support
-    -->
-
-    <xsl:template name="trace">
-        <xsl:param name="rule-name"/>
-        <xsl:param name="matching" select="/.."/>
-        <xsl:if test="$trace">
-            <xsl:if test="not($matching)"><xsl:message>TRACE: (<xsl:value-of select="$rule-name"/>)</xsl:message></xsl:if>
-            <xsl:for-each select="$matching">
-                <xsl:message>RULE: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
-                    <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
-            </xsl:for-each>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template name="trace-path">
-        <xsl:if test="$trace">
-            <xsl:message>THEME: <xsl:for-each select="ancestor-or-self::*"><xsl:variable name="this" select="."
-                />/<xsl:value-of select="name()"/><xsl:choose><xsl:when test="@id">[@id='<xsl:value-of select="@id"/>']</xsl:when><xsl:when test="preceding-sibling::*[name()=name($this)]|following-sibling::*[name()=name($this)]">[<xsl:number/>]</xsl:when></xsl:choose></xsl:for-each></xsl:message>
-        </xsl:if>
-    </xsl:template>
-
-
-</xsl:stylesheet>

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Fri Jul  9 17:24:30 2010
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 """\
-Usage: %prog RULES
+Usage: %prog [-r] RULES
 
 Preprocess RULES, an xdv rules file
 """
 usage = __doc__
 
 import logging
-import pkg_resources
 import re
 
 from optparse import OptionParser
@@ -15,7 +14,7 @@
 from urlparse import urljoin
 
 from xdv.cssrules import convert_css_selectors
-from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE, CustomResolver, pkg_xsl
+from xdv.utils import namespaces, fullname, AC_READ_NET, AC_READ_FILE, pkg_xsl, _createOptionParser
 
 logger = logging.getLogger('xdv')
 
@@ -29,7 +28,6 @@
 annotate_themes  = pkg_xsl('annotate-themes.xsl')
 annotate_rules   = pkg_xsl('annotate-rules.xsl')
 apply_rules      = pkg_xsl('apply-rules.xsl')
-emit_stylesheet  = pkg_xsl('emit-stylesheet.xsl')
 
 def update_namespace(rules_doc):
     """Convert old namespace to new namespace in place
@@ -40,7 +38,7 @@
     else:
         return rules_doc
 
-def expand_themes(rules_doc, parser=None, absolute_prefix=None):
+def expand_themes(rules_doc, parser=None, absolute_prefix=None, read_network=False):
     """Expand <theme href='...'/> nodes with the theme html.
     """
     if absolute_prefix is None:
@@ -50,6 +48,9 @@
         parser = etree.HTMLParser()
     for element in rules_doc.xpath('xdv:theme[@href]', namespaces=namespaces):
         url = urljoin(base, element.get('href'))
+        if '://' in url:
+            if not theme.startswith('file://'):
+                raise ValueError("Supplied theme '%s', but network access denied." % url)
         theme_doc = etree.parse(url, parser=parser)
         prefix = urljoin(absolute_prefix, element.get('prefix', ''))
         apply_absolute_prefix(theme_doc, prefix)
@@ -69,7 +70,9 @@
         node.set('href', url)
     for node in theme_doc.xpath('//comment() | //style'):
         if node.tag == 'style' or node.tag == etree.Comment and node.text.startswith("[if IE"):
-            node.text = IMPORT_STYLESHEET.sub(lambda match: match.group(1) + urljoin(absolute_prefix, match.group(2)) + match.group(3), node.text)
+            node.text = IMPORT_STYLESHEET.sub(
+                lambda match: match.group(1) + urljoin(absolute_prefix, match.group(2)) + match.group(3),
+                node.text)
 
 def add_extra(rules_doc, extra):
     root = rules_doc.getroot()
@@ -77,7 +80,10 @@
     root.extend(extra_elements)
     return rules_doc
 
-def add_theme(rules_doc, theme, parser=None, absolute_prefix=None):
+def add_theme(rules_doc, theme, parser=None, absolute_prefix=None, read_network=False):
+    if isinstance(theme, basestring) and '://' in theme:
+        if not theme.startswith('file://'):
+            raise ValueError("Supplied theme '%s', but network access denied." % theme)
     if absolute_prefix is None:
         absolute_prefix = ''
     if parser is None:
@@ -91,19 +97,8 @@
     root.append(element)
     return rules_doc
 
-def set_parser(stylesheet, parser, compiler_parser=None):
-    dummy_doc = etree.parse(pkg_resources.resource_filename('xdv', 'dummy.html'), parser=parser)
-    name = 'file:///__xdv__'
-    resolver = CustomResolver({name: stylesheet})
-    if compiler_parser is None:
-        compiler_parser = etree.XMLParser()
-    compiler_parser.resolvers.add(resolver)
-    identity = pkg_xsl('identity.xsl', compiler_parser)
-    output_doc = identity(dummy_doc, docurl="'%s'"%name)
-    compiler_parser.resolvers.remove(resolver)
-    return output_doc
-
-def process_rules(rules, theme=None, extra=None, trace=None, css=True, xinclude=True, absolute_prefix=None, includemode=None, update=True, parser=None, rules_parser=None, compiler_parser=None, access_control=None):
+def process_rules(rules, theme=None, extra=None, trace=None, css=True, xinclude=True, absolute_prefix=None,
+                  includemode=None, update=True, parser=None, rules_parser=None, read_network=False, stop=None):
     if trace:
         trace = '1'
     else:
@@ -111,57 +106,72 @@
     if rules_parser is None:
         rules_parser = etree.XMLParser(recover=False)
     rules_doc = etree.parse(rules, parser=rules_parser)
+    if stop == 0: return rules_doc
     if parser is None:
         parser = etree.HTMLParser()
     if xinclude:
-        rules_doc.xinclude()
+        rules_doc.xinclude() # XXX read_network limitation not yet supported for xinclude
+    if stop == 1: return rules_doc
     if update:
         rules_doc = update_namespace(rules_doc)
+    if stop == 2: return rules_doc
     if css:
         rules_doc = convert_css_selectors(rules_doc)
-    rules_doc = expand_themes(rules_doc, parser, absolute_prefix)
+    if stop == 3: return rules_doc
+    rules_doc = expand_themes(rules_doc, parser, absolute_prefix, read_network)
     if theme is not None:
-        rules_doc = add_theme(rules_doc, theme, parser, absolute_prefix)
+        rules_doc = add_theme(rules_doc, theme, parser, absolute_prefix, read_network)
+    if stop == 4: return rules_doc
     if includemode is None:
         includemode = 'document'
     includemode = "'%s'" % includemode
     rules_doc = normalize_rules(rules_doc, includemode=includemode)
+    if stop == 5: return rules_doc
     rules_doc = apply_conditions(rules_doc)
+    if stop == 6: return rules_doc
     rules_doc = merge_conditions(rules_doc)
+    if stop == 7: return rules_doc
     rules_doc = annotate_themes(rules_doc)
+    if stop == 8: return rules_doc
     rules_doc = annotate_rules(rules_doc)
+    if stop == 9: return rules_doc
     rules_doc = apply_rules(rules_doc, trace=trace)
-    compiled_doc = emit_stylesheet(rules_doc)
-    compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
-    return compiled_doc
-
+    assert stop < 10, "There are only 10 steps"
+    return rules_doc
 
 
 def main():
     """Called from console script
     """
-    parser = OptionParser(usage=usage)
-    parser.add_option("-o", "--output", metavar="output.html",
-                      help="Output filename (instead of stdout)",
-                      dest="output", default=sys.stdout)
-    parser.add_option("-p", "--pretty-print", action="store_true",
-                      help="Pretty print output",
-                      dest="pretty_print", default=False)
-    parser.add_option("-a", "--absolute-prefix", metavar="/",
-                      help="relative urls in the theme file will be made into absolute links with this prefix.",
-                      dest="absolute_prefix", default=None)
-    parser.add_option("-i", "--includemode", metavar="INC",
-                      help="include mode (document, ssi or esi)",
-                      dest="includemode", default=None)
-    parser.add_option("-t", "--theme", metavar="theme.html",
-                      help="Theme file",
-                      dest="theme", default=None)
+    parser = _createOptionParser(usage=usage)
+    parser.add_option("-s", "--stop", metavar="n", type="int",
+                      help="Stop preprocessing at stage n", 
+                      dest="stop", default=None)
     (options, args) = parser.parse_args()
 
-    if len(args) != 1:
-        parser.error("Invalid number of arguments")
-    rules = args[0]
-    rules_doc = process_rules(rules, theme=options.theme, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
+    if options.rules is None:
+        if len(args) == 2 and options.theme is None:
+            options.rules, options.theme = args
+        elif len(args) == 1:
+            options.rules, = args
+        else:
+            parser.error("Wrong number of arguments.")
+    elif args:
+        parser.error("Wrong number of arguments.")
+
+    if options.trace:
+        logger.setLevel(logging.DEBUG)
+
+    rules_doc = process_rules(
+        options.rules,
+        theme=options.theme,
+        extra=options.extra,
+        trace=options.trace,
+        absolute_prefix=options.absolute_prefix,
+        includemode=options.includemode,
+        read_network=options.read_network,
+        stop=options.stop,
+        )
     rules_doc.write(options.output, pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/run.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/run.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/run.py	Fri Jul  9 17:24:30 2010
@@ -1,20 +1,24 @@
 #!/usr/bin/env python
 """\
-Usage: %prog TRANSFORM CONTENT
+Usage: %prog -x TRANSFORM CONTENT
 
   TRANSFORM is the compiled theme transform
   CONTENT is an html file.
   
-Usage: %prog -t THEME -r RULES [options] CONTENT
+Usage: %prog -r RULES [options] CONTENT
 """
 usage = __doc__
 
+import logging
 import sys
 import os.path
+
 from lxml import etree
-from optparse import OptionParser
-from compiler import compile_theme
-from utils import AC_READ_NET, AC_READ_FILE
+
+from xdv.compiler import compile_theme
+from xdv.utils import AC_READ_NET, AC_READ_FILE, _createOptionParser
+
+logger = logging.getLogger('xdv')
 
 class RunResolver(etree.Resolver):
     def __init__(self, directory):
@@ -29,65 +33,61 @@
 def main():
     """Called from console script
     """
-    op = OptionParser(usage=usage)
-    op.add_option("-t", "--theme", metavar="theme.html",
-                  help="Theme file",
-                  dest="theme", default=None)
-    op.add_option("-r", "--rules", metavar="rules.xml",
-                  help="XDV rules file", 
-                  dest="rules", default=None)
-    op.add_option("-e", "--extra", metavar="extra.xsl",
-                  help="XDV extraurl XSLT file (depracated, use inline xsl in the rules instead)",
-                  dest="extra", default=None)
-    op.add_option("-o", "--output", metavar="output.html",
-                  help="Output filename (instead of stdout)",
-                  dest="output", default=sys.stdout)
-    op.add_option("-p", "--pretty-print", action="store_true",
-                  help="Pretty print output (can alter rendering on the browser)",
-                  dest="pretty_print", default=False)
-    op.add_option("--xinclude", action="store_true",
-                  help="Run XInclude on rules.xml (depracated, xinclude is always run)",
-                  dest="xinclude", default=True)
-    op.add_option("-n", "--network", action="store_true",
-                  help="Allow reads to the network to fetch resources",
-                  dest="read_network", default=False)
-    op.add_option("-a", "--absolute-prefix", metavar="/",
-                  help="relative urls in the theme file will be made into absolute links with this prefix.",
-                  dest="absolute_prefix", default=None)
-    op.add_option("-i", "--includemode", metavar="INC",
-                  help="include mode (document, ssi or esi)",
-                  dest="includemode", default=None)
+    op = _createOptionParser(usage=usage)
+    op.add_option("-x", "--xsl", metavar="transform.xsl",
+                      help="XSL transform", 
+                      dest="xsl", default=None)
     (options, args) = op.parse_args()
 
-    if options.read_network:
-        access_control = AC_READ_NET
-    else:
-        access_control = AC_READ_FILE
-
-    if len(args) == 2:
-        transform_path, content = args
-        parser = etree.XMLParser()
-        output_xslt = etree.parse(transform_path, parser=parser)
-    elif len(args) == 1:
-        if options.rules:
-            content, = args
-            parser = etree.HTMLParser()
-            output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, parser=parser, access_control=access_control, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
+    if len(args) > 2:
+        op.error("Wrong number of arguments.")
+    elif len(args) == 2:
+        if options.xsl or options.rules:
+            op.error("Wrong number of arguments.")
+        path, content = args
+        if path.lower().endswith('.xsl'):
+            options.xsl = path
         else:
-            op.error("Rules must be supplied.")
+            options.rules = path
+    elif len(args) == 1:
+        content, = args
     else:
         op.error("Wrong number of arguments.")
+    if options.rules is None and options.xsl is None:
+        op.error("Must supply either options or rules")
+
+    if options.trace:
+        logger.setLevel(logging.DEBUG)
+
+    if options.xsl is not None:
+        output_xslt = etree.parse(options.xsl)
+    else:
+        parser = etree.HTMLParser()
+        output_xslt = compile_theme(
+            rules=options.rules,
+            theme=options.theme,
+            extra=options.extra,
+            parser=parser,
+            read_network=options.read_network,
+            absolute_prefix=options.absolute_prefix,
+            includemode=options.includemode,
+            )
 
     if content == '-':
         content = sys.stdin
 
+    if options.read_network:
+        access_control = AC_READ_NET
+    else:
+        access_control = AC_READ_FILE
+
     parser.resolvers.add(RunResolver(os.path.dirname(content)))
     transform = etree.XSLT(output_xslt, access_control=access_control)
     content_doc = etree.parse(content, parser=etree.HTMLParser())
     output_html = transform(content_doc)
     output_html.write(options.output, encoding='UTF-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:
-        print msg
+        logger.warn(msg)
 
 if __name__ == '__main__':
     main()

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/utils.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/utils.py	Fri Jul  9 17:24:30 2010
@@ -1,6 +1,9 @@
-from lxml import etree
 import logging
 import pkg_resources
+import sys
+
+from lxml import etree
+from optparse import OptionParser
 
 logger=logging.getLogger('xdv')
 
@@ -46,3 +49,35 @@
 
 def pkg_xsl(name, parser=None):
     return LoggingXSLTWrapper(etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser)), logger)
+
+
+def _createOptionParser(usage):
+    parser = OptionParser(usage=usage)
+    parser.add_option("-o", "--output", metavar="output.xsl",
+                      help="Output filename (instead of stdout)",
+                      dest="output", default=sys.stdout)
+    parser.add_option("-p", "--pretty-print", action="store_true",
+                      help="Pretty print output (may alter rendering in browser)",
+                      dest="pretty_print", default=False)
+    parser.add_option("--trace", action="store_true",
+                      help="Compiler trace logging",
+                      dest="trace", default=False)
+    parser.add_option("-a", "--absolute-prefix", metavar="/",
+                      help="relative urls in the theme file will be made into absolute links with this prefix.",
+                      dest="absolute_prefix", default=None)
+    parser.add_option("-i", "--includemode", metavar="INC",
+                      help="include mode (document, ssi or esi)",
+                      dest="includemode", default=None)
+    parser.add_option("-n", "--network", action="store_true",
+                      help="Allow reads to the network to fetch resources",
+                      dest="read_network", default=False)
+    parser.add_option("-t", "--theme", metavar="theme.html",
+                      help="Theme file",
+                      dest="theme", default=None)
+    parser.add_option("-r", "--rules", metavar="rules.xml",
+                      help="XDV rules file", 
+                      dest="rules", default=None)
+    parser.add_option("-e", "--extra", metavar="extra.xsl",
+                      help="Extra XSL to be included in the transform (depracated, use inline xsl in the rules instead)",
+                      dest="extra", default=None)
+    return parser

Modified: z3/xdv/branches/multistage-compiler/setup.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/setup.py	(original)
+++ z3/xdv/branches/multistage-compiler/setup.py	Fri Jul  9 17:24:30 2010
@@ -26,5 +26,6 @@
         [console_scripts]
         xdvcompiler = xdv.compiler:main
         xdvrun = xdv.run:main
+        xdvpreprocessor = xdv.rules:main
         """,
     )

From ldr at codespeak.net  Fri Jul  9 17:28:14 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  9 Jul 2010 17:28:14 +0200 (CEST)
Subject: [z3-checkins] r76080 - in z3/xdv/trunk: . docs lib/xdv
	lib/xdv/tests lib/xdv/tests/absolute-prefix
	lib/xdv/tests/absolute-prefix-disabled
	lib/xdv/tests/drop-content lib/xdv/tests/esi
	lib/xdv/tests/html-xml-lang lib/xdv/tests/html-xml-lang-2
	lib/xdv/tests/modify-theme lib/xdv/tests/multi-theme-1
	lib/xdv/tests/multi-theme-2 lib/xdv/tests/nested-conditions-1
	lib/xdv/tests/nested-conditions-2
	lib/xdv/tests/nested-conditions-3 lib/xdv/tests/ssi
Message-ID: <20100709152814.126D2282C07@codespeak.net>

Author: ldr
Date: Fri Jul  9 17:28:12 2010
New Revision: 76080

Added:
   z3/xdv/trunk/lib/xdv/annotate-rules.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/annotate-rules.xsl
   z3/xdv/trunk/lib/xdv/annotate-themes.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/annotate-themes.xsl
   z3/xdv/trunk/lib/xdv/apply-conditions.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/apply-conditions.xsl
   z3/xdv/trunk/lib/xdv/apply-rules.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/apply-rules.xsl
   z3/xdv/trunk/lib/xdv/defaults.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/defaults.xsl
   z3/xdv/trunk/lib/xdv/dummy.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/dummy.html
   z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/emit-stylesheet.xsl
   z3/xdv/trunk/lib/xdv/identity.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/identity.xsl
   z3/xdv/trunk/lib/xdv/merge-conditions.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/merge-conditions.xsl
   z3/xdv/trunk/lib/xdv/normalize-rules.xsl
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/normalize-rules.xsl
   z3/xdv/trunk/lib/xdv/rules.py
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/content.html
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/options.cfg
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/options.cfg
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/output.html
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/rules.xml
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix-disabled/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix-disabled/theme.html
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/content.html
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/options.cfg
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/options.cfg
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/output.html
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/rules.xml
   z3/xdv/trunk/lib/xdv/tests/absolute-prefix/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/absolute-prefix/theme.html
   z3/xdv/trunk/lib/xdv/tests/default-options.cfg
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/default-options.cfg
   z3/xdv/trunk/lib/xdv/tests/drop-content/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/
   z3/xdv/trunk/lib/xdv/tests/drop-content/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/content.html
   z3/xdv/trunk/lib/xdv/tests/drop-content/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/output.html
   z3/xdv/trunk/lib/xdv/tests/drop-content/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/rules.xml
   z3/xdv/trunk/lib/xdv/tests/drop-content/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/drop-content/theme.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang-2/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang-2/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/content.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang-2/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/output.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang-2/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang-2/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang-2/theme.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/content.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/output.html
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/rules.xml
   z3/xdv/trunk/lib/xdv/tests/html-xml-lang/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/html-xml-lang/theme.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/options.cfg
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/options.cfg
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/output.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/theme1.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme1.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-1/theme2.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-1/theme2.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/options.cfg
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/options.cfg
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/output.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/theme1.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme1.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-2/theme2.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/multi-theme-2/theme2.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-1/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-1/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/content.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-1/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/output.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-1/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-1/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-1/theme.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-2/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-2/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/content.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-2/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/output.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-2/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-2/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-2/theme.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-3/
      - copied from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-3/content.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/content.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-3/output.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/output.html
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-3/rules.xml
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/rules.xml
   z3/xdv/trunk/lib/xdv/tests/nested-conditions-3/theme.html
      - copied unchanged from r76079, z3/xdv/branches/multistage-compiler/lib/xdv/tests/nested-conditions-3/theme.html
Removed:
   z3/xdv/trunk/lib/xdv/boilerplate.xsl
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/absolute_rules.xml
   z3/xdv/trunk/lib/xdv/tests/absolute_theme.html
Modified:
   z3/xdv/trunk/   (props changed)
   z3/xdv/trunk/buildout.cfg
   z3/xdv/trunk/docs/TODO.txt
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/cssrules.py
   z3/xdv/trunk/lib/xdv/run.py
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/lib/xdv/tests/tests.py
   z3/xdv/trunk/lib/xdv/utils.py
   z3/xdv/trunk/setup.py
Log:
merge the multistage-compiler branch back to trunk

Modified: z3/xdv/trunk/buildout.cfg
==============================================================================
--- z3/xdv/trunk/buildout.cfg	(original)
+++ z3/xdv/trunk/buildout.cfg	Fri Jul  9 17:28:12 2010
@@ -12,3 +12,4 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = xdv
+defaults = ['--auto-color']

Modified: z3/xdv/trunk/docs/TODO.txt
==============================================================================
--- z3/xdv/trunk/docs/TODO.txt	(original)
+++ z3/xdv/trunk/docs/TODO.txt	Fri Jul  9 17:28:12 2010
@@ -39,6 +39,16 @@
 0.4 release
 ===========
 
+Refactor compiler
+-----------------
+
+Move to a pipeline. Running compiler.xsl in Apache did not work out in
+practise.
+
+# css -> xpath
+# rules.xml + themes merged together
+# annotate
+# compile theme
 
 Group directive
 ---------------

Deleted: /z3/xdv/trunk/lib/xdv/boilerplate.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/boilerplate.xsl	Fri Jul  9 17:28:12 2010
+++ (empty file)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dv="http://namespaces.plone.org/xdv"
-    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
-    xmlns:exsl="http://exslt.org/common"
-    xmlns:str="http://exslt.org/strings"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    exclude-result-prefixes="exsl str dv xhtml" >
-  <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
-      media-type="text/html" encoding="utf-8"
-      doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-    <xsl:template match="/">
-
-        <!-- Pass incoming content through initial-stage filter. -->
-        <xsl:variable name="initial-stage-rtf">
-            <xsl:apply-templates select="/" mode="initial-stage"/>
-        </xsl:variable>
-        <xsl:variable name="initial-stage" select="exsl:node-set($initial-stage-rtf)"/>
-
-        <!-- Now apply the theme to the initial-stage content -->
-        <xsl:variable name="themedcontent-rtf">
-            <xsl:apply-templates select="$initial-stage" mode="apply-theme"/>
-        </xsl:variable>
-        <xsl:variable name="content" select="exsl:node-set($themedcontent-rtf)"/>
-
-        <!-- We're done, so generate some output by passing 
-            through a final stage. -->
-        <xsl:apply-templates select="$content" mode="final-stage"/>
-
-    </xsl:template>
-
-    <!-- 
-    
-        Utility templates
-    -->
-    <xsl:template match="none" mode="insert-drop-rules">
-        <!-- The compiler looks for this and replaces 
-        the @match and @mode. -->
-    </xsl:template>
-    <xsl:template match="node()|@*" mode="initial-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="initial-stage"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="pre/text()" mode="initial-stage">
-        <!-- Filter out quoted &#13; -->
-        <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
-    </xsl:template>
-    <xsl:template match="/" mode="apply-theme">
-        <dv:insert/>
-    </xsl:template>
-    <xsl:template match="style|script|xhtml:style|xhtml:script" priority="5" mode="final-stage">
-        <xsl:element name="{local-name()}">
-            <xsl:apply-templates select="@*" mode="final-stage"/>
-            <xsl:value-of select="text()" disable-output-escaping="yes"/>
-        </xsl:element>
-    </xsl:template>
-    <xsl:template match="node()|@*" priority="1" mode="final-stage">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="final-stage"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- 
-    
-        Extra templates
-    -->
-    <dv:insert-extra/>
-</xsl:stylesheet>

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Fri Jul  9 17:28:12 2010
@@ -11,79 +11,32 @@
 """
 usage = __doc__
 
-import re
-import os.path
-import sys
 import logging
+import pkg_resources
+import sys
+
 from lxml import etree
-from optparse import OptionParser
 
-from utils import namespaces, AC_READ_NET, AC_READ_FILE
-from cssrules import convert_css_selectors
+from xdv.rules import process_rules
+from xdv.utils import namespaces, AC_READ_NET, AC_READ_FILE, pkg_xsl, _createOptionParser, CustomResolver
 
 logger = logging.getLogger('xdv')
 
-HERE = os.path.dirname(__file__)
-
-IMPORT_STYLESHEET = re.compile(r'''(@import\s+(?:url\(['"]?|['"]))(.+)(['"]?\)|['"])''', re.IGNORECASE)
-
-COMPILER_PATH = os.path.join(HERE, 'compiler.xsl')
-
-UPDATE_PATH = os.path.join(HERE, 'update-namespace.xsl')
-update_transform = etree.XSLT(etree.parse(UPDATE_PATH))
+emit_stylesheet = pkg_xsl('emit-stylesheet.xsl')
 
-def update_namespace(rules):
-    """Convert old namespace to new namespace in place
-    """
-    if rules.xpath("//*[namespace-uri()='%s']" % namespaces['old']):
-        logger.warning('The %s namespace is deprecated, use %s instead.' % (namespaces['old'], namespaces['xdv']))
-        return update_transform(rules)
-    else:
-        return rules
-
-class CompileResolver(etree.Resolver):
-    def __init__(self, rules, extra=None):
-        self.rules = rules
-        self.extra = extra
-        
-    def resolve(self, url, pubid, context):
-        if url == 'file:///__xdv__rules':
-            return self.resolve_string(self.rules, context)
-        if url == 'file:///__xdv__extra' and self.extra is not None:
-            return self.resolve_string(self.extra, context)
-
-def to_absolute(path, prefix):
-    """Make a url/path into an absolute URL by applying the given prefix
-    """
-    # Absolute path or full url
-    if path.startswith('/') or '://' in path:
-        return path
-    
-    absolute = "%s/%s" % (prefix, path)
-    if '://' in absolute:
-        return absolute
-        
-    normalized = os.path.normpath(absolute)
-    if os.path.sep != '/':
-        normalized = normalized.replace(os.path.sep, '/')
-    return normalized    
-
-def apply_absolute_prefix(theme_doc, absolute_prefix):
-    if absolute_prefix.endswith('/'):
-        absolute_prefix = absolute_prefix[:-1]
-    for node in theme_doc.xpath('*//style | *//script | *//img | *//link | *//input | *//comment() '):
-        if node.tag in ('img', 'script', 'input',):
-            src = node.get('src')
-            if src:
-                node.set('src', to_absolute(src, absolute_prefix))
-        elif node.tag == 'link':
-            href = node.get('href')
-            if href:
-                node.set('href', to_absolute(href, absolute_prefix))
-        elif node.tag == 'style' or node.tag == etree.Comment and node.text.startswith("[if IE"):
-            node.text = IMPORT_STYLESHEET.sub(lambda match: match.group(1) + to_absolute(match.group(2), absolute_prefix) + match.group(3), node.text)
+def set_parser(stylesheet, parser, compiler_parser=None):
+    dummy_doc = etree.parse(pkg_resources.resource_filename('xdv', 'dummy.html'), parser=parser)
+    name = 'file:///__xdv__'
+    resolver = CustomResolver({name: stylesheet})
+    if compiler_parser is None:
+        compiler_parser = etree.XMLParser()
+    compiler_parser.resolvers.add(resolver)
+    identity = pkg_xsl('identity.xsl', compiler_parser)
+    output_doc = identity(dummy_doc, docurl="'%s'"%name)
+    compiler_parser.resolvers.remove(resolver)
+    return output_doc
 
-def compile_theme(rules, theme, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None):
+def compile_theme(rules, theme=None, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None, read_network=False):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
@@ -112,103 +65,57 @@
     * ``compiler_parser``` can be set to an lxml parser instance; the default is a
       XMLParser
     * ``rules_parser`` can be set to an lxml parser instance; the default is a
-      XMLParse.
+      XMLParser.
     """
-    
-    if rules_parser is None:
-        rules_parser = etree.XMLParser(recover=False)
-    rules_doc = etree.parse(rules, parser=rules_parser)
-    
-    if xinclude:
-        rules_doc.xinclude()
-    if update:
-        rules_doc = update_namespace(rules_doc)
-    if css:
-        convert_css_selectors(rules_doc)
-    
-    if parser is None:
-        parser = etree.HTMLParser()
-    theme_doc = etree.parse(theme, parser=parser)
-    
-    if absolute_prefix:
-        apply_absolute_prefix(theme_doc, absolute_prefix)
-    
-    if compiler_parser is None:
-        compiler_parser = etree.XMLParser()
-    if access_control is None:
-        access_control = AC_READ_FILE
-    compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser), access_control=access_control)
-
-    params = dict(rulesuri="'file:///__xdv__rules'")
-    if extra:
-        params['extraurl'] = "'file:///__xdv__extra'"
-        resolver = CompileResolver(etree.tostring(rules_doc), etree.tostring(etree.parse(extra)))
-    else:
-        resolver = CompileResolver(etree.tostring(rules_doc))
-    if trace:
-        params['trace'] = '1'
-    if includemode:
-        params['includemode'] = "'%s'" % includemode
+    if access_control is not None:
+        read_network = access_control.options['read_network']
+    rules_doc = process_rules(
+        rules=rules,
+        theme=theme,
+        extra=extra,
+        css=css,
+        xinclude=xinclude,
+        absolute_prefix=absolute_prefix,
+        update=update,
+        trace=trace,
+        includemode=includemode,
+        parser=parser,
+        rules_parser=rules_parser,
+        read_network=read_network,
+        )
+    compiled_doc = emit_stylesheet(rules_doc)
+    compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
+    return compiled_doc
 
-    compiler_parser.resolvers.add(resolver)
-    compiled = compiler_transform(theme_doc, **params)
-    for msg in compiler_transform.error_log:
-        logger.info(msg)
-    return compiled
 
 def main():
     """Called from console script
     """
-    parser = OptionParser(usage=usage)
-    parser.add_option("-o", "--output", metavar="output.xsl",
-                      help="Output filename (instead of stdout)",
-                      dest="output", default=sys.stdout)
-    parser.add_option("-p", "--pretty-print", action="store_true",
-                      help="Pretty print output (may alter rendering in browser)",
-                      dest="pretty_print", default=False)
-    parser.add_option("--trace", action="store_true",
-                      help="Compiler trace logging",
-                      dest="trace", default=False)
-    parser.add_option("--xinclude", action="store_true",
-                      help="Run XInclude on rules.xml (depracated, xinclude is always run)",
-                      dest="xinclude", default=True)
-    parser.add_option("-a", "--absolute-prefix", metavar="/",
-                      help="relative urls in the theme file will be made into absolute links with this prefix.",
-                      dest="absolute_prefix", default=None)
-    parser.add_option("-i", "--includemode", metavar="INC",
-                      help="include mode (document, ssi or esi)",
-                      dest="includemode", default=None)
-    parser.add_option("-n", "--network", action="store_true",
-                      help="Allow reads to the network to fetch resources",
-                      dest="read_network", default=False)
-    parser.add_option("-t", "--theme", metavar="theme.html",
-                      help="Theme file",
-                      dest="theme", default=None)
-    parser.add_option("-r", "--rules", metavar="rules.xml",
-                      help="XDV rules file", 
-                      dest="rules", default=None)
-    parser.add_option("-e", "--extra", metavar="extra.xsl",
-                      help="Extra XSL to be included in the transform (depracated, use inline xsl in the rules instead)",
-                      dest="extra", default=None)
+    parser = _createOptionParser(usage=usage)
     (options, args) = parser.parse_args()
 
-    if options.rules is None and options.theme is None:
-        if len(args) == 2:
+    if options.rules is None:
+        if len(args) == 2 and options.theme is None:
             options.rules, options.theme = args
+        elif len(args) == 1:
+            options.rules, = args
         else:
             parser.error("Wrong number of arguments.")
-    elif not(options.rules is not None and options.theme is not None):
-        parser.error("Both theme and rules must be supplied as options or as arguments.")
+    elif args:
+        parser.error("Wrong number of arguments.")
 
     if options.trace:
         logger.setLevel(logging.DEBUG)
 
-    if options.read_network:
-        access_control = AC_READ_NET
-    else:
-        access_control = AC_READ_FILE
-
-    output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode, access_control=access_control)
+    output_xslt = compile_theme(
+        rules=options.rules,
+        theme=options.theme,
+        extra=options.extra,
+        trace=options.trace,
+        absolute_prefix=options.absolute_prefix,
+        includemode=options.includemode,
+        read_network=options.read_network,
+        )
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Deleted: /z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/compiler.xsl	Fri Jul  9 17:28:12 2010
+++ (empty file)
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-    xmlns:dv="http://namespaces.plone.org/xdv"
-    xmlns:dyn="http://exslt.org/dynamic"
-    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
-    xmlns:exsl="http://exslt.org/common"
-    xmlns:set="http://exslt.org/sets"
-    xmlns:str="http://exslt.org/strings"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    xmlns:xml="http://www.w3.org/XML/1998/namespace"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="dv dyn exsl xml">
-    <xsl:output indent="yes" media-type="text/xml"/>
-
-    <xsl:param name="rulesuri">rules.xml</xsl:param>
-    <xsl:param name="boilerplateurl">boilerplate.xsl</xsl:param>
-    <xsl:param name="extraurl"/>
-    <xsl:param name="trace"/>
-    <xsl:param name="includemode">document</xsl:param>
-    <xsl:param name="ssiprefix"></xsl:param>
-    <xsl:param name="ssisuffix"></xsl:param>
-    <xsl:param name="ssiquerysuffix">;filter_xpath=</xsl:param>
-    <xsl:param name="esiprefix"></xsl:param>
-    <xsl:param name="esisuffix"></xsl:param>
-    <xsl:param name="esiquerysuffix">;filter_xpath=</xsl:param>
-    <xsl:variable name="theme" select="/"/>
-
-    <!--
-        Multi-stage theme compiler
-    -->
-
-    <xsl:template match="/">
-
-        <!-- Put unique xml:id values on all the theme html -->
-        <xsl:variable name="themehtml-rtf">
-            <xsl:apply-templates select="/html" mode="annotate-html"/>
-        </xsl:variable>
-        <xsl:variable name="themehtml" select="exsl:node-set($themehtml-rtf)"/>
-
-        <!-- Include the rules file, adding @xml:id attributes as it is included -->
-        <xsl:variable name="rules-rtf">
-            <xsl:apply-templates select="document($rulesuri, $theme)/*" mode="annotate-rules">
-                <xsl:with-param name="themehtml" select="$themehtml"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="rules" select="exsl:node-set($rules-rtf)"/>
-
-        <!-- Make a pass through all the theme html, filtering 
-            as we go. This is where rule generation happens. -->
-        <xsl:variable name="stage1-rtf">
-            <xsl:apply-templates select="$themehtml" mode="apply-rules">
-                <xsl:with-param name="rules" select="$rules"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="stage1" select="exsl:node-set($stage1-rtf)"/>
-
-        <!-- Stage 2, include the boilerplate and make a compiled
-            XSLT. -->
-        <xsl:variable name="stage2-rtf">
-            <xsl:apply-templates select="document($boilerplateurl)" mode="include-boilerplate">
-                <xsl:with-param name="stage1" select="$stage1"/>
-                <xsl:with-param name="rules" select="$rules"/>
-            </xsl:apply-templates>
-        </xsl:variable>
-        <xsl:variable name="stage2" select="exsl:node-set($stage2-rtf)"/>
-
-        <!-- We're done, so generate some output -->
-        <xsl:copy-of select="$stage2"/>
-
-    </xsl:template>
-
-    <!--
-        Boilerplate
-    -->
-
-    <xsl:template match="node()|@*" mode="include-boilerplate">
-        <xsl:param name="stage1"/>
-        <xsl:param name="rules"/>
-        <xsl:choose>
-            <xsl:when test="@mode='insert-drop-rules'">
-                <!-- If there are any <drop @content> rules, put it in 
-                here. -->
-                <xsl:for-each select="$rules/dv:rules/dv:drop[@content]">
-                    <xsl:element name="xsl:template">
-                        <xsl:attribute name="match">
-                            <xsl:value-of select="@content"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="mode">initial-stage</xsl:attribute>
-                        <xsl:comment>Do nothing, skip these nodes</xsl:comment>
-                    </xsl:element>
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="name()='dv:insert'">
-                <!-- Put the compiled theme in at this spot of the boilerplate -->
-                <xsl:apply-templates select="$stage1" mode="include-boilerplate">
-                    <xsl:with-param name="stage1" select="$stage1"/>
-                </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="name()='dv:insert-extra'">
-                <!-- Put the extra templates in at this spot of the boilerplate -->
-                <xsl:if test="$extraurl">
-                    <xsl:copy-of select="document($extraurl, $theme)/xsl:stylesheet/node()" />
-                </xsl:if>
-                <xsl:copy-of select="$rules/dv:rules/xsl:*" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
-                        <xsl:with-param name="stage1" select="$stage1"/>
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </xsl:template>
-
-    <xsl:template match="/xsl:stylesheet/@exclude-result-prefixes" mode="include-boilerplate">
-        <xsl:param name="stage1"/>
-        <xsl:param name="rules"/>
-        <xsl:choose>
-            <xsl:when test="$includemode='esi' or $rules//*[@method='esi']">
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="include-boilerplate">
-                        <xsl:with-param name="stage1" select="$stage1"/>
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:attribute name="exclude-result-prefixes"><xsl:value-of select="."/> esi</xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!--
-        Annotate the rules for stage1
-    -->
-
-    <xsl:template match="dv:rules" mode="annotate-rules">
-        <xsl:param name="themehtml"/>
-        <xsl:copy>
-            <xsl:for-each select="//dv:rules/dv:*[local-name() != 'rules']">
-                <xsl:copy>
-                    <xsl:attribute name="xml:id">r<xsl:value-of select="position()"/></xsl:attribute>
-                    <xsl:copy-of select="@*[local-name() != 'if-content']"/>
-                    <xsl:choose>
-                        <xsl:when test="@if-content = ''">
-                            <xsl:attribute name="if-content"><xsl:value-of select="@content"/></xsl:attribute>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:copy-of select="@if-content"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:if test="@href and not(@method)">
-                        <xsl:attribute name="method"><xsl:value-of select="$includemode"/></xsl:attribute>
-                    </xsl:if>
-                    <xsl:if test="node()">
-                        <dv:synthetic><xsl:apply-templates select="node()" mode="filter-synthetic"/></dv:synthetic>
-                    </xsl:if>
-                    <dv:matches>
-                        <xsl:variable name="themexpath" select="@theme"/>
-                        <xsl:for-each select="$themehtml">
-                            <xsl:for-each select="dyn:evaluate($themexpath)">
-                                <dv:xmlid>
-                                    <xsl:value-of select="@xml:id"/>
-                                </dv:xmlid>
-                            </xsl:for-each>
-                        </xsl:for-each>
-                    </dv:matches>
-                </xsl:copy>
-            </xsl:for-each>
-            <xsl:copy-of select="xsl:*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="node()|@*" mode="filter-synthetic">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" mode="filter-synthetic"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match='//*[namespace-uri() = "http://www.w3.org/1999/xhtml"]' mode="filter-synthetic">
-        <xsl:element name="{local-name()}">
-            <xsl:apply-templates select="@*|node()" mode="filter-synthetic"/>
-        </xsl:element>
-    </xsl:template>
-
-
-    <!--
-        Annotate the theme html
-    -->
-
-    <xsl:template match="comment()" mode="annotate-html">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
-
-    <xsl:template match="node()|@*" mode="annotate-html">
-        <xsl:copy>
-            <xsl:attribute name="xml:id">
-                <xsl:value-of select="generate-id()"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*" mode="annotate-html"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="/html/@xmlns" mode="annotate-html" priority="5">
-        <!-- setting the namespace to xhtml mucks up the included namespaces, so cheat -->
-        <xsl:if test="document($rulesuri, $theme)//*/@method='esi' or $includemode='esi'">
-            <!-- when we have another namespace defined, libxml2/xmlsave.c will not magically add the xhtml ns for us -->
-            <xsl:element name="xsl:attribute">
-                <xsl:attribute name="name">xmlns</xsl:attribute>
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="pre/text()" mode="annotate-html">
-        <!-- Filter out quoted &#13; -->
-        <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
-    </xsl:template>
-
-    <!--
-        Apply the rules
-    -->
-
-    <xsl:template match="node()|@*" mode="apply-rules">
-        <xsl:param name="rules"/>
-        <xsl:variable name="thisxmlid" select="@xml:id"/>
-        <xsl:variable name="matching-rules" select="$rules//*[dv:matches/dv:xmlid=$thisxmlid]"/>
-        <xsl:choose>
-            <xsl:when test="$matching-rules">
-                <xsl:call-template name="trace-path"/>
-                <!-- Before -->
-                <xsl:call-template name="trace"><xsl:with-param name="rule-name">before</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='before']"/></xsl:call-template>
-                <xsl:apply-templates select="$matching-rules[local-name()='before']" mode="conditional-include"/>
-                <!--
-                    Pass control to first rule template
-                -->
-                <xsl:call-template name="drop">
-                    <xsl:with-param name="matching-rules" select="$matching-rules"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-                <!-- After -->
-                <xsl:call-template name="trace"><xsl:with-param name="rule-name">after</xsl:with-param><xsl:with-param name="matching" select="$matching-rules[local-name()='after']"/></xsl:call-template>
-                <xsl:apply-templates select="$matching-rules[local-name()='after']" mode="conditional-include"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*" mode="apply-rules">
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="@xml:id" mode="apply-rules" priority="5">
-        <!-- Filter this out -->
-    </xsl:template>
-
-    <xsl:template mode="apply-rules" priority="5"
-        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
-        <!-- Emit xsl that avoids escaping -->
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>
-    </xsl:template>
-
-    <!--
-        Rule templates
-    -->
-    <xsl:template name="drop">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">drop</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-        <xsl:choose>
-            <xsl:when test="$matching-this[not(@if-content)]">
-                <!--
-                    Do nothing.  We want to get rid of this node
-                    in the theme. Next rule is `after`.
-                -->
-            </xsl:when>
-            <xsl:when test="$matching-this/@if-content">
-                <!--
-                    <drop condition="content" ...
-                    When the rule matches, toss out the theme node.
-                    Otherwise keep theme node.
-                -->
-                <xsl:element name="xsl:choose">
-                    <xsl:element name="xsl:when">
-                        <xsl:attribute name="test">
-                            <xsl:for-each select="$matching-this/@if-content">
-                                <xsl:text>(</xsl:text><xsl:value-of select="."/><xsl:text>)</xsl:text>
-                                <xsl:if test="position() != last()">
-                                    <xsl:text> or </xsl:text>
-                                </xsl:if>
-                            </xsl:for-each>
-                        </xsl:attribute>
-                        <!--
-                            Do nothing.  We want to get rid of this node
-                            in the theme.
-                        -->
-                    </xsl:element>
-                    <xsl:element name="xsl:otherwise">
-                        <xsl:call-template name="replace">
-                            <xsl:with-param name="matching-rules" select="$matching-other"/>
-                            <xsl:with-param name="rules" select="$rules"/>
-                        </xsl:call-template>
-                    </xsl:element>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="replace">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="replace">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">replace</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()=$rule-name]"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-
-        <xsl:variable name="unconditional" select="$matching-this[not(@if-content)]"/>
-        <xsl:variable name="conditional" select="$matching-this[@if-content]"/>
-        <xsl:if test="count($unconditional) > 1">
-            <xsl:message terminate="yes">
-                ERROR: Multiple unconditional replace rules may not match a single theme node.
-            </xsl:message>
-        </xsl:if>
-
-        <xsl:choose>
-            <xsl:when test="$conditional">
-                <!-- conditional <replace ...
-                When the rule matches, toss out the theme node and
-                include the @content. Otherwise keep theme node. -->
-                <xsl:element name="xsl:choose">
-                    <xsl:for-each select="$conditional">
-                        <xsl:element name="xsl:when">
-                            <xsl:attribute name="test">
-                                <xsl:value-of select="@if-content"/>
-                            </xsl:attribute>
-                            <xsl:call-template name="include">
-                                <xsl:with-param name="rule" select="."/>
-                            </xsl:call-template>
-                        </xsl:element>
-                    </xsl:for-each>
-                    <xsl:choose>
-                        <xsl:when test="$unconditional">
-                            <xsl:element name="xsl:otherwise">
-                                <!-- unconditional <replace.
-                                Toss out the theme node.  Simply include the @content. -->
-                                <xsl:call-template name="include">
-                                    <xsl:with-param name="rule" select="$unconditional"/>
-                                </xsl:call-template>
-                            </xsl:element>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:element name="xsl:otherwise">
-                                <xsl:call-template name="prepend-copy-append">
-                                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                                    <xsl:with-param name="rules" select="$rules"/>
-                                </xsl:call-template>
-                            </xsl:element>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$unconditional">
-                <!-- unconditional <replace.
-                Toss out the theme node.  Simply include the @content. -->
-                <xsl:call-template name="include">
-                    <xsl:with-param name="rule" select="$unconditional"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="prepend-copy-append">
-                    <xsl:with-param name="matching-rules" select="$matching-other"/>
-                    <xsl:with-param name="rules" select="$rules"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="prepend-copy-append">
-        <xsl:param name="matching-rules"/>
-        <xsl:param name="rules"/>
-        <xsl:variable name="rule-name">prepend-copy-append</xsl:variable>
-        <xsl:variable name="matching-this" select="$matching-rules[local-name()='prepend' or local-name()='copy' or local-name()='append']"/>
-        <xsl:variable name="matching-other" select="set:difference($matching-rules, $matching-this)"/>
-        <xsl:call-template name="trace"><xsl:with-param name="rule-name" select="$rule-name"/><xsl:with-param name="matching" select="$matching-this"/></xsl:call-template>
-
-                <xsl:copy>
-                    <!-- Theme attributes -->
-                    <xsl:apply-templates select="@*" mode="apply-rules">
-                        <xsl:with-param name="rules" select="$rules"/>
-                    </xsl:apply-templates>
-
-                    <!-- Prepend -->
-                    <xsl:apply-templates select="$matching-this[local-name()='prepend']" mode="conditional-include"/>
-
-                    <!-- Copy -->
-                    <xsl:variable name="unconditional" select="$matching-this[local-name()='copy' and not(@if-content)]"/>
-                    <xsl:variable name="conditional" select="$matching-this[local-name()='copy' and @if-content]"/>
-                    <xsl:if test="count($unconditional) > 1">
-                        <xsl:message terminate="yes">
-                            ERROR: Multiple unconditional copy rules may not match a single theme node.
-                        </xsl:message>
-                    </xsl:if>
-
-                    <xsl:choose>
-                        <xsl:when test="$conditional">
-                            <!-- conditional <copy ...
-                            When the rule matches, copy the node and its attributes,
-                            but clear the children and text, just include the @content.
-                            Otherwise keep theme node. -->
-                            <xsl:element name="xsl:choose">
-                                <xsl:for-each select="$conditional">
-                                    <xsl:element name="xsl:when">
-                                        <xsl:attribute name="test">
-                                            <xsl:value-of select="@if-content"/>
-                                        </xsl:attribute>
-                                        <xsl:call-template name="include">
-                                            <xsl:with-param name="rule" select="."/>
-                                        </xsl:call-template>
-                                    </xsl:element>
-                                </xsl:for-each>
-                                <xsl:choose>
-                                    <xsl:when test="$unconditional">
-                                        <xsl:element name="xsl:otherwise">
-                                            <!-- unconditional <copy. Simply include the @content. -->
-                                            <xsl:call-template name="include">
-                                                <xsl:with-param name="rule" select="$unconditional"/>
-                                            </xsl:call-template>
-                                        </xsl:element>
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:element name="xsl:otherwise">
-                                            <xsl:apply-templates select="node()" mode="apply-rules">
-                                                <xsl:with-param name="rules" select="$rules"/>
-                                            </xsl:apply-templates>
-                                        </xsl:element>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                            </xsl:element>
-                        </xsl:when>
-                        <xsl:when test="$unconditional">
-                            <!-- unconditional <copy. Simply include the @content. -->
-                            <xsl:call-template name="include">
-                                <xsl:with-param name="rule" select="$unconditional"/>
-                            </xsl:call-template>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:apply-templates select="node()" mode="apply-rules">
-                                <xsl:with-param name="rules" select="$rules"/>
-                            </xsl:apply-templates>
-                        </xsl:otherwise>
-                    </xsl:choose>
-
-                    <!-- Append -->
-                    <xsl:apply-templates select="$matching-rules[local-name()='append']" mode="conditional-include"/>
-
-                </xsl:copy>
-
-    </xsl:template>
-
-
-    <!--
-        Content inclusion
-    -->
-
-    <xsl:template match="@*|node()" mode="conditional-include">
-        <xsl:choose>
-            <xsl:when test="@if-content">
-                <xsl:element name="xsl:if">
-                    <xsl:attribute name="test">
-                        <xsl:value-of select="@if-content"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="include">
-                        <xsl:with-param name="rule" select="."/>
-                    </xsl:call-template>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="include">
-                    <xsl:with-param name="rule" select="."/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="include">
-        <xsl:param name="rule"/>
-        <xsl:variable name="href" select="$rule/@href"/>
-        <xsl:variable name="content" select="$rule/@content"/>
-        <xsl:variable name="content_quoted" select="str:encode-uri($content, false())"/>
-        <xsl:variable name="method" select="$rule/@method"/>
-        <xsl:choose>
-            <xsl:when test="$rule/dv:synthetic">
-                <xsl:if test="$content">
-                    <xsl:message terminate="yes">
-                        ERROR: @content attribute and inline content not allowed in same rule
-                    </xsl:message>
-                </xsl:if>
-                <xsl:if test="$href">
-                    <xsl:message terminate="yes">
-                        ERROR: @href attribute and inline content not allowed in same rule
-                    </xsl:message>
-                </xsl:if>
-                <xsl:apply-templates mode="include-synthetic" select="$rule/dv:synthetic/node()"/>
-            </xsl:when>
-            <xsl:when test="not($href)">
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">
-                        <xsl:value-of select="$content"/>
-                    </xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'document'">
-                <xsl:element name="xsl:copy-of">
-                    <xsl:attribute name="select">document('<xsl:value-of select="$href"/>', .)<xsl:value-of select="$content"/></xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'ssi'">
-                <!-- Assumptions:
-                    * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
-                -->
-                <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
-                    <xsl:when test="not($content)"><xsl:value-of select="$href"/></xsl:when>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($ssisuffix, '?')), $ssiquerysuffix, $content_quoted)"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="concat($href, $ssisuffix, '?', $ssiquerysuffix, $content_quoted)"/></xsl:otherwise>
-                    </xsl:choose>" wait="yes" </xsl:element>
-            </xsl:when>
-            <xsl:when test="$method = 'esi'">
-                <!-- Assumptions:
-                    * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
-                -->
-                <esi:include><xsl:attribute name="src"><xsl:choose>
-                    <xsl:when test="not($content)"><xsl:value-of select="$href"/></xsl:when>
-                    <xsl:when test="contains($href, '?')"><xsl:value-of select="concat(str:replace($href, '?', concat($esisuffix, '?')), $esiquerysuffix, $content_quoted)"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="concat($href, $esisuffix, '?', $esiquerysuffix, $content_quoted)"/></xsl:otherwise>
-                    </xsl:choose></xsl:attribute></esi:include>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    ERROR: Unknown includemode or @method attribute
-                </xsl:message>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template match="comment()" mode="include-synthetic">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
-
-    <xsl:template mode="include-synthetic"
-        match="text()[parent::style|parent::script|parent::xhtml:style|parent::xhtml:script]">
-        <!-- Emit xsl that avoids escaping -->
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>        
-    </xsl:template>
-
-    <xsl:template match="@*|node()" mode="include-synthetic">
-        <xsl:copy>
-          <xsl:apply-templates select="@*|node()" mode="include-synthetic"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!--
-        Debugging support
-    -->
-
-    <xsl:template name="trace">
-        <xsl:param name="rule-name"/>
-        <xsl:param name="matching" select="/.."/>
-        <xsl:if test="$trace">
-            <xsl:if test="not($matching)"><xsl:message>TRACE: (<xsl:value-of select="$rule-name"/>)</xsl:message></xsl:if>
-            <xsl:for-each select="$matching">
-                <xsl:message>RULE: &lt;<xsl:value-of select="name()"/><xsl:for-each select="@*">
-                    <xsl:value-of select="' '"/><xsl:value-of select="name()"/>="<xsl:value-of select="."/>"</xsl:for-each>/&gt;</xsl:message>
-            </xsl:for-each>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template name="trace-path">
-        <xsl:if test="$trace">
-            <xsl:message>THEME: <xsl:for-each select="ancestor-or-self::*"><xsl:variable name="this" select="."
-                />/<xsl:value-of select="name()"/><xsl:choose><xsl:when test="@id">[@id='<xsl:value-of select="@id"/>']</xsl:when><xsl:when test="preceding-sibling::*[name()=name($this)]|following-sibling::*[name()=name($this)]">[<xsl:number/>]</xsl:when></xsl:choose></xsl:for-each></xsl:message>
-        </xsl:if>
-    </xsl:template>
-
-
-</xsl:stylesheet>

Modified: z3/xdv/trunk/lib/xdv/cssrules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/cssrules.py	(original)
+++ z3/xdv/trunk/lib/xdv/cssrules.py	Fri Jul  9 17:28:12 2010
@@ -20,7 +20,7 @@
 import logging
 logger = logging.getLogger('xdv')
 
-def convert_css_selectors(rules, prefix='//'):
+def convert_css_selectors(rules):
     """Convert css rules to xpath rules element tree in place
     """
     #XXX: There is a :root pseudo-class - http://www.w3.org/TR/css3-selectors/#root-pseudo
@@ -28,10 +28,17 @@
     for element in rules.xpath("//@*[namespace-uri()='%s']/.." % utils.namespaces['css']):
         for name, value in element.attrib.items():
             if name.startswith('{%s}' % utils.namespaces['css']):
-                if value:
-                    element.attrib[utils.localname(name)] = css_to_xpath(value, prefix=prefix)
+                localname = utils.localname(name)
+                if not value:
+                    element.attrib[localname] = ""
+                    continue
+                if localname == 'content' and element.tag == '{%s}drop' % utils.namespaces['xdv']:
+                    prefix = '//'
                 else:
-                    element.attrib[utils.fullname(element.nsmap[element.prefix], utils.localname(name))] = ""
+                    prefix = 'descendant-or-self::'                    
+                element.attrib[localname] = css_to_xpath(value, prefix=prefix)
+
+    return rules
 
 def main():
     """Called from console script

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Fri Jul  9 17:28:12 2010
@@ -1,20 +1,24 @@
 #!/usr/bin/env python
 """\
-Usage: %prog TRANSFORM CONTENT
+Usage: %prog -x TRANSFORM CONTENT
 
   TRANSFORM is the compiled theme transform
   CONTENT is an html file.
   
-Usage: %prog -t THEME -r RULES [options] CONTENT
+Usage: %prog -r RULES [options] CONTENT
 """
 usage = __doc__
 
+import logging
 import sys
 import os.path
+
 from lxml import etree
-from optparse import OptionParser
-from compiler import compile_theme
-from utils import AC_READ_NET, AC_READ_FILE
+
+from xdv.compiler import compile_theme
+from xdv.utils import AC_READ_NET, AC_READ_FILE, _createOptionParser
+
+logger = logging.getLogger('xdv')
 
 class RunResolver(etree.Resolver):
     def __init__(self, directory):
@@ -29,59 +33,61 @@
 def main():
     """Called from console script
     """
-    op = OptionParser(usage=usage)
-    op.add_option("-t", "--theme", metavar="theme.html",
-                  help="Theme file",
-                  dest="theme", default=None)
-    op.add_option("-r", "--rules", metavar="rules.xml",
-                  help="XDV rules file", 
-                  dest="rules", default=None)
-    op.add_option("-e", "--extra", metavar="extra.xsl",
-                  help="XDV extraurl XSLT file (depracated, use inline xsl in the rules instead)",
-                  dest="extra", default=None)
-    op.add_option("-o", "--output", metavar="output.html",
-                  help="Output filename (instead of stdout)",
-                  dest="output", default=sys.stdout)
-    op.add_option("-p", "--pretty-print", action="store_true",
-                  help="Pretty print output (can alter rendering on the browser)",
-                  dest="pretty_print", default=False)
-    op.add_option("--xinclude", action="store_true",
-                  help="Run XInclude on rules.xml (depracated, xinclude is always run)",
-                  dest="xinclude", default=True)
-    op.add_option("-n", "--network", action="store_true",
-                  help="Allow reads to the network to fetch resources",
-                  dest="read_network", default=False)
+    op = _createOptionParser(usage=usage)
+    op.add_option("-x", "--xsl", metavar="transform.xsl",
+                      help="XSL transform", 
+                      dest="xsl", default=None)
     (options, args) = op.parse_args()
 
-    if options.read_network:
-        access_control = AC_READ_NET
-    else:
-        access_control = AC_READ_FILE
-
-    if len(args) == 2:
-        transform_path, content = args
-        parser = etree.XMLParser()
-        output_xslt = etree.parse(transform_path, parser=parser)
-    elif len(args) == 1:
-        if options.theme and options.rules:
-            content, = args
-            parser = etree.HTMLParser()
-            output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, parser=parser, access_control=access_control)
+    if len(args) > 2:
+        op.error("Wrong number of arguments.")
+    elif len(args) == 2:
+        if options.xsl or options.rules:
+            op.error("Wrong number of arguments.")
+        path, content = args
+        if path.lower().endswith('.xsl'):
+            options.xsl = path
         else:
-            op.error("Theme and rules must be supplied.")
+            options.rules = path
+    elif len(args) == 1:
+        content, = args
     else:
         op.error("Wrong number of arguments.")
+    if options.rules is None and options.xsl is None:
+        op.error("Must supply either options or rules")
+
+    if options.trace:
+        logger.setLevel(logging.DEBUG)
+
+    if options.xsl is not None:
+        output_xslt = etree.parse(options.xsl)
+    else:
+        parser = etree.HTMLParser()
+        output_xslt = compile_theme(
+            rules=options.rules,
+            theme=options.theme,
+            extra=options.extra,
+            parser=parser,
+            read_network=options.read_network,
+            absolute_prefix=options.absolute_prefix,
+            includemode=options.includemode,
+            )
 
     if content == '-':
         content = sys.stdin
 
+    if options.read_network:
+        access_control = AC_READ_NET
+    else:
+        access_control = AC_READ_FILE
+
     parser.resolvers.add(RunResolver(os.path.dirname(content)))
     transform = etree.XSLT(output_xslt, access_control=access_control)
     content_doc = etree.parse(content, parser=etree.HTMLParser())
     output_html = transform(content_doc)
     output_html.write(options.output, encoding='UTF-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:
-        print msg
+        logger.warn(msg)
 
 if __name__ == '__main__':
     main()

Deleted: /z3/xdv/trunk/lib/xdv/tests/absolute_rules.xml
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/absolute_rules.xml	Fri Jul  9 17:28:12 2010
+++ (empty file)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://namespaces.plone.org/xdv">
-    
-</rules>

Deleted: /z3/xdv/trunk/lib/xdv/tests/absolute_theme.html
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/absolute_theme.html	Fri Jul  9 17:28:12 2010
+++ (empty file)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>Absolute prefix</title>
-        
-        <style type="text/css">
-            @import "foo.css";        
-            @import url("foo.css");
-            @import url('./foo.css');
-            @import url('../foo.css');
-            @import url('/foo.css');
-            @import url('http://site.com/foo.css');
-        </style>
-        
-        <link rel="stylesheet" href="foo.css" />
-        <link rel="stylesheet" href="./foo.css" />
-        <link rel="stylesheet" href="../foo.css" />
-        <link rel="stylesheet" href="/foo.css" />
-        <link rel="stylesheet" href="http://site.com/foo.css" />
-        
-        <script type="text/javascript" src="foo.js" />
-        <script type="text/javascript" src="./foo.js" />
-        <script type="text/javascript" src="../foo.js" />
-        <script type="text/javascript" src="/foo.js" />
-        <script type="text/javascript" src="http://site.com/foo.js" />
-        
-    </head>
-    <body>
-        <img src="foo.jpg" />
-        <img src="./foo.jpg" />
-        <img src="../foo.jpg" />
-        <img src="/foo.jpg" />
-        <img src="http://site.com/foo.jpg" />
-        
-        <input type="submit" src="foo.jpg" />
-        <input type="submit" src="./foo.jpg" />
-        <input type="submit" src="../foo.jpg" />
-        <input type="submit" src="/foo.jpg" />
-        <input type="submit" src="http://site.com/foo.jpg" />
-        
-        <a href="foo.html">Link</a>
-        
-    </body>
-</html>

Modified: z3/xdv/trunk/lib/xdv/tests/esi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/output.html	Fri Jul  9 17:28:12 2010
@@ -2,7 +2,7 @@
 <html xmlns:esi="http://www.edge-delivery.org/esi/1.0" xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-    <esi:include src="extra.html?;filter_xpath=//*[@id%20=%20'something']"></esi:include>
+    <esi:include src="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']"></esi:include>
     <esi:include src="fragment.html"></esi:include>
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/modify-theme/rules.xml	Fri Jul  9 17:28:12 2010
@@ -12,7 +12,7 @@
         </p>
     </xdv:before>
     
-    <xdv:append theme="/html/head">
+    <xdv:append css:theme="head">
         <style type="text/css">
             /* From the rules */
             body > h1 { color: red; }

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/output.html	Fri Jul  9 17:28:12 2010
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html?;filter_xpath=//*[@id%20=%20'something']" wait="yes" -->
+<!--# include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']" wait="yes" -->
 <!--# include  virtual="fragment.html" wait="yes" -->
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Fri Jul  9 17:28:12 2010
@@ -9,6 +9,8 @@
 import difflib
 from StringIO import StringIO
 import unittest
+import ConfigParser
+import pkg_resources
 
 import xdv.compiler
 import xdv.run
@@ -18,6 +20,8 @@
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 
+defaultsfn = pkg_resources.resource_filename('xdv.tests', 'default-options.cfg')
+
 class XDVTestCase(unittest.TestCase):
     
     writefiles = os.environ.get('XDVTESTS_WRITE_FILES', False)
@@ -27,7 +31,12 @@
     
     def testAll(self):
         self.errors = StringIO()
-        themefn = os.path.join(self.testdir, "theme.html")
+        config = ConfigParser.ConfigParser()
+        config.read([defaultsfn, os.path.join(self.testdir, "options.cfg")])
+        
+        themefn = None
+        if config.get('xdvtest', 'theme'):
+            themefn = os.path.join(self.testdir, config.get('xdvtest', 'theme'))
         contentfn = os.path.join(self.testdir, "content.html")
         rulesfn = os.path.join(self.testdir, "rules.xml")
         xpathsfn = os.path.join(self.testdir, "xpaths.txt")
@@ -39,7 +48,13 @@
 
         # Make a compiled version
         theme_parser = etree.HTMLParser()
-        ct = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, parser=theme_parser)
+        ct = xdv.compiler.compile_theme(
+            rules=rulesfn,
+            theme=themefn,
+            parser=theme_parser,
+            absolute_prefix=config.get('xdvtest', 'absolute-prefix'),
+            includemode=config.get('xdvtest', 'includemode'),
+            )
         
         # Serialize / parse the theme - this can catch problems with escaping.
         cts = etree.tostring(ct)
@@ -66,9 +81,10 @@
         theme_parser.resolvers.add(xdv.run.RunResolver(self.testdir))
         processor = etree.XSLT(ct)
         result = processor(contentdoc)
+
         # Read the whole thing to strip off xhtml namespace.
         # If we had xslt 2.0 then we could use xpath-default-namespace.
-        self.themed_string = etree.tostring(result, encoding="UTF-8", pretty_print=True)
+        self.themed_string = etree.tostring(result, encoding="UTF-8", pretty_print=config.getboolean('xdvtest', 'pretty-print'))
         self.themed_content = etree.ElementTree(file=StringIO(self.themed_string), 
                                                 parser=etree.HTMLParser())
 
@@ -95,126 +111,13 @@
             if old != new:
                 #if self.writefiles:
                 #    open(outputfn + '.old', 'w').write(old)
-                print "ERROR:", "output.html has CHANGED"
                 for line in difflib.unified_diff(old.split('\n'), new.split('\n'), outputfn, 'now'):
                     print  line
-                self.assertEquals(old, new)
+                assert old == new, "output.html has CHANGED"
 
         # Write out the result to catch unexpected changes
         if self.writefiles:
             open(outputfn, 'w').write(self.themed_string)
-    
-class TestAbsolutePrefix(unittest.TestCase):
-    
-    def testEnabled(self):
-        themefn = os.path.join(HERE, "absolute_theme.html")
-        rulesfn = os.path.join(HERE, "absolute_rules.xml")
-        
-        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn, absolute_prefix="/abs")
-        
-        styleTag = compiled.xpath('//style')[0]
-        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        expectedLines = [
-            '@import "/abs/foo.css";',
-            '@import url("/abs/foo.css");',
-            "@import url('/abs/foo.css');",
-            "@import url('/foo.css');",
-            "@import url('/foo.css');",
-            "@import url('http://site.com/foo.css');"
-            ]
-        for line, expected in zip(styleLines, expectedLines):
-            self.assertEquals(line, expected)
-        
-        linkTags = compiled.xpath('//link')
-        self.assertEquals([
-            '/abs/foo.css',
-            '/abs/foo.css',
-            '/foo.css',
-            '/foo.css',
-            'http://site.com/foo.css'
-        ], [x.get('href') for x in linkTags])
-        
-        scriptTags = compiled.xpath('//script')
-        self.assertEquals([
-            '/abs/foo.js',
-            '/abs/foo.js',
-            '/foo.js',
-            '/foo.js',
-            'http://site.com/foo.js'
-        ], [x.get('src') for x in scriptTags])
-        
-        imgTags = compiled.xpath('//img')
-        self.assertEquals([
-            '/abs/foo.jpg',
-            '/abs/foo.jpg',
-            '/foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in imgTags])
-        
-        inputTags = compiled.xpath('//input')
-        self.assertEquals([
-            '/abs/foo.jpg',
-            '/abs/foo.jpg',
-            '/foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in inputTags])
-    
-    def testDisabled(self):
-        themefn = os.path.join(HERE, "absolute_theme.html")
-        rulesfn = os.path.join(HERE, "absolute_rules.xml")
-        
-        compiled = xdv.compiler.compile_theme(rules=rulesfn, theme=themefn)
-        
-        styleTag = compiled.xpath('//style')[0]
-        styleLines = [x.strip() for x in styleTag.getchildren()[0].text.split('\n') if x.strip()]
-        expectedLines = [
-            '@import "foo.css";',
-            '@import url("foo.css");',
-            "@import url('./foo.css');",
-            "@import url('../foo.css');",
-            "@import url('/foo.css');",
-            "@import url('http://site.com/foo.css');"
-            ]
-        for line, expected in zip(styleLines, expectedLines):
-            self.assertEquals(line, expected)
-        
-        linkTags = compiled.xpath('//link')
-        self.assertEquals([
-            'foo.css',
-            './foo.css',
-            '../foo.css',
-            '/foo.css',
-            'http://site.com/foo.css'
-        ], [x.get('href') for x in linkTags])
-        
-        scriptTags = compiled.xpath('//script')
-        self.assertEquals([
-            'foo.js',
-            './foo.js',
-            '../foo.js',
-            '/foo.js',
-            'http://site.com/foo.js'
-        ], [x.get('src') for x in scriptTags])
-        
-        imgTags = compiled.xpath('//img')
-        self.assertEquals([
-            'foo.jpg',
-            './foo.jpg',
-            '../foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in imgTags])
-        
-        inputTags = compiled.xpath('//input')
-        self.assertEquals([
-            'foo.jpg',
-            './foo.jpg',
-            '../foo.jpg',
-            '/foo.jpg',
-            'http://site.com/foo.jpg'
-        ], [x.get('src') for x in inputTags])
 
 
 def test_suite():
@@ -227,5 +130,4 @@
             continue
         cls = type('Test-%s'%name, (XDVTestCase,), dict(testdir=path))
         suite.addTest(unittest.makeSuite(cls))
-    suite.addTest(unittest.makeSuite(TestAbsolutePrefix))
     return suite

Modified: z3/xdv/trunk/lib/xdv/utils.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/utils.py	(original)
+++ z3/xdv/trunk/lib/xdv/utils.py	Fri Jul  9 17:28:12 2010
@@ -1,9 +1,17 @@
+import logging
+import pkg_resources
+import sys
+
 from lxml import etree
+from optparse import OptionParser
+
+logger=logging.getLogger('xdv')
 
 namespaces = dict(
     xdv="http://namespaces.plone.org/xdv",
     css="http://namespaces.plone.org/xdv+css",
     old="http://openplans.org/deliverance",
+    xsl="http://www.w3.org/1999/XSL/Transform",
     )
 
 def localname(name):
@@ -14,3 +22,62 @@
 
 AC_READ_FILE = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=False, write_network=False)
 AC_READ_NET = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=True, write_network=False)
+
+class CustomResolver(etree.Resolver):
+    def __init__(self, data):
+        self.data = data
+        
+    def resolve(self, url, pubid, context):
+        output = self.data.get(url)
+        if output is not None:
+            return self.resolve_string(output, context)
+
+
+class LoggingXSLTWrapper:
+    def __init__(self, xslt, logger):
+        self.xslt = xslt
+        self.logger = logger
+    def __call__(self, *args, **kw):
+        result = self.xslt(*args, **kw)
+        for msg in self.xslt.error_log:
+            if msg.type == etree.ErrorTypes.ERR_OK:
+                self.logger.debug(msg.message)
+            else:
+                self.logger.debug(msg)
+        return result
+
+
+def pkg_xsl(name, parser=None):
+    return LoggingXSLTWrapper(etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser)), logger)
+
+
+def _createOptionParser(usage):
+    parser = OptionParser(usage=usage)
+    parser.add_option("-o", "--output", metavar="output.xsl",
+                      help="Output filename (instead of stdout)",
+                      dest="output", default=sys.stdout)
+    parser.add_option("-p", "--pretty-print", action="store_true",
+                      help="Pretty print output (may alter rendering in browser)",
+                      dest="pretty_print", default=False)
+    parser.add_option("--trace", action="store_true",
+                      help="Compiler trace logging",
+                      dest="trace", default=False)
+    parser.add_option("-a", "--absolute-prefix", metavar="/",
+                      help="relative urls in the theme file will be made into absolute links with this prefix.",
+                      dest="absolute_prefix", default=None)
+    parser.add_option("-i", "--includemode", metavar="INC",
+                      help="include mode (document, ssi or esi)",
+                      dest="includemode", default=None)
+    parser.add_option("-n", "--network", action="store_true",
+                      help="Allow reads to the network to fetch resources",
+                      dest="read_network", default=False)
+    parser.add_option("-t", "--theme", metavar="theme.html",
+                      help="Theme file",
+                      dest="theme", default=None)
+    parser.add_option("-r", "--rules", metavar="rules.xml",
+                      help="XDV rules file", 
+                      dest="rules", default=None)
+    parser.add_option("-e", "--extra", metavar="extra.xsl",
+                      help="Extra XSL to be included in the transform (depracated, use inline xsl in the rules instead)",
+                      dest="extra", default=None)
+    return parser

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Fri Jul  9 17:28:12 2010
@@ -26,5 +26,6 @@
         [console_scripts]
         xdvcompiler = xdv.compiler:main
         xdvrun = xdv.run:main
+        xdvpreprocessor = xdv.rules:main
         """,
     )

From ldr at codespeak.net  Fri Jul  9 18:07:48 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  9 Jul 2010 18:07:48 +0200 (CEST)
Subject: [z3-checkins] r76081 - z3/xdv/branches/multistage-compiler/lib/xdv
Message-ID: <20100709160748.91848282C09@codespeak.net>

Author: ldr
Date: Fri Jul  9 18:07:44 2010
New Revision: 76081

Modified:
   z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
Log:
read_network only prevents http, https and ftp reads. collective.xdv tests pass

Modified: z3/xdv/branches/multistage-compiler/lib/xdv/rules.py
==============================================================================
--- z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	(original)
+++ z3/xdv/branches/multistage-compiler/lib/xdv/rules.py	Fri Jul  9 18:07:44 2010
@@ -48,9 +48,8 @@
         parser = etree.HTMLParser()
     for element in rules_doc.xpath('xdv:theme[@href]', namespaces=namespaces):
         url = urljoin(base, element.get('href'))
-        if '://' in url:
-            if not theme.startswith('file://'):
-                raise ValueError("Supplied theme '%s', but network access denied." % url)
+        if url[:6] in ('ftp://', 'http:/', 'https:'):
+            raise ValueError("Supplied theme '%s', but network access denied." % url)
         theme_doc = etree.parse(url, parser=parser)
         prefix = urljoin(absolute_prefix, element.get('prefix', ''))
         apply_absolute_prefix(theme_doc, prefix)
@@ -81,9 +80,8 @@
     return rules_doc
 
 def add_theme(rules_doc, theme, parser=None, absolute_prefix=None, read_network=False):
-    if isinstance(theme, basestring) and '://' in theme:
-        if not theme.startswith('file://'):
-            raise ValueError("Supplied theme '%s', but network access denied." % theme)
+    if isinstance(theme, basestring) and theme[:6] in ('ftp://', 'http:/', 'https:'):
+        raise ValueError("Supplied theme '%s', but network access denied." % theme)
     if absolute_prefix is None:
         absolute_prefix = ''
     if parser is None:

From ldr at codespeak.net  Fri Jul  9 18:09:25 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  9 Jul 2010 18:09:25 +0200 (CEST)
Subject: [z3-checkins] r76082 - in z3/xdv/trunk: . lib/xdv
Message-ID: <20100709160925.C6463282C09@codespeak.net>

Author: ldr
Date: Fri Jul  9 18:09:24 2010
New Revision: 76082

Modified:
   z3/xdv/trunk/   (props changed)
   z3/xdv/trunk/lib/xdv/rules.py
Log:
merge the multistage-compiler branch back to trunk again

Modified: z3/xdv/trunk/lib/xdv/rules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/rules.py	(original)
+++ z3/xdv/trunk/lib/xdv/rules.py	Fri Jul  9 18:09:24 2010
@@ -48,9 +48,8 @@
         parser = etree.HTMLParser()
     for element in rules_doc.xpath('xdv:theme[@href]', namespaces=namespaces):
         url = urljoin(base, element.get('href'))
-        if '://' in url:
-            if not theme.startswith('file://'):
-                raise ValueError("Supplied theme '%s', but network access denied." % url)
+        if url[:6] in ('ftp://', 'http:/', 'https:'):
+            raise ValueError("Supplied theme '%s', but network access denied." % url)
         theme_doc = etree.parse(url, parser=parser)
         prefix = urljoin(absolute_prefix, element.get('prefix', ''))
         apply_absolute_prefix(theme_doc, prefix)
@@ -81,9 +80,8 @@
     return rules_doc
 
 def add_theme(rules_doc, theme, parser=None, absolute_prefix=None, read_network=False):
-    if isinstance(theme, basestring) and '://' in theme:
-        if not theme.startswith('file://'):
-            raise ValueError("Supplied theme '%s', but network access denied." % theme)
+    if isinstance(theme, basestring) and theme[:6] in ('ftp://', 'http:/', 'https:'):
+        raise ValueError("Supplied theme '%s', but network access denied." % theme)
     if absolute_prefix is None:
         absolute_prefix = ''
     if parser is None:

From ejucovy at codespeak.net  Fri Jul  9 23:26:16 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri,  9 Jul 2010 23:26:16 +0200 (CEST)
Subject: [z3-checkins] r76085 - z3/deliverance/tags/0.3.0
Message-ID: <20100709212616.5D837282C00@codespeak.net>

Author: ejucovy
Date: Fri Jul  9 23:26:13 2010
New Revision: 76085

Added:
   z3/deliverance/tags/0.3.0/
      - copied from r76084, z3/deliverance/trunk/
Log:
tag 0.3 release

From ejucovy at codespeak.net  Fri Jul  9 23:27:24 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri,  9 Jul 2010 23:27:24 +0200 (CEST)
Subject: [z3-checkins] r76086 - z3/deliverance/tags/0.3.0
Message-ID: <20100709212724.31E1D282C00@codespeak.net>

Author: ejucovy
Date: Fri Jul  9 23:27:22 2010
New Revision: 76086

Modified:
   z3/deliverance/tags/0.3.0/setup.py
Log:
er, update version

Modified: z3/deliverance/tags/0.3.0/setup.py
==============================================================================
--- z3/deliverance/tags/0.3.0/setup.py	(original)
+++ z3/deliverance/tags/0.3.0/setup.py	Fri Jul  9 23:27:22 2010
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3-dev'
+version = '0.3.0'
 
 setup(name='Deliverance',
       version=version,

From ejucovy at codespeak.net  Sat Jul 10 19:15:55 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 10 Jul 2010 19:15:55 +0200 (CEST)
Subject: [z3-checkins] r76094 - in z3/deliverance/trunk: .
	deliverance/docs/_build docs
Message-ID: <20100710171555.CC178282B9D@codespeak.net>

Author: ejucovy
Date: Sat Jul 10 19:15:54 2010
New Revision: 76094

Added:
   z3/deliverance/trunk/deliverance/docs/_build/   (props changed)
   z3/deliverance/trunk/setup.cfg
Removed:
   z3/deliverance/trunk/docs/
Log:
 * remove crufty /docs/ directory
 * add empty /deliverance/docs/_build for sphinx to build into
 * set svn:ignore all within /deliverance/docs/_build/ since that's where sphinx dumps its compiled output
 * add setup.cfg parameters for sphinx's setup.py build_sphinx and Sphinx-PyPI-upload's upload_sp[hinx



Added: z3/deliverance/trunk/setup.cfg
==============================================================================
--- (empty file)
+++ z3/deliverance/trunk/setup.cfg	Sat Jul 10 19:15:54 2010
@@ -0,0 +1,7 @@
+[build_sphinx]
+source-dir = deliverance/docs/
+build-dir  = deliverance/docs/_build
+all_files  = 1
+
+[upload_sphinx]
+upload-dir = deliverance/docs/_build/html

From ejucovy at codespeak.net  Sat Jul 10 19:17:17 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 10 Jul 2010 19:17:17 +0200 (CEST)
Subject: [z3-checkins] r76095 - in z3/deliverance/trunk: . deliverance/docs
Message-ID: <20100710171717.9FD17282B9D@codespeak.net>

Author: ejucovy
Date: Sat Jul 10 19:17:16 2010
New Revision: 76095

Modified:
   z3/deliverance/trunk/changes_on_trunk.txt
   z3/deliverance/trunk/deliverance/docs/news.txt
Log:
update changes

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Sat Jul 10 19:17:16 2010
@@ -1,3 +1 @@
 
-* Pass open file objects to lxml instead of filenames. Apparently lxml can segfault in some circumstances
-  if you pass a filename for it to open multiple times. (kiorky)

Modified: z3/deliverance/trunk/deliverance/docs/news.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/news.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/news.txt	Sat Jul 10 19:17:16 2010
@@ -1,6 +1,18 @@
 News
 ====
 
+0.3.0
+-----
+
+ * Pass open file objects to lxml instead of filenames. Apparently 
+   lxml can segfault in some circumstances if you pass a filename 
+   for it to open multiple times. (kiorky)
+
+ * Reorganized pyref documentation into a single document for easier
+   reference.
+
+ * Added a document on configuring Deliverance with Paste Deploy.
+
 0.3c4
 -----
 

From ejucovy at codespeak.net  Sat Jul 10 19:24:43 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 10 Jul 2010 19:24:43 +0200 (CEST)
Subject: [z3-checkins] r76098 - z3/deliverance/trunk
Message-ID: <20100710172443.9856C282B9D@codespeak.net>

Author: ejucovy
Date: Sat Jul 10 19:24:42 2010
New Revision: 76098

Removed:
   z3/deliverance/trunk/regen-docs
Log:
remove old script for updating docs, replaced by build_sphinx and upload_sphinx to pypi

Deleted: /z3/deliverance/trunk/regen-docs
==============================================================================
--- /z3/deliverance/trunk/regen-docs	Sat Jul 10 19:24:42 2010
+++ (empty file)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "publish" ] ; then
-    PUBLISH=1
-    OPS="-D live_site=1"
-    shift;
-fi
-
-mkdir -p docs/_static docs/_build
-sphinx-build $OPS "$@" -E -b html docs/ docs/_build || exit 1
-if [ "$PUBLISH" = "1" ] ; then
-  cd docs/_build
-  echo "Uploading files..."
-  tar czvf - . | ssh flow.openplans.org 'ssh acura.openplans.org "cd /www/deliverance.openplans.org/; tar xzvf -"'
-fi

From z3-checkins at codespeak.net  Sun Jul 11 15:45:40 2010
From: z3-checkins at codespeak.net (Drugs For ErectionBoosting)
Date: Sun, 11 Jul 2010 15:45:40 +0200 (CEST)
Subject: [z3-checkins] User z3-checkins,
	welcome to the best discount Sale. many can reappointed March in
Message-ID: <20100711134540.2E6092A2B3D@codespeak.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20100711/eb0efeca/attachment.htm 

From ldr at codespeak.net  Tue Jul 13 16:44:14 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 13 Jul 2010 16:44:14 +0200 (CEST)
Subject: [z3-checkins] r76186 - z3/xdv/trunk/lib/xdv
Message-ID: <20100713144414.91E85282B9E@codespeak.net>

Author: ldr
Date: Tue Jul 13 16:44:13 2010
New Revision: 76186

Modified:
   z3/xdv/trunk/lib/xdv/run.py
Log:
fix to xdvrun (thanks Lars\!)

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Tue Jul 13 16:44:13 2010
@@ -59,10 +59,12 @@
     if options.trace:
         logger.setLevel(logging.DEBUG)
 
+    parser = etree.HTMLParser()
+    parser.resolvers.add(RunResolver(os.path.dirname(content)))
+
     if options.xsl is not None:
         output_xslt = etree.parse(options.xsl)
     else:
-        parser = etree.HTMLParser()
         output_xslt = compile_theme(
             rules=options.rules,
             theme=options.theme,
@@ -81,9 +83,8 @@
     else:
         access_control = AC_READ_FILE
 
-    parser.resolvers.add(RunResolver(os.path.dirname(content)))
     transform = etree.XSLT(output_xslt, access_control=access_control)
-    content_doc = etree.parse(content, parser=etree.HTMLParser())
+    content_doc = etree.parse(content, parser=parser)
     output_html = transform(content_doc)
     output_html.write(options.output, encoding='UTF-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:

From ldr at codespeak.net  Wed Jul 14 16:34:18 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed, 14 Jul 2010 16:34:18 +0200 (CEST)
Subject: [z3-checkins] r76202 - z3/xdv/trunk
Message-ID: <20100714143418.76542282B90@codespeak.net>

Author: ldr
Date: Wed Jul 14 16:34:17 2010
New Revision: 76202

Modified:
   z3/xdv/trunk/lxml.cfg
Log:
update lxml.cfg to libxml2 2.7.7

Modified: z3/xdv/trunk/lxml.cfg
==============================================================================
--- z3/xdv/trunk/lxml.cfg	(original)
+++ z3/xdv/trunk/lxml.cfg	Wed Jul 14 16:34:17 2010
@@ -10,6 +10,5 @@
 [lxml]
 recipe = z3c.recipe.staticlxml
 egg = lxml
-libxml2-url = http://xmlsoft.org/sources/libxml2-2.7.6.tar.gz
+libxml2-url = http://xmlsoft.org/sources/libxml2-2.7.7.tar.gz
 libxslt-url = http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz
-

From ejucovy at codespeak.net  Wed Jul 21 19:06:00 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 21 Jul 2010 19:06:00 +0200 (CEST)
Subject: [z3-checkins] r76302 - in z3/deliverance/tags/0.3.0/deliverance: .
	docs
Message-ID: <20100721170600.74FF2282B90@codespeak.net>

Author: ejucovy
Date: Wed Jul 21 19:05:58 2010
New Revision: 76302

Modified:
   z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
   z3/deliverance/tags/0.3.0/deliverance/pagematch.py
Log:
Apply https://projects.openplans.org/deliverance/attachment/ticket/39/response_status_match.diff to allow matches against response status code - thanks esanchez

Modified: z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	Wed Jul 21 19:05:58 2010
@@ -693,12 +693,18 @@
     This matches the request host, the domain name of the request URL.
     The default pattern type is ``wildcard-insensitive:``. 
 
+``response-status``:
+    This matches the response status code (200, 404, 503...). The default
+    pattern type is ``exact:``.
+
 Each pattern string can start with ``patterntype:`` which defines what
 kind of pattern it is.  Here's a list of the available patterns (these
 also apply to the key/value matching described in the next section): 
 
 ``wildcard:``
-    This is a wildcard match, i.e., you can use ``*``.
+    This is a wildcard match, i.e., you can use ``*``. If matching 
+    ``response-status`` you can match all server errors with the
+    pattern ``wildcard:5*``
 
 ``wildcard-insensitive:``
     Wildcards that are case-insensitive.

Modified: z3/deliverance/tags/0.3.0/deliverance/pagematch.py
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/pagematch.py	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/pagematch.py	Wed Jul 21 19:05:58 2010
@@ -20,7 +20,7 @@
 
     def __init__(self, path=None, domain=None,
                  request_header=None, response_header=None, environ=None,
-                 pyref=None, source_location=None):
+                 pyref=None, source_location=None, response_status=None):
         ## FIXME: this should add response_status
         self.path = path
         self.domain = domain
@@ -29,6 +29,7 @@
         self.environ = environ
         self.pyref = pyref
         self.source_location = source_location
+        self.response_status = response_status
 
     
     @classmethod
@@ -42,6 +43,7 @@
                                          header=True)
         response_header = cls._parse_attr(el, 'response-header', default='exact', 
                                           header=True)
+        response_status = cls._parse_attr(el, 'response-status', default='exact')
         environ = cls._parse_attr(el, 'environ', default='exact', header=True)
         pyref = PyReference.parse_xml(
             el, source_location=source_location,
@@ -52,12 +54,13 @@
             domain=domain,
             request_header=request_header,
             response_header=response_header,
+            response_status=response_status,
             environ=environ,
             pyref=pyref,
             source_location=source_location)
 
     match_attrs = [
-        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref']
+        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref', 'response-status']
 
     @staticmethod
     def _parse_attr(el, attr, default=None, header=False):
@@ -82,6 +85,7 @@
             ('domain', self.domain),
             ('request-header', self.request_header),
             ('response-header', self.response_header),
+            ('response-status', self.response_status),
             ('environ', self.environ)]:
             if value:
                 parts.append(u'%s="%s"' % (attr, html_quote(unicode(value))))
@@ -156,6 +160,14 @@
                     'do not match response-header="%s"',
                     debug_name, ', '.join(header_debug), self.response_header)
                 return False
+        if self.response_status:
+            result = self.response_status(str(resp.status_int))
+            if not result:
+                log.debug(
+                    debug_context, 'Skipping %s because response status %s do not '
+                    'match request-header="%s"',
+                    debug_name, resp.status_int, self.response_status)
+                return False
         if self.environ:
             result, keys = self.environ(request.environ)
             if not result:

From ejucovy at codespeak.net  Wed Jul 21 19:06:58 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 21 Jul 2010 19:06:58 +0200 (CEST)
Subject: [z3-checkins] r76303 - in z3/deliverance/tags/0.3.0/deliverance: .
	docs
Message-ID: <20100721170658.994F2282B90@codespeak.net>

Author: ejucovy
Date: Wed Jul 21 19:06:57 2010
New Revision: 76303

Modified:
   z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
   z3/deliverance/tags/0.3.0/deliverance/stringmatch.py
Log:
Apply https://projects.openplans.org/deliverance/attachment/ticket/39/reverse_matcher.diff to allow reverse matches by applying a prefix not: against any matcher statement - thanks esanchez

Modified: z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	Wed Jul 21 19:06:57 2010
@@ -740,6 +740,11 @@
     pattern is fairly insignificant, except ``boolean:not`` inverts
     the match. 
 
+``not:``
+    This allows to reverse the result of any matcher. So
+    ``not:path:/some-path`` will match ``/some-path-to-somewhere``,
+    but it will not match ``/some-path/to/a/place``.
+
 Key/Value Matching
 ~~~~~~~~~~~~~~~~~~
 

Modified: z3/deliverance/tags/0.3.0/deliverance/stringmatch.py
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/stringmatch.py	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/stringmatch.py	Wed Jul 21 19:06:57 2010
@@ -185,6 +185,25 @@
 
 _add_matcher(ExactMatcher)
         
+class ReverseMatcher(Matcher):
+    """
+    Allows to reverse the result of any matcher
+    """
+
+    name = 'not'
+
+    def __init__(self, pattern):
+        self.pattern = pattern
+        self.matcher = compile_matcher(self.pattern, default='exact')
+
+    def __call__(self, s):
+        return not self.matcher(s)
+
+    def strip_prefix(self):
+        return self.pattern
+
+_add_matcher(ReverseMatcher)
+
 class ExactInsensitiveMatcher(Matcher):
     """
     Matches a string exactly, but ignoring case.

From ejucovy at codespeak.net  Wed Jul 21 19:09:37 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 21 Jul 2010 19:09:37 +0200 (CEST)
Subject: [z3-checkins] r76304 - z3/deliverance/tags/0.3.0
Message-ID: <20100721170937.C43CC282B90@codespeak.net>

Author: ejucovy
Date: Wed Jul 21 19:09:36 2010
New Revision: 76304

Modified:
   z3/deliverance/tags/0.3.0/changes_on_trunk.txt
Log:
Update changes

Modified: z3/deliverance/tags/0.3.0/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/changes_on_trunk.txt	(original)
+++ z3/deliverance/tags/0.3.0/changes_on_trunk.txt	Wed Jul 21 19:09:36 2010
@@ -1,3 +1,6 @@
 
-* Pass open file objects to lxml instead of filenames. Apparently lxml can segfault in some circumstances
-  if you pass a filename for it to open multiple times. (kiorky)
+ * Added a response-status matcher, for matching against the status code of the response.
+   Use like <match response-status="404" class="notfounds" /> (esanchez)
+
+ * Added a ReverseMatcher, which allows you to prefix a match statement with not: to reverse
+   the result.  Use like <match path="not:/bad-path" /> (esanchez)

From ejucovy at codespeak.net  Wed Jul 21 19:13:32 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 21 Jul 2010 19:13:32 +0200 (CEST)
Subject: [z3-checkins] r76305 - z3/deliverance/tags/0.3.0/deliverance/docs
Message-ID: <20100721171332.E094B282B90@codespeak.net>

Author: ejucovy
Date: Wed Jul 21 19:13:31 2010
New Revision: 76305

Modified:
   z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
Log:
add minimum-version notices since the online published docs are not versioned

Modified: z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	Wed Jul 21 19:13:31 2010
@@ -694,8 +694,8 @@
     The default pattern type is ``wildcard-insensitive:``. 
 
 ``response-status``:
-    This matches the response status code (200, 404, 503...). The default
-    pattern type is ``exact:``.
+    (New in 0.4) This matches the response status code (200, 404, 503...). 
+    The default pattern type is ``exact:``.
 
 Each pattern string can start with ``patterntype:`` which defines what
 kind of pattern it is.  Here's a list of the available patterns (these
@@ -741,10 +741,11 @@
     the match. 
 
 ``not:``
-    This allows to reverse the result of any matcher. So
+    (New in 0.4) This reverses the result of any matcher. So
     ``not:path:/some-path`` will match ``/some-path-to-somewhere``,
     but it will not match ``/some-path/to/a/place``.
 
+
 Key/Value Matching
 ~~~~~~~~~~~~~~~~~~
 

From ejucovy at codespeak.net  Thu Jul 22 18:10:32 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 22 Jul 2010 18:10:32 +0200 (CEST)
Subject: [z3-checkins] r76315 - in z3/deliverance/tags/0.3.0: . deliverance
	deliverance/docs
Message-ID: <20100722161032.9C2C5282B9D@codespeak.net>

Author: ejucovy
Date: Thu Jul 22 18:10:30 2010
New Revision: 76315

Modified:
   z3/deliverance/tags/0.3.0/changes_on_trunk.txt
   z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
   z3/deliverance/tags/0.3.0/deliverance/pagematch.py
   z3/deliverance/tags/0.3.0/deliverance/stringmatch.py
Log:
urgh, my working copy was screwed up and committing to /tags/0.3.0/ while claiming it had /trunk/ checked out.  unmerging patches that should be applied to trunk instead.

Modified: z3/deliverance/tags/0.3.0/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/changes_on_trunk.txt	(original)
+++ z3/deliverance/tags/0.3.0/changes_on_trunk.txt	Thu Jul 22 18:10:30 2010
@@ -1,6 +1,3 @@
 
- * Added a response-status matcher, for matching against the status code of the response.
-   Use like <match response-status="404" class="notfounds" /> (esanchez)
-
- * Added a ReverseMatcher, which allows you to prefix a match statement with not: to reverse
-   the result.  Use like <match path="not:/bad-path" /> (esanchez)
+* Pass open file objects to lxml instead of filenames. Apparently lxml can segfault in some circumstances
+  if you pass a filename for it to open multiple times. (kiorky)

Modified: z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/docs/configuration.txt	Thu Jul 22 18:10:30 2010
@@ -693,18 +693,12 @@
     This matches the request host, the domain name of the request URL.
     The default pattern type is ``wildcard-insensitive:``. 
 
-``response-status``:
-    (New in 0.4) This matches the response status code (200, 404, 503...). 
-    The default pattern type is ``exact:``.
-
 Each pattern string can start with ``patterntype:`` which defines what
 kind of pattern it is.  Here's a list of the available patterns (these
 also apply to the key/value matching described in the next section): 
 
 ``wildcard:``
-    This is a wildcard match, i.e., you can use ``*``. If matching 
-    ``response-status`` you can match all server errors with the
-    pattern ``wildcard:5*``
+    This is a wildcard match, i.e., you can use ``*``.
 
 ``wildcard-insensitive:``
     Wildcards that are case-insensitive.
@@ -740,12 +734,6 @@
     pattern is fairly insignificant, except ``boolean:not`` inverts
     the match. 
 
-``not:``
-    (New in 0.4) This reverses the result of any matcher. So
-    ``not:path:/some-path`` will match ``/some-path-to-somewhere``,
-    but it will not match ``/some-path/to/a/place``.
-
-
 Key/Value Matching
 ~~~~~~~~~~~~~~~~~~
 

Modified: z3/deliverance/tags/0.3.0/deliverance/pagematch.py
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/pagematch.py	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/pagematch.py	Thu Jul 22 18:10:30 2010
@@ -20,7 +20,7 @@
 
     def __init__(self, path=None, domain=None,
                  request_header=None, response_header=None, environ=None,
-                 pyref=None, source_location=None, response_status=None):
+                 pyref=None, source_location=None):
         ## FIXME: this should add response_status
         self.path = path
         self.domain = domain
@@ -29,7 +29,6 @@
         self.environ = environ
         self.pyref = pyref
         self.source_location = source_location
-        self.response_status = response_status
 
     
     @classmethod
@@ -43,7 +42,6 @@
                                          header=True)
         response_header = cls._parse_attr(el, 'response-header', default='exact', 
                                           header=True)
-        response_status = cls._parse_attr(el, 'response-status', default='exact')
         environ = cls._parse_attr(el, 'environ', default='exact', header=True)
         pyref = PyReference.parse_xml(
             el, source_location=source_location,
@@ -54,13 +52,12 @@
             domain=domain,
             request_header=request_header,
             response_header=response_header,
-            response_status=response_status,
             environ=environ,
             pyref=pyref,
             source_location=source_location)
 
     match_attrs = [
-        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref', 'response-status']
+        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref']
 
     @staticmethod
     def _parse_attr(el, attr, default=None, header=False):
@@ -85,7 +82,6 @@
             ('domain', self.domain),
             ('request-header', self.request_header),
             ('response-header', self.response_header),
-            ('response-status', self.response_status),
             ('environ', self.environ)]:
             if value:
                 parts.append(u'%s="%s"' % (attr, html_quote(unicode(value))))
@@ -160,14 +156,6 @@
                     'do not match response-header="%s"',
                     debug_name, ', '.join(header_debug), self.response_header)
                 return False
-        if self.response_status:
-            result = self.response_status(str(resp.status_int))
-            if not result:
-                log.debug(
-                    debug_context, 'Skipping %s because response status %s do not '
-                    'match request-header="%s"',
-                    debug_name, resp.status_int, self.response_status)
-                return False
         if self.environ:
             result, keys = self.environ(request.environ)
             if not result:

Modified: z3/deliverance/tags/0.3.0/deliverance/stringmatch.py
==============================================================================
--- z3/deliverance/tags/0.3.0/deliverance/stringmatch.py	(original)
+++ z3/deliverance/tags/0.3.0/deliverance/stringmatch.py	Thu Jul 22 18:10:30 2010
@@ -185,25 +185,6 @@
 
 _add_matcher(ExactMatcher)
         
-class ReverseMatcher(Matcher):
-    """
-    Allows to reverse the result of any matcher
-    """
-
-    name = 'not'
-
-    def __init__(self, pattern):
-        self.pattern = pattern
-        self.matcher = compile_matcher(self.pattern, default='exact')
-
-    def __call__(self, s):
-        return not self.matcher(s)
-
-    def strip_prefix(self):
-        return self.pattern
-
-_add_matcher(ReverseMatcher)
-
 class ExactInsensitiveMatcher(Matcher):
     """
     Matches a string exactly, but ignoring case.

From ejucovy at codespeak.net  Thu Jul 22 18:12:01 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 22 Jul 2010 18:12:01 +0200 (CEST)
Subject: [z3-checkins] r76316 - in z3/deliverance/trunk: . deliverance
	deliverance/docs
Message-ID: <20100722161201.4630B282B9D@codespeak.net>

Author: ejucovy
Date: Thu Jul 22 18:11:59 2010
New Revision: 76316

Modified:
   z3/deliverance/trunk/   (props changed)
   z3/deliverance/trunk/changes_on_trunk.txt
   z3/deliverance/trunk/deliverance/docs/configuration.txt
   z3/deliverance/trunk/deliverance/pagematch.py
   z3/deliverance/trunk/deliverance/stringmatch.py
Log:
reapply esanchez's patches to the right branch

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Thu Jul 22 18:11:59 2010
@@ -1 +1,7 @@
 
+ * Added a response-status matcher, for matching against the status code of the response.
+   Use like <match response-status="404" class="notfounds" /> (esanchez)
+
+ * Added a ReverseMatcher, which allows you to prefix a match statement with not: to reverse
+   the result.  Use like <match path="not:/bad-path" /> (esanchez)
+

Modified: z3/deliverance/trunk/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/configuration.txt	Thu Jul 22 18:11:59 2010
@@ -693,12 +693,18 @@
     This matches the request host, the domain name of the request URL.
     The default pattern type is ``wildcard-insensitive:``. 
 
+``response-status``:
+    (New in 0.4) This matches the response status code (200, 404, 503...). 
+    The default pattern type is ``exact:``.
+
 Each pattern string can start with ``patterntype:`` which defines what
 kind of pattern it is.  Here's a list of the available patterns (these
 also apply to the key/value matching described in the next section): 
 
 ``wildcard:``
-    This is a wildcard match, i.e., you can use ``*``.
+    This is a wildcard match, i.e., you can use ``*``. If matching 
+    ``response-status`` you can match all server errors with the
+    pattern ``wildcard:5*``
 
 ``wildcard-insensitive:``
     Wildcards that are case-insensitive.
@@ -734,6 +740,12 @@
     pattern is fairly insignificant, except ``boolean:not`` inverts
     the match. 
 
+``not:``
+    (New in 0.4) This reverses the result of any matcher. So
+    ``not:path:/some-path`` will match ``/some-path-to-somewhere``,
+    but it will not match ``/some-path/to/a/place``.
+
+
 Key/Value Matching
 ~~~~~~~~~~~~~~~~~~
 

Modified: z3/deliverance/trunk/deliverance/pagematch.py
==============================================================================
--- z3/deliverance/trunk/deliverance/pagematch.py	(original)
+++ z3/deliverance/trunk/deliverance/pagematch.py	Thu Jul 22 18:11:59 2010
@@ -20,7 +20,7 @@
 
     def __init__(self, path=None, domain=None,
                  request_header=None, response_header=None, environ=None,
-                 pyref=None, source_location=None):
+                 pyref=None, source_location=None, response_status=None):
         ## FIXME: this should add response_status
         self.path = path
         self.domain = domain
@@ -29,6 +29,7 @@
         self.environ = environ
         self.pyref = pyref
         self.source_location = source_location
+        self.response_status = response_status
 
     
     @classmethod
@@ -42,6 +43,7 @@
                                          header=True)
         response_header = cls._parse_attr(el, 'response-header', default='exact', 
                                           header=True)
+        response_status = cls._parse_attr(el, 'response-status', default='exact')
         environ = cls._parse_attr(el, 'environ', default='exact', header=True)
         pyref = PyReference.parse_xml(
             el, source_location=source_location,
@@ -52,12 +54,13 @@
             domain=domain,
             request_header=request_header,
             response_header=response_header,
+            response_status=response_status,
             environ=environ,
             pyref=pyref,
             source_location=source_location)
 
     match_attrs = [
-        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref']
+        'path', 'domain', 'request-header', 'response-header', 'environ', 'pyref', 'response-status']
 
     @staticmethod
     def _parse_attr(el, attr, default=None, header=False):
@@ -82,6 +85,7 @@
             ('domain', self.domain),
             ('request-header', self.request_header),
             ('response-header', self.response_header),
+            ('response-status', self.response_status),
             ('environ', self.environ)]:
             if value:
                 parts.append(u'%s="%s"' % (attr, html_quote(unicode(value))))
@@ -156,6 +160,14 @@
                     'do not match response-header="%s"',
                     debug_name, ', '.join(header_debug), self.response_header)
                 return False
+        if self.response_status:
+            result = self.response_status(str(resp.status_int))
+            if not result:
+                log.debug(
+                    debug_context, 'Skipping %s because response status %s do not '
+                    'match request-header="%s"',
+                    debug_name, resp.status_int, self.response_status)
+                return False
         if self.environ:
             result, keys = self.environ(request.environ)
             if not result:

Modified: z3/deliverance/trunk/deliverance/stringmatch.py
==============================================================================
--- z3/deliverance/trunk/deliverance/stringmatch.py	(original)
+++ z3/deliverance/trunk/deliverance/stringmatch.py	Thu Jul 22 18:11:59 2010
@@ -185,6 +185,25 @@
 
 _add_matcher(ExactMatcher)
         
+class ReverseMatcher(Matcher):
+    """
+    Allows to reverse the result of any matcher
+    """
+
+    name = 'not'
+
+    def __init__(self, pattern):
+        self.pattern = pattern
+        self.matcher = compile_matcher(self.pattern, default='exact')
+
+    def __call__(self, s):
+        return not self.matcher(s)
+
+    def strip_prefix(self):
+        return self.pattern
+
+_add_matcher(ReverseMatcher)
+
 class ExactInsensitiveMatcher(Matcher):
     """
     Matches a string exactly, but ignoring case.

From ldr at codespeak.net  Fri Jul 23 16:45:57 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri, 23 Jul 2010 16:45:57 +0200 (CEST)
Subject: [z3-checkins] r76331 - in z3/xdv/trunk/lib/xdv: .
	tests/drop-theme-comment
Message-ID: <20100723144557.95FB5282B9E@codespeak.net>

Author: ldr
Date: Fri Jul 23 16:45:56 2010
New Revision: 76331

Added:
   z3/xdv/trunk/lib/xdv/fixup-themes.xsl
      - copied, changed from r76327, z3/xdv/trunk/lib/xdv/annotate-themes.xsl
   z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/
   z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/content.html
   z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/output.html
   z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/rules.xml
   z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/annotate-themes.xsl
   z3/xdv/trunk/lib/xdv/rules.py
Log:
Allow comments to be selected in the theme

Modified: z3/xdv/trunk/lib/xdv/annotate-themes.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/annotate-themes.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/annotate-themes.xsl	Fri Jul 23 16:45:56 2010
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
-    xmlns:esi="http://www.edge-delivery.org/esi/1.0"
-    xmlns:str="http://exslt.org/strings"
     xmlns:xdv="http://namespaces.plone.org/xdv"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     >
 
     <!--
-        Annotate the themes html
+        Annotate the theme's html
     -->
 
     <xsl:template match="xdv:theme">
@@ -35,39 +33,4 @@
         </xsl:copy>
     </xsl:template>
 
-    <xsl:template match="html/@xmlns" priority="5">
-        <!-- setting the namespace to xhtml mucks up the included namespaces, so cheat -->
-        <xsl:if test="//xdv:*/@method='esi'">
-            <!-- when we have another namespace defined, libxml2/xmlsave.c will not magically add the xhtml ns for us -->
-            <xsl:element name="xsl:attribute">
-                <xsl:attribute name="name">xmlns</xsl:attribute>
-                <xsl:value-of select="."/>
-            </xsl:element>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="html/@*[name() = 'xml:lang']" priority="5">
-        <!-- Filter it out, rely on lang attribute -->
-    </xsl:template>
-
-    <xsl:template match="pre/text()">
-        <!-- Filter out quoted &#13; -->
-        <xsl:value-of select="str:replace(., '&#13;&#10;', '&#10;')"/>
-    </xsl:template>
-
-    <xsl:template match="style/text()|script/text()">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">tag_text</xsl:attribute>
-            <xsl:value-of select="."/>
-        </xsl:element>
-        <xsl:element name="xsl:value-of">
-            <xsl:attribute name="select">$tag_text</xsl:attribute>
-            <xsl:attribute name="disable-output-escaping">yes</xsl:attribute>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template match="//xdv:theme//comment() | //xdv:*[@theme]//comment()">
-        <xsl:element name="xsl:comment"><xsl:value-of select="."/></xsl:element>
-    </xsl:template>
-
 </xsl:stylesheet>

Copied: z3/xdv/trunk/lib/xdv/fixup-themes.xsl (from r76327, z3/xdv/trunk/lib/xdv/annotate-themes.xsl)
==============================================================================
--- z3/xdv/trunk/lib/xdv/annotate-themes.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/fixup-themes.xsl	Fri Jul 23 16:45:56 2010
@@ -8,27 +8,9 @@
     >
 
     <!--
-        Annotate the themes html
+        Fixup the theme's html
     -->
 
-    <xsl:template match="xdv:theme">
-        <xsl:copy>
-            <xsl:attribute name="xml:id">
-                <xsl:value-of select="generate-id()"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>   
-
-    <xsl:template match="//xdv:theme//*">
-        <xsl:copy>
-            <xsl:attribute name="xml:id">
-                <xsl:value-of select="generate-id()"/>-<xsl:value-of select="ancestor::xdv:theme/@href"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
     <xsl:template match="node()|@*">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>

Modified: z3/xdv/trunk/lib/xdv/rules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/rules.py	(original)
+++ z3/xdv/trunk/lib/xdv/rules.py	Fri Jul 23 16:45:56 2010
@@ -28,6 +28,8 @@
 annotate_themes  = pkg_xsl('annotate-themes.xsl')
 annotate_rules   = pkg_xsl('annotate-rules.xsl')
 apply_rules      = pkg_xsl('apply-rules.xsl')
+fixup_themes     = pkg_xsl('fixup-themes.xsl')
+
 
 def update_namespace(rules_doc):
     """Convert old namespace to new namespace in place
@@ -95,6 +97,15 @@
     root.append(element)
     return rules_doc
 
+def fixup_theme_comment_selectors(rules):
+    """Comments must be converted to <xsl:comment> to be output, doing it early
+    allows them to get an xml:id so they can be matched in the theme. The theme
+    selector needs rewriting to replace comment() with xsl:comment
+    """
+    for element in rules.xpath("//@theme[contains(., 'comment()')]/.."):
+        element.attrib['theme'] = element.attrib['theme'].replace('comment()', 'xsl:comment')
+    return rules
+
 def process_rules(rules, theme=None, extra=None, trace=None, css=True, xinclude=True, absolute_prefix=None,
                   includemode=None, update=True, parser=None, rules_parser=None, read_network=False, stop=None):
     if trace:
@@ -116,25 +127,28 @@
     if css:
         rules_doc = convert_css_selectors(rules_doc)
     if stop == 3: return rules_doc
+    rules_doc = fixup_theme_comment_selectors(rules_doc)
+    if stop == 4: return rules_doc
     rules_doc = expand_themes(rules_doc, parser, absolute_prefix, read_network)
     if theme is not None:
         rules_doc = add_theme(rules_doc, theme, parser, absolute_prefix, read_network)
-    if stop == 4: return rules_doc
+    if stop == 5: return rules_doc
     if includemode is None:
         includemode = 'document'
     includemode = "'%s'" % includemode
     rules_doc = normalize_rules(rules_doc, includemode=includemode)
-    if stop == 5: return rules_doc
-    rules_doc = apply_conditions(rules_doc)
     if stop == 6: return rules_doc
-    rules_doc = merge_conditions(rules_doc)
+    rules_doc = apply_conditions(rules_doc)
     if stop == 7: return rules_doc
-    rules_doc = annotate_themes(rules_doc)
+    rules_doc = merge_conditions(rules_doc)
     if stop == 8: return rules_doc
-    rules_doc = annotate_rules(rules_doc)
+    rules_doc = fixup_themes(rules_doc)
     if stop == 9: return rules_doc
+    rules_doc = annotate_themes(rules_doc)
+    if stop == 10: return rules_doc
+    rules_doc = annotate_rules(rules_doc)
+    if stop == 11: return rules_doc
     rules_doc = apply_rules(rules_doc, trace=trace)
-    assert stop < 10, "There are only 10 steps"
     return rules_doc
 
 

Added: z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/content.html	Fri Jul 23 16:45:56 2010
@@ -0,0 +1 @@
+Ignored content

Added: z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/output.html	Fri Jul 23 16:45:56 2010
@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/rules.xml	Fri Jul 23 16:45:56 2010
@@ -0,0 +1,3 @@
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <drop theme="/html/head/comment()" />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/drop-theme-comment/theme.html	Fri Jul 23 16:45:56 2010
@@ -0,0 +1,7 @@
+<html>
+    <head>
+        <!--[if lte IE 6]>
+            <script type="text/javascript" src="ie-only.js"></script>
+        <![endif]-->
+    </head>
+</html>

From z3-checkins at codespeak.net  Mon Jul 26 03:40:11 2010
From: z3-checkins at codespeak.net (z3-checkins at codespeak.net)
Date: Mon, 26 Jul 2010 03:40:11 +0200 (CEST)
Subject: z3-checkins@codespeak.net VIAGRA ® Official Site -16%
Message-ID: <20100726014011.A904B5080B@codespeak.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20100726/99812010/attachment-0001.htm 

From z3-checkins at codespeak.net  Wed Jul 28 19:37:48 2010
From: z3-checkins at codespeak.net (928 VIAGRA ® Official Site)
Date: Wed, 28 Jul 2010 19:37:48 +0200 (CEST)
Subject: z3-checkins@codespeak.net VIAGRA ® Official Site 96% 0FF
Message-ID: <20100728173748.BADFD282B9C@codespeak.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20100728/3495afbc/attachment.htm 

From ldr at codespeak.net  Thu Jul 29 21:52:32 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 29 Jul 2010 21:52:32 +0200 (CEST)
Subject: [z3-checkins] r76394 - in z3/xdv/trunk/lib/xdv: . tests/ssi
	tests/ssiwait
Message-ID: <20100729195232.D8477282BAD@codespeak.net>

Author: ldr
Date: Thu Jul 29 21:52:31 2010
New Revision: 76394

Added:
   z3/xdv/trunk/lib/xdv/tests/ssiwait/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/ssi/
Modified:
   z3/xdv/trunk/lib/xdv/annotate-rules.xsl
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/lib/xdv/tests/ssiwait/output.html
   z3/xdv/trunk/lib/xdv/tests/ssiwait/rules.xml
   z3/xdv/trunk/lib/xdv/utils.py
Log:
separate ssi and ssiwait modes; ssi include statements should be compatible with apache; older nginx may now need ssiwait, but it seems to work without now.

Modified: z3/xdv/trunk/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/annotate-rules.xsl	Thu Jul 29 21:52:31 2010
@@ -101,16 +101,16 @@
         </xsl:element>
     </xsl:template>
     
-    <xsl:template match="*[@method = 'ssi']" mode="include">
+    <xsl:template match="*[@method = 'ssi' or @method = 'ssiwait']" mode="include">
         <!-- Assumptions:
             * When using ssiprefix, @href should be an absolute local path (i.e.  /foo/bar)
         -->
         <xsl:variable name="content_quoted" select="str:encode-uri(@content, false())"/>
-        <xsl:element name="xsl:comment"># include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
+        <xsl:element name="xsl:comment">#include  virtual="<xsl:value-of select="$ssiprefix"/><xsl:choose>
             <xsl:when test="not(@content)"><xsl:value-of select="@href"/></xsl:when>
             <xsl:when test="contains(@href, '?')"><xsl:value-of select="concat(str:replace(@href, '?', concat($ssisuffix, '?')), $ssiquerysuffix, $content_quoted)"/></xsl:when>
             <xsl:otherwise><xsl:value-of select="concat(@href, $ssisuffix, '?', $ssiquerysuffix, $content_quoted)"/></xsl:otherwise>
-            </xsl:choose>" wait="yes" </xsl:element>
+            </xsl:choose>"<xsl:if test="@method = 'ssiwait'"> wait="yes"</xsl:if></xsl:element>
     </xsl:template>
     
     <xsl:template match="*[@method = 'esi']" mode="include">

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/output.html	Thu Jul 29 21:52:31 2010
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']" wait="yes" -->
-<!--# include  virtual="fragment.html" wait="yes" -->
+<!--#include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']"-->
+<!--#include  virtual="fragment.html"-->
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/ssiwait/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssiwait/output.html	Thu Jul 29 21:52:31 2010
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>theme</h1>
-<!--# include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']" wait="yes" -->
-<!--# include  virtual="fragment.html" wait="yes" -->
+<!--#include  virtual="extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'something']" wait="yes"-->
+<!--#include  virtual="fragment.html" wait="yes"-->
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/ssiwait/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssiwait/rules.xml	Thu Jul 29 21:52:31 2010
@@ -3,7 +3,7 @@
     xmlns:css="http://namespaces.plone.org/xdv+css"
     >
 
-    <replace css:theme="#include" css:content="#something" href="extra.html" method="ssi"/>
-    <replace css:theme="#include-fragment" href="fragment.html" method="ssi"/>
+    <replace css:theme="#include" css:content="#something" href="extra.html" method="ssiwait"/>
+    <replace css:theme="#include-fragment" href="fragment.html" method="ssiwait"/>
 
 </rules>

Modified: z3/xdv/trunk/lib/xdv/utils.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/utils.py	(original)
+++ z3/xdv/trunk/lib/xdv/utils.py	Thu Jul 29 21:52:31 2010
@@ -66,7 +66,7 @@
                       help="relative urls in the theme file will be made into absolute links with this prefix.",
                       dest="absolute_prefix", default=None)
     parser.add_option("-i", "--includemode", metavar="INC",
-                      help="include mode (document, ssi or esi)",
+                      help="include mode (document, ssi, ssiwait or esi)",
                       dest="includemode", default=None)
     parser.add_option("-n", "--network", action="store_true",
                       help="Allow reads to the network to fetch resources",

From ldr at codespeak.net  Thu Jul 29 21:53:23 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 29 Jul 2010 21:53:23 +0200 (CEST)
Subject: [z3-checkins] r76395 - z3/xdv/trunk
Message-ID: <20100729195323.12E8E282BAD@codespeak.net>

Author: ldr
Date: Thu Jul 29 21:53:21 2010
New Revision: 76395

Modified:
   z3/xdv/trunk/nginx.cfg
Log:
update nginx, this version modifies parameter parsing so that ':' is a acceptable in the value

Modified: z3/xdv/trunk/nginx.cfg
==============================================================================
--- z3/xdv/trunk/nginx.cfg	(original)
+++ z3/xdv/trunk/nginx.cfg	Thu Jul 29 21:53:21 2010
@@ -9,9 +9,8 @@
 
 [nginx]
 recipe = zc.recipe.cmmi
-url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-2.tar.gz
+url = http://html-xslt.googlecode.com/files/nginx-0.7.67-html-xslt-4.tar.gz
 # The SSI bug was fixed in nginx-0.7.65-html-xslt-2.tar.gz
-md5sum = f863bdfdbeb01c11677d856c78716b35
 extra_options =
     --conf-path=${buildout:directory}/etc/nginx.conf
     --sbin-path=${buildout:directory}/bin

From ldr at codespeak.net  Fri Jul 30 17:40:22 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri, 30 Jul 2010 17:40:22 +0200 (CEST)
Subject: [z3-checkins] r76404 - in z3/xdv/trunk/lib/xdv: . tests/013
Message-ID: <20100730154022.6885D282C0E@codespeak.net>

Author: ldr
Date: Fri Jul 30 17:40:20 2010
New Revision: 76404

Modified:
   z3/xdv/trunk/lib/xdv/annotate-rules.xsl
   z3/xdv/trunk/lib/xdv/tests/013/rules.xml
Log:
make document includes work when content xpath does not start with /

Modified: z3/xdv/trunk/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/annotate-rules.xsl	Fri Jul 30 17:40:20 2010
@@ -97,7 +97,7 @@
     
     <xsl:template match="*[@method = 'document']" mode="include">
         <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', $base)<xsl:value-of select="@content"/></xsl:attribute>
+            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', $base)/<xsl:value-of select="@content"/></xsl:attribute>
         </xsl:element>
     </xsl:template>
     

Modified: z3/xdv/trunk/lib/xdv/tests/013/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/013/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/013/rules.xml	Fri Jul 30 17:40:20 2010
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://namespaces.plone.org/xdv">
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
     <before theme="//*[@id='marker1']" content="//*[@id='external1']" href="extra.html"/>
     <replace theme="//*[@id='marker1']" content="//*[@id='external2']" href="extra.html"/>
     <after theme="//*[@id='marker1']" content="//*[@id='external3']" href="extra.html"/>
     <prepend theme="//*[@id='marker2']" content="//*[@id='external4']" href="extra.html"/>
     <copy theme="//*[@id='marker2']" content="//*[@id='external5']" href="extra.html"/>
-    <append theme="//*[@id='marker2']" content="//*[@id='external6']" href="extra.html"/>
+    <append theme="//*[@id='marker2']" css:content="#external6" href="extra.html"/>
     <!-- From the content -->
     <after theme="//*[@id='marker2']" content="/html/body/*"/>
 </rules>

From ldr at codespeak.net  Tue Aug  3 18:34:26 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 18:34:26 +0200 (CEST)
Subject: [z3-checkins] r76448 - z3/xdv/trunk/lib/xdv/tests/entities
Message-ID: <20100803163426.70086282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 18:34:24 2010
New Revision: 76448

Added:
   z3/xdv/trunk/lib/xdv/tests/entities/
   z3/xdv/trunk/lib/xdv/tests/entities/content.html
   z3/xdv/trunk/lib/xdv/tests/entities/output.html
   z3/xdv/trunk/lib/xdv/tests/entities/rules.xml
   z3/xdv/trunk/lib/xdv/tests/entities/theme.html
Log:
Test demonstrating how to declare entities referenced in the rules file.

Added: z3/xdv/trunk/lib/xdv/tests/entities/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/entities/content.html	Tue Aug  3 18:34:24 2010
@@ -0,0 +1,5 @@
+<html>
+    <body>
+        <p>The content is parsed as HTML so entities like &nbsp; and &mdash; are understood.</p>
+    </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/entities/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/entities/output.html	Tue Aug  3 18:34:24 2010
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <p>The theme is parsed as HTML so entities like ? and ? are understood.</p>
+    <p>The content is parsed as HTML so entities like ? and ? are understood.</p>
+    <p>The rules are parsed as XML, this means that:</p>
+    <ul>
+      <li>The predefined XML entities are always available: ", &amp;, ', &lt;, &gt;.</li>
+      <li>Other entities must be explicitly declared in the doctype, as they are here for ? and ?.</li>
+    </ul>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/entities/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/entities/rules.xml	Tue Aug  3 18:34:24 2010
@@ -0,0 +1,18 @@
+<!DOCTYPE rules [
+    <!ENTITY mdash "&#8212;">
+    <!ENTITY nbsp "&#160;">
+]>
+<rules xmlns="http://namespaces.plone.org/xdv"
+       xmlns:css="http://namespaces.plone.org/xdv+css">
+
+    <append css:theme="body" css:content="body > *"/>
+
+    <append css:theme="body">
+        <p>The rules are parsed as XML, this means that:</p>
+        <ul>
+            <li>The predefined XML entities are always available: &quot;, &amp;, &apos;, &lt;, &gt;.</li>
+            <li>Other entities must be explicitly declared in the doctype, as they are here for &nbsp; and &mdash;.</li>
+        </ul>
+    </append>
+
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/entities/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/entities/theme.html	Tue Aug  3 18:34:24 2010
@@ -0,0 +1,5 @@
+<html>
+    <body>
+        <p>The theme is parsed as HTML so entities like &nbsp; and &mdash; are understood.</p>
+    </body>
+</html>

From ldr at codespeak.net  Tue Aug  3 18:39:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 18:39:58 +0200 (CEST)
Subject: [z3-checkins] r76449 - z3/xdv/trunk/lib/xdv/tests/entities
Message-ID: <20100803163958.186AF282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 18:39:56 2010
New Revision: 76449

Modified:
   z3/xdv/trunk/lib/xdv/tests/entities/output.html
   z3/xdv/trunk/lib/xdv/tests/entities/rules.xml
Log:
link to more on character entity references

Modified: z3/xdv/trunk/lib/xdv/tests/entities/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/entities/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/entities/output.html	Tue Aug  3 18:39:56 2010
@@ -7,6 +7,9 @@
     <ul>
       <li>The predefined XML entities are always available: ", &amp;, ', &lt;, &gt;.</li>
       <li>Other entities must be explicitly declared in the doctype, as they are here for ? and ?.</li>
+      <li>
+        <a href="http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references">More on character entity references</a>
+      </li>
     </ul>
   </body>
 </html>

Modified: z3/xdv/trunk/lib/xdv/tests/entities/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/entities/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/entities/rules.xml	Tue Aug  3 18:39:56 2010
@@ -12,6 +12,7 @@
         <ul>
             <li>The predefined XML entities are always available: &quot;, &amp;, &apos;, &lt;, &gt;.</li>
             <li>Other entities must be explicitly declared in the doctype, as they are here for &nbsp; and &mdash;.</li>
+            <li><a href="http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references">More on character entity references</a></li>
         </ul>
     </append>
 

From ldr at codespeak.net  Tue Aug  3 19:04:51 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 19:04:51 +0200 (CEST)
Subject: [z3-checkins] r76453 - in z3/xdv/trunk/lib/xdv/tests: 001 002 003
	004 005 006 007 008 009 010 011 012 013 014 append comments
	conditional-rules-1 conditional-rules-2 copy
	css-xpath-child-selectors document-includes drop-content/005
	empty-xmlns prepend prepend-append replace replace-after
	style-script-quoting
Message-ID: <20100803170451.9DE8B282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 19:04:49 2010
New Revision: 76453

Added:
   z3/xdv/trunk/lib/xdv/tests/append/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/003/
   z3/xdv/trunk/lib/xdv/tests/comments/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/007/
   z3/xdv/trunk/lib/xdv/tests/conditional-rules-1/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/010/
   z3/xdv/trunk/lib/xdv/tests/conditional-rules-2/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/011/
   z3/xdv/trunk/lib/xdv/tests/copy/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/002/
   z3/xdv/trunk/lib/xdv/tests/css-xpath-child-selectors/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/014/
   z3/xdv/trunk/lib/xdv/tests/document-includes/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/013/
   z3/xdv/trunk/lib/xdv/tests/document-includes/rules.xml
      - copied unchanged from r76404, z3/xdv/trunk/lib/xdv/tests/013/rules.xml
   z3/xdv/trunk/lib/xdv/tests/drop-content/005/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/005/
   z3/xdv/trunk/lib/xdv/tests/empty-xmlns/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/008/
   z3/xdv/trunk/lib/xdv/tests/prepend/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/004/
   z3/xdv/trunk/lib/xdv/tests/prepend-append/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/006/
   z3/xdv/trunk/lib/xdv/tests/replace/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/001/
   z3/xdv/trunk/lib/xdv/tests/replace-after/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/012/
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting/
      - copied from r76391, z3/xdv/trunk/lib/xdv/tests/009/
Removed:
   z3/xdv/trunk/lib/xdv/tests/001/
   z3/xdv/trunk/lib/xdv/tests/002/
   z3/xdv/trunk/lib/xdv/tests/003/
   z3/xdv/trunk/lib/xdv/tests/004/
   z3/xdv/trunk/lib/xdv/tests/005/
   z3/xdv/trunk/lib/xdv/tests/006/
   z3/xdv/trunk/lib/xdv/tests/007/
   z3/xdv/trunk/lib/xdv/tests/008/
   z3/xdv/trunk/lib/xdv/tests/009/
   z3/xdv/trunk/lib/xdv/tests/010/
   z3/xdv/trunk/lib/xdv/tests/011/
   z3/xdv/trunk/lib/xdv/tests/012/
   z3/xdv/trunk/lib/xdv/tests/013/content.html
   z3/xdv/trunk/lib/xdv/tests/013/extra.html
   z3/xdv/trunk/lib/xdv/tests/013/output.html
   z3/xdv/trunk/lib/xdv/tests/013/rules.xml
   z3/xdv/trunk/lib/xdv/tests/013/theme.html
   z3/xdv/trunk/lib/xdv/tests/013/xpaths.txt
   z3/xdv/trunk/lib/xdv/tests/014/
   z3/xdv/trunk/lib/xdv/tests/empty-xmlns/xpaths.txt
Log:
rename old numbered tests

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/content.html
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/content.html	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>Replace and after</title>
-    </head>
-    <body>
-        <h2>Smaller Title</h2>
-        <p> content </p>
-        <div id="footer">Footer</div>
-    </body>
-</html>

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/extra.html
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/extra.html	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,22 +0,0 @@
-<html>
-    <body>
-        <div id="external1">
-            ONE
-        </div>
-        <div id="external2">
-            TWO
-        </div>
-        <div id="external3">
-            THREE
-        </div>
-        <div id="external4">
-            FOUR
-        </div>
-        <div id="external5">
-            FIVE
-        </div>
-        <div id="external6">
-            SIX
-        </div>
-    </body>
-</html>
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/output.html
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/output.html	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>External includes</title>
-  </head>
-  <body>
-    <div id="external1">
-            ONE
-        </div>
-    <div id="external2">
-            TWO
-        </div>
-    <div id="external3">
-            THREE
-        </div>
-    <div id="marker2">
-      <div id="external4">
-            FOUR
-        </div>
-      <div id="external5">
-            FIVE
-        </div>
-      <div id="external6">
-            SIX
-        </div>
-    </div>
-    <h2>Smaller Title</h2>
-    <p> content </p>
-    <div id="footer">Footer</div>
-  </body>
-</html>

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/rules.xml
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/rules.xml	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rules xmlns="http://namespaces.plone.org/xdv"
-       xmlns:css="http://namespaces.plone.org/xdv+css">
-    <before theme="//*[@id='marker1']" content="//*[@id='external1']" href="extra.html"/>
-    <replace theme="//*[@id='marker1']" content="//*[@id='external2']" href="extra.html"/>
-    <after theme="//*[@id='marker1']" content="//*[@id='external3']" href="extra.html"/>
-    <prepend theme="//*[@id='marker2']" content="//*[@id='external4']" href="extra.html"/>
-    <copy theme="//*[@id='marker2']" content="//*[@id='external5']" href="extra.html"/>
-    <append theme="//*[@id='marker2']" css:content="#external6" href="extra.html"/>
-    <!-- From the content -->
-    <after theme="//*[@id='marker2']" content="/html/body/*"/>
-</rules>

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/theme.html
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/theme.html	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-    <head>
-        <title>External includes</title>
-    </head>
-    <body>
-        <div id="marker1">Marker</div>
-        <div id="marker2">Marker</div>
-    </body>
-</html>

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/xpaths.txt
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/xpaths.txt	Tue Aug  3 19:04:49 2010
+++ (empty file)
@@ -1,13 +0,0 @@
-# 
-# External includes. Using @href to specify what to include
-# content is empty. This time there are no portlets.
-#
-/html/body/div[@id='external1']
-/html/body/div[@id='external2']
-/html/body/div[@id='external3']
-/html/body/div[@id='marker2']/div[@id='external4']
-/html/body/div[@id='marker2']/div[@id='external5']
-/html/body/div[@id='marker2']/div[@id='external6']
-
-# from the content
-/html/body/h2

Deleted: /z3/xdv/trunk/lib/xdv/tests/008/xpaths.txt
==============================================================================

From ldr at codespeak.net  Tue Aug  3 19:06:26 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 19:06:26 +0200 (CEST)
Subject: [z3-checkins] r76454 - z3/xdv/trunk/lib/xdv/tests/013
Message-ID: <20100803170626.D5687282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 19:06:25 2010
New Revision: 76454

Removed:
   z3/xdv/trunk/lib/xdv/tests/013/
Log:
sigh

From ldr at codespeak.net  Tue Aug  3 19:16:24 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 19:16:24 +0200 (CEST)
Subject: [z3-checkins] r76455 - in z3/xdv/trunk/lib/xdv/tests: drop-content
	drop-replace
Message-ID: <20100803171624.8A0F8282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 19:16:23 2010
New Revision: 76455

Added:
   z3/xdv/trunk/lib/xdv/tests/drop-replace/
      - copied from r76454, z3/xdv/trunk/lib/xdv/tests/drop-content/
Removed:
   z3/xdv/trunk/lib/xdv/tests/drop-content/
Log:
sigh 1

From ldr at codespeak.net  Tue Aug  3 19:16:45 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 19:16:45 +0200 (CEST)
Subject: [z3-checkins] r76456 - in z3/xdv/trunk/lib/xdv/tests: drop-content
	drop-replace/005
Message-ID: <20100803171645.39138282BDE@codespeak.net>

Author: ldr
Date: Tue Aug  3 19:16:43 2010
New Revision: 76456

Added:
   z3/xdv/trunk/lib/xdv/tests/drop-content/
      - copied from r76455, z3/xdv/trunk/lib/xdv/tests/drop-replace/005/
Removed:
   z3/xdv/trunk/lib/xdv/tests/drop-replace/005/
Log:
sigh 2

From ldr at codespeak.net  Tue Aug  3 19:33:57 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  3 Aug 2010 19:33:57 +0200 (CEST)
Subject: [z3-checkins] r76459 - z3/xdv/trunk/lib/xdv
Message-ID: <20100803173357.037E3282BF1@codespeak.net>

Author: ldr
Date: Tue Aug  3 19:33:56 2010
New Revision: 76459

Modified:
   z3/xdv/trunk/lib/xdv/annotate-rules.xsl
Log:
remove the extra '/' when not needed from external document includes

Modified: z3/xdv/trunk/lib/xdv/annotate-rules.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/annotate-rules.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/annotate-rules.xsl	Tue Aug  3 19:33:56 2010
@@ -97,7 +97,7 @@
     
     <xsl:template match="*[@method = 'document']" mode="include">
         <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', $base)/<xsl:value-of select="@content"/></xsl:attribute>
+            <xsl:attribute name="select">document('<xsl:value-of select="@href"/>', $base)<xsl:if test="not(starts-with(@content, '/'))">/</xsl:if><xsl:value-of select="@content"/></xsl:attribute>
         </xsl:element>
     </xsl:template>
     

From ldr at codespeak.net  Thu Aug  5 12:50:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  5 Aug 2010 12:50:58 +0200 (CEST)
Subject: [z3-checkins] r76482 - z3/xdv/trunk/lib/xdv
Message-ID: <20100805105058.95FC2282BFB@codespeak.net>

Author: ldr
Date: Thu Aug  5 12:50:56 2010
New Revision: 76482

Modified:
   z3/xdv/trunk/lib/xdv/run.py
Log:
Run resolver url resolution

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Thu Aug  5 12:50:56 2010
@@ -27,6 +27,9 @@
     def resolve(self, url, id, context):
         # libxml2 does not do this correctly on it's own with the HTMLParser
         # but it does work in Apache
+        if '://' in url or url.startswith('/'):
+            # It seems we must explicitly resolve the url here
+            return self.resolve_filename(url, context)
         url = os.path.join(self.directory, url)
         return self.resolve_filename(url, context)
 

From ldr at codespeak.net  Fri Aug  6 17:58:15 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  6 Aug 2010 17:58:15 +0200 (CEST)
Subject: [z3-checkins] r76513 - in z3/xdv/trunk: . docs
Message-ID: <20100806155815.1D480282BEB@codespeak.net>

Author: ldr
Date: Fri Aug  6 17:58:13 2010
New Revision: 76513

Added:
   z3/xdv/trunk/docs/CHANGES.txt
Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/docs/HISTORY.txt
   z3/xdv/trunk/docs/TODO.txt
   z3/xdv/trunk/setup.py
Log:
update docs, prepare for 0.4b1 release

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Fri Aug  6 17:58:13 2010
@@ -86,7 +86,7 @@
 libxml2 and libxslt development packages in order for it to build. On
 Debian/Ubuntu you can run::
 
-    $ sudo apt-get install libxslt1-dev
+    $ sudo apt-get install build-essential python2.6-dev libxslt1-dev
 
 On some operating systems, notably Mac OS X, installing a "good" ``lxml`` egg
 can be problematic, due to a mismatch in the operating system versions of the
@@ -102,7 +102,7 @@
     [lxml]
     recipe = z3c.recipe.staticlxml
     egg = lxml
-    libxml2-url = http://xmlsoft.org/sources/libxml2-2.7.6.tar.gz
+    libxml2-url = http://xmlsoft.org/sources/libxml2-2.7.7.tar.gz
     libxslt-url = http://xmlsoft.org/sources/libxslt-1.1.26.tar.gz
     
     [xdv]
@@ -118,7 +118,6 @@
 The rules file, conventionally called ``rules.xml``, is rooted in a tag
 called ``<rules />``::
 
-    <?xml version="1.0" encoding="UTF-8"?>
     <rules xmlns="http://namespaces.plone.org/xdv"
            xmlns:css="http://namespaces.plone.org/xdv+css">
            
@@ -138,6 +137,16 @@
 
 The following elements are allowed inside the ``<rules />`` element:
 
+``<theme />``
+-------------
+
+Used to specify the theme file. For example::
+
+    <theme href="theme.html"/>
+
+Relative paths are resolved relative to the rules.xml file. For http/https
+urls, the ``--network`` switch must be supplied to xdvcompiler/xdvrun.
+
 ``<replace />``
 ---------------
 
@@ -325,6 +334,55 @@
 taking the contents of the ``<title />`` tag in the head of the content
 document.
 
+Condition grouping and nesting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A condition may be applied to multiple rules by placing it on a ``<rules>``
+tag::
+
+    <rules xmlns="http://namespaces.plone.org/xdv"
+           xmlns:css="http://namespaces.plone.org/xdv+css">
+        
+        <rules css:if-content="#personal-bar">
+            <append css:theme="#header-box" css:content="#user-prefs"/>
+            <append css:theme="#header-box" css:content="#logout"/>
+        </rules>
+        
+        ...
+        
+    </rules>
+
+Conditions may also be nested, so::
+
+    <rules if-content="condition1">
+        <rules if-content="condition2">
+            <copy if-content="condition3" css:theme="#a" css:content="#b"/>
+        </rules>
+    </rules>
+
+Is equivalent to::
+
+    <copy if-content="(condition1) and (condition2) and (condition3)" css:theme="#a" css:content="#b"/>
+
+Multiple themes
+~~~~~~~~~~~~~~~
+
+It's possible to specify multiple themes using conditions. For instance::
+
+    <theme href="theme.html"/>
+    <theme href="news.html" css:if-content="body.section-news"/>
+    <theme href="members.html" css:if-content="body.section-members"/>
+
+The unconditional theme is used as a fallback when no other theme's condition is satisfied.
+
+All rules are applied to all themes. To have a rule apply to only a single
+theme, use the condition grouping syntax::
+
+    <rules css:if-content="body.section-news">
+        <theme href="news.html"/>
+        <copy css:content="h2.articleheading" css:theme="h1"/>
+    </rules>
+
 Including external content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -355,17 +413,17 @@
     <append css:theme="#left-column" css:content="#portlet"
             href="/extra.html" method="ssi"/>
 
-  The output will look something like this::
+  The output will render like this::
   
-    <!--# include wait="yes" virtual="/extra.html?;filter_xpath=//*[@id%20=%20'portlet']" -->
+    <!--#include virtual="/extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'portlet']"-->
   
   This SSI instruction would need to be processed by a fronting web server
-  such as Apache or nginx. Also note the ``;filter_xpath`` query string
+  such as Apache or Nginx. Also note the ``;filter_xpath`` query string
   parameter. Since we are deferring resolution of the referenced document
   until SSI processing takes place (i.e. after the compiled XDV XSLT transform
   has executed), we need to ask the SSI processor to filter out elements in
   the included file that we are not interested in. This requires specific
-  configuration. An example for nginx is included below.
+  configuration. An example for Nginx is included below.
   
   For simple SSI includes of a whole document, you may omit the ``content``
   selector from the rule::
@@ -374,7 +432,11 @@
   
   The output then renders like this::
   
-    <!--# include wait="yes" virtual="/extra.html" -->
+    <!--#include virtual="/extra.html"-->
+
+  Some versions of Nginx have required the ``wait="yes"`` ssi option to be
+  stable. This can be specified by setting the ``method`` attribute to
+  ``ssiwait``.
 
 * Via an Edge Side Includes directive. This can be specified by setting the
   ``method`` attribute to ``esi``::
@@ -384,7 +446,7 @@
 
   The output is similar to that for the SSI mode::
 
-    <esi:include src="/extra.html?;filter_xpath=//*[@id%20=%20'portlet']"></esi:include>
+    <esi:include src="/extra.html?;filter_xpath=descendant-or-self::*[@id%20=%20'portlet']"></esi:include>
   
   Again, the directive would need to be processed by a fronting server, such
   as Varnish. Chances are an ESI-aware cache server would not support
@@ -416,24 +478,21 @@
 
 For example::
 
-    <xdv:rules
-        xmlns:xdv="http://namespaces.plone.org/xdv"
+    <rules
+        xmlns="http://namespaces.plone.org/xdv"
         xmlns:css="http://namespaces.plone.org/xdv+css"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         >
 
-        <xdv:append theme="/html/head">
+        <append theme="/html/head">
             <style type="text/css">
                 /* From the rules */
                 body > h1 { color: red; }
             </style>
-        </xdv:append>
+        </append>
 
     </xdv:rules>
 
-Notice how we have placed the rules in an explicit ``xdv`` namespace, so that
-we can write the "inline" HTML without a namespace prefix.
-
 In the example above, the ``<append />`` rule will copy the ``<style />``
 attribute and its contents into the ``<head />`` of the theme. Similar rules
 can be constructed for ``<copy />``, ``<replace />``, ``<prepend />``, 
@@ -443,20 +502,14 @@
 this manner. Having declared the ``xsl`` namespace as shown above, we can do
 something like this::
 
-    <xdv:replace css:theme="#details">
+    <replace css:theme="#details">
         <dl id="details">
             <xsl:for-each css:select="table#details > tr">
                 <dt><xsl:copy-of select="td[1]/text()"/></dt>
                 <dd><xsl:copy-of select="td[2]/node()"/></dd>
             </xsl:for-each>
         </dl>
-    </xdv:replace>
-
-Note that css expressions are converted to "placeless" XPath expressions,
-so ``css:select="table#details > tr"`` converts to
-``select="//table[@id='details]/tr"``. This means it would not be possible to
-use ``css:select="td:first-child > *"`` as you want a relative selector here.
-You can, of course, just use a manual XPath in a ``select`` attribute instead.
+    </replace>
 
 Inline XSL directives
 ~~~~~~~~~~~~~~~~~~~~~
@@ -472,12 +525,25 @@
 
 Note: this may effect the rendering of the page on the browser.
 
-To use a strict doctype::
+Doctypes
+~~~~~~~~
+
+By default, XDV transforms output pages with the XHTML 1.0 Transitional
+doctype. To use a strict doctype include this inline XSL::
 
     <xsl:output
         doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
         doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
 
+It's important to note that only the XHTML 1.0 Strict and XHTML 1.0
+Transitional doctypes trigger the special XHTML compatibility mode of
+libxml2's XML serializer. This ensures ``<br/>`` is rendered as ``<br />`` and
+``<div/>`` as ``<div></div>``, which is necessary for browsers to correctly
+parse the document as HTML.
+
+The HTML5 specification lists XHTML 1.0 Strict as as `obsolete permitted
+doctype string`_, so this doctype is recommended when HTML5 output is desired.
+
 XInclude
 ~~~~~~~~
 
@@ -503,8 +569,8 @@
 
 Once you have written your rules file, you need to compile it to an XSLT for
 deployment. In some cases, you may have an application server that does this
-on the fly, e.g. if you are using the ``collective.xdv`` package with Plone.
-For deployment to a web server like Apache or nginx, however, you will need
+on the fly, e.g. if you are using the collective.xdv_ package with Plone.
+For deployment to a web server like Apache or Nginx, however, you will need
 to perform this step manually.
 
 The easiest way to invoke the XDV compiler is via the ``xdvcompiler`` command
@@ -513,17 +579,18 @@
 
     $ bin/xdvcompiler --help
 
-To run the compiler with ``rules.xml`` operating on ``theme.html``::
+To run the compiler with ``rules.xml``::
 
-    $ bin/xdvcompiler rules.xml theme.html
+    $ bin/xdvcompiler rules.xml
 
 This will print the compiled XSLT file to the standard output. You can save
 it to a file instead using::
 
-    $ bin/xdvcompiler -o theme.xsl rules.xml theme.html
+    $ bin/xdvcompiler -o theme.xsl -r rules.xml
 
 The following command line options are available:
 
+* Use ``-t theme.html`` to supply a theme if none is specified in the rules.
 * Use ``-p`` to pretty-print the output for improved readability. There is a
   risk that this could alter rendering in the browser, though, as browsers
   are sensitive to some kinds of whitespace.
@@ -562,17 +629,17 @@
 To test the compiled theme, you can apply it to a static file representing
 the content. The easiest way to do this is via the ``xdvrun`` script::
 
-    $ bin/xdvrun theme.xsl content.html
+    $ bin/xdvrun --xsl theme.xsl content.html
 
 This will print the output to the standard output. You can save it to a file
 instead with::
 
-    $ bin/xdvrun -o output.html theme.xsl content.html
+    $ bin/xdvrun -o output.html --xsl theme.xsl content.html
 
-For testing, you can also compile and run the theme in one go, by using the
-``-r`` (rules) and ``-t`` (theme) arguments to ``xdvrun``::
+For testing, you can also compile and run the theme in one go, by supplying the
+``-r`` (rules) argument to ``xdvrun``::
 
-    $ bin/xdvrun -o output.html -r rules.xml -t theme.html content.html
+    $ bin/xdvrun -o output.html -r rules.xml content.html
 
 To see the built-in help for this command, run::
     
@@ -591,7 +658,7 @@
 * ``rules`` is the rules file, given either as a file name or a string with
   the file contents.
 * ``theme`` is the theme file, given either as a file name or a string with
-  the file contents
+  the file contents (deprecated, use inline <theme> instead.)
 * ``extra`` is an optional XSLT file with XDV extensions, given as a URI
   (depracated, use inline xsl in the rules instead)
 * ``css``   can be set to False to disable CSS syntax support (providing a
@@ -660,76 +727,74 @@
 -----
 
 If you are working with Plone, the easiest way to use XDV is via the
-`collective.xdv <http://pypi.python.org/pypi/collective.xdv>`_ add-on. This
-provides a control panel for configuring the XDV rules file, theme and
-other options, and hooks into a transformation chain that executes after
-Plone has rendered the final page to apply the XDV transform.
+collective.xdv_ add-on. This provides a control panel for configuring the XDV
+rules file, theme and other options, and hooks into a transformation chain
+that executes after Plone has rendered the final page to apply the XDV
+transform.
 
 Even if you intend to deploy the compiled theme to another web server,
-``collective.xdv`` is a useful development tool: so long as Zope is in
-"development mode", it will re-compile the theme on the fly, allowing you
-to make changes to theme and rules on the fly. It also provides some tools
-for packaging up your theme and deploying it to different sites.
+collective.xdv_ is a useful development tool: so long as Zope is in
+"development mode", it will re-compile the theme on the fly, allowing you to
+make changes to theme and rules on the fly. It also provides some tools for
+packaging up your theme and deploying it to different sites.
 
 WSGI
 ----
 
-If you are using a WSGI stack, you can use the `dv.xdvserver
-<http://pypi.python.org/pypi/dv.xdvserver>`_ middleware to apply an XDV
-theme. This supports all the core XDV options, and can be configured to
-either re-compile the theme on the fly (useful for development), or compile
-it only once (useful for deployment.)
+If you are using a WSGI stack, you can use the dv.xdvserver_ middleware to
+apply an XDV theme. This supports all the core XDV options, and can be
+configured to either re-compile the theme on the fly (useful for development),
+or compile it only once (useful for deployment.)
 
 It is also possible to use this with the Paste ``proxy`` middleware to
-create a standalone XDV proxy for any site. See the `dv.xdvserver`_
+create a standalone XDV proxy for any site. See the dv.xdvserver_
 documentation for details.
 
-nginx
+Nginx
 -----
 
-To deploy an XDV theme to the `nginx <http://nginx.org>`_ web server, you
-will need to compile nginx with a special version of the XSLT module that
+To deploy an XDV theme to the Nginx_ web server, you
+will need to compile Nginx with a special version of the XSLT module that
 can (optionally) use the HTML parser from libxml2.
 
 In the future, the necessary patches to enable HTML mode parsing will
-hopefully be part of the standard nginx distribution. In the meantime,
-they are maintained in the `html-xslt <http://code.google.com/p/html-xslt/>`_
-project.
+hopefully be part of the standard Nginx distribution. In the meantime, they
+are maintained in the html-xslt_ project.
 
-Using a properly patched nginx, you can configure it with XSLT support like
+Using a properly patched Nginx, you can configure it with XSLT support like
 so::
 
     $ ./configure --with-http_xslt_module
 
-If you are using zc.buildout and would like to build nginx, you can start
+If you are using zc.buildout and would like to build Nginx, you can start
 with the following example::
 
     [buildout]
     parts =
         ...
-        nginx
+        Nginx
     
     ...
         
-    [nginx]
+    [Nginx]
     recipe = zc.recipe.cmmi
-    url = http://html-xslt.googlecode.com/files/nginx-0.7.65-html-xslt-2.tar.gz
+    url = http://html-xslt.googlecode.com/files/Nginx-0.7.67-html-xslt-4.tar.gz
     extra_options =
-        --conf-path=${buildout:directory}/etc/nginx.conf
+        --conf-path=${buildout:directory}/etc/Nginx.conf
         --sbin-path=${buildout:directory}/bin
-        --error-log-path=${buildout:directory}/var/log/nginx-error.log
-        --http-log-path=${buildout:directory}/var/log/nginx-access.log
-        --pid-path=${buildout:directory}/var/nginx.pid
-        --lock-path=${buildout:directory}/var/nginx.lock
+        --error-log-path=${buildout:directory}/var/log/Nginx-error.log
+        --http-log-path=${buildout:directory}/var/log/Nginx-access.log
+        --pid-path=${buildout:directory}/var/Nginx.pid
+        --lock-path=${buildout:directory}/var/Nginx.lock
         --with-http_stub_status_module
         --with-http_xslt_module
 
 If libxml2 or libxslt are installed in a non-standard location you may need to
 supply the ``--with-libxml2=<path>`` and ``--with-libxslt=<path>`` options.
 This requires that you set an appropriate ``LD_LIBRARY_PATH`` (Linux / BSD) or
-``DYLD_LIBRARY_PATH`` (Mac OS X) environment variable when running nginx.
+``DYLD_LIBRARY_PATH`` (Mac OS X) environment variable when running Nginx.
 
-For theming a static site, enable the XSLT transform in the nginx
+For theming a static site, enable the XSLT transform in the Nginx
 configuration as follows::
 
     location / {
@@ -738,7 +803,7 @@
         xslt_types text/html;
     }
 
-nginx may also be configured as a transforming proxy server::
+Nginx may also be configured as a transforming proxy server::
 
     location / {
         xslt_stylesheet /path/to/compiled-theme.xsl;
@@ -754,8 +819,8 @@
 
 Removing the Accept-Encoding header is sometimes necessary to prevent the
 backend server compressing the response (and preventing transformation). The
-response may be compressed in nginx by setting ``gzip on;`` - see the `gzip
-module documentation <http://wiki.nginx.org/NginxHttpGzipModule>`_ for
+response may be compressed in Nginx by setting ``gzip on;`` - see the `gzip
+module documentation <http://wiki.Nginx.org/NginxHttpGzipModule>`_ for
 details.
 
 In this example an X-XDV header was set so the backend server may choose to
@@ -765,7 +830,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As an event based server, it is not practical to add ``document()`` support to
-the nginx XSLT module for in-transform inclusion. Instead, external content is
+the Nginx XSLT module for in-transform inclusion. Instead, external content is
 included through SSI in a sub-request. The SSI sub-request includes a query
 string parameter to indicate which parts of the resultant document to include,
 called ``;filter_xpath`` - see above for a full example. The configuration
@@ -829,9 +894,9 @@
 
 In this example the sub-request is set to loop back on itself, so the include
 is taken from a themed page. ``filter.xsl`` (in the lib/xdv directory) and
-``theme.xsl`` should both be placed in the same directory as ``nginx.conf``.
+``theme.xsl`` should both be placed in the same directory as ``Nginx.conf``.
 
-An example buildout is available in ``nginx.cfg`` in this package.
+An example buildout is available in ``Nginx.cfg`` in this package.
 
 Varnish
 -------
@@ -849,17 +914,18 @@
 Apache
 ------
 
-XDV currently requires a version of mod_transform with html parsing support
-and a disabled mod_depends. The latest patched versions may be downloaded from
-the `html-xslt project page <http://code.google.com/p/html-xslt/>`_.
+XDV currently requires a version of mod_transform with html parsing support.
+The latest patched versions may be downloaded from the html-xslt_ project
+page.
+
+As well as the libxml2 and libxslt development packages, you will require the
+appropriate Apache development pacakge::
 
-As well as the libxml2 and libxslt development packages, you will require
-libapreq2 and the Apache development pacakges::
+    $ sudo apt-get install libxslt1-dev apache2-threaded-dev
 
-    $ sudo apt-get install libxslt1-dev libapache2-mod-apreq2 libapreq2-dev \
-    > apache2-threaded-dev
+(or ``apache2-prefork-dev`` when using PHP.)
 
-Install mod_depends then mod_transform using the standard procedure::
+Install mod_transform using the standard procedure::
 
     $ ./configure
     $ make
@@ -868,14 +934,13 @@
 An example virtual host configuration is shown below::
 
     NameVirtualHost *
-    LoadModule depends_module /usr/lib/apache2/modules/mod_depends.so
     LoadModule transform_module /usr/lib/apache2/modules/mod_transform.so
     <VirtualHost *>
 
         FilterDeclare THEME
         FilterProvider THEME XSLT resp=Content-Type $text/html
 
-        TransformOptions +ApacheFS +HTML
+        TransformOptions ApacheFS HTML HideParseErrors
         TransformSet /theme.xsl
         TransformCache /theme.xsl /etc/apache2/theme.xsl
 
@@ -885,9 +950,14 @@
         
     </VirtualHost>
 
-The +ApacheFS directive enables XSLT ``document()`` inclusion.
+The ``ApacheFS`` directive enables XSLT ``document()`` inclusion.
 
 Unfortunately it is not possible to theme error responses (such as a 404 Not
 Found page) with Apache as these do not pass through the filter chain.
 
 .. _Deliverance: http://deliveranceproject.org/
+.. _collective.xdv: http://pypi.python.org/pypi/collective.xdv
+.. _dv.xdvserver: http://pypi.python.org/pypi/dv.xdvserver
+.. Nginx: http://nginx.org
+.. _html-xslt: http://code.google.com/p/html-xslt/
+.. _`obsolete permitted doctype string`: http://dev.w3.org/html5/spec/Overview.html#obsolete-permitted-doctype-string

Added: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/docs/CHANGES.txt	Fri Aug  6 17:58:13 2010
@@ -0,0 +1,26 @@
+Changelog
+=========
+
+0.4b1 - 2010-08-06
+------------------
+
+* Multistage compiler breaks down work into smaller, more easily debugged
+  chunks. (In the spirit of the original DVNG prototype.)
+
+* Refactoring of generated XSLT to perform its work in a single pass, bringing
+  a 30-50% speedup.
+
+* Multiple theme support using the new <theme> directive.
+
+* Nested <rules> and condition merging allows for condition grouping.
+
+* Allow comments to be selected in the theme.
+
+* Tweaked ``ssi`` includemode for Apache compatibility. The previous
+  ``wait="yes"`` behaviour no longer seems necessary with current versions of
+  Nginx, but is available using the ``ssiwait`` includemode.
+
+* CSS expressions are now converted to relative rather than absolute xpaths.
+  While this makes no difference to their use in xdv directives (which are
+  executed in the context of the root node), more flexibility is available
+  when used with inline XSL.

Modified: z3/xdv/trunk/docs/HISTORY.txt
==============================================================================
--- z3/xdv/trunk/docs/HISTORY.txt	(original)
+++ z3/xdv/trunk/docs/HISTORY.txt	Fri Aug  6 17:58:13 2010
@@ -1,5 +1,5 @@
-Changelog
-=========
+History
+=======
 
 0.3 - 2010-05-29
 ----------------

Modified: z3/xdv/trunk/docs/TODO.txt
==============================================================================
--- z3/xdv/trunk/docs/TODO.txt	(original)
+++ z3/xdv/trunk/docs/TODO.txt	Fri Aug  6 17:58:13 2010
@@ -3,43 +3,10 @@
 ======
 
 
-0.3 release
-===========
-
-``pre`` double linebreaks (complete)
-------------------------------------
-
-libxml2 quotes CR characters on output, this causes Firefox to insert extra
-blank lines in ``<pre>`` blocks. As HTTP specified CRLF line endings for form
-this is a problem for us. plone.org works around this with::
-
-    <xsl:template match="pre/text()" xmlns:str="http://exslt.org/strings" mode="initial-stage">
-        <xsl:value-of select="str:replace(., '&#13;', '')"/>
-    </xsl:template>
-
-This should be included in the boilerplate xsl.
-
-
-Copy xsl directives from the rules file (complete)
---------------------------------------------------
-
-We want to be able to do::
-
-    <rules xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:strip-space elements="*" />
-    </rules>
-
-And have the directive copied into the output xsl.
-
-In combination with the inline XSL, this should allow the ``extra.xsl``
-support to be depracated
-
-
-
 0.4 release
 ===========
 
-Refactor compiler
+Refactor compiler (complete)
 -----------------
 
 Move to a pipeline. Running compiler.xsl in Apache did not work out in
@@ -50,7 +17,7 @@
 # annotate
 # compile theme
 
-Group directive
+Group directive (implemented as nested <rules>)
 ---------------
 
 It would be useful to group together rules that share the same condition::
@@ -90,7 +57,7 @@
 .. _libxslt-regexp-plugin: http://fr.rpmfind.net/pub/libxml/plugins/
 
 
-Refactor generated xslt
+Refactor generated xslt (complete)
 -----------------------
 
 The xslt generated by the xdv compiler is currently uses three passes,
@@ -181,7 +148,7 @@
 
 * Nested <rules> now works, so this is not necessary.
 
-Theme directive / multiple theme support
+Theme directive / multiple theme support (complete)
 ----------------------------------------
 
 It would be nice to specify the theme in the rules file itself::

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Fri Aug  6 17:58:13 2010
@@ -1,16 +1,16 @@
 from setuptools import setup, find_packages
-import os
+import os.path
 
 setup(
     name='xdv',
-    version='0.4a1',
+    version='0.4b1',
     description='''\
 XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple
 transform on each request thereafter. Alternatively, compile your theme during
 development, check it into Subversion, and not touch XDV during deployment.''',
     long_description=open("README.txt").read() + "\n\n" +
-                     open(os.path.join("docs", "HISTORY.txt")).read(),
+                     open(os.path.join("docs", "CHANGES.txt")).read(),
     packages=find_packages('lib'),
     package_dir = {'':'lib'},
     include_package_data=True,

From ldr at codespeak.net  Fri Aug  6 17:59:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  6 Aug 2010 17:59:10 +0200 (CEST)
Subject: [z3-checkins] r76514 - z3/xdv/tags/0.4b1
Message-ID: <20100806155910.94834282BEB@codespeak.net>

Author: ldr
Date: Fri Aug  6 17:59:09 2010
New Revision: 76514

Added:
   z3/xdv/tags/0.4b1/   (props changed)
      - copied from r76513, z3/xdv/trunk/
Log:
tag 0.4b1

From ldr at codespeak.net  Fri Aug  6 17:59:45 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Fri,  6 Aug 2010 17:59:45 +0200 (CEST)
Subject: [z3-checkins] r76515 - in z3/xdv/trunk: . docs
Message-ID: <20100806155945.3C57C282BEB@codespeak.net>

Author: ldr
Date: Fri Aug  6 17:59:43 2010
New Revision: 76515

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/setup.py
Log:
bump version

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Fri Aug  6 17:59:43 2010
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.4b2 - unreleased
+------------------
+
+
+
 0.4b1 - 2010-08-06
 ------------------
 

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Fri Aug  6 17:59:43 2010
@@ -3,7 +3,7 @@
 
 setup(
     name='xdv',
-    version='0.4b1',
+    version='0.4b2',
     description='''\
 XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple

From ldr at codespeak.net  Mon Aug 16 20:49:27 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 16 Aug 2010 20:49:27 +0200 (CEST)
Subject: [z3-checkins] r76639 - in z3/xdv/trunk: docs lib/xdv
Message-ID: <20100816184927.21C5A282BAD@codespeak.net>

Author: ldr
Date: Mon Aug 16 20:49:25 2010
New Revision: 76639

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/utils.py
Log:
Fix loading of compiler stylesheets so as not to be affected by resolvers.

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Mon Aug 16 20:49:25 2010
@@ -4,7 +4,7 @@
 0.4b2 - unreleased
 ------------------
 
-
+* Fix loading of compiler stylesheets so as not to be affected by resolvers.
 
 0.4b1 - 2010-08-06
 ------------------

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Mon Aug 16 20:49:25 2010
@@ -25,7 +25,7 @@
 emit_stylesheet = pkg_xsl('emit-stylesheet.xsl')
 
 def set_parser(stylesheet, parser, compiler_parser=None):
-    dummy_doc = etree.parse(pkg_resources.resource_filename('xdv', 'dummy.html'), parser=parser)
+    dummy_doc = etree.parse(open(pkg_resources.resource_filename('xdv', 'dummy.html')), parser=parser)
     name = 'file:///__xdv__'
     resolver = CustomResolver({name: stylesheet})
     if compiler_parser is None:

Modified: z3/xdv/trunk/lib/xdv/utils.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/utils.py	(original)
+++ z3/xdv/trunk/lib/xdv/utils.py	Mon Aug 16 20:49:25 2010
@@ -48,7 +48,7 @@
 
 
 def pkg_xsl(name, parser=None):
-    return LoggingXSLTWrapper(etree.XSLT(etree.parse(pkg_resources.resource_filename('xdv', name), parser=parser)), logger)
+    return LoggingXSLTWrapper(etree.XSLT(etree.parse(open(pkg_resources.resource_filename('xdv', name)), parser=parser)), logger)
 
 
 def _createOptionParser(usage):

From ldr at codespeak.net  Mon Aug 16 20:52:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 16 Aug 2010 20:52:12 +0200 (CEST)
Subject: [z3-checkins] r76640 - in z3/xdv/trunk: . docs lib/xdv
	lib/xdv/tests/multi-theme-3
Message-ID: <20100816185212.45C9A282BAD@codespeak.net>

Author: ldr
Date: Mon Aug 16 20:52:10 2010
New Revision: 76640

Added:
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/options.cfg
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/output.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme1.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme2.html
Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
Log:
When no conditional themes match, pass the document through without theming.

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Mon Aug 16 20:52:10 2010
@@ -373,7 +373,9 @@
     <theme href="news.html" css:if-content="body.section-news"/>
     <theme href="members.html" css:if-content="body.section-members"/>
 
-The unconditional theme is used as a fallback when no other theme's condition is satisfied.
+The unconditional theme is used as a fallback when no other theme's condition
+is satisfied. If no unconditional theme is specified, the document is passed
+through without theming.
 
 All rules are applied to all themes. To have a rule apply to only a single
 theme, use the condition grouping syntax::

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Mon Aug 16 20:52:10 2010
@@ -4,6 +4,8 @@
 0.4b2 - unreleased
 ------------------
 
+* When no conditional themes match, pass the document through without theming.
+
 * Fix loading of compiler stylesheets so as not to be affected by resolvers.
 
 0.4b1 - 2010-08-06

Modified: z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	Mon Aug 16 20:52:10 2010
@@ -91,7 +91,7 @@
                             <xsl:text>&#10;</xsl:text>
                             <xsl:element name="xsl:otherwise">
                                 <xsl:element name="xsl:apply-templates">
-                                    <xsl:attribute name="select">.</xsl:attribute>
+                                    <xsl:attribute name="select">@*|node()</xsl:attribute>
                                     <xsl:if test="$unconditional">
                                         <xsl:for-each select="$unconditional">
                                             <xsl:variable name="themeid" select="@xml:id"/>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/content.html	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/options.cfg	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+theme =

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/output.html	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/rules.xml	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,9 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    
+    <theme css:if-content="body.theme1" href="theme1.html"/>
+    <theme css:if-content="body.theme2" href="theme2.html"/>
+    <copy css:theme="#content" css:content="body > *"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme1.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme1.html	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 1</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme2.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-3/theme2.html	Mon Aug 16 20:52:10 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 2</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

From ldr at codespeak.net  Mon Aug 16 20:53:38 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 16 Aug 2010 20:53:38 +0200 (CEST)
Subject: [z3-checkins] r76641 - z3/xdv/trunk/docs
Message-ID: <20100816185338.C4D49282BAD@codespeak.net>

Author: ldr
Date: Mon Aug 16 20:53:37 2010
New Revision: 76641

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
Log:
prepare 0.4b2 release

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Mon Aug 16 20:53:37 2010
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.4b2 - unreleased
+0.4b2 - 2010-08-16
 ------------------
 
 * When no conditional themes match, pass the document through without theming.

From ldr at codespeak.net  Mon Aug 16 20:55:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 16 Aug 2010 20:55:10 +0200 (CEST)
Subject: [z3-checkins] r76642 - z3/xdv/tags/0.4b2
Message-ID: <20100816185510.C41CD282BAD@codespeak.net>

Author: ldr
Date: Mon Aug 16 20:55:09 2010
New Revision: 76642

Added:
   z3/xdv/tags/0.4b2/   (props changed)
      - copied from r76641, z3/xdv/trunk/
Log:
tag 0.4b2

From ldr at codespeak.net  Mon Aug 16 20:55:46 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 16 Aug 2010 20:55:46 +0200 (CEST)
Subject: [z3-checkins] r76643 - in z3/xdv/trunk: . docs
Message-ID: <20100816185546.12378282BAD@codespeak.net>

Author: ldr
Date: Mon Aug 16 20:55:45 2010
New Revision: 76643

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/setup.py
Log:
bump version

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Mon Aug 16 20:55:45 2010
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.4b3 - unreleased
+------------------
+
+
+
 0.4b2 - 2010-08-16
 ------------------
 

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Mon Aug 16 20:55:45 2010
@@ -3,7 +3,7 @@
 
 setup(
     name='xdv',
-    version='0.4b2',
+    version='0.4b3',
     description='''\
 XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple

From ejucovy at codespeak.net  Fri Aug 20 17:32:11 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri, 20 Aug 2010 17:32:11 +0200 (CEST)
Subject: [z3-checkins] r76682 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100820153211.D227536C536@codespeak.net>

Author: ejucovy
Date: Fri Aug 20 17:32:10 2010
New Revision: 76682

Modified:
   z3/deliverance/trunk/deliverance/docs/configuration.txt
Log:
apply ascpike's documentation patch from https://projects.openplans.org/deliverance/ticket/43

Modified: z3/deliverance/trunk/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/configuration.txt	Fri Aug 20 17:32:10 2010
@@ -58,7 +58,10 @@
 
 You can also put it inside ``<rule>`` elements, and then it will apply
 just to that rule set. This is useful if you are using `match and page
-classes`_.
+classes`_. 
+
+In the case that multiple matching rule sets declare themes,
+the last theme seen is used.
 
 Pyref in themes
 ~~~~~~~~~~~~~~~

From ejucovy at codespeak.net  Fri Aug 20 18:02:51 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri, 20 Aug 2010 18:02:51 +0200 (CEST)
Subject: [z3-checkins] r76684 - in z3/deliverance/trunk: . deliverance
	deliverance/docs deliverance/tests
Message-ID: <20100820160251.00852282B90@codespeak.net>

Author: ejucovy
Date: Fri Aug 20 18:02:50 2010
New Revision: 76684

Modified:
   z3/deliverance/trunk/changes_on_trunk.txt
   z3/deliverance/trunk/deliverance/docs/configuration.txt
   z3/deliverance/trunk/deliverance/rules.py
   z3/deliverance/trunk/deliverance/tests/test_middleware.txt
Log:
https://projects.openplans.org/deliverance/ticket/44 - add an attribute 'collapse-sources' which allows content elements to be merged into the theme without setting the deliverance marker attribute, so that later actions will act on those elements as if they came from the theme.  (the existing behavior remains the default; except where collapse-sources='1' is set on an action, all content elements moved into the theme will be ignored by subsequent actions)

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Fri Aug 20 18:02:50 2010
@@ -5,3 +5,9 @@
  * Added a ReverseMatcher, which allows you to prefix a match statement with not: to reverse
    the result.  Use like <match path="not:/bad-path" /> (esanchez)
 
+ * Added a boolean collapse-sources attribute on TransformActions
+   (append, prepend, replace) which can signal that elements moved
+   from the content to the theme should be "fully collapsed" into the
+   theme immediately, allowing subsequent actions to act on those
+   elements within the theme. (ejucovy)
+

Modified: z3/deliverance/trunk/deliverance/docs/configuration.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/configuration.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/configuration.txt	Fri Aug 20 18:02:50 2010
@@ -393,6 +393,72 @@
 If you *do* want content copied instead of moved then add ``move="0"``
 to the action.
 
+Keeping track of sources
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default Deliverance keeps track of the source of elements in the theme.
+If content elements are merged into the theme, later actions won't be able
+to find those elements in the theme.  So in a case with a content like:
+
+.. code-block:: html
+
+    <body>
+      <div>Content div!</div>
+    </body>
+
+and a theme like:
+
+.. code-block:: html
+
+    <body>
+      <div>Theme div</div>
+      <div>Another theme div</div>
+      <span>Fleem</span>
+    </body>
+
+with the rules:
+
+.. code-block:: xml
+
+    <rule>
+      <append content="div" theme="children:body" />
+      <drop theme="div" />
+    </rule>
+
+The result will be
+
+.. code-block:: html
+
+    <body>
+      <span>Fleem</span>
+      <div>Content div!</div>
+    </body>
+
+It is occasionally useful to tell Deliverance to ignore this distinction
+and act on elements that were placed in the theme by an earlier rule. To
+do this, use a ``<rule collapse-sources="1" />``.
+
+If this attribute is set for an action, then elements that are moved into
+the theme during that action will be immediately merged with the theme
+so that later actions on the theme can act upon them.
+
+In the above example, if the rules were:
+
+.. code-block:: xml
+
+    <rule>
+      <append content="div" theme="children:body" collapse-sources="1" />
+      <drop theme="div" />
+    </rule>
+
+The result would instead be
+
+.. code-block:: html
+
+    <body>
+      <span>Fleem</span>
+    </body>
+
 Standard actions and ``suppress-standard``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

Modified: z3/deliverance/trunk/deliverance/rules.py
==============================================================================
--- z3/deliverance/trunk/deliverance/rules.py	(original)
+++ z3/deliverance/trunk/deliverance/rules.py	Fri Aug 20 18:02:50 2010
@@ -431,7 +431,8 @@
 
     def __init__(self, source_location, content, theme, if_content=None, 
                  content_href=None, move=True, nocontent=None, notheme=None, 
-                 manytheme=None, manycontent=None):
+                 manytheme=None, manycontent=None,
+                 collapse_sources=False):
         self.source_location = source_location
         assert content is not None
         self.content = content
@@ -452,6 +453,7 @@
         self.notheme = self.convert_error('notheme', notheme)
         self.manytheme = self.convert_error('manytheme', manytheme)
         self.manycontent = self.convert_error('manycontent', manycontent)
+        self.collapse_sources = collapse_sources
 
     @classmethod
     def from_xml(cls, tag, source_location):
@@ -463,12 +465,15 @@
         if_content = cls.compile_selector(tag, 'if-content', source_location, invertable=True)
         content_href = tag.get('href')
         move = asbool(tag.get('move', '1'))
+        collapse_sources = asbool(tag.get('collapse-sources', '0'))
+
         return cls(source_location, content, theme, if_content=if_content,
                    content_href=content_href, move=move,
                    nocontent=tag.get('nocontent'),
                    notheme=tag.get('notheme'),
                    manytheme=tag.get('manytheme'),
-                   manycontent=tag.get('manycontent'))
+                   manycontent=tag.get('manycontent'),
+                   collapse_sources=collapse_sources)
 
     def apply(self, content_doc, theme_doc, resource_fetcher, log):
         """
@@ -549,7 +554,8 @@
             theme_el = theme_els[0]
         if not self.move and theme_type in ('children', 'elements'):
             content_els = copy.deepcopy(content_els)
-        mark_content_els(content_els)
+        if not self.collapse_sources:
+            mark_content_els(content_els)
         self.apply_transformation(content_type, content_els, attributes, 
                                   theme_type, theme_el, log)
 

Modified: z3/deliverance/trunk/deliverance/tests/test_middleware.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/tests/test_middleware.txt	(original)
+++ z3/deliverance/trunk/deliverance/tests/test_middleware.txt	Fri Aug 20 18:02:50 2010
@@ -1060,3 +1060,91 @@
    <BLANKLINE>
     </body></html>
 
+By default Deliverance keeps track of the source of elements in the
+theme.  If content elements are merged into the theme, later actions
+won't be able to find those elements in the theme.  So in the
+following case::
+
+    >>> new_rule_xml = '''\
+    ... <ruleset>
+    ...   <theme href="/collapse-theme" />
+    ...   <rule class="default">
+    ...     <append content="div" theme="children:body" />
+    ...     <drop theme="div" />
+    ...   </rule>
+    ... </ruleset>'''
+    >>> f = open(rule_filename, 'w+')
+    >>> f.write(new_rule_xml)
+    >>> f.close()
+
+    >>> app['/collapse-theme'] = Response("""<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    ... "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    ... <html><head></head><body> 
+    ... <div>Theme div</div>
+    ... <div>Another theme div</div>
+    ... <span>Fleem</span>
+    ... </body></html>""")
+
+    >>> app['/collapse-content'] = Response("""<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    ... "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    ... <html><head></head><body> 
+    ... <div>Content div!</div>
+    ... </body></html>""")
+
+The <div>Content div!</div> from the content source will remain in the
+output, since the <drop> action only applies to elements that were in
+the original theme, even though that div has landed in the theme by
+the time the <drop> action occurs::
+
+    >>> print compare_request('/collapse-content', deliv_filename) # doctest: +REPORT_UDIFF
+    Original content:
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html><head></head><body> 
+    <div>Content div!</div>
+    </body></html>
+    Themed content:
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /></head><body> 
+    <BLANKLINE>
+    <BLANKLINE>
+    <span>Fleem</span>
+    <div>Content div!</div>
+    </body></html>
+
+It is occasionally useful to tell Deliverance to ignore this
+distinction and act on elements that were placed in the theme by an
+earlier rule. To do this, use a ``<rule collapse-sources="1" />``. If
+this attribute is set for an action, then elements that are moved into
+the theme during that action will be immediately merged with the theme
+so that later actions on the theme can act upon them.  So in our
+example, setting ``collapse-sources="1"`` on the <append> action will
+cause the final output to contain no <div>s at all::
+
+    >>> new_rule_xml = '''\
+    ... <ruleset>
+    ...   <theme href="/collapse-theme" />
+    ...   <rule class="default">
+    ...     <append content="div" theme="children:body" collapse-sources="1" />
+    ...     <drop theme="div" />
+    ...   </rule>
+    ... </ruleset>'''
+    >>> f = open(rule_filename, 'w+')
+    >>> f.write(new_rule_xml)
+    >>> f.close()
+
+    >>> print compare_request('/collapse-content', deliv_filename) # doctest: +REPORT_UDIFF
+    Original content:
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html><head></head><body> 
+    <div>Content div!</div>
+    </body></html>
+    Themed content:
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ASCII" /></head><body> 
+    <BLANKLINE>
+    <BLANKLINE>
+    <span>Fleem</span>
+    <BLANKLINE>
+    </body></html>

From ejucovy at codespeak.net  Fri Aug 20 22:13:09 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri, 20 Aug 2010 22:13:09 +0200 (CEST)
Subject: [z3-checkins] r76688 - in z3/deliverance/trunk: . deliverance
Message-ID: <20100820201309.894F5282B90@codespeak.net>

Author: ejucovy
Date: Fri Aug 20 22:13:06 2010
New Revision: 76688

Modified:
   z3/deliverance/trunk/changes_on_trunk.txt
   z3/deliverance/trunk/deliverance/middleware.py
Log:
factor out DeliveranceMiddleware.default_theme method for easier overridability by subclasses (e.g. making the value of theme_uri a uri template, or other per-request logic)

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Fri Aug 20 22:13:06 2010
@@ -11,3 +11,12 @@
    theme immediately, allowing subsequent actions to act on those
    elements within the theme. (ejucovy)
 
+ * Factored out method ``DeliveranceMiddleware.default_theme(self, environ)``
+   so that subclasses can implement custom logic for calculating the global
+   default theme per request based on the WSGI environment and the value of
+   ``self._default_theme`` which is set by the ``theme_uri`` parameter in
+   the paste.deploy configuration.
+
+   The default implementation returns the raw string ``self._default_theme``
+   directly.
+

Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py	(original)
+++ z3/deliverance/trunk/deliverance/middleware.py	Fri Aug 20 22:13:06 2010
@@ -44,12 +44,22 @@
         self.log_factory = log_factory
         self.log_factory_kw = log_factory_kw
 
-        self.default_theme = default_theme
+        self._default_theme = default_theme
 
         ## FIXME: clearly, this should not be a dictionary:
         self.known_html = set()
         self.known_titles = {}
 
+    def default_theme(self, environ):
+        """
+        The URI of the global default theme, if one is set, or None.
+
+        This is a method that takes the WSGI environ so that subclasses
+        can override the behavior (for example setting the default theme
+        to a URI template that is interpolated on every request)
+        """
+        return self._default_theme
+
     def log_description(self, log=None):
         """The description shown in the log for this context"""
         return 'Deliverance'
@@ -105,7 +115,7 @@
             self.known_titles[req.url] = self._get_title(resp.body)
             self.known_html.add(req.url)
         resp = rule_set.apply_rules(req, resp, resource_fetcher, log, 
-                                    default_theme=self.default_theme)
+                                    default_theme=self.default_theme(environ))
         if clientside:
             resp.decode_content()
             resp.body = self._substitute_jsenable(resp.body)

From ejucovy at codespeak.net  Fri Aug 20 22:37:40 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri, 20 Aug 2010 22:37:40 +0200 (CEST)
Subject: [z3-checkins] r76689 - in z3/deliverance/trunk: . deliverance
Message-ID: <20100820203740.C29DB282B90@codespeak.net>

Author: ejucovy
Date: Fri Aug 20 22:37:39 2010
New Revision: 76689

Modified:
   z3/deliverance/trunk/changes_on_trunk.txt
   z3/deliverance/trunk/deliverance/middleware.py
Log:
factor out DeliveranceMiddleware.build_external_subrequest method so that subclasses can override this behavior, e.g. to preserve certain headers from the original request into subrequests

Modified: z3/deliverance/trunk/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/trunk/changes_on_trunk.txt	(original)
+++ z3/deliverance/trunk/changes_on_trunk.txt	Fri Aug 20 22:37:39 2010
@@ -20,3 +20,13 @@
    The default implementation returns the raw string ``self._default_theme``
    directly.
 
+ * Factored out method ``DeliveranceMiddleware.build_external_subrequest``
+   which is called when Deliverance is getting a resource via an external
+   subrequest (as opposed to a file:// URL or an internal subrequest to the
+   application being wrapped by Deliverance)
+
+   The method returns a webob.Request object; the default implementation
+   returns a blank Request with only the header
+   ``x-deliverance-theme-subrequest`` set.  Subclasses can override
+   this behavior, e.g. to preserve certain headers from the original
+   request into subrequests. 

Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py	(original)
+++ z3/deliverance/trunk/deliverance/middleware.py	Fri Aug 20 22:37:39 2010
@@ -239,13 +239,38 @@
                           'Internal request for %s was not 200 OK; retrying as external request.' % url)
             
         ## FIXME: pluggable subrequest handler?
-        subreq = Request.blank(url)
-        subreq.headers['x-deliverance-theme-subrequest'] = "1"
+        subreq = self.build_external_subrequest(url, orig_req, log)
         subresp = subreq.get_response(proxy_exact_request)
         log.debug(self, 'External request for %s: %s content-type: %s',
                   url, subresp.status, subresp.content_type)
         return subresp
 
+    def build_external_subrequest(self, url, orig_req, log):
+        """
+        Returns a webob.Request to be used when Deliverance is getting
+        a resource via an external subrequest (as opposed to a file://
+        URL or an internal subrequest to the application being wrapped
+        by Deliverance)
+
+        The method returns a webob.Request object; the default
+        implementation returns a blank Request with only the header
+        ``x-deliverance-theme-subrequest`` set.  Subclasses can
+        override this behavior, e.g. to preserve certain headers from
+        the original request into subrequests.
+
+        ``url``:
+          The URL of the resource to be fetched
+
+        ``orig_req``:
+          The original request received by Deliverance
+
+        ``log``:
+          The logging object
+        """
+        subreq = Request.blank(url)
+        subreq.headers['x-deliverance-theme-subrequest'] = "1"
+        return subreq
+
     def link_to(self, req, url, source=False, line=None, selector=None, 
                 browse=False):
         """

From ejucovy at codespeak.net  Fri Aug 20 22:38:03 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri, 20 Aug 2010 22:38:03 +0200 (CEST)
Subject: [z3-checkins] r76690 - z3/deliverance/trunk
Message-ID: <20100820203803.35F6D282B90@codespeak.net>

Author: ejucovy
Date: Fri Aug 20 22:38:01 2010
New Revision: 76690

Modified:
   z3/deliverance/trunk/setup.py
Log:
bump version

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Fri Aug 20 22:38:01 2010
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3-dev'
+version = '0.4-dev'
 
 setup(name='Deliverance',
       version=version,

From ejucovy at codespeak.net  Wed Aug 25 16:26:25 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 25 Aug 2010 16:26:25 +0200 (CEST)
Subject: [z3-checkins] r76727 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100825142625.EF124282BDB@codespeak.net>

Author: ejucovy
Date: Wed Aug 25 16:26:23 2010
New Revision: 76727

Modified:
   z3/deliverance/trunk/deliverance/docs/quickstart.txt
Log:
#46 - updating quickstart docs:

 * removing extra buildout recipe, we only need one
 ** removed the one that definitely doesn't work anymore, since it points to the outdated deliverance.openplans.org pybundle
 * reword buildout heading to avoid implying that buildout is not normal



Modified: z3/deliverance/trunk/deliverance/docs/quickstart.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/quickstart.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/quickstart.txt	Wed Aug 25 16:26:23 2010
@@ -25,18 +25,22 @@
 
     $ easy_install Deliverance
 
+You can also install with pip if that's your preference:
+
+    $ pip install Deliverance
+
 .. comment:
 
     This isn't really necessary anymore, I think:
 
     To install lxml, you have to have ``libxml2`` installed, and the ``-dev`` packages for ``libxml2`` and Python itself.  On Ubuntu this is ``libxml2-dev``, ``libxslt1-dev``, and ``python2.5-dev``.
 
-This can take a long time to crunch.  On a Mac you must have the developer tools installed.
+This can take a long time to crunch, because of the lxml dependency.  On a Mac you must have the developer tools installed.
 
-If Normal Installation Fails: buildout
---------------------------------------
+Installing with buildout
+------------------------
 
-For some people on some machines, you may find that the normal installation fails.  Or you might just like buildout.  If you do, here's an example of a ``buildout.cfg`` file for building Deliverance (from Martin Aspeli)::
+If you prefer to use buildout, here's an example of a ``buildout.cfg`` file for building Deliverance (from Martin Aspeli)::
 
   [buildout]
   parts = 
@@ -106,32 +110,6 @@
 
 Once you have logged in you can look at ``http://localhost:8000/?deliv_log`` to see a log of everything Deliverance is doing (at the bottom of the page).
 
-Using Buildout
---------------
-
-Ga?l Pasgrimaud wrote up `instructions on installing Deliverance using buildout and pip <http://www.gawel.org/weblog/en/2008/12/combine-zc.buildout-an-pip-benefits>`_.  The basic recipe looks like::
-
-    [buildout]
-    # the cache dir is used by buildout & pip
-    download-cache = download
-    parts = eggs
-
-    [eggs]
-    recipe = gp.recipe.pip
-
-    # eggs installed by pip (also add the Deliverance bundle)
-    install =
-        Cython
-        --install-option=--static-deps lxml==2.2alpha1
-        http://deliverance.openplans.org/dist/Deliverance-snapshot-latest.pybundle
-
-    # eggs installed by zc.recipe.egg
-    eggs =
-        Paste
-        pyquery
-
-This uses his `gp.recipe.pip <http://pypi.python.org/pypi/gp.recipe.pip>`_ buildout recipe.
-
 Editing the Rules
 -----------------
 

From ejucovy at codespeak.net  Wed Aug 25 16:29:40 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Wed, 25 Aug 2010 16:29:40 +0200 (CEST)
Subject: [z3-checkins] r76728 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100825142940.2E0B1282BAD@codespeak.net>

Author: ejucovy
Date: Wed Aug 25 16:29:38 2010
New Revision: 76728

Modified:
   z3/deliverance/trunk/deliverance/docs/quickstart.txt
Log:
#46 - warn that plone.recipe.deliverance is unmaintained

Modified: z3/deliverance/trunk/deliverance/docs/quickstart.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/quickstart.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/quickstart.txt	Wed Aug 25 16:29:38 2010
@@ -66,6 +66,13 @@
       Deliverance
   interpreter = py
 
+Warning: plone.recipe.deliverance
+---------------------------------
+
+You might come across a package `plone.recipe.deliverance
+<http://pypi.python.org/pypi/plone.recipe.deliverance>`_.  It is
+unmaintained, so don't try to use it.
+
 Creating a Configuration
 ------------------------
 

From tomster at codespeak.net  Mon Aug 30 14:36:06 2010
From: tomster at codespeak.net (tomster at codespeak.net)
Date: Mon, 30 Aug 2010 14:36:06 +0200 (CEST)
Subject: [z3-checkins] r76801 - in z3/dv.xdvserver/trunk: . docs dv/xdvserver
Message-ID: <20100830123606.B43B5282B90@codespeak.net>

Author: tomster
Date: Mon Aug 30 14:36:04 2010
New Revision: 76801

Modified:
   z3/dv.xdvserver/trunk/docs/HISTORY.txt
   z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
   z3/dv.xdvserver/trunk/setup.py
Log:
 * use lxml.html.tostring instead of lxml.tostring for output
 * release 1.0b8



Modified: z3/dv.xdvserver/trunk/docs/HISTORY.txt
==============================================================================
--- z3/dv.xdvserver/trunk/docs/HISTORY.txt	(original)
+++ z3/dv.xdvserver/trunk/docs/HISTORY.txt	Mon Aug 30 14:36:04 2010
@@ -1,7 +1,14 @@
 Changelog
 =========
 
-1.0b7 - 
+1.0b8 - 2010-08-22
+------------------
+
+* use lxml.html.tostring instead of lxml.tostring for output to 
+  avoid empty tags like <script/>, which confuses browsers
+  [tomster]
+
+1.0b7 - 2010-08-19
 ------------------
 
 * Use lxml for web resolving.

Modified: z3/dv.xdvserver/trunk/dv/xdvserver/filter.py
==============================================================================
--- z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	(original)
+++ z3/dv.xdvserver/trunk/dv/xdvserver/filter.py	Mon Aug 30 14:36:04 2010
@@ -4,6 +4,7 @@
 import os.path
 
 from lxml import etree
+from lxml import html
 
 from paste.request import construct_url
 from paste.response import header_value, replace_header
@@ -68,7 +69,7 @@
         
         content = etree.fromstring(body, parser=etree.HTMLParser())
         transformed = self.transform(content)
-        return etree.tostring(transformed)
+        return html.tostring(transformed)
     
     def __call__(self, environ, start_response):
         

Modified: z3/dv.xdvserver/trunk/setup.py
==============================================================================
--- z3/dv.xdvserver/trunk/setup.py	(original)
+++ z3/dv.xdvserver/trunk/setup.py	Mon Aug 30 14:36:04 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.0b7'
+version = '1.0b9'
 
 setup(name='dv.xdvserver',
       version=version,

From ejucovy at codespeak.net  Fri Sep  3 16:42:07 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Fri,  3 Sep 2010 16:42:07 +0200 (CEST)
Subject: [z3-checkins] r76856 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100903144207.48B30282B9C@codespeak.net>

Author: ejucovy
Date: Fri Sep  3 16:42:04 2010
New Revision: 76856

Modified:
   z3/deliverance/trunk/deliverance/docs/quickstart.txt
Log:
simplify buildout instructions per https://projects.openplans.org/deliverance/ticket/47

Modified: z3/deliverance/trunk/deliverance/docs/quickstart.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/quickstart.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/quickstart.txt	Fri Sep  3 16:42:04 2010
@@ -40,31 +40,22 @@
 Installing with buildout
 ------------------------
 
-If you prefer to use buildout, here's an example of a ``buildout.cfg`` file for building Deliverance (from Martin Aspeli)::
+If you prefer to use buildout, here's an example of a ``buildout.cfg`` file for building Deliverance::
 
-  [buildout]
-  parts = 
-      lxml
+  [buildout]                            
+  parts =  
       server
-  develop = 
-      src/Deliverance
-  versions = versions
-
-  [versions]
-  lxml = 2.1.2
-
-  [lxml]
-  recipe = z3c.recipe.staticlxml
-  egg = lxml == 2.1.2
-  force = false
-
-  [server]
-  recipe = zc.recipe.egg
-  eggs =
-      lxml
-      PasteScript
-      Deliverance
-  interpreter = py
+                     
+  [server]                           
+  recipe = zc.recipe.egg                 
+  eggs =                              
+      PasteScript                                   
+      Deliverance     
+
+You might have trouble installing lxml, particularly if you're on a
+Mac.  If so, you might want to incorporate `z3c.recipe.staticlxml
+<http://pypi.python.org/pypi/z3c.recipe.staticlxml>`_ into your
+buildout.
 
 Warning: plone.recipe.deliverance
 ---------------------------------

From ldr at codespeak.net  Sun Sep  5 22:18:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun,  5 Sep 2010 22:18:12 +0200 (CEST)
Subject: [z3-checkins] r76876 - in z3/xdv/trunk: docs lib/xdv
	lib/xdv/tests/multi-theme-4
Message-ID: <20100905201812.C97F8282B90@codespeak.net>

Author: ldr
Date: Sun Sep  5 22:18:10 2010
New Revision: 76876

Added:
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/options.cfg
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/output.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme1.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme2.html
Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/rules.py
Log:
Fix for themes in nested rules tags.

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Sun Sep  5 22:18:10 2010
@@ -4,7 +4,7 @@
 0.4b3 - unreleased
 ------------------
 
-
+* Fix for themes in nested rules tags.
 
 0.4b2 - 2010-08-16
 ------------------

Modified: z3/xdv/trunk/lib/xdv/rules.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/rules.py	(original)
+++ z3/xdv/trunk/lib/xdv/rules.py	Sun Sep  5 22:18:10 2010
@@ -48,7 +48,7 @@
     base = rules_doc.docinfo.URL
     if parser is None:
         parser = etree.HTMLParser()
-    for element in rules_doc.xpath('xdv:theme[@href]', namespaces=namespaces):
+    for element in rules_doc.xpath('//xdv:theme[@href]', namespaces=namespaces):
         url = urljoin(base, element.get('href'))
         if url[:6] in ('ftp://', 'http:/', 'https:'):
             raise ValueError("Supplied theme '%s', but network access denied." % url)

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/content.html	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,5 @@
+<html>
+  <body class="theme1">
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/options.cfg	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+theme =

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/output.html	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>This is theme 1</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/rules.xml	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,13 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    
+    <rules css:if-content="body.theme1">
+        <theme href="theme1.html"/>
+    </rules>
+    <rules css:if-content="body.theme2">
+        <theme href="theme2.html"/>
+    </rules>
+    <copy css:theme="#content" css:content="body > *"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme1.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme1.html	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 1</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme2.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-4/theme2.html	Sun Sep  5 22:18:10 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 2</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

From ejucovy at codespeak.net  Tue Sep  7 17:53:03 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Tue,  7 Sep 2010 17:53:03 +0200 (CEST)
Subject: [z3-checkins] r76922 - z3/deliverance/trunk/deliverance
Message-ID: <20100907155303.35230282BDB@codespeak.net>

Author: ejucovy
Date: Tue Sep  7 17:53:01 2010
New Revision: 76922

Modified:
   z3/deliverance/trunk/deliverance/middleware.py
Log:
move <<'deliv_notheme' in req.GET>> check into a method so a middleware subclass could customize the logic for when to pass around deliverance entirely

Modified: z3/deliverance/trunk/deliverance/middleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/middleware.py	(original)
+++ z3/deliverance/trunk/deliverance/middleware.py	Tue Sep  7 17:53:01 2010
@@ -64,10 +64,15 @@
         """The description shown in the log for this context"""
         return 'Deliverance'
 
+    def notheme_request(self, req):
+        if 'deliv_notheme' in req.GET:
+            return True
+
     def __call__(self, environ, start_response):
         req = Request(environ)
-        if 'deliv_notheme' in req.GET:
+        if self.notheme_request(req):
             return self.app(environ, start_response)
+
         req.environ['deliverance.base_url'] = req.application_url
         ## FIXME: copy_get?:
         orig_req = Request(environ.copy())

From ldr at codespeak.net  Tue Sep  7 22:16:11 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue,  7 Sep 2010 22:16:11 +0200 (CEST)
Subject: [z3-checkins] r76927 - z3/xdv/trunk
Message-ID: <20100907201611.AD6E8282BD6@codespeak.net>

Author: ldr
Date: Tue Sep  7 22:16:09 2010
New Revision: 76927

Modified:
   z3/xdv/trunk/LICENSE.txt
Log:
update license years

Modified: z3/xdv/trunk/LICENSE.txt
==============================================================================
--- z3/xdv/trunk/LICENSE.txt	(original)
+++ z3/xdv/trunk/LICENSE.txt	Tue Sep  7 22:16:09 2010
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Paul Everitt and Laurence Rowe
+Copyright (c) 2008, 2009, 2010 Paul Everitt and Laurence Rowe
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

From ldr at codespeak.net  Wed Sep  8 12:31:41 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  8 Sep 2010 12:31:41 +0200 (CEST)
Subject: [z3-checkins] r76939 - in z3/xdv/trunk: docs lib/xdv
	lib/xdv/tests/multi-theme-5
Message-ID: <20100908103141.353D3282BD6@codespeak.net>

Author: ldr
Date: Wed Sep  8 12:31:39 2010
New Revision: 76939

Added:
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/content.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/options.cfg
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/output.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/rules.xml
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme1.html
   z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme2.html
Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
Log:
Fix for default theme.

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Wed Sep  8 12:31:39 2010
@@ -4,6 +4,8 @@
 0.4b3 - unreleased
 ------------------
 
+* Fix for default theme.
+
 * Fix for themes in nested rules tags.
 
 0.4b2 - 2010-08-16

Modified: z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	Wed Sep  8 12:31:39 2010
@@ -90,17 +90,24 @@
                             </xsl:for-each>
                             <xsl:text>&#10;</xsl:text>
                             <xsl:element name="xsl:otherwise">
-                                <xsl:element name="xsl:apply-templates">
-                                    <xsl:attribute name="select">@*|node()</xsl:attribute>
-                                    <xsl:if test="$unconditional">
+                                <xsl:choose>
+                                    <xsl:when test="$unconditional">
                                         <xsl:for-each select="$unconditional">
                                             <xsl:variable name="themeid" select="@xml:id"/>
-                                            <xsl:attribute name="mode">
-                                                <xsl:value-of select="$themeid"/>
-                                            </xsl:attribute>
+                                            <xsl:element name="xsl:apply-templates">
+                                                <xsl:attribute name="select">.</xsl:attribute>
+                                                <xsl:attribute name="mode">
+                                                    <xsl:value-of select="$themeid"/>
+                                                </xsl:attribute>
+                                            </xsl:element>
                                         </xsl:for-each>
-                                    </xsl:if>
-                                </xsl:element>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:element name="xsl:apply-templates">
+                                            <xsl:attribute name="select">@*|node()</xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:otherwise>
+                                </xsl:choose>
                             </xsl:element>
                             <xsl:text>&#10;</xsl:text>
                         </xsl:element>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/content.html	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/options.cfg	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+theme =

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/output.html	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>This is theme 2</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/rules.xml	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,9 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    
+    <theme css:if-content="body.theme1" href="theme1.html"/>
+    <theme href="theme2.html"/>
+    <copy css:theme="#content" css:content="body > *"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme1.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme1.html	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 1</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme2.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/multi-theme-5/theme2.html	Wed Sep  8 12:31:39 2010
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <h1>This is theme 2</h1>
+  <div id="content">
+  </div>
+</body>
+</html>

From ldr at codespeak.net  Wed Sep  8 15:04:57 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  8 Sep 2010 15:04:57 +0200 (CEST)
Subject: [z3-checkins] r76944 - in z3/xdv/trunk/lib/xdv/tests:
	style-script-quoting style-script-quoting-1 style-script-quoting-2
Message-ID: <20100908130457.AB4C3282BD6@codespeak.net>

Author: ldr
Date: Wed Sep  8 15:04:54 2010
New Revision: 76944

Added:
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-1/
      - copied from r76895, z3/xdv/trunk/lib/xdv/tests/style-script-quoting/
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/content.html
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/output.html
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/theme.html
Removed:
   z3/xdv/trunk/lib/xdv/tests/style-script-quoting/
Log:
Add test for script cdata and comments

Added: z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/content.html	Wed Sep  8 15:04:54 2010
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Content</title>
+    <script type="text/javascript">
+        <!--
+        var a = '<div>';
+        //-->
+    </script>
+    <script type="text/javascript">
+        // <![CDATA[
+        var b = '<div>';
+        // ]]>
+    </script>
+  </head>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/output.html	Wed Sep  8 15:04:54 2010
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Theme Title</title>
+    <script type="text/javascript">
+            <!--
+            var x = '<div>';
+            //-->
+        </script>
+    <script type="text/javascript">
+            // <![CDATA[
+            var y = '<div>';
+            // ]]>
+        </script>
+    <script type="text/javascript">
+        <!--
+        var a = '<div>';
+        //-->
+    </script>
+    <script type="text/javascript">
+        // <![CDATA[
+        var b = '<div>';
+        // ]]>
+    </script>
+  </head>
+  <body>
+    <h1>Title</h1>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/rules.xml	Wed Sep  8 15:04:54 2010
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rules xmlns="http://namespaces.plone.org/xdv">
+    <append theme="/html/head" content="/html/head/script"/>
+    <copy theme="//*[@id='content']" content="//*[@id='content']/*"/>
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/style-script-quoting-2/theme.html	Wed Sep  8 15:04:54 2010
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Theme Title</title>
+        <script type="text/javascript">
+            <!--
+            var x = '<div>';
+            //-->
+        </script>
+        <script type="text/javascript">
+            // <![CDATA[
+            var y = '<div>';
+            // ]]>
+        </script>
+    </head>
+    <body>
+        <h1>Title</h1>
+    </body>
+</html>

From ldr at codespeak.net  Wed Sep  8 17:08:36 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  8 Sep 2010 17:08:36 +0200 (CEST)
Subject: [z3-checkins] r76948 - in z3/xdv/trunk: docs lib/xdv lib/xdv/tests
Message-ID: <20100908150836.7A244282BD6@codespeak.net>

Author: ldr
Date: Wed Sep  8 17:08:35 2010
New Revision: 76948

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
   z3/xdv/trunk/lib/xdv/run.py
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
Serialize using XSLT method from xdvrun.

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Wed Sep  8 17:08:35 2010
@@ -4,6 +4,8 @@
 0.4b3 - unreleased
 ------------------
 
+* Serialize using XSLT method from xdvrun.
+
 * Fix for default theme.
 
 * Fix for themes in nested rules tags.

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Wed Sep  8 17:08:35 2010
@@ -36,7 +36,7 @@
     compiler_parser.resolvers.remove(resolver)
     return output_doc
 
-def compile_theme(rules, theme=None, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None, read_network=False):
+def compile_theme(rules, theme=None, extra=None, css=True, xinclude=True, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None, read_network=False, indent=None):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
@@ -83,7 +83,10 @@
         rules_parser=rules_parser,
         read_network=read_network,
         )
-    compiled_doc = emit_stylesheet(rules_doc)
+    params = {}
+    if indent is not None:
+        params['indent'] = indent and "'yes'" or "'no'"
+    compiled_doc = emit_stylesheet(rules_doc, **params)
     compiled_doc = set_parser(etree.tostring(compiled_doc), parser, compiler_parser)
     return compiled_doc
 

Modified: z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/emit-stylesheet.xsl	Wed Sep  8 17:08:35 2010
@@ -13,6 +13,7 @@
 
     <xsl:param name="defaultsurl">defaults.xsl</xsl:param>
     <xsl:param name="usebase"/>
+    <xsl:param name="indent"/>
     <xsl:variable name="rules" select="//dv:*[@theme]"/>
     <xsl:variable name="drop-content-rules" select="//dv:drop[@content]"/>
     <xsl:variable name="inline-xsl" select="/dv:rules/xsl:*"/>
@@ -31,6 +32,17 @@
         <xsl:apply-templates select="$defaults/xsl:stylesheet"/>
     </xsl:template>
 
+    <xsl:template match="xsl:output/@indent">
+        <xsl:choose>
+            <xsl:when test="$indent">
+                <xsl:attribute name="indent"><xsl:value-of select="$indent"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
     <!--
         Boilerplate
     -->

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Wed Sep  8 17:08:35 2010
@@ -76,6 +76,7 @@
             read_network=options.read_network,
             absolute_prefix=options.absolute_prefix,
             includemode=options.includemode,
+            indent=options.pretty_print,
             )
 
     if content == '-':
@@ -89,7 +90,11 @@
     transform = etree.XSLT(output_xslt, access_control=access_control)
     content_doc = etree.parse(content, parser=parser)
     output_html = transform(content_doc)
-    output_html.write(options.output, encoding='UTF-8', pretty_print=options.pretty_print)
+    if isinstance(options.output, basestring):
+        out = open(options.output, 'wt')
+    else:
+        out = options.output
+    out.write(str(output_html))
     for msg in transform.error_log:
         logger.warn(msg)
 

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Wed Sep  8 17:08:35 2010
@@ -53,7 +53,7 @@
             theme=themefn,
             parser=theme_parser,
             absolute_prefix=config.get('xdvtest', 'absolute-prefix'),
-            includemode=config.get('xdvtest', 'includemode'),
+            indent=config.getboolean('xdvtest', 'pretty-print')
             )
         
         # Serialize / parse the theme - this can catch problems with escaping.
@@ -84,7 +84,7 @@
 
         # Read the whole thing to strip off xhtml namespace.
         # If we had xslt 2.0 then we could use xpath-default-namespace.
-        self.themed_string = etree.tostring(result, encoding="UTF-8", pretty_print=config.getboolean('xdvtest', 'pretty-print'))
+        self.themed_string = str(result)
         self.themed_content = etree.ElementTree(file=StringIO(self.themed_string), 
                                                 parser=etree.HTMLParser())
 

From ldr at codespeak.net  Wed Sep  8 17:55:42 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  8 Sep 2010 17:55:42 +0200 (CEST)
Subject: [z3-checkins] r76949 - in z3/xdv/trunk: docs lib/xdv lib/xdv/tests
	lib/xdv/tests/path-param-1 lib/xdv/tests/path-param-2
Message-ID: <20100908155542.E5193282BD6@codespeak.net>

Author: ldr
Date: Wed Sep  8 17:55:40 2010
New Revision: 76949

Added:
   z3/xdv/trunk/lib/xdv/tests/path-param-1/
   z3/xdv/trunk/lib/xdv/tests/path-param-1/content.html
   z3/xdv/trunk/lib/xdv/tests/path-param-1/options.cfg
   z3/xdv/trunk/lib/xdv/tests/path-param-1/output.html
   z3/xdv/trunk/lib/xdv/tests/path-param-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/path-param-1/theme.html
   z3/xdv/trunk/lib/xdv/tests/path-param-2/
   z3/xdv/trunk/lib/xdv/tests/path-param-2/content.html
   z3/xdv/trunk/lib/xdv/tests/path-param-2/options.cfg
   z3/xdv/trunk/lib/xdv/tests/path-param-2/output.html
   z3/xdv/trunk/lib/xdv/tests/path-param-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/path-param-2/theme.html
Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/defaults.xsl
   z3/xdv/trunk/lib/xdv/run.py
   z3/xdv/trunk/lib/xdv/tests/default-options.cfg
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
path parameter

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Wed Sep  8 17:55:40 2010
@@ -4,6 +4,8 @@
 0.4b3 - unreleased
 ------------------
 
+* $path parameter. 
+
 * Serialize using XSLT method from xdvrun.
 
 * Fix for default theme.

Modified: z3/xdv/trunk/lib/xdv/defaults.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/defaults.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/defaults.xsl	Wed Sep  8 17:55:40 2010
@@ -10,6 +10,8 @@
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
     exclude-result-prefixes="exsl str css dv dyn xhtml">
 
+    <xsl:param name="path"/>
+
     <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
         media-type="text/html" encoding="UTF-8"
         doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Wed Sep  8 17:55:40 2010
@@ -40,6 +40,9 @@
     op.add_option("-x", "--xsl", metavar="transform.xsl",
                       help="XSL transform", 
                       dest="xsl", default=None)
+    op.add_option("--path", metavar="PATH",
+                      help="URI path", 
+                      dest="path", default=None)
     (options, args) = op.parse_args()
 
     if len(args) > 2:
@@ -89,7 +92,10 @@
 
     transform = etree.XSLT(output_xslt, access_control=access_control)
     content_doc = etree.parse(content, parser=parser)
-    output_html = transform(content_doc)
+    params = {}
+    if options.path is not None:
+        params['path'] = "'%s'" % options.path
+    output_html = transform(content_doc, **params)
     if isinstance(options.output, basestring):
         out = open(options.output, 'wt')
     else:

Modified: z3/xdv/trunk/lib/xdv/tests/default-options.cfg
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/default-options.cfg	(original)
+++ z3/xdv/trunk/lib/xdv/tests/default-options.cfg	Wed Sep  8 17:55:40 2010
@@ -3,3 +3,4 @@
 absolute-prefix =
 includemode = document
 theme = theme.html
+path =

Added: z3/xdv/trunk/lib/xdv/tests/path-param-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-1/content.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-1/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-1/options.cfg	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewhere

Added: z3/xdv/trunk/lib/xdv/tests/path-param-1/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-1/output.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-1/rules.xml	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,10 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <copy
+        if-content="starts-with($path, '/somewhere')"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-1/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-1/theme.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-2/content.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-2/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-2/options.cfg	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /elsewhere

Added: z3/xdv/trunk/lib/xdv/tests/path-param-2/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-2/output.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content"></div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-2/rules.xml	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,10 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <copy
+        if-content="starts-with($path, '/somewhere')"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/path-param-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/path-param-2/theme.html	Wed Sep  8 17:55:40 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

Modified: z3/xdv/trunk/lib/xdv/tests/tests.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/tests.py	(original)
+++ z3/xdv/trunk/lib/xdv/tests/tests.py	Wed Sep  8 17:55:40 2010
@@ -80,7 +80,9 @@
         # Apply the compiled version, then test against desired output
         theme_parser.resolvers.add(xdv.run.RunResolver(self.testdir))
         processor = etree.XSLT(ct)
-        result = processor(contentdoc)
+        params = {}
+        params['path'] = "'%s'" % config.get('xdvtest', 'path')
+        result = processor(contentdoc, **params)
 
         # Read the whole thing to strip off xhtml namespace.
         # If we had xslt 2.0 then we could use xpath-default-namespace.

From ldr at codespeak.net  Wed Sep  8 18:39:32 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Wed,  8 Sep 2010 18:39:32 +0200 (CEST)
Subject: [z3-checkins] r76950 - in z3/xdv/trunk: docs lib/xdv
	lib/xdv/tests/if-path-1
Message-ID: <20100908163932.AD570282BD6@codespeak.net>

Author: ldr
Date: Wed Sep  8 18:39:31 2010
New Revision: 76950

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-1/
   z3/xdv/trunk/lib/xdv/tests/if-path-1/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-1/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-1/theme.html
Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/lib/xdv/apply-conditions.xsl
   z3/xdv/trunk/lib/xdv/defaults.xsl
   z3/xdv/trunk/lib/xdv/merge-conditions.xsl
Log:
if-path support

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Wed Sep  8 18:39:31 2010
@@ -4,6 +4,8 @@
 0.4b3 - unreleased
 ------------------
 
+* if-path support.
+
 * $path parameter. 
 
 * Serialize using XSLT method from xdvrun.

Modified: z3/xdv/trunk/lib/xdv/apply-conditions.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/apply-conditions.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/apply-conditions.xsl	Wed Sep  8 18:39:31 2010
@@ -5,17 +5,21 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     >
 
-    <xsl:template match="xdv:*[@if-content]">
+    <xsl:template match="xdv:*[@if-content or @if-path]">
         <xsl:copy>
             <xsl:apply-templates select="@*"/>
             <xsl:attribute name="condition">
                 <xsl:choose>
-                    <xsl:when test="@if-content = ''">
-                        <xsl:value-of select="@content"/>
+                    <xsl:when test="@if-content = ''"><xsl:value-of select="@content"/></xsl:when>
+                    <xsl:when test="@if-content">(<xsl:value-of select="@if-content"/>)</xsl:when>
+                </xsl:choose>
+                <xsl:if test="@if-content and @if-path"> and </xsl:if>
+                <xsl:choose>
+                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path) - 1) = '/'">
+                        <xsl:message terminate="yes">@if-path ending with '/' not yet supported</xsl:message>
                     </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="@if-content"/>
-                    </xsl:otherwise>
+                    <xsl:when test="@if-path and starts-with(@if-path, '/')">starts-with($normalized_path, '<xsl:value-of select="@if-path"/>/')</xsl:when>
+                    <xsl:when test="@if-path">contains($normalized_path, '/<xsl:value-of select="@if-path"/>/')</xsl:when>
                 </xsl:choose>
             </xsl:attribute>
             <xsl:apply-templates select="node()"/>

Modified: z3/xdv/trunk/lib/xdv/defaults.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/defaults.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/defaults.xsl	Wed Sep  8 18:39:31 2010
@@ -11,6 +11,7 @@
     exclude-result-prefixes="exsl str css dv dyn xhtml">
 
     <xsl:param name="path"/>
+    <xsl:variable name="normalized_path" select="concat($path, '/')"/>
 
     <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
         media-type="text/html" encoding="UTF-8"

Modified: z3/xdv/trunk/lib/xdv/merge-conditions.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/merge-conditions.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/merge-conditions.xsl	Wed Sep  8 18:39:31 2010
@@ -11,7 +11,7 @@
             <xsl:apply-templates select="@*"/>
             <xsl:if test="$conditions">
                 <xsl:attribute name="merged-condition">
-                    <xsl:for-each select="$conditions">(<xsl:value-of select="@condition"/>)<xsl:if test="position() != last()"> and </xsl:if></xsl:for-each>
+                    <xsl:for-each select="$conditions"><xsl:value-of select="@condition"/><xsl:if test="position() != last()"> and </xsl:if></xsl:for-each>
                 </xsl:attribute>
             </xsl:if>
             <xsl:apply-templates select="node()"/>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-1/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/content.html	Wed Sep  8 18:39:31 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg	Wed Sep  8 18:39:31 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewhere

Added: z3/xdv/trunk/lib/xdv/tests/if-path-1/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/output.html	Wed Sep  8 18:39:31 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml	Wed Sep  8 18:39:31 2010
@@ -0,0 +1,10 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <copy
+        if-path="/somewhere"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-1/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/theme.html	Wed Sep  8 18:39:31 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 18:22:08 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 18:22:08 +0200 (CEST)
Subject: [z3-checkins] r76977 - in z3/xdv/trunk/lib/xdv: . tests/if-path-1
	tests/if-path-2
Message-ID: <20100909162208.73F3536C225@codespeak.net>

Author: ldr
Date: Thu Sep  9 18:22:06 2010
New Revision: 76977

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-2/
   z3/xdv/trunk/lib/xdv/tests/if-path-2/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-2/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-2/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-2/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-2/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/apply-conditions.xsl
   z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml
Log:
exact path match

Modified: z3/xdv/trunk/lib/xdv/apply-conditions.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/apply-conditions.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/apply-conditions.xsl	Thu Sep  9 18:22:06 2010
@@ -15,7 +15,8 @@
                 </xsl:choose>
                 <xsl:if test="@if-content and @if-path"> and </xsl:if>
                 <xsl:choose>
-                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path) - 1) = '/'">
+                    <xsl:when test="@if-path and starts-with(@if-path, '/') and substring(@if-path, string-length(@if-path)) = '/'">$normalized_path = '<xsl:value-of select="@if-path"/>'</xsl:when>
+                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path)) = '/'">
                         <xsl:message terminate="yes">@if-path ending with '/' not yet supported</xsl:message>
                     </xsl:when>
                     <xsl:when test="@if-path and starts-with(@if-path, '/')">starts-with($normalized_path, '<xsl:value-of select="@if-path"/>/')</xsl:when>

Modified: z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/rules.xml	Thu Sep  9 18:22:06 2010
@@ -2,6 +2,7 @@
     xmlns="http://namespaces.plone.org/xdv"
     xmlns:css="http://namespaces.plone.org/xdv+css"
     >
+    <!-- path starts with -->
     <copy
         if-path="/somewhere"
         css:theme="#content"

Added: z3/xdv/trunk/lib/xdv/tests/if-path-2/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-2/content.html	Thu Sep  9 18:22:06 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-2/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-2/options.cfg	Thu Sep  9 18:22:06 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewhere

Added: z3/xdv/trunk/lib/xdv/tests/if-path-2/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-2/output.html	Thu Sep  9 18:22:06 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-2/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-2/rules.xml	Thu Sep  9 18:22:06 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- an exact path match -->
+    <copy
+        if-path="/somewhere/"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-2/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-2/theme.html	Thu Sep  9 18:22:06 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 18:31:18 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 18:31:18 +0200 (CEST)
Subject: [z3-checkins] r76979 - in z3/xdv/trunk/lib/xdv: . tests/if-path-1
	tests/if-path-3
Message-ID: <20100909163118.363C9282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 18:31:16 2010
New Revision: 76979

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-3/
   z3/xdv/trunk/lib/xdv/tests/if-path-3/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-3/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-3/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-3/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-3/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/apply-conditions.xsl
   z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg
Log:
path ends with

Modified: z3/xdv/trunk/lib/xdv/apply-conditions.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/apply-conditions.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/apply-conditions.xsl	Thu Sep  9 18:31:16 2010
@@ -15,12 +15,14 @@
                 </xsl:choose>
                 <xsl:if test="@if-content and @if-path"> and </xsl:if>
                 <xsl:choose>
-                    <xsl:when test="@if-path and starts-with(@if-path, '/') and substring(@if-path, string-length(@if-path)) = '/'">$normalized_path = '<xsl:value-of select="@if-path"/>'</xsl:when>
-                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path)) = '/'">
-                        <xsl:message terminate="yes">@if-path ending with '/' not yet supported</xsl:message>
-                    </xsl:when>
-                    <xsl:when test="@if-path and starts-with(@if-path, '/')">starts-with($normalized_path, '<xsl:value-of select="@if-path"/>/')</xsl:when>
-                    <xsl:when test="@if-path">contains($normalized_path, '/<xsl:value-of select="@if-path"/>/')</xsl:when>
+                    <xsl:when test="@if-path and starts-with(@if-path, '/') and substring(@if-path, string-length(@if-path)) = '/'"
+                        >$normalized_path = '<xsl:value-of select="@if-path"/>'</xsl:when>
+                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path)) = '/'"
+                        >substring($normalized_path, string-length($normalized_path) - <xsl:value-of select="string-length(@if-path)"/>) = '/<xsl:value-of select="@if-path"/>'</xsl:when>
+                    <xsl:when test="@if-path and starts-with(@if-path, '/')"
+                        >starts-with($normalized_path, '<xsl:value-of select="@if-path"/>/')</xsl:when>
+                    <xsl:when test="@if-path"
+                        >contains($normalized_path, '/<xsl:value-of select="@if-path"/>/')</xsl:when>
                 </xsl:choose>
             </xsl:attribute>
             <xsl:apply-templates select="node()"/>

Modified: z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg	(original)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-1/options.cfg	Thu Sep  9 18:31:16 2010
@@ -1,2 +1,2 @@
 [xdvtest]
-path = /somewhere
+path = /somewhere/another

Added: z3/xdv/trunk/lib/xdv/tests/if-path-3/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-3/content.html	Thu Sep  9 18:31:16 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-3/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-3/options.cfg	Thu Sep  9 18:31:16 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewhere/another

Added: z3/xdv/trunk/lib/xdv/tests/if-path-3/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-3/output.html	Thu Sep  9 18:31:16 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-3/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-3/rules.xml	Thu Sep  9 18:31:16 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- path ends with -->
+    <copy
+        if-path="another/"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-3/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-3/theme.html	Thu Sep  9 18:31:16 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 18:33:34 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 18:33:34 +0200 (CEST)
Subject: [z3-checkins] r76980 - z3/xdv/trunk/lib/xdv/tests/if-path-4
Message-ID: <20100909163334.94BB936C227@codespeak.net>

Author: ldr
Date: Thu Sep  9 18:33:33 2010
New Revision: 76980

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-4/
   z3/xdv/trunk/lib/xdv/tests/if-path-4/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-4/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-4/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-4/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-4/theme.html
Log:
path contains

Added: z3/xdv/trunk/lib/xdv/tests/if-path-4/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-4/content.html	Thu Sep  9 18:33:33 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-4/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-4/options.cfg	Thu Sep  9 18:33:33 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /start/somewhere/another

Added: z3/xdv/trunk/lib/xdv/tests/if-path-4/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-4/output.html	Thu Sep  9 18:33:33 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-4/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-4/rules.xml	Thu Sep  9 18:33:33 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- path contains -->
+    <copy
+        if-path="somewhere"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-4/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-4/theme.html	Thu Sep  9 18:33:33 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 19:01:45 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 19:01:45 +0200 (CEST)
Subject: [z3-checkins] r76981 - in z3/xdv/trunk/lib/xdv: . tests/if-path-5
Message-ID: <20100909170145.1FB6A36C22E@codespeak.net>

Author: ldr
Date: Thu Sep  9 19:01:43 2010
New Revision: 76981

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-5/
   z3/xdv/trunk/lib/xdv/tests/if-path-5/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-5/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-5/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-5/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-5/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/defaults.xsl
Log:
path normalization for trailing /

Modified: z3/xdv/trunk/lib/xdv/defaults.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/defaults.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/defaults.xsl	Thu Sep  9 19:01:43 2010
@@ -11,7 +11,7 @@
     exclude-result-prefixes="exsl str css dv dyn xhtml">
 
     <xsl:param name="path"/>
-    <xsl:variable name="normalized_path" select="concat($path, '/')"/>
+    <xsl:variable name="normalized_path"><xsl:value-of select="$path"/><xsl:if test="substring($path, string-length($path)) != '/'">/</xsl:if></xsl:variable>
 
     <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
         media-type="text/html" encoding="UTF-8"

Added: z3/xdv/trunk/lib/xdv/tests/if-path-5/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-5/content.html	Thu Sep  9 19:01:43 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-5/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-5/options.cfg	Thu Sep  9 19:01:43 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewhere/

Added: z3/xdv/trunk/lib/xdv/tests/if-path-5/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-5/output.html	Thu Sep  9 19:01:43 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-5/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-5/rules.xml	Thu Sep  9 19:01:43 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- an exact path match where the supplied path has a trailing slash -->
+    <copy
+        if-path="/somewhere/"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-5/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-5/theme.html	Thu Sep  9 19:01:43 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 19:21:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 19:21:10 +0200 (CEST)
Subject: [z3-checkins] r76982 - in z3/xdv/trunk/lib/xdv: . tests/if-path-6
Message-ID: <20100909172110.6C804282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 19:21:08 2010
New Revision: 76982

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-6/
   z3/xdv/trunk/lib/xdv/tests/if-path-6/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-6/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-6/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-6/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-6/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/apply-conditions.xsl
Log:
multiple path conditions

Modified: z3/xdv/trunk/lib/xdv/apply-conditions.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/apply-conditions.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/apply-conditions.xsl	Thu Sep  9 19:21:08 2010
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
+    xmlns:str="http://exslt.org/strings"
     xmlns:xdv="http://namespaces.plone.org/xdv"
     xmlns:xml="http://www.w3.org/XML/1998/namespace"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -14,16 +15,25 @@
                     <xsl:when test="@if-content">(<xsl:value-of select="@if-content"/>)</xsl:when>
                 </xsl:choose>
                 <xsl:if test="@if-content and @if-path"> and </xsl:if>
-                <xsl:choose>
-                    <xsl:when test="@if-path and starts-with(@if-path, '/') and substring(@if-path, string-length(@if-path)) = '/'"
-                        >$normalized_path = '<xsl:value-of select="@if-path"/>'</xsl:when>
-                    <xsl:when test="@if-path and substring(@if-path, string-length(@if-path)) = '/'"
-                        >substring($normalized_path, string-length($normalized_path) - <xsl:value-of select="string-length(@if-path)"/>) = '/<xsl:value-of select="@if-path"/>'</xsl:when>
-                    <xsl:when test="@if-path and starts-with(@if-path, '/')"
-                        >starts-with($normalized_path, '<xsl:value-of select="@if-path"/>/')</xsl:when>
-                    <xsl:when test="@if-path"
-                        >contains($normalized_path, '/<xsl:value-of select="@if-path"/>/')</xsl:when>
-                </xsl:choose>
+                <xsl:if test="@if-path">
+                    <xsl:variable name="paths" select="str:tokenize(@if-path)"/>
+                    <xsl:if test="count($paths) > 1">(</xsl:if>
+                    <xsl:for-each select="$paths">
+                        <xsl:variable name="path" select="text()"/>
+                        <xsl:choose>
+                            <xsl:when test="starts-with($path, '/') and substring($path, string-length($path)) = '/'"
+                                >$normalized_path = '<xsl:value-of select="$path"/>'</xsl:when>
+                            <xsl:when test="substring($path, string-length($path)) = '/'"
+                                >substring($normalized_path, string-length($normalized_path) - <xsl:value-of select="string-length($path)"/>) = '/<xsl:value-of select="$path"/>'</xsl:when>
+                            <xsl:when test="starts-with($path, '/')"
+                                >starts-with($normalized_path, '<xsl:value-of select="$path"/>/')</xsl:when>
+                            <xsl:otherwise
+                                >contains($normalized_path, '/<xsl:value-of select="$path"/>/')</xsl:otherwise>
+                        </xsl:choose>
+                        <xsl:if test="count($paths) > 1 and position() != last()"> or </xsl:if>
+                    </xsl:for-each>
+                    <xsl:if test="count($paths) > 1">)</xsl:if>
+                </xsl:if>
             </xsl:attribute>
             <xsl:apply-templates select="node()"/>
         </xsl:copy>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-6/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-6/content.html	Thu Sep  9 19:21:08 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-6/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-6/options.cfg	Thu Sep  9 19:21:08 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /another

Added: z3/xdv/trunk/lib/xdv/tests/if-path-6/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-6/output.html	Thu Sep  9 19:21:08 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-6/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-6/rules.xml	Thu Sep  9 19:21:08 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- path starts with -->
+    <copy
+        if-path="/somewhere /another"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-6/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-6/theme.html	Thu Sep  9 19:21:08 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 19:39:01 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 19:39:01 +0200 (CEST)
Subject: [z3-checkins] r76985 - z3/xdv/trunk
Message-ID: <20100909173901.DAF02282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 19:39:00 2010
New Revision: 76985

Modified:
   z3/xdv/trunk/README.txt
Log:
Note on Apache configuration docs

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Thu Sep  9 19:39:00 2010
@@ -916,12 +916,12 @@
 Apache
 ------
 
-XDV currently requires a version of mod_transform with html parsing support.
-The latest patched versions may be downloaded from the html-xslt_ project
+XDV requires a version of mod_transform with html parsing support.
+The latest compatible version may be downloaded from the html-xslt_ project
 page.
 
 As well as the libxml2 and libxslt development packages, you will require the
-appropriate Apache development pacakge::
+appropriate Apache development package::
 
     $ sudo apt-get install libxslt1-dev apache2-threaded-dev
 
@@ -942,17 +942,19 @@
         FilterDeclare THEME
         FilterProvider THEME XSLT resp=Content-Type $text/html
 
-        TransformOptions ApacheFS HTML HideParseErrors
+        TransformOptions +ApacheFS +HTML +HideParseErrors
         TransformSet /theme.xsl
         TransformCache /theme.xsl /etc/apache2/theme.xsl
 
         <LocationMatch "/">
             FilterChain THEME
         </LocationMatch>
-        
+
     </VirtualHost>
 
-The ``ApacheFS`` directive enables XSLT ``document()`` inclusion.
+The ``ApacheFS`` directive enables XSLT ``document()`` inclusion, though
+beware that the includes documents are currently parsed using the XML rather
+than HTML parser.
 
 Unfortunately it is not possible to theme error responses (such as a 404 Not
 Found page) with Apache as these do not pass through the filter chain.

From ldr at codespeak.net  Thu Sep  9 19:52:37 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 19:52:37 +0200 (CEST)
Subject: [z3-checkins] r76987 - z3/xdv/trunk/lib/xdv/tests/if-path-7
Message-ID: <20100909175237.5B569282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 19:52:35 2010
New Revision: 76987

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-7/
   z3/xdv/trunk/lib/xdv/tests/if-path-7/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-7/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-7/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-7/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-7/theme.html
Log:
a test for an exact path match to /

Added: z3/xdv/trunk/lib/xdv/tests/if-path-7/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-7/content.html	Thu Sep  9 19:52:35 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-7/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-7/options.cfg	Thu Sep  9 19:52:35 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /

Added: z3/xdv/trunk/lib/xdv/tests/if-path-7/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-7/output.html	Thu Sep  9 19:52:35 2010
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content">
+      <p>content</p>
+    </div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-7/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-7/rules.xml	Thu Sep  9 19:52:35 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- an exact path match to the root -->
+    <copy
+        if-path="/"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-7/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-7/theme.html	Thu Sep  9 19:52:35 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 19:57:46 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 19:57:46 +0200 (CEST)
Subject: [z3-checkins] r76988 - z3/xdv/trunk/lib/xdv/tests/if-path-8
Message-ID: <20100909175746.49134282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 19:57:44 2010
New Revision: 76988

Added:
   z3/xdv/trunk/lib/xdv/tests/if-path-8/
   z3/xdv/trunk/lib/xdv/tests/if-path-8/content.html
   z3/xdv/trunk/lib/xdv/tests/if-path-8/options.cfg
   z3/xdv/trunk/lib/xdv/tests/if-path-8/output.html
   z3/xdv/trunk/lib/xdv/tests/if-path-8/rules.xml
   z3/xdv/trunk/lib/xdv/tests/if-path-8/theme.html
Log:
test to show only complete path segments are matched

Added: z3/xdv/trunk/lib/xdv/tests/if-path-8/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-8/content.html	Thu Sep  9 19:57:44 2010
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <p>content</p>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-8/options.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-8/options.cfg	Thu Sep  9 19:57:44 2010
@@ -0,0 +1,2 @@
+[xdvtest]
+path = /somewherelse

Added: z3/xdv/trunk/lib/xdv/tests/if-path-8/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-8/output.html	Thu Sep  9 19:57:44 2010
@@ -0,0 +1,7 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <body>
+    <h1>Title</h1>
+    <div id="content"></div>
+  </body>
+</html>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-8/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-8/rules.xml	Thu Sep  9 19:57:44 2010
@@ -0,0 +1,11 @@
+<rules
+    xmlns="http://namespaces.plone.org/xdv"
+    xmlns:css="http://namespaces.plone.org/xdv+css"
+    >
+    <!-- only complete path segments are matched -->
+    <copy
+        if-path="/somewhere"
+        css:theme="#content"
+        css:content="body > *"
+        />
+</rules>

Added: z3/xdv/trunk/lib/xdv/tests/if-path-8/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/if-path-8/theme.html	Thu Sep  9 19:57:44 2010
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <h1>Title</h1>
+  <div id="content"></div>
+</body>
+</html>

From ldr at codespeak.net  Thu Sep  9 20:43:58 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 20:43:58 +0200 (CEST)
Subject: [z3-checkins] r76989 - in z3/xdv/trunk: . docs templates
Message-ID: <20100909184358.BBC92282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 20:43:55 2010
New Revision: 76989

Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/docs/TODO.txt
   z3/xdv/trunk/templates/nginx.conf.in
Log:
Document path conditions.

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Thu Sep  9 20:43:55 2010
@@ -286,7 +286,7 @@
 does not appear in the markup. The ``if-content`` attribute can be used with
 any rule to make it conditional.
 
-``if-content`` should be set an XPath expression. You can also use
+``if-content`` should be set to an XPath expression. You can also use
 ``css:if-content`` with a CSS3 expression. If the expression matches a node
 in the content, the rule will be applied::
 
@@ -306,10 +306,9 @@
 content into the element with id ``header`` in the theme, so long as an
 element with id ``personal-bar`` also appears somewhere in the content.
 
-Above, we also saw the special case of an empty ``if-content`` (which also
-works with an empty ``css:if-content``). This is a shortcut that means "use
-the expression in the ``content`` or ``css:content``` attribute as the
-condition". Hence the following two rules are equivalent::
+An empty ``if-content`` (or ``css:if-content``) is a shortcut meaning "use the
+expression in the ``content`` or ``css:content``` attribute as the condition".
+Hence the following two rules are equivalent::
 
     <copy css:theme="#header" css:content="#header-box > *"
           css:if-content="#header-box > *"/>
@@ -385,6 +384,48 @@
         <copy css:content="h2.articleheading" css:theme="h1"/>
     </rules>
 
+Path conditions
+~~~~~~~~~~~~~~~
+
+A path condition may be applied to a rule, theme or group with the ``if-path``
+attribute.
+
+A leading ``/`` indicates that a path should be matched at the start of the
+url::
+
+    <theme href="news.html" if-path="/news"/>
+
+matches pages with urls ``/news``, ``/news/`` and ``/news/page1.html`` but
+not ``/newspapers`` - only complete path segments are matched.
+
+A trailing ``/`` indicates that a path should be matched at the end of the
+url::
+
+    <theme href="news.html" if-path="news/"/>
+
+matches ``/mysite/news`` and ``/mysite/news/``.
+
+To match an exact url, use both leading and trailing ``/``::
+
+    <theme href="news.html" if-path="/news/"/>
+
+matches ``/news`` and ``/news/``.
+
+Without a leading or trailing ``/`` the path segment(s) may match anywhere in
+the url::
+
+    <theme href="news.html" if-path="news/space"/>
+
+matches ``/mysite/news/space/page1.html``.
+
+Multiple alternative path conditions may be included in the ``if-path``
+attribute as whitespace separated list::
+
+    <theme href="wide.html" if-path="/ /index.html/"/>
+
+matches ``/`` and ``/index.html``. ``if-path="/"`` is considered an exact
+match condition
+
 Including external content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -800,7 +841,9 @@
 configuration as follows::
 
     location / {
-        xslt_stylesheet /path/to/compiled-theme.xsl;
+        xslt_stylesheet /path/to/compiled-theme.xsl
+            path='$uri'
+            ;
         xslt_html_parser on;
         xslt_types text/html;
     }
@@ -808,7 +851,9 @@
 Nginx may also be configured as a transforming proxy server::
 
     location / {
-        xslt_stylesheet /path/to/compiled-theme.xsl;
+        xslt_stylesheet /path/to/compiled-theme.xsl
+            path='$uri'
+            ;
         xslt_html_parser on;
         xslt_types text/html;
         rewrite ^(.*)$ /VirtualHostBase/http/localhost/Plone/VirtualHostRoot$1 break;
@@ -828,8 +873,8 @@
 In this example an X-XDV header was set so the backend server may choose to
 serve different different CSS resources.
 
-Including external content
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Including external content with SSI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As an event based server, it is not practical to add ``document()`` support to
 the Nginx XSLT module for in-transform inclusion. Instead, external content is
@@ -886,7 +931,9 @@
             }
 
             location / {
-                xslt_stylesheet theme.xsl;
+                xslt_stylesheet theme.xsl
+                    path='$uri'
+                    ;
                 xslt_html_parser on;
                 xslt_types text/html;
                 ssi on; # Not required in ESI mode
@@ -959,6 +1006,8 @@
 Unfortunately it is not possible to theme error responses (such as a 404 Not
 Found page) with Apache as these do not pass through the filter chain.
 
+As parameters are not currently supported, path expression are unavailable.
+
 .. _Deliverance: http://deliveranceproject.org/
 .. _collective.xdv: http://pypi.python.org/pypi/collective.xdv
 .. _dv.xdvserver: http://pypi.python.org/pypi/dv.xdvserver

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Thu Sep  9 20:43:55 2010
@@ -4,11 +4,9 @@
 0.4b3 - unreleased
 ------------------
 
-* if-path support.
+* Path conditions with @if-path.
 
-* $path parameter. 
-
-* Serialize using XSLT method from xdvrun.
+* Serialize using XSLT method in xdvrun to respect <xsl:output method="html"/>
 
 * Fix for default theme.
 

Modified: z3/xdv/trunk/docs/TODO.txt
==============================================================================
--- z3/xdv/trunk/docs/TODO.txt	(original)
+++ z3/xdv/trunk/docs/TODO.txt	Thu Sep  9 20:43:55 2010
@@ -32,7 +32,7 @@
 * Maybe this should be called ``rules`` instead.
 
 
-Path conditions
+Path conditions (implemented as a single if-path attribute)
 ---------------
 
 So far, XDV has taken the view that path configuration belongs in your

Modified: z3/xdv/trunk/templates/nginx.conf.in
==============================================================================
--- z3/xdv/trunk/templates/nginx.conf.in	(original)
+++ z3/xdv/trunk/templates/nginx.conf.in	Thu Sep  9 20:43:55 2010
@@ -56,7 +56,9 @@
         # Our styled location.
         location /styled {
             alias ${root};
-            xslt_stylesheet ${example.xsl};
+            xslt_stylesheet ${example.xsl}
+                path='$uri'
+                ;
             xslt_html_parser on;
             xslt_types text/html;
             # Switch on ssi here to enable external includes.
@@ -66,7 +68,9 @@
         # Another styled location.
         location /styled/ploneorg {
             alias ${root}/ploneorg;
-            xslt_stylesheet ${ploneorg.xsl};
+            xslt_stylesheet ${ploneorg.xsl}
+                path='$uri'
+                ;
             xslt_html_parser on;
             xslt_types text/html;
         }

From ldr at codespeak.net  Thu Sep  9 20:46:18 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 20:46:18 +0200 (CEST)
Subject: [z3-checkins] r76990 - z3/xdv/trunk/docs
Message-ID: <20100909184618.559A6282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 20:46:16 2010
New Revision: 76990

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
Log:
prepare 0.4b3 release

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Thu Sep  9 20:46:16 2010
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-0.4b3 - unreleased
+0.4b3 - 2010-09-09
 ------------------
 
 * Path conditions with @if-path.

From ldr at codespeak.net  Thu Sep  9 20:47:50 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 20:47:50 +0200 (CEST)
Subject: [z3-checkins] r76991 - z3/xdv/tags/0.4b3
Message-ID: <20100909184750.27A7E282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 20:47:48 2010
New Revision: 76991

Added:
   z3/xdv/tags/0.4b3/   (props changed)
      - copied from r76990, z3/xdv/trunk/
Log:
tag 0.4b3

From ldr at codespeak.net  Thu Sep  9 20:48:47 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu,  9 Sep 2010 20:48:47 +0200 (CEST)
Subject: [z3-checkins] r76992 - in z3/xdv/trunk: . docs
Message-ID: <20100909184847.A7058282B9C@codespeak.net>

Author: ldr
Date: Thu Sep  9 20:48:46 2010
New Revision: 76992

Modified:
   z3/xdv/trunk/docs/CHANGES.txt
   z3/xdv/trunk/setup.py
Log:
bump version

Modified: z3/xdv/trunk/docs/CHANGES.txt
==============================================================================
--- z3/xdv/trunk/docs/CHANGES.txt	(original)
+++ z3/xdv/trunk/docs/CHANGES.txt	Thu Sep  9 20:48:46 2010
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.4b4 - unreleased
+------------------
+
+
+
 0.4b3 - 2010-09-09
 ------------------
 

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Thu Sep  9 20:48:46 2010
@@ -3,7 +3,7 @@
 
 setup(
     name='xdv',
-    version='0.4b3',
+    version='0.4b4',
     description='''\
 XDV implements a subset of Deliverance using a pure XSLT engine. With XDV, you
 "compile" your theme and ruleset in one step, then use a superfast/simple

From ldr at codespeak.net  Mon Sep 13 18:09:59 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Mon, 13 Sep 2010 18:09:59 +0200 (CEST)
Subject: [z3-checkins] r77045 - in z3/dv.xdvserver/trunk: . dv/xdvserver
Message-ID: <20100913160959.8825F282C01@codespeak.net>

Author: ldr
Date: Mon Sep 13 18:09:53 2010
New Revision: 77045

Added:
   z3/dv.xdvserver/trunk/bootstrap.py   (contents, props changed)
   z3/dv.xdvserver/trunk/buildout.cfg
   z3/dv.xdvserver/trunk/dv/xdvserver/tests.py
Log:
basic testing infrastructure

Added: z3/dv.xdvserver/trunk/bootstrap.py
==============================================================================
--- (empty file)
+++ z3/dv.xdvserver/trunk/bootstrap.py	Mon Sep 13 18:09:53 2010
@@ -0,0 +1,260 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+"""
+
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
+
+if sys.platform == 'win32':
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    quote = str
+
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+    [sys.executable, '-Sc',
+     'try:\n'
+     '    import ConfigParser\n'
+     'except ImportError:\n'
+     '    print 1\n'
+     'else:\n'
+     '    print 0\n'],
+    stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
+
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded.  This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient.  However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+    # We will restart with python -S.
+    args = sys.argv[:]
+    args[0:0] = [sys.executable, '-S']
+    args = map(quote, args)
+    os.execv(sys.executable, args)
+# Now we are running with -S.  We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+    if k in ('setuptools', 'pkg_resources') or (
+        hasattr(v, '__path__') and
+        len(v.__path__)==1 and
+        not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+        # This is a namespace package.  Remove it.
+        sys.modules.pop(k)
+
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+    if value:
+        if '://' not in value: # It doesn't smell like a URL.
+            value = 'file://%s' % (
+                urllib.pathname2url(
+                    os.path.abspath(os.path.expanduser(value))),)
+        if opt_str == '--download-base' and not value.endswith('/'):
+            # Download base needs a trailing slash to make the world happy.
+            value += '/'
+    else:
+        value = None
+    name = opt_str[2:].replace('-', '_')
+    setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+                          help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+                   action="store_true", dest="use_distribute", default=False,
+                   help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+                  callback=normalize_to_url, nargs=1, type="string",
+                  help=("Specify a URL or file location for the setup file. "
+                        "If you use Setuptools, this will default to " +
+                        setuptools_source + "; if you use Distribute, this "
+                        "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+                  callback=normalize_to_url, nargs=1, type="string",
+                  help=("Specify a URL or directory for downloading "
+                        "zc.buildout and either Setuptools or Distribute. "
+                        "Defaults to PyPI."))
+parser.add_option("--eggs",
+                  help=("Specify a directory for storing eggs.  Defaults to "
+                        "a temporary directory that is deleted when the "
+                        "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+                  dest='accept_buildout_test_releases',
+                  action="store_true", default=False,
+                  help=("Normally, if you do not specify a --version, the "
+                        "bootstrap script and buildout gets the newest "
+                        "*final* versions of zc.buildout and its recipes and "
+                        "extensions for you.  If you use this flag, "
+                        "bootstrap and buildout will get the newest releases "
+                        "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+                   help=("Specify the path to the buildout configuration "
+                         "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+    args += ['-c', options.config_file]
+
+if options.eggs:
+    eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+    eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+    if options.use_distribute:
+        options.setup_source = distribute_source
+    else:
+        options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+    args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+    import pkg_resources
+    import setuptools # A flag.  Sometimes pkg_resources is installed alone.
+    if not hasattr(pkg_resources, '_distribute'):
+        raise ImportError
+except ImportError:
+    ez_code = urllib2.urlopen(
+        options.setup_source).read().replace('\r\n', '\n')
+    ez = {}
+    exec ez_code in ez
+    setup_args = dict(to_dir=eggs_dir, download_delay=0)
+    if options.download_base:
+        setup_args['download_base'] = options.download_base
+    if options.use_distribute:
+        setup_args['no_fake'] = True
+    ez['use_setuptools'](**setup_args)
+    if 'pkg_resources' in sys.modules:
+        reload(sys.modules['pkg_resources'])
+    import pkg_resources
+    # This does not (always?) update the default working set.  We will
+    # do it.
+    for path in sys.path:
+        if path not in pkg_resources.working_set.entries:
+            pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+       '-c',
+       quote('from setuptools.command.easy_install import main; main()'),
+       '-mqNxd',
+       quote(eggs_dir)]
+
+if not has_broken_dash_S:
+    cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+    find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+    cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+    setup_requirement = 'distribute'
+else:
+    setup_requirement = 'setuptools'
+ws = pkg_resources.working_set
+setup_requirement_path = ws.find(
+    pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+    os.environ,
+    PYTHONPATH=setup_requirement_path)
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+    # Figure out the most recent final version of zc.buildout.
+    import setuptools.package_index
+    _final_parts = '*final-', '*final'
+    def _final_version(parsed_version):
+        for part in parsed_version:
+            if (part[:1] == '*') and (part not in _final_parts):
+                return False
+        return True
+    index = setuptools.package_index.PackageIndex(
+        search_path=[setup_requirement_path])
+    if find_links:
+        index.add_find_links((find_links,))
+    req = pkg_resources.Requirement.parse(requirement)
+    if index.obtain(req) is not None:
+        best = []
+        bestv = None
+        for dist in index[req.project_name]:
+            distv = dist.parsed_version
+            if _final_version(distv):
+                if bestv is None or distv > bestv:
+                    best = [dist]
+                    bestv = distv
+                elif distv == bestv:
+                    best.append(dist)
+        if best:
+            best.sort()
+            version = best[-1].version
+if version:
+    requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+    import subprocess
+    exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+    exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+    sys.stdout.flush()
+    sys.stderr.flush()
+    print ("An error occurred when trying to install zc.buildout. "
+           "Look above this message for any errors that "
+           "were output by easy_install.")
+    sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+    shutil.rmtree(eggs_dir)

Added: z3/dv.xdvserver/trunk/buildout.cfg
==============================================================================
--- (empty file)
+++ z3/dv.xdvserver/trunk/buildout.cfg	Mon Sep 13 18:09:53 2010
@@ -0,0 +1,19 @@
+[buildout]
+versions = versions
+parts = test py
+develop = .
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = dv.xdvserver
+defaults = ['--auto-color']
+
+[py]
+recipe = zc.recipe.egg
+eggs =
+    dv.xdvserver
+    collective.checkdocs
+interpreter = py
+
+[versions]
+lxml = 2.2.8

Added: z3/dv.xdvserver/trunk/dv/xdvserver/tests.py
==============================================================================
--- (empty file)
+++ z3/dv.xdvserver/trunk/dv/xdvserver/tests.py	Mon Sep 13 18:09:53 2010
@@ -0,0 +1,36 @@
+import unittest
+from dv.xdvserver.filter import XSLTMiddleware
+from paste.fixture import TestApp
+
+def application(environ, start_response):
+    """Simplest possible application object"""
+    status = '200 OK'
+    response_headers = [('Content-Type', 'text/html')]
+    start_response(status, response_headers)
+    return ['<html><body>Hello world!<br></body></html>\n']
+
+XHTML_IDENTITY = '''
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="no" omit-xml-declaration="yes"
+        media-type="text/html" encoding="UTF-8"
+        doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+        doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+        />
+    <xsl:template match="@*|node()">
+      <xsl:copy>
+        <xsl:apply-templates select="@*|node()"/>
+      </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
+'''
+
+class TestXSLTMiddleware(unittest.TestCase):
+
+    def broken_test_xhtml(self):
+        app = TestApp(XSLTMiddleware(app=application, global_conf=None, xslt_source=XHTML_IDENTITY))
+        response = app.get('/')
+        response.mustcontain('<br />')
+
+
+def test_suite():
+    return unittest.defaultTestLoader.loadTestsFromName(__name__)

From z3-checkins at codespeak.net  Tue Sep 21 17:58:57 2010
From: z3-checkins at codespeak.net (z3-checkins at codespeak.net)
Date: Tue, 21 Sep 2010 17:58:57 +0200 (CEST)
Subject: [z3-checkins] MensHealth Discount ID65771
Message-ID: <20100921195216.2666.qmail@186-58-25-195.speedy.com.ar>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/z3-checkins/attachments/20100921/53f7657f/attachment-0001.htm 

From ejucovy at codespeak.net  Thu Sep 23 18:26:16 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 18:26:16 +0200 (CEST)
Subject: [z3-checkins] r77307 - z3/deliverance/trunk
Message-ID: <20100923162616.DB4AF282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 18:26:15 2010
New Revision: 77307

Modified:
   z3/deliverance/trunk/setup.py
Log:
remove broken devauth dependency_link.  i'll tag and release devauth.

Modified: z3/deliverance/trunk/setup.py
==============================================================================
--- z3/deliverance/trunk/setup.py	(original)
+++ z3/deliverance/trunk/setup.py	Thu Sep 23 18:26:15 2010
@@ -45,9 +45,6 @@
         "chardet",
         "simplejson",
         ],
-      dependency_links=[
-        "https://svn.openplans.org/svn/DevAuth/trunk#egg=DevAuth-dev",
-        ],
       entry_points="""
       [console_scripts]
       deliverance-proxy = deliverance.proxycommand:main

From ejucovy at codespeak.net  Thu Sep 23 19:04:14 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:04:14 +0200 (CEST)
Subject: [z3-checkins] r77308 - z3/deliverance/trunk/deliverance
Message-ID: <20100923170414.A69F2282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:04:12 2010
New Revision: 77308

Modified:
   z3/deliverance/trunk/deliverance/ruleset.py
Log:
fix import for webob 1.0

Modified: z3/deliverance/trunk/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/trunk/deliverance/ruleset.py	(original)
+++ z3/deliverance/trunk/deliverance/ruleset.py	Thu Sep 23 19:04:12 2010
@@ -3,7 +3,12 @@
 import re
 from lxml.html import tostring, document_fromstring
 from lxml.etree import XML, Comment
-from webob.headerdict import HeaderDict
+
+try: # webob 1.0
+    from webob.headers import ResponseHeaders
+except ImportError:  # webob 0.9.8
+    from webob.headerdict import HeaderDict as ResponseHeaders
+
 from deliverance.exceptions import AbortTheme, DeliveranceSyntaxError
 from deliverance.pagematch import run_matches, Match, ClientsideMatch
 from deliverance.rules import Rule, remove_content_attribs
@@ -35,7 +40,7 @@
         """
         extra_headers = parse_meta_headers(resp.body)
         if extra_headers:
-            response_headers = HeaderDict(resp.headerlist + extra_headers)
+            response_headers = ResponseHeaders(resp.headerlist + extra_headers)
         else:
             response_headers = resp.headers
         try:
@@ -239,7 +244,7 @@
     def clientside_actions(self, req, resp, log):
         extra_headers = parse_meta_headers(resp.body)
         if extra_headers:
-            response_headers = HeaderDict(resp.headerlist + extra_headers)
+            response_headers = ResponseHeaders(resp.headerlist + extra_headers)
         else:
             response_headers = resp.headers
         try:

From ejucovy at codespeak.net  Thu Sep 23 19:08:38 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:08:38 +0200 (CEST)
Subject: [z3-checkins] r77309 - z3/deliverance/branches/0.3
Message-ID: <20100923170838.D264C282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:08:37 2010
New Revision: 77309

Added:
   z3/deliverance/branches/0.3/
      - copied from r77308, z3/deliverance/tags/0.3.0/
Log:
branch 0.3.0 tag to backport fix from trunk for webob 1.0

From ejucovy at codespeak.net  Thu Sep 23 19:09:36 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:09:36 +0200 (CEST)
Subject: [z3-checkins] r77310 - z3/deliverance/branches/0.3
Message-ID: <20100923170936.6DD91282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:09:34 2010
New Revision: 77310

Modified:
   z3/deliverance/branches/0.3/setup.py
Log:
bump version

Modified: z3/deliverance/branches/0.3/setup.py
==============================================================================
--- z3/deliverance/branches/0.3/setup.py	(original)
+++ z3/deliverance/branches/0.3/setup.py	Thu Sep 23 19:09:34 2010
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3.0'
+version = '0.3.1'
 
 setup(name='Deliverance',
       version=version,

From ejucovy at codespeak.net  Thu Sep 23 19:10:03 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:10:03 +0200 (CEST)
Subject: [z3-checkins] r77311 - z3/deliverance/branches/0.3
Message-ID: <20100923171003.2EE15282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:10:01 2010
New Revision: 77311

Modified:
   z3/deliverance/branches/0.3/setup.py
Log:
devauth trunk link is broken (devauth has moved); anyway, we should depend on a release

Modified: z3/deliverance/branches/0.3/setup.py
==============================================================================
--- z3/deliverance/branches/0.3/setup.py	(original)
+++ z3/deliverance/branches/0.3/setup.py	Thu Sep 23 19:10:01 2010
@@ -45,9 +45,6 @@
         "chardet",
         "simplejson",
         ],
-      dependency_links=[
-        "https://svn.openplans.org/svn/DevAuth/trunk#egg=DevAuth-dev",
-        ],
       entry_points="""
       [console_scripts]
       deliverance-proxy = deliverance.proxycommand:main

From ejucovy at codespeak.net  Thu Sep 23 19:11:59 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:11:59 +0200 (CEST)
Subject: [z3-checkins] r77312 - in z3/deliverance/branches/0.3: . deliverance
Message-ID: <20100923171159.B3688282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:11:58 2010
New Revision: 77312

Modified:
   z3/deliverance/branches/0.3/   (props changed)
   z3/deliverance/branches/0.3/deliverance/ruleset.py
Log:
merge r77308 from trunk: webob 1.0 compatibility (with fallback import from webob 0.9.8 location)

Modified: z3/deliverance/branches/0.3/deliverance/ruleset.py
==============================================================================
--- z3/deliverance/branches/0.3/deliverance/ruleset.py	(original)
+++ z3/deliverance/branches/0.3/deliverance/ruleset.py	Thu Sep 23 19:11:58 2010
@@ -3,7 +3,12 @@
 import re
 from lxml.html import tostring, document_fromstring
 from lxml.etree import XML, Comment
-from webob.headerdict import HeaderDict
+
+try: # webob 1.0
+    from webob.headers import ResponseHeaders
+except ImportError:  # webob 0.9.8
+    from webob.headerdict import HeaderDict as ResponseHeaders
+
 from deliverance.exceptions import AbortTheme, DeliveranceSyntaxError
 from deliverance.pagematch import run_matches, Match, ClientsideMatch
 from deliverance.rules import Rule, remove_content_attribs
@@ -35,7 +40,7 @@
         """
         extra_headers = parse_meta_headers(resp.body)
         if extra_headers:
-            response_headers = HeaderDict(resp.headerlist + extra_headers)
+            response_headers = ResponseHeaders(resp.headerlist + extra_headers)
         else:
             response_headers = resp.headers
         try:
@@ -239,7 +244,7 @@
     def clientside_actions(self, req, resp, log):
         extra_headers = parse_meta_headers(resp.body)
         if extra_headers:
-            response_headers = HeaderDict(resp.headerlist + extra_headers)
+            response_headers = ResponseHeaders(resp.headerlist + extra_headers)
         else:
             response_headers = resp.headers
         try:

From ejucovy at codespeak.net  Thu Sep 23 19:14:04 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:14:04 +0200 (CEST)
Subject: [z3-checkins] r77313 - in z3/deliverance/branches/0.3: .
	deliverance/docs
Message-ID: <20100923171404.4AAEB282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:14:02 2010
New Revision: 77313

Modified:
   z3/deliverance/branches/0.3/changes_on_trunk.txt
   z3/deliverance/branches/0.3/deliverance/docs/news.txt
Log:
update news

Modified: z3/deliverance/branches/0.3/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/branches/0.3/changes_on_trunk.txt	(original)
+++ z3/deliverance/branches/0.3/changes_on_trunk.txt	Thu Sep 23 19:14:02 2010
@@ -1,3 +1 @@
 
-* Pass open file objects to lxml instead of filenames. Apparently lxml can segfault in some circumstances
-  if you pass a filename for it to open multiple times. (kiorky)

Modified: z3/deliverance/branches/0.3/deliverance/docs/news.txt
==============================================================================
--- z3/deliverance/branches/0.3/deliverance/docs/news.txt	(original)
+++ z3/deliverance/branches/0.3/deliverance/docs/news.txt	Thu Sep 23 19:14:02 2010
@@ -1,6 +1,20 @@
 News
 ====
 
+0.3.1
+-----
+
+ * Compatible with WebOb 1.0 (or 0.9.8)
+
+ * Remove dependency_link for unpinned trunk of DevAuth
+
+0.3
+---
+
+ * Pass open file objects to lxml instead of filenames. Apparently
+   lxml can segfault in some circumstances if you pass a filename 
+   for it to open multiple times. (kiorky)
+
 0.3c4
 -----
 

From ejucovy at codespeak.net  Thu Sep 23 19:15:27 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:15:27 +0200 (CEST)
Subject: [z3-checkins] r77314 - z3/deliverance/branches/0.3
Message-ID: <20100923171527.E8288282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:15:26 2010
New Revision: 77314

Modified:
   z3/deliverance/branches/0.3/changes_on_trunk.txt
Log:
keep 0.3.1 changes in changes_on_trunk file which setup.py uses to generate long_description for a release

Modified: z3/deliverance/branches/0.3/changes_on_trunk.txt
==============================================================================
--- z3/deliverance/branches/0.3/changes_on_trunk.txt	(original)
+++ z3/deliverance/branches/0.3/changes_on_trunk.txt	Thu Sep 23 19:15:26 2010
@@ -1 +1,2 @@
-
+ * Compatible with WebOb 1.0 (or 0.9.8)
+ * Remove dependency_link for unpinned trunk of DevAuth

From ejucovy at codespeak.net  Thu Sep 23 19:16:31 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:16:31 +0200 (CEST)
Subject: [z3-checkins] r77315 - z3/deliverance/branches/0.3/deliverance/docs
Message-ID: <20100923171631.0DDAC282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:16:29 2010
New Revision: 77315

Modified:
   z3/deliverance/branches/0.3/deliverance/docs/news.txt
Log:
copy news.txt entry for 0.3.0 from trunk instead

Modified: z3/deliverance/branches/0.3/deliverance/docs/news.txt
==============================================================================
--- z3/deliverance/branches/0.3/deliverance/docs/news.txt	(original)
+++ z3/deliverance/branches/0.3/deliverance/docs/news.txt	Thu Sep 23 19:16:29 2010
@@ -8,13 +8,18 @@
 
  * Remove dependency_link for unpinned trunk of DevAuth
 
-0.3
----
+0.3.0
+-----
 
- * Pass open file objects to lxml instead of filenames. Apparently
+ * Pass open file objects to lxml instead of filenames. Apparently 
    lxml can segfault in some circumstances if you pass a filename 
    for it to open multiple times. (kiorky)
 
+ * Reorganized pyref documentation into a single document for easier
+   reference.
+
+ * Added a document on configuring Deliverance with Paste Deploy.
+
 0.3c4
 -----
 

From ejucovy at codespeak.net  Thu Sep 23 19:19:08 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:19:08 +0200 (CEST)
Subject: [z3-checkins] r77316 - z3/deliverance/tags/0.3.1
Message-ID: <20100923171908.3CFC6282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:19:06 2010
New Revision: 77316

Added:
   z3/deliverance/tags/0.3.1/   (props changed)
      - copied from r77315, z3/deliverance/branches/0.3/
Log:
tag 0.3.1

From ejucovy at codespeak.net  Thu Sep 23 19:23:14 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Thu, 23 Sep 2010 19:23:14 +0200 (CEST)
Subject: [z3-checkins] r77317 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100923172314.30996282B9D@codespeak.net>

Author: ejucovy
Date: Thu Sep 23 19:23:12 2010
New Revision: 77317

Modified:
   z3/deliverance/trunk/deliverance/docs/news.txt
Log:
add 0.3.1 news entries

Modified: z3/deliverance/trunk/deliverance/docs/news.txt
==============================================================================
--- z3/deliverance/trunk/deliverance/docs/news.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/news.txt	Thu Sep 23 19:23:12 2010
@@ -1,6 +1,13 @@
 News
 ====
 
+0.3.1
+-----
+
+ * Compatible with WebOb 1.0 (or 0.9.8)
+
+ * Remove dependency_link for unpinned trunk of DevAuth
+
 0.3.0
 -----