This is the theme title

`` blocks. As HTTP specified CRLF line endings for form
+this is a problem for us. plone.org works around this with::
+
+    
+        
+    
+
+This should be included in the boilerplate xsl.
+
+
+Copy xsl directives from the rules file
+---------------------------------------
+
+We want to be able to do::
+
+    
+        
+    
+
+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
+===========
+
+
+Group directive
+---------------
+
+It would be useful to group together rules that share the same condition::
+
+    
+     
+     
+    
+
+To match multiple paths in a single rule separate them with spaces::
+
+    
+
+This would be limited to simple string matching. Regexp would also be
+possible, with the extension included in lxml or the libxslt-regexp-plugin_
+for apache / nginx usage::
+
+    
+
+($path would be supplied to the template as a parameter)
+
+.. _libxslt-regexp-plugin: http://fr.rpmfind.net/pub/libxml/plugins/
+
+
+Refactor generated xslt
+-----------------------
+
+The xslt generated by the xdv compiler is currently uses three passes,
+an initial-stage where drop rules are applied, an apply-theme stage
+and a final-stage which ensures script and style element content is
+unquoted. By collapsing this into a single stage we should see a
+30-50% speedup (from my initial experiments).
+
+The initial-stage and final-stage passes were also a plugin point to
+include custom xslt, but xdv 0.3 now allows you to write inline xsl
+should you wish::
+
+    
+       
+           
+               
+               
+           
+       
+    
+
+extra.xsl is may also be used for output directives, such as
+````. This would be put into the rules file
+instead.
+
+There is one slight complication. Take a content document as follows::
+
+    ONE
+    TWO
+
+And rules::
+
+    
+    
+
+Should this give the output (as currently)::
+
+    
+    ONE
+    
+
+or (the easier to implement in a single pass template)::
+
+    
+    ONE
+    TWO
+    
+
+I guess the former might be implemented by prefixing
+ancestor-or-self::, though that may interact badly with complex xpath
+selectors.
+
+
+Include directive
+-----------------
+
+The current xinclude syntax is complex, maybe we need a dedicated directive::
+
+    
+
+* Lars noted that by placing an id on groups, it would be possible to pull in
+  groups with xinclude. e.g.:
+
+  In rules.xml::
+
+    
+      
+    
+
+  In common.xml::
+
+    
+      
+        
+      
+      
+        
+      
+    
+
+  With the result::
+
+    
+      
+        
+      
+    
+
+
+Theme directive / multiple theme support
+----------------------------------------
+
+It would be nice to specify the theme in the rules file itself::
+
+    
+
+Multiple themes may be used with conditions::
+
+    
+    
+
+When no conditional theme matches and there is no unconditional theme, the
+page would still be parsed and serialized through libxml2.
+
+
+Omit directive
+--------------
+
+Similar to TAL's omit-tag, it leaves the contents of the matched node
+in place, while omitting the start and end tags (along with any
+attributes)::
+
+    
+
+* Martin points out that ``omit`` is a synonym for ``drop``, though we already
+  have ``copy`` and ``replace``.
+
+
+Better debugging support
+------------------------
+
+There needs to be some mechanism to feedback to the integrator which rules are
+being matched, probably by writing out information into comments.
+
+
+
+Maybe sometime in the future
+============================
+
+
+pyref support
+-------------
+
+It might be useful to add pyref_ support for collective.xdv and dv.xdvserver.
+
+.. _pyref
+
+
+i18n support
+------------
+
+It would be nice to be able to leverage the existing gettext translation
+machinery for message strings within the template. I don't know exactly what
+syntax we should use, but it would be quite easy to implement with lxml (see
+this perl example_.) For Apache / Nginx use we would need a C libxslt plugin,
+but that shouldn't be too hard.
+
+Maybe something like::
+
+    
+
+.. _example: `_

From ejucovy at codespeak.net  Sat May 22 19:09:59 2010
From: ejucovy at codespeak.net (ejucovy at codespeak.net)
Date: Sat, 22 May 2010 19:09:59 +0200 (CEST)
Subject: [z3-checkins] r74683 - z3/deliverance/trunk/deliverance/docs
Message-ID: <20100522170959.64815282BAD@codespeak.net>

Author: ejucovy
Date: Sat May 22 19:09:57 2010
New Revision: 74683

Modified:
   z3/deliverance/trunk/deliverance/docs/rules.txt
Log:
add example on how to select multiple things with a single CSS selector, per http://www.coactivate.org/projects/deliverance/lists/deliverance-discussion/archive/2010/05/1273691268732

Modified: z3/deliverance/trunk/deliverance/docs/rules.txt
==============================================================================

--- z3/deliverance/trunk/deliverance/docs/rules.txt	(original)
+++ z3/deliverance/trunk/deliverance/docs/rules.txt	Sat May 22 19:09:57 2010
@@ -27,6 +27,7 @@
 Some types are invalid in some positions; this will be noted later on.
 
 
+
 Actions
 -------
 
@@ -227,3 +228,10 @@
 
 
 
+You want to copy all the items with class .one and all the items with class .three, preserving their order:
+
+.. code-block:: xml
+  
+  
+

From ldr at codespeak.net  Sun May 23 14:22:47 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 14:22:47 +0200 (CEST)
Subject: [z3-checkins] r74685 - z3/xdv/trunk/lib/xdv
Message-ID: <20100523122247.100E0282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 14:22:45 2010
New Revision: 74685

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/run.py
Log:
add support for xslt access control, so reads to network can be supported

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun May 23 14:22:45 2010
@@ -83,7 +83,7 @@
         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 compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None):
+def compile_theme(rules, theme, extra=None, css=True, xinclude=False, absolute_prefix=None, update=True, trace=False, includemode=None, parser=None, compiler_parser=None, rules_parser=None, access_control=None):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
@@ -134,7 +134,9 @@
     
     if compiler_parser is None:
         compiler_parser = etree.XMLParser()
-    compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser))
+    if access_control is None:
+        access_control = etree.XSLTAccessControl()
+    compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser), access_control=access_control)
 
     params = dict(rulesuri="'xdv:rules'")
     if extra:
@@ -187,6 +189,9 @@
     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)
     (options, args) = parser.parse_args()
     
     if len(args) !=2:
@@ -195,8 +200,10 @@
 
     if options.trace:
         logger.setLevel(logging.DEBUG)
+    
+    access_control = etree.XSLTAccessControl(read_network=options.read_network)
 
-    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode)
+    output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode, access_control=access_control)
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Sun May 23 14:22:45 2010
@@ -47,8 +47,13 @@
     op.add_option("--xinclude", action="store_true",
                   help="Run XInclude on rules.xml",
                   dest="xinclude", default=False)
+    op.add_option("-n", "--network", action="store_true",
+                  help="Allow reads to the network to fetch resources",
+                  dest="read_network", default=False)
     (options, args) = op.parse_args()
 
+    access_control = etree.XSLTAccessControl(read_network=options.read_network)
+
     if len(args) == 2:
         transform_path, content = args
         parser = etree.XMLParser()
@@ -57,7 +62,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, xinclude=options.xinclude, parser=parser)
+            output_xslt = compile_theme(rules=options.rules, theme=options.theme, extra=options.extra, xinclude=options.xinclude, parser=parser, access_control=access_control)
         else:
             op.error("Theme and rules must be supplied.")
     else:
@@ -67,7 +72,7 @@
         content = sys.stdin
 
     parser.resolvers.add(RunResolver(os.path.dirname(content)))
-    transform = etree.XSLT(output_xslt)
+    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)

From ldr at codespeak.net  Sun May 23 15:14:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 15:14:10 +0200 (CEST)
Subject: [z3-checkins] r74686 - z3/xdv/trunk/lib/xdv
Message-ID: <20100523131410.B9265282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 15:14:09 2010
New Revision: 74686

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/run.py
Log:
fix access control

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun May 23 15:14:09 2010
@@ -47,9 +47,9 @@
         self.extra = extra
         
     def resolve(self, url, pubid, context):
-        if url == 'xdv:rules':
+        if url == '__xdv__rules':
             return self.resolve_string(self.rules, context)
-        if url == 'xdv:extra' and self.extra is not None:
+        if url == '__xdv__extra' and self.extra is not None:
             return self.resolve_string(self.extra, context)
 
 def to_absolute(path, prefix):
@@ -135,12 +135,12 @@
     if compiler_parser is None:
         compiler_parser = etree.XMLParser()
     if access_control is None:
-        access_control = etree.XSLTAccessControl()
+        access_control = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=False, write_network=False)
     compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser), access_control=access_control)
 
-    params = dict(rulesuri="'xdv:rules'")
+    params = dict(rulesuri="'__xdv__rules'")
     if extra:
-        params['extraurl'] = "'xdv:extra'"
+        params['extraurl'] = "'__xdv__extra'"
         resolver = CompileResolver(etree.tostring(rules_doc), etree.tostring(etree.parse(extra)))
     else:
         resolver = CompileResolver(etree.tostring(rules_doc))
@@ -200,8 +200,8 @@
 
     if options.trace:
         logger.setLevel(logging.DEBUG)
-    
-    access_control = etree.XSLTAccessControl(read_network=options.read_network)
+
+    access_control = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=options.read_network, write_network=False)
 
     output_xslt = compile_theme(rules=rules, theme=theme, extra=options.extra, trace=options.trace, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode, access_control=access_control)
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Sun May 23 15:14:09 2010
@@ -52,7 +52,7 @@
                   dest="read_network", default=False)
     (options, args) = op.parse_args()
 
-    access_control = etree.XSLTAccessControl(read_network=options.read_network)
+    access_control = access_control = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=options.read_network, write_network=False)
 
     if len(args) == 2:
         transform_path, content = args

From ldr at codespeak.net  Sun May 23 15:45:59 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 15:45:59 +0200 (CEST)
Subject: [z3-checkins] r74687 - z3/xdv/trunk/lib/xdv
Message-ID: <20100523134559.1F0A8282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 15:45:57 2010
New Revision: 74687

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
remove unused function

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun May 23 15:45:57 2010
@@ -155,15 +155,6 @@
         logger.info(msg)
     return compiled
 
-def prepare_filename(filename):
-    """Make file name string parameters compatible with xdv's compiler.xsl
-    """
-    filename = os.path.abspath(filename)
-    if sys.platform.startswith('win'):
-        # compiler.xsl on Windows wants c:/foo/bar instead of C:\foo\bar
-        filename = filename.replace('\\', '/')
-    return filename
-
 def main():
     """Called from console script
     """

From ldr at codespeak.net  Sun May 23 20:55:57 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 20:55:57 +0200 (CEST)
Subject: [z3-checkins] r74688 - z3/xdv/trunk/lib/xdv
Message-ID: <20100523185557.8B3DC282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 20:55:54 2010
New Revision: 74688

Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
allow theme and rules to be supplied as options to compiler

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun May 23 20:55:54 2010
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """\
-Usage: %prog [options] RULES THEME
+Usage: %prog [options] [-r] RULES [-t] THEME
 
   THEME is an html file.
   RULES is a file defining a set of xdv rules in css syntax, e.g:
@@ -183,18 +183,28 @@
     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)
     (options, args) = parser.parse_args()
-    
-    if len(args) !=2:
-        parser.error("Wrong number of arguments.")
-    rules, theme = args
+
+    if options.rules is None and options.theme is None:
+        if len(args) == 2:
+            options.rules, options.theme = 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)
 
     access_control = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=options.read_network, write_network=False)
 
-    output_xslt = compile_theme(rules=rules, theme=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, xinclude=options.xinclude, absolute_prefix=options.absolute_prefix, includemode=options.includemode, access_control=access_control)
     output_xslt.write(options.output, encoding='utf-8', pretty_print=options.pretty_print)
 
 if __name__ == '__main__':

From ldr at codespeak.net  Sun May 23 20:56:27 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 20:56:27 +0200 (CEST)
Subject: [z3-checkins] r74689 - in z3/xdv/trunk/lib/xdv: .
	tests/inline-xsl-directives
Message-ID: <20100523185627.04140282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 20:56:26 2010
New Revision: 74689

Added:
   z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/
   z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/content.html
   z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/output.html
   z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/rules.xml
   z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
allow inline xsl directives in rules

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Sun May 23 20:56:26 2010
@@ -101,6 +101,7 @@
                 
                     
                 
+                
             
             
                 
@@ -139,7 +140,7 @@
     
         
         
-            
+            
                 
                     r
                     
@@ -169,6 +170,7 @@
                     
                 
             
+            
         
     
 

Added: z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/content.html	Sun May 23 20:56:26 2010
@@ -0,0 +1 @@
+From the content

Added: z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/output.html	Sun May 23 20:56:26 2010
@@ -0,0 +1,8 @@
+
+
+  
+    
+      From the content
+    
+  
+

Added: z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/rules.xml	Sun May 23 20:56:26 2010
@@ -0,0 +1,9 @@
+
+
+   
+    
+

Added: z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/inline-xsl-directives/theme.html	Sun May 23 20:56:26 2010
@@ -0,0 +1,3 @@
+
+    Content
+

From ldr at codespeak.net  Sun May 23 21:15:33 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:15:33 +0200 (CEST)
Subject: [z3-checkins] r74690 - z3/xdv/trunk/lib/xdv/tests
Message-ID: <20100523191533.3C109282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:15:30 2010
New Revision: 74690

Modified:
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
tweak test class names

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	Sun May 23 21:15:30 2010
@@ -225,7 +225,7 @@
         path = os.path.join(HERE, name)
         if not os.path.isdir(path):
             continue
-        cls = type('Test%s'%name, (XDVTestCase,), dict(testdir=path))
+        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  Sun May 23 21:17:10 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:17:10 +0200 (CEST)
Subject: [z3-checkins] r74691 - z3/xdv/trunk/lib/xdv/tests/pre-line-endings
Message-ID: <20100523191710.72075282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:17:08 2010
New Revision: 74691

Added:
   z3/xdv/trunk/lib/xdv/tests/pre-line-endings/
   z3/xdv/trunk/lib/xdv/tests/pre-line-endings/content.html
   z3/xdv/trunk/lib/xdv/tests/pre-line-endings/output.html
   z3/xdv/trunk/lib/xdv/tests/pre-line-endings/rules.xml
   z3/xdv/trunk/lib/xdv/tests/pre-line-endings/theme.html
Log:
Fix  double linebreaks

Added: z3/xdv/trunk/lib/xdv/tests/pre-line-endings/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/pre-line-endings/content.html	Sun May 23 21:17:08 2010
@@ -0,0 +1 @@
+Line1
Line2
\ No newline at end of file

Added: z3/xdv/trunk/lib/xdv/tests/pre-line-endings/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/pre-line-endings/output.html	Sun May 23 21:17:08 2010
@@ -0,0 +1,11 @@
+
+
+  
+    
+      Line1
+Line2
+    
+    Line1
+Line2
+  
+

Added: z3/xdv/trunk/lib/xdv/tests/pre-line-endings/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/pre-line-endings/rules.xml	Sun May 23 21:17:08 2010
@@ -0,0 +1,5 @@
+
+
+    
+

Added: z3/xdv/trunk/lib/xdv/tests/pre-line-endings/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/pre-line-endings/theme.html	Sun May 23 21:17:08 2010
@@ -0,0 +1,4 @@
+
+    Content
+
+Line1
Line2

From ldr at codespeak.net  Sun May 23 21:20:32 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:20:32 +0200 (CEST)
Subject: [z3-checkins] r74692 - z3/xdv/trunk/lib/xdv
Message-ID: <20100523192032.E3CEC282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:20:31 2010
New Revision: 74692

Modified:
   z3/xdv/trunk/lib/xdv/boilerplate.xsl
   z3/xdv/trunk/lib/xdv/compiler.xsl
Log:
compiler changes for pre line endings

Modified: z3/xdv/trunk/lib/xdv/boilerplate.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/boilerplate.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/boilerplate.xsl	Sun May 23 21:20:31 2010
@@ -4,8 +4,9 @@
     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 dv xhtml" >
+    exclude-result-prefixes="exsl str dv xhtml" >
   
         
     
+    
+        
+        
+    
     
         
     

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Sun May 23 21:20:31 2010
@@ -215,6 +215,11 @@
         
     
 
+    
+        
+        
+    
+
     

From ldr at codespeak.net  Sun May 23 21:22:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:22:12 +0200 (CEST)
Subject: [z3-checkins] r74693 - in z3/xdv/trunk/lib/xdv/tests: 001 002 003
	004 005 006 007 008 009 010 011 012 013 014
Message-ID: <20100523192212.47078282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:22:10 2010
New Revision: 74693

Removed:
   z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/004/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/005/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/006/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/007/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/008/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/009/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
   z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
Log:
remove the compiled.xsl files from the tests, keeping them up to date is just make work

Deleted: /z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/001/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,54 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/002/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,54 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        <xsl:copy-of select="/html/head/title"/>
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/003/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,54 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        Second Theme Page Title
-        Title
-        
-        
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/010/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,61 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        Theming with portlets
-        
-            
-                Portlet
-            
-        
-        Footer
-    
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/011/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,58 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        Theming with portlets
-        
-            
-        
-    
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/012/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,57 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        Replace and after
-        
-        
-    
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/013/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,57 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        External includes
-        
-        

-    
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

Deleted: /z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl
==============================================================================
--- /z3/xdv/trunk/lib/xdv/tests/014/compiled.xsl	Sun May 23 21:22:10 2010
+++ (empty file)
@@ -1,65 +0,0 @@
-
-  
-
-    
-
-        
-        
-            
-        
-        
-
-        
-        
-            
-        
-        
-
-        
-        
-
-    
-
-    
-    
-    
-        
-            
-        
-    
-    
-        
-        
-        
-            Third Marker
-            first
-                second
-                
-                fourth
-            
-        Third Marker
-        Fourth marker
-    
-    
-    
-        
-            
-            
-        
-    
-    
-        
-            
-        
-    
-
-    
-    
-
\ No newline at end of file

From ldr at codespeak.net  Sun May 23 21:46:27 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:46:27 +0200 (CEST)
Subject: [z3-checkins] r74694 - in z3/xdv/trunk/lib/xdv: .
	tests/nested-rules-for-xinclude
Message-ID: <20100523194627.83E61282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:46:26 2010
New Revision: 74694

Added:
   z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/
   z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/content.html
   z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/output.html
   z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/rules.xml
   z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/theme.html
Modified:
   z3/xdv/trunk/lib/xdv/compiler.py
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/run.py
Log:
allow nested rules tags for simpler xincludes

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Sun May 23 21:46:26 2010
@@ -83,16 +83,17 @@
         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 compile_theme(rules, theme, extra=None, css=True, xinclude=False, 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, 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):
     """Invoke the xdv compiler.
     
     * ``rules`` is the rules file
     * ``theme`` is the theme file
-    * ``extra`` is an optional XSLT file with XDV extensions
+    * ``extra`` is an optional XSLT file with XDV extensions (depracated, use
+      inline xsl in the rules instead)
     * ``css``   can be set to False to disable CSS syntax support (providing a
       moderate speed gain)
-    * ``xinclude`` can be set to True to enable XInclude support (at a
-      moderate speed cost)
+    * ``xinclude`` can be set to False to disable XInclude support during the
+      compile phase (providing a moderate speed gain)
     * ``absolute_prefix`` can be set to a string that will be prefixed to any
       *relative* URL referenced in an image, link or stylesheet in the theme
       HTML file before the theme is passed to the compiler. This allows a
@@ -159,9 +160,6 @@
     """Called from console script
     """
     parser = OptionParser(usage=usage)
-    parser.add_option("-e", "--extra", metavar="extra.xsl",
-                      help="Extra XSL to be included in the transform",
-                      dest="extra", default=None)
     parser.add_option("-o", "--output", metavar="output.xsl",
                       help="Output filename (instead of stdout)",
                       dest="output", default=sys.stdout)
@@ -172,8 +170,8 @@
                       help="Compiler trace logging",
                       dest="trace", default=False)
     parser.add_option("--xinclude", action="store_true",
-                      help="Run XInclude on rules.xml",
-                      dest="xinclude", default=False)
+                      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)
@@ -189,6 +187,9 @@
     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)
     (options, args) = parser.parse_args()
 
     if options.rules is None and options.theme is None:

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Sun May 23 21:46:26 2010
@@ -140,7 +140,7 @@
     
         
         
-            
+            
                 
                     r
                     

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Sun May 23 21:46:26 2010
@@ -36,7 +36,7 @@
                   help="XDV rules file", 
                   dest="rules", default=None)
     op.add_option("-e", "--extra", metavar="extra.xsl",
-                  help="XDV extraurl XSLT file",
+                  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)",
@@ -45,8 +45,8 @@
                   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",
-                  dest="xinclude", default=False)
+                  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)
@@ -62,7 +62,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, xinclude=options.xinclude, 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)
         else:
             op.error("Theme and rules must be supplied.")
     else:

Added: z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/content.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/content.html	Sun May 23 21:46:26 2010
@@ -0,0 +1 @@
+From the content

Added: z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/output.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/output.html	Sun May 23 21:46:26 2010
@@ -0,0 +1,8 @@
+
+
+  
+    
+      From the content
+    
+  
+

Added: z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/rules.xml	Sun May 23 21:46:26 2010
@@ -0,0 +1,7 @@
+
+
+    
+        
+    
+

Added: z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/theme.html
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/theme.html	Sun May 23 21:46:26 2010
@@ -0,0 +1,3 @@
+
+    Content
+

From ldr at codespeak.net  Sun May 23 21:52:13 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 21:52:13 +0200 (CEST)
Subject: [z3-checkins] r74695 - z3/xdv/trunk/lib/xdv/tests/xinclude
Message-ID: <20100523195213.682DE282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 21:52:12 2010
New Revision: 74695

Added:
   z3/xdv/trunk/lib/xdv/tests/xinclude/
      - copied from r74694, z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/
   z3/xdv/trunk/lib/xdv/tests/xinclude/included-rules.xml
Modified:
   z3/xdv/trunk/lib/xdv/tests/xinclude/rules.xml
Log:
xinclude test

Added: z3/xdv/trunk/lib/xdv/tests/xinclude/included-rules.xml
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/lib/xdv/tests/xinclude/included-rules.xml	Sun May 23 21:52:12 2010
@@ -0,0 +1,6 @@
+
+
+    
+
+

Modified: z3/xdv/trunk/lib/xdv/tests/xinclude/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/nested-rules-for-xinclude/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/xinclude/rules.xml	Sun May 23 21:52:12 2010
@@ -1,7 +1,8 @@
-
-
-    
-        
-    
-
+
+
+    
+
+
\ No newline at end of file

From ldr at codespeak.net  Sun May 23 22:05:01 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 22:05:01 +0200 (CEST)
Subject: [z3-checkins] r74696 - in z3/xdv/trunk/lib/xdv: . tests/esi
	tests/ssi
Message-ID: <20100523200501.A4C7A282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 22:05:00 2010
New Revision: 74696

Modified:
   z3/xdv/trunk/lib/xdv/compiler.xsl
   z3/xdv/trunk/lib/xdv/tests/esi/output.html
   z3/xdv/trunk/lib/xdv/tests/esi/rules.xml
   z3/xdv/trunk/lib/xdv/tests/esi/theme.html
   z3/xdv/trunk/lib/xdv/tests/ssi/output.html
   z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml
   z3/xdv/trunk/lib/xdv/tests/ssi/theme.html
Log:
allow for esi / ssi includes without content selector

Modified: z3/xdv/trunk/lib/xdv/compiler.xsl
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.xsl	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.xsl	Sun May 23 22:05:00 2010
@@ -540,6 +540,7 @@
                     * When using ssiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 # include  virtual="
+                    
                     
                     
                     " wait="yes" 
@@ -549,6 +550,7 @@
                     * When using esiprefix, $href should be an absolute local path (i.e.  /foo/bar)
                 -->
                 
+                    
                     
                     
                     

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	Sun May 23 22:05:00 2010
@@ -3,5 +3,6 @@
   
     theme
     
+    
   
 

Modified: z3/xdv/trunk/lib/xdv/tests/esi/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/rules.xml	Sun May 23 22:05:00 2010
@@ -4,5 +4,6 @@
     >
 
     
+    
 
 

Modified: z3/xdv/trunk/lib/xdv/tests/esi/theme.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/esi/theme.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/esi/theme.html	Sun May 23 22:05:00 2010
@@ -3,5 +3,6 @@
     
         theme
         theme content
+        theme content
     
 

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	Sun May 23 22:05:00 2010
@@ -3,5 +3,6 @@
   
     theme
 
+
   
 

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/rules.xml	Sun May 23 22:05:00 2010
@@ -4,5 +4,6 @@
     >
 
     
+    
 
 

Modified: z3/xdv/trunk/lib/xdv/tests/ssi/theme.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/ssi/theme.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/ssi/theme.html	Sun May 23 22:05:00 2010
@@ -3,5 +3,6 @@
     
         theme
         theme content
+        theme content
     
 

From ldr at codespeak.net  Sun May 23 22:19:03 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 22:19:03 +0200 (CEST)
Subject: [z3-checkins] r74697 - in z3/xdv/trunk: . docs
Message-ID: <20100523201903.635E0282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 22:19:01 2010
New Revision: 74697

Removed:
   z3/xdv/trunk/CHANGES.txt
Modified:
   z3/xdv/trunk/README.txt
   z3/xdv/trunk/docs/TODO.txt
Log:
update documentation

Deleted: /z3/xdv/trunk/CHANGES.txt
==============================================================================
--- /z3/xdv/trunk/CHANGES.txt	Sun May 23 22:19:01 2010
+++ (empty file)
@@ -1,30 +0,0 @@
-
-To Do
--------------
-
-- Generate valid XHTML output despite the namespaces of the theme or
-  content nodes.  See NOTES.rst for more info.
-
-August 27
----------
-
-- Support attribute merging.  For example, getting an attribute from
-  content  and adding or replacing the attributes on the theme
-  .  See NOTES.rst for more.
-
-- Work on a test suite.
-
-August 6
-------------------
-
-- Set media-type on transforms. Compiler outputs as text/xml and generated
-  transforms output in text/html, but run in xml mode.
-  (Laurence)
-
-July 31 
-------------------
-
-- Add support for 
-
-- Add support for  and change example rules.xml to demonstrate
-  it

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Sun May 23 22:19:01 2010
@@ -442,6 +442,26 @@
 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.
 
+Inline XSL directives
+~~~~~~~~~~~~~~~~~~~~~
+
+You may supply inline XSL directives in the rules to tweak the final output,
+for instance to strip space from the output document use::
+
+    
+
+        
+
+    
+
+Note: this may effect the rendering of the page on the browser.
+
+To use a strict doctype::
+
+    
+
 XInclude
 ~~~~~~~~
 
@@ -449,9 +469,7 @@
 This is particularly useful if you have multiple variations on the same theme
 used to style different pages on a particular website.
 
-Rules files can be included using the XInclude protocol. By default, XInclude
-processing is disabled (since it is a slight performance hit at compile
-time), but it can be enabled in the XDV compiler using a command line option.
+Rules files may be included using the XInclude protocol.
 
 Inclusions use standard XInclude syntax. For example::
 
@@ -460,12 +478,10 @@
         xmlns:css="http://namespaces.plone.org/xdv+css"
         xmlns:xi="http://www.w3.org/2001/XInclude">
         
-        
+        
     
     
 
-An xpointer is used so as not to pull in the outer  element.
-
 Compilation
 ===========
 
@@ -498,12 +514,8 @@
 * Use ``-a`` to set an absolute prefix - see below.
 * Use ``-i`` to set the default external file inclusion mode to one of
   ``document``, ``ssi`` or ``esi``.
-* Use ``-e`` to specify an "extras" XSLT file to be included in the compiled
-  theme. This allows you to include arbitrary XSLT instructions beyond what
-  XDV creates for you.
 * Use ``--trace`` to output trace logging during the compilation step. This
   can be helpful in debugging rules.
-* Use ``--xinclude`` to process XInclude instructions in the rules file.
 
 Check the output of the ``--help`` option for more details.
 
@@ -565,9 +577,10 @@
 * ``theme`` is the theme file, given either as a file name or a string with
   the file contents
 * ``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
   moderate speed gain)
-* ``xinclude`` can be set to ``True`` to enable XInclude support (at a
+* ``xinclude`` can be set to ``False`` to enable XInclude support (at a
   moderate speed cost). If enabled, XInclude syntax can be used to split the
   rules file into multiple, re-usable fragments.
 * ``absolute_prefix`` can be set an string to be used as the "absolute prefix"
@@ -594,15 +607,12 @@
     from lxml import etree
     from xdv.compiler import compile_theme
     
-    extraurl = None
     absolute_prefix = "/static"
-    xinclude = False
             
     rules = "rules.xml"
     theme = "theme.html"
             
-    compiled_theme = compile_theme(rules, theme, extra=extraurl, 
-                                   xinclude=xinclude,
+    compiled_theme = compile_theme(rules, theme,
                                    absolute_prefix=absolute_prefix)
             
     transform = etree.XSLT(compiled_theme)
@@ -864,4 +874,4 @@
 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://deliverance.openplans.org/
+.. _Deliverance: http://deliveranceproject.org/

Modified: z3/xdv/trunk/docs/TODO.txt
==============================================================================
--- z3/xdv/trunk/docs/TODO.txt	(original)
+++ z3/xdv/trunk/docs/TODO.txt	Sun May 23 22:19:01 2010
@@ -6,8 +6,8 @@
 0.3 release
 ===========
 
-``pre`` double linebreaks
--------------------------
+``pre`` double linebreaks (complete)
+------------------------------------
 
 libxml2 quotes CR characters on output, this causes Firefox to insert extra
 blank lines in ```` blocks. As HTTP specified CRLF line endings for form
@@ -20,8 +20,8 @@
 This should be included in the boilerplate xsl.
 
 
-Copy xsl directives from the rules file
----------------------------------------
+Copy xsl directives from the rules file (complete)
+--------------------------------------------------
 
 We want to be able to do::
 

From ldr at codespeak.net  Sun May 23 23:14:17 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 23:14:17 +0200 (CEST)
Subject: [z3-checkins] r74698 - z3/xdv/trunk
Message-ID: <20100523211417.BA04F282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 23:14:16 2010
New Revision: 74698

Added:
   z3/xdv/trunk/checkdocs.cfg
Modified:
   z3/xdv/trunk/README.txt
Log:
documentation update; checkdocs buildout

Modified: z3/xdv/trunk/README.txt
==============================================================================
--- z3/xdv/trunk/README.txt	(original)
+++ z3/xdv/trunk/README.txt	Sun May 23 23:14:16 2010
@@ -357,8 +357,7 @@
 
   The output will look something like this::
   
-    
+    
   
   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
@@ -367,6 +366,15 @@
   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.
+  
+  For simple SSI includes of a whole document, you may omit the ``content``
+  selector from the rule::
+  
+    
+  
+  The output then renders like this::
+  
+    
 
 * Via an Edge Side Includes directive. This can be specified by setting the
   ``method`` attribute to ``esi``::
@@ -376,8 +384,7 @@
 
   The output is similar to that for the SSI mode::
 
-    
-    
+    
   
   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
@@ -387,6 +394,15 @@
   of this is placed in-between the cache server and the underlying web server,
   that server can perform the necessary filtering.
 
+  For simple ESI includes of a whole document, you may omit the ``content``
+  selector from the rule::
+  
+    
+  
+  The output then renders like this::
+  
+    
+
 Modifying the theme on the fly
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

Added: z3/xdv/trunk/checkdocs.cfg
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/checkdocs.cfg	Sun May 23 23:14:16 2010
@@ -0,0 +1,6 @@
+[buildout]
+extends = buildout.cfg
+
+[xdv]
+eggs +=
+    collective.checkdocs

From ldr at codespeak.net  Sun May 23 23:15:23 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 23:15:23 +0200 (CEST)
Subject: [z3-checkins] r74699 - in z3/xdv/trunk: . docs
Message-ID: <20100523211523.E17A9282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 23:15:22 2010
New Revision: 74699

Added:
   z3/xdv/trunk/docs/HISTORY.txt
Modified:
   z3/xdv/trunk/docs/TODO.txt
   z3/xdv/trunk/setup.py
Log:
prepare for 0.3rc1 release

Added: z3/xdv/trunk/docs/HISTORY.txt
==============================================================================
--- (empty file)
+++ z3/xdv/trunk/docs/HISTORY.txt	Sun May 23 23:15:22 2010
@@ -0,0 +1,8 @@
+Changelog
+=========
+
+0.3rc1 - 2010-05-23
+-------------------
+
+* First release candidate.
+  [laurence]

Modified: z3/xdv/trunk/docs/TODO.txt
==============================================================================
--- z3/xdv/trunk/docs/TODO.txt	(original)
+++ z3/xdv/trunk/docs/TODO.txt	Sun May 23 23:15:22 2010
@@ -52,7 +52,7 @@
 
 Nested conditions would be allowed and simply ANDed together.
 
-* Maybe this should be called ``rules`` instead. Then inclusion works better.
+* Maybe this should be called ``rules`` instead.
 
 
 Path conditions
@@ -134,8 +134,8 @@
 selectors.
 
 
-Include directive
------------------
+Include directive (rejected)
+----------------------------
 
 The current xinclude syntax is complex, maybe we need a dedicated directive::
 
@@ -169,6 +169,7 @@
       
     
 
+* Nested  now works, so this is not necessary.
 
 Theme directive / multiple theme support
 ----------------------------------------

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Sun May 23 23:15:22 2010
@@ -1,13 +1,16 @@
 from setuptools import setup, find_packages
+import os
+
 setup(
     name='xdv',
-    version='0.3a3',
+    version='0.3rc1',
     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(),
+    long_description=open("README.txt").read() + "\n\n" +
+                     open(os.path.join("docs", "HISTORY.txt")).read(),
     packages=find_packages('lib'),
     package_dir = {'':'lib'},
     include_package_data=True,

From ldr at codespeak.net  Sun May 23 23:16:21 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 23:16:21 +0200 (CEST)
Subject: [z3-checkins] r74700 - z3/xdv/tags/0.3rc1
Message-ID: <20100523211621.DF001282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 23:16:20 2010
New Revision: 74700

Added:
   z3/xdv/tags/0.3rc1/
      - copied from r74699, z3/xdv/trunk/
Log:
tag 0.3rc1

From ldr at codespeak.net  Sun May 23 23:44:38 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Sun, 23 May 2010 23:44:38 +0200 (CEST)
Subject: [z3-checkins] r74701 - z3/xdv/trunk
Message-ID: <20100523214438.ED08C282BD8@codespeak.net>

Author: ldr
Date: Sun May 23 23:44:37 2010
New Revision: 74701

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

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Sun May 23 23:44:37 2010
@@ -3,7 +3,7 @@
 
 setup(
     name='xdv',
-    version='0.3rc1',
+    version='0.3rc2',
     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  Tue May 25 13:15:54 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 25 May 2010 13:15:54 +0200 (CEST)
Subject: [z3-checkins] r74729 - z3/xdv/trunk/docs
Message-ID: <20100525111554.333E0282B9D@codespeak.net>

Author: ldr
Date: Tue May 25 13:15:52 2010
New Revision: 74729

Modified:
   z3/xdv/trunk/docs/HISTORY.txt
Log:
better history

Modified: z3/xdv/trunk/docs/HISTORY.txt
==============================================================================
--- z3/xdv/trunk/docs/HISTORY.txt	(original)
+++ z3/xdv/trunk/docs/HISTORY.txt	Tue May 25 13:15:52 2010
@@ -4,5 +4,31 @@
 0.3rc1 - 2010-05-23
 -------------------
 
+* Nested  are now allowed, so you can simply::
+
+    ````
+
+  [elro]
+
+* XInclude processing is now enabled by default
+  [elro]
+
+* XSL directives inlined in the rules file are now supported (e.g.
+  ). With the inline XSL support, there should
+  now be no need for extra.xsl.
+  [elro]
+
+* libxml2 quotes CR characters on output, causing Firefox to insert extra
+  blank lines in ```` blocks. As HTTP specified CRLF line endings for
+  form this was a problem for us. This is now caught by the compiled XSL.
+  [elro]
+
+* Support for including complete fragment documents with SSI/ESI.
+  [elro]
+
+* A bug on namespace upgrade is fixed, but you should update your namespace to
+  http://namespaces.plone.org/xdv anyway.
+  [elro]
+
 * First release candidate.
-  [laurence]
+  [elro]

From ldr at codespeak.net  Tue May 25 13:18:33 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 25 May 2010 13:18:33 +0200 (CEST)
Subject: [z3-checkins] r74730 - in z3/xdv/trunk: docs lib/xdv
Message-ID: <20100525111833.52F1C282B9D@codespeak.net>

Author: ldr
Date: Tue May 25 13:18:31 2010
New Revision: 74730

Modified:
   z3/xdv/trunk/docs/HISTORY.txt
   z3/xdv/trunk/lib/xdv/compiler.py
Log:
Fixed bug resolving the rules files while use a network theme.

Modified: z3/xdv/trunk/docs/HISTORY.txt
==============================================================================
--- z3/xdv/trunk/docs/HISTORY.txt	(original)
+++ z3/xdv/trunk/docs/HISTORY.txt	Tue May 25 13:18:31 2010
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.3rc2 - 2010-05-25
+-------------------
+
+* Fixed bug resolving the rules files while use a network theme.
+  [elro]
+
 0.3rc1 - 2010-05-23
 -------------------
 

Modified: z3/xdv/trunk/lib/xdv/compiler.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/compiler.py	(original)
+++ z3/xdv/trunk/lib/xdv/compiler.py	Tue May 25 13:18:31 2010
@@ -47,9 +47,9 @@
         self.extra = extra
         
     def resolve(self, url, pubid, context):
-        if url == '__xdv__rules':
+        if url == 'file:///__xdv__rules':
             return self.resolve_string(self.rules, context)
-        if url == '__xdv__extra' and self.extra is not None:
+        if url == 'file:///__xdv__extra' and self.extra is not None:
             return self.resolve_string(self.extra, context)
 
 def to_absolute(path, prefix):
@@ -139,9 +139,9 @@
         access_control = etree.XSLTAccessControl(read_file=True, write_file=False, create_dir=False, read_network=False, write_network=False)
     compiler_transform = etree.XSLT(etree.parse(COMPILER_PATH, parser=compiler_parser), access_control=access_control)
 
-    params = dict(rulesuri="'__xdv__rules'")
+    params = dict(rulesuri="'file:///__xdv__rules'")
     if extra:
-        params['extraurl'] = "'__xdv__extra'"
+        params['extraurl'] = "'file:///__xdv__extra'"
         resolver = CompileResolver(etree.tostring(rules_doc), etree.tostring(etree.parse(extra)))
     else:
         resolver = CompileResolver(etree.tostring(rules_doc))

From ldr at codespeak.net  Tue May 25 14:06:22 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 25 May 2010 14:06:22 +0200 (CEST)
Subject: [z3-checkins] r74731 - z3/xdv/trunk/docs
Message-ID: <20100525120622.65C26282BDB@codespeak.net>

Author: ldr
Date: Tue May 25 14:06:21 2010
New Revision: 74731

Modified:
   z3/xdv/trunk/docs/HISTORY.txt
Log:
(docs) Note: the current lxml Windows binaries are unable to load files over the network.

Modified: z3/xdv/trunk/docs/HISTORY.txt
==============================================================================
--- z3/xdv/trunk/docs/HISTORY.txt	(original)
+++ z3/xdv/trunk/docs/HISTORY.txt	Tue May 25 14:06:21 2010
@@ -4,6 +4,9 @@
 0.3rc2 - 2010-05-25
 -------------------
 
+Note: the current lxml Windows binaries are unable to load files over the
+network.
+
 * Fixed bug resolving the rules files while use a network theme.
   [elro]
 

From ldr at codespeak.net  Tue May 25 14:07:17 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 25 May 2010 14:07:17 +0200 (CEST)
Subject: [z3-checkins] r74732 - z3/xdv/tags/0.3rc2
Message-ID: <20100525120717.83D6E282BDB@codespeak.net>

Author: ldr
Date: Tue May 25 14:07:16 2010
New Revision: 74732

Added:
   z3/xdv/tags/0.3rc2/
      - copied from r74731, z3/xdv/trunk/
Log:
tag 0.3rc2

From ldr at codespeak.net  Tue May 25 14:11:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Tue, 25 May 2010 14:11:12 +0200 (CEST)
Subject: [z3-checkins] r74733 - z3/xdv/trunk
Message-ID: <20100525121112.67375282BDB@codespeak.net>

Author: ldr
Date: Tue May 25 14:11:10 2010
New Revision: 74733

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

Modified: z3/xdv/trunk/setup.py
==============================================================================
--- z3/xdv/trunk/setup.py	(original)
+++ z3/xdv/trunk/setup.py	Tue May 25 14:11:10 2010
@@ -3,7 +3,7 @@
 
 setup(
     name='xdv',
-    version='0.3rc2',
+    version='0.3rc3',
     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  Thu May 27 14:54:50 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 27 May 2010 14:54:50 +0200 (CEST)
Subject: [z3-checkins] r74808 - z3/xdv/trunk/examples/ploneorg
Message-ID: <20100527125450.D33C0282BE0@codespeak.net>

Author: ldr
Date: Thu May 27 14:54:49 2010
New Revision: 74808

Removed:
   z3/xdv/trunk/examples/ploneorg/default-extra.xsl
Modified:
   z3/xdv/trunk/examples/ploneorg/default.xml
Log:
update ploneorg example with css rules

Deleted: /z3/xdv/trunk/examples/ploneorg/default-extra.xsl
==============================================================================
--- /z3/xdv/trunk/examples/ploneorg/default-extra.xsl	Thu May 27 14:54:49 2010
+++ (empty file)
@@ -1,5 +0,0 @@
-
-
-    
-    
-

Modified: z3/xdv/trunk/examples/ploneorg/default.xml
==============================================================================
--- z3/xdv/trunk/examples/ploneorg/default.xml	(original)
+++ z3/xdv/trunk/examples/ploneorg/default.xml	Thu May 27 14:54:49 2010
@@ -1,11 +1,16 @@
 
-
-	
-	
+
+    
+    
+    
+	
+	
 
 	
-	
-	
+	
+	
 
 	
@@ -13,26 +18,26 @@
 	
 
 	
-	
+	
 
 	
-	 
-	
+	 
+	
 
 	
-	
-	
+	
+	
 	
-	 
+	 
 
 	
-	
+	
 
 	
-	
-	
+	
+	
 
-	
+	
 
     
 

From ldr at codespeak.net  Thu May 27 15:55:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 27 May 2010 15:55:12 +0200 (CEST)
Subject: [z3-checkins] r74810 - z3/xdv/trunk/lib/xdv
Message-ID: <20100527135512.DA7C8282BE0@codespeak.net>

Author: ldr
Date: Thu May 27 15:55:11 2010
New Revision: 74810

Modified:
   z3/xdv/trunk/lib/xdv/utils.py
Log:
unused code

Modified: z3/xdv/trunk/lib/xdv/utils.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/utils.py	(original)
+++ z3/xdv/trunk/lib/xdv/utils.py	Thu May 27 15:55:11 2010
@@ -1,5 +1,3 @@
-from lxml import etree
-
 namespaces = dict(
     xdv="http://namespaces.plone.org/xdv",
     css="http://namespaces.plone.org/xdv+css",
@@ -11,20 +9,3 @@
 
 def fullname(namespace, name):
     return '{%s}%s' % (namespace, name)
-
-class Resolver(etree.Resolver):
-
-    def __init__(self, strings={}, files={}, filenames=[]):
-        self.strings = {}
-        self.files = {}
-        self.filenames = set(filenames)
-
-    def resolve(self, url, pubid, context):
-        result = self.strings.get(url)
-        if result is not None:
-            return self.resolve_string(result, context)
-        result = self.files.get(url)
-        if result is not None:
-            return self.resolve_file(result, context)
-        if url in self.filenames:
-            return self.resolve_filename(url, context)

From ldr at codespeak.net  Thu May 27 15:57:12 2010
From: ldr at codespeak.net (ldr at codespeak.net)
Date: Thu, 27 May 2010 15:57:12 +0200 (CEST)
Subject: [z3-checkins] r74811 - in z3/xdv/trunk/lib/xdv: . tests tests/001
	tests/002 tests/003 tests/004 tests/005 tests/006 tests/007
	tests/008 tests/009 tests/010 tests/011 tests/012 tests/013
	tests/014 tests/modify-theme
Message-ID: <20100527135712.2050A282BE0@codespeak.net>

Author: ldr
Date: Thu May 27 15:57:10 2010
New Revision: 74811

Modified:
   z3/xdv/trunk/lib/xdv/run.py
   z3/xdv/trunk/lib/xdv/tests/001/output.html
   z3/xdv/trunk/lib/xdv/tests/002/output.html
   z3/xdv/trunk/lib/xdv/tests/003/output.html
   z3/xdv/trunk/lib/xdv/tests/004/output.html
   z3/xdv/trunk/lib/xdv/tests/005/output.html
   z3/xdv/trunk/lib/xdv/tests/006/output.html
   z3/xdv/trunk/lib/xdv/tests/007/output.html
   z3/xdv/trunk/lib/xdv/tests/008/output.html
   z3/xdv/trunk/lib/xdv/tests/009/output.html
   z3/xdv/trunk/lib/xdv/tests/010/output.html
   z3/xdv/trunk/lib/xdv/tests/011/output.html
   z3/xdv/trunk/lib/xdv/tests/012/output.html
   z3/xdv/trunk/lib/xdv/tests/013/output.html
   z3/xdv/trunk/lib/xdv/tests/014/output.html
   z3/xdv/trunk/lib/xdv/tests/modify-theme/output.html
   z3/xdv/trunk/lib/xdv/tests/tests.py
Log:
Use UTF-8 output in tests to match xdvrun

Modified: z3/xdv/trunk/lib/xdv/run.py
==============================================================================
--- z3/xdv/trunk/lib/xdv/run.py	(original)
+++ z3/xdv/trunk/lib/xdv/run.py	Thu May 27 15:57:10 2010
@@ -75,7 +75,7 @@
     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)
+    output_html.write(options.output, encoding='UTF-8', pretty_print=options.pretty_print)
     for msg in transform.error_log:
         print msg
 

Modified: z3/xdv/trunk/lib/xdv/tests/001/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/001/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/001/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     A Deeper Look At xdv
   
   

Modified: z3/xdv/trunk/lib/xdv/tests/002/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/002/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/002/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
       <title>A Deeper Look At xdv
     

Modified: z3/xdv/trunk/lib/xdv/tests/003/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/003/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/003/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     Second Theme Page Title
     
     

Modified: z3/xdv/trunk/lib/xdv/tests/004/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/004/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/004/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
     Second Theme Page Title
     

Modified: z3/xdv/trunk/lib/xdv/tests/005/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/005/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/005/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     Second Theme Page Title
   
   

Modified: z3/xdv/trunk/lib/xdv/tests/006/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/006/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/006/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     
     Second Theme Page Title
     

Modified: z3/xdv/trunk/lib/xdv/tests/007/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/007/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/007/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     Ninth Theme Page Title
     
     

Modified: z3/xdv/trunk/lib/xdv/tests/008/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/008/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/008/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     A Deeper Look At xdv
   
   

Modified: z3/xdv/trunk/lib/xdv/tests/009/output.html
==============================================================================
--- z3/xdv/trunk/lib/xdv/tests/009/output.html	(original)
+++ z3/xdv/trunk/lib/xdv/tests/009/output.html	Thu May 27 15:57:10 2010
@@ -1,7 +1,7 @@
 
 
   
-    
+    
     Theme Title
     