Changeset 853

Timestamp:

09/18/05 02:33:28 (3 years ago)

Author:

rkern

Message:

notebook.py can now collate multiple sheets into one book through a DocBook? template (e.g. scipy_tutorial.xml)

Files:

• nbdoc/trunk/notabene/docbook.py (modified) (3 diffs)
• nbdoc/trunk/notabene/notebook.py (modified) (4 diffs)
• nbdoc/trunk/notabene/xmlutils.py (modified) (2 diffs)
• nbdoc/trunk/scipy_tutorial/chapter04.pybk (modified) (1 diff)
• nbdoc/trunk/scipy_tutorial/chapter10.pybk (modified) (5 diffs)
• nbdoc/trunk/scipy_tutorial/chapter12.pybk (modified) (1 diff)
• nbdoc/trunk/scipy_tutorial/scipy_tutorial.xml (added)

nbdoc/trunk/notabene/docbook.py

@@ -5 +5 @@
-import copy
-from cgi import escape
+import os
+import tempfile
+import subprocess
-
-from lxml import etree as ET
@@ -214 +217 @@
-            return None
-        return text.replace('\\', r'\\').replace('{', r'\{').replace('}', r'\}')
-
+
+
+
-        pass
-
-
+
+
-        pass
-
-
+
+
+
-        listings = tree.xpath('//programlisting') 
-        for listing in listings:  
-self
+cls
-            for sub in listing.getiterator():  
-
-
-
-
-
+
+
+
+
+
+
-
-        Returns a string containing the new document.
@@ -237 +245 @@
-        xsl = getattr(style, '%s_xsl'%kind)()
-        xslt = ET.XSLT(xsl)
-
-
-
+
+
+
+
-        return xslt.tostring(newtree)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

nbdoc/trunk/notabene/notebook.py

@@ -2 +2 @@
-
-import os
-import subprocess
-import tempfile
-import warnings
-
@@ -10 +8 @@
-from notabene import normal
-from notabene import validate
-rdf, dc
+nsmap, rdf, dc, xlink
-
-class SubelemWrapper(object):
@@ -448 +446 @@
-    contents = property(get_contents)
-
+    def write_formatted(self, filename=None, format='html'):
+        from notabene.docbook import DBFormatter
+        dbf = DBFormatter(self)
+        if filename is None:
+            base = self.name
+        else:
+            base = os.path.splitext(filename)[0]
+        sheet = self.root.find('sheet')
+        if sheet is not None:
+            dbxml = dbf.transform_sheet(sheet)
+            newfile = dbf.write_formatted(dbxml, base, format)
+            return newfile
+            
+def spliturl(basedir, url):
+    import urlparse
+    parts = urlparse.urlparse(url)
+    if parts[0] not in ('file', ''):
+        warnings.warn('Unknown protocol %s://' % parts[0])
+    path = parts[2]
+    frag = parts[-1]
+    path = os.path.abspath(os.path.join(basedir, path))
+    return path, frag
+
+def book2docbook(bookfilename):
+    from notabene.docbook import DBFormatter
+    book = ET.parse(bookfilename)
+    basedir, basename = os.path.split(bookfilename)
+    child2parent = dict((c,p) for p in book.getiterator() for c in p)
+    for link in book.xpath('//*[@xlink:type="simple"]', 
+        namespaces=nsmap(xlink)):
+        parent = child2parent[link]
+        path, frag = spliturl(basedir, link.get(xlink.href))
+        print path, frag
+        nb = Notebook.from_file(path)
+        sheet = nb.xpath.evaluate('/notebook/sheet[@id="%s"]' % frag)
+        if sheet == []:
+            raise ValueError('could not find <sheet id="%s"> in %s' %
+                (frag, path))
+        else:
+            sheet = sheet[0]
+        dbf = DBFormatter(nb)
+        dbxml = dbf.transform_sheet(sheet, nodetype=link.tag)
+        idx = parent.index(link)
+        parent[idx] = dbxml
+    return book
+
-def main():
-    import sys
@@ -470 +514 @@
-
-    else:
+        from notabene.docbook import DBFormatter
-        if options.book is None:
-            for filename in args:
-                base = os.path.splitext(filename)[0]
-                nb = Notebook.from_file(filename)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                
-

nbdoc/trunk/notabene/xmlutils.py

@@ +1 @@
+#*****************************************************************************
+#       Copyright (C) 2005 Robert Kern. All rights reserved.
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#*****************************************************************************
+
-class XMLNS(object):
-    """Convenience object for handling namespaced tag names in ElementTree-like
@@ -42 +49 @@
-dc = XMLNS('dc', 'http://purl.org/dc/elements/1.1/')
-xsl = XMLNS('xsl', 'http://www.w3.org/1999/XSL/Transform')
+xlink = XMLNS('xlink', 'http://www.w3.org/1999/xlink')

nbdoc/trunk/scipy_tutorial/chapter04.pybk

@@ -113 +113 @@
-integrals are actually functions which can be constant functions. An example of
-using double integration to compute several values of
-
+/
-</para>
-<para>XXX: ipython

nbdoc/trunk/scipy_tutorial/chapter10.pybk

@@ -20 +20 @@
-just convenient short-hand for Matrix.Matrix. If you are going to be doing a lot
-of matrix-math, it is convenient to convert arrays into matrices using this
-c
+
-two-dimensional matrices using MATLAB-like syntax with commas or spaces
-
+q
-in a string passed to mat. 
-</para>
@@ -31 +31 @@
-<section>
-<title>Finding Inverse</title>
-
-
-
-
-
-
+
+
+
+
+
+
+
-1 &amp; 3 &amp; 5\\
-2 &amp; 5 &amp; 1\\
@@ -45 +46 @@
--1.48 &amp; 0.36 &amp; 0.88\\
-0.56 &amp; 0.08 &amp; -0.36\\
-
+
+
+
-</para>
-<para> XXX: ipython
@@ -71 +74 @@
-matrix is offered which can speed up the processing when applicable. As an
-example, suppose it is desired to solve the following simultaneous equations:
-
+
+
+
+
+
+
+
+
-\left[\begin{array}{c}
-x\\
@@ -87 +97 @@
--9.28\\
-5.16\\
-
+
+
+
-which can be faster and more numerically stable. In this case it gives the same
-answer as shown in the following example: 

nbdoc/trunk/scipy_tutorial/chapter12.pybk

@@ -12 +12 @@
-</para>
-<itemizedlist>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-* 
+
-</para></listitem>
-</itemizedlist>