Changeset 854

Timestamp:

09/18/05 06:58:08 (3 years ago)

Author:

rkern

Message:

Equation support for HTML.

Files:

• nbdoc/trunk/notabene/docbook.py (modified) (7 diffs)
• nbdoc/trunk/notabene/notebook.py (modified) (4 diffs)
• nbdoc/trunk/notabene/styles.py (modified) (3 diffs)
• nbdoc/trunk/scipy_tutorial/chapter02.pybk (modified) (1 diff)
• nbdoc/trunk/scipy_tutorial/clean.py (added)

nbdoc/trunk/notabene/docbook.py

@@ -8 +8 @@
-import tempfile
-import subprocess
+import shutil
+import warnings
-
-from lxml import etree as ET
@@ -13 +15 @@
-from notabene.formatter import Formatter
-from PyFontify import fontify
+
+def relpath(target, base=os.curdir):
+    """
+    Return a relative path to the target from either the current dir or an optional base dir.
+    Base can be a directory specified either as absolute or relative to current dir.
+
+    This function is by Richard Barran.
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/302594
+    """
+
+    if not os.path.exists(target):
+        raise OSError, 'Target does not exist: '+target
+
+    if not os.path.isdir(base):
+        raise OSError, 'Base is not a directory or does not exist: '+base
+
+    base_list = (os.path.abspath(base)).split(os.sep)
+    target_list = (os.path.abspath(target)).split(os.sep)
+
+    # On the windows platform the target may be on a completely different drive from the base.
+    if os.name in ['nt','dos','os2'] and base_list[0] <> target_list[0]:
+        raise OSError, 'Target is on a different drive to base. Target: '+target_list[0].upper()+', base: '+base_list[0].upper()
+
+    # Starting from the filepath root, work out how much of the filepath is
+    # shared by base and target.
+    for i in range(min(len(base_list), len(target_list))):
+        if base_list[i] <> target_list[i]: break
+    else:
+        # If we broke out of the loop, i is pointing to the first differing path elements.
+        # If we didn't break out of the loop, i is pointing to identical path elements.
+        # Increment i so that in all cases it points to the first differing path elements.
+        i+=1
+
+    rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:]
+    return os.path.join(*rel_list)
+
+
+
-
-def dbify(text):
@@ -120 +160 @@
-        verbatim = equ.get('verb', None)
-        if verbatim != '1':
-\begin{equation}%s\end{equation}
+$$%s$$
-        mo = ET.SubElement(dbeq, 'mediaobject')
-        to = ET.SubElement(mo, 'textobject')
@@ -219 +259 @@
-        
-    @classmethod
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        pass
-
-    @classmethod
-
-pass
+, name=None
+cls.equation_images(tree, name)
-    
-    @classmethod
-
+, name=None
-        listings = tree.xpath('//programlisting') 
-        for listing in listings:  
@@ -236 +315 @@
-
-    @classmethod
-
+name=None, 
-        """Convert a DocBook document to the final format.
-
@@ -247 +326 @@
-        if ET.iselement(dbxml):
-            dbxml = ET.ElementTree(dbxml)
-
+, name
-        newtree = xslt.apply(dbxml)
-        return xslt.tostring(newtree)
@@ -283 +362 @@
-            toPDF = True
-            
-
+, name=base
-
-        if toPDF:

nbdoc/trunk/notabene/notebook.py

@@ -3 +3 @@
-import os
-import warnings
+import copy
-
-from lxml import etree as ET
@@ -9 +10 @@
-from notabene import validate
-from notabene.xmlutils import nsmap, rdf, dc, xlink
+
+def element_copy(element):
+    return ET.XML(ET.tostring(element, encoding='utf-8'))
-
-class SubelemWrapper(object):
@@ -478 +482 @@
-        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)
@@ -489 +492 @@
-        dbxml = dbf.transform_sheet(sheet, nodetype=link.tag)
-        idx = parent.index(link)
-
+
+
-    return book
-

nbdoc/trunk/notabene/styles.py

@@ -127 +127 @@
-    padding: 0;
-}
+
+div.mediaobject {
+    text-align: center;
+    margin: 1em;
+}
+
+span.inlinemediaobject > img {
+    vertical-align: middle;
+}
+
-"""
-
@@ -149 +159 @@
-        fvopt = ET.SubElement(sheet, xsl.template, name="latex.fancyvrb.options")
-        fvopt.text = r",commandchars=\\\{\}"
+
+        # turn off fancyhdr
+        fancyhdr = ET.SubElement(sheet, xsl.param, name='latex.use.fancyhdr')
+        fancyhdr.text = '0'
-
-        docclass = ET.SubElement(sheet, xsl.param,
@@ -198 +212 @@
-        comment = ET.SubElement(css_style, xsl.comment)
-        comment.text = self.html_css()
+        ET.SubElement(sheet, xsl.param, name="section.autolabel", select="1")
+        ET.SubElement(sheet, xsl.param, 
+            name="section.label.includes.component.label", select="1")
-
-        return ET.ElementTree(sheet)

nbdoc/trunk/scipy_tutorial/chapter02.pybk

@@ -34 +34 @@
->>> scipy.sqrt(-1) </para>
-</section>
-
+
+
+
+
+
-<section>
-<title>scipy_base routines</title>