Index: /trunk/doc/2000ft.graffle
===================================================================
--- /trunk/doc/2000ft.graffle (revision 3)
+++ /trunk/doc/2000ft.graffle (revision 3)
@@ -0,0 +1,1094 @@
+
+
+
+
+ ActiveLayerIndex
+ 0
+ AutoAdjust
+
+ CanvasColor
+
+ w
+ 1
+
+ CanvasOrigin
+ {0, 0}
+ CanvasScale
+ 1
+ ColumnAlign
+ 1
+ ColumnSpacing
+ 36
+ CreationDate
+ 2006-05-08 14:33:49 +0200
+ Creator
+ chris
+ DisplayScale
+ 1 cm = 1 cm
+ GraphDocumentVersion
+ 5
+ GraphicsList
+
+
+ Bounds
+ {{241.464, 258}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 50
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 ...}
+
+
+
+ Class
+ LineGraphic
+ Head
+
+ ID
+ 29
+
+ ID
+ 48
+ OrthogonalBarAutomatic
+
+ OrthogonalBarPosition
+ -1
+ Points
+
+ {372, 149.5}
+ {317.768, 149.5}
+
+ Style
+
+ stroke
+
+ HeadArrow
+ FilledArrow
+ LineType
+ 2
+ TailArrow
+ 0
+
+
+ Tail
+
+ ID
+ 46
+
+
+
+ Bounds
+ {{387.348, 138}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 47
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 Template}
+
+
+
+ Bounds
+ {{372, 119}, {125.232, 61}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Color
+
+ b
+ 1
+ g
+ 1
+ r
+ 1
+
+ Font
+ Helvetica-Bold
+ Size
+ 12
+
+ ID
+ 46
+ Shape
+ Rectangle
+ Style
+
+ fill
+
+ Color
+
+ b
+ 0.835052
+ g
+ 0.669573
+ r
+ 0.544872
+
+
+ shadow
+
+ Draws
+ NO
+
+ stroke
+
+ CornerRadius
+ 5
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\i\b\fs24 \cf1 templating}
+ VerticalPad
+ 2
+
+ TextPlacement
+ 0
+
+
+ Class
+ LineGraphic
+ Head
+
+ ID
+ 29
+
+ ID
+ 45
+ OrthogonalBarAutomatic
+
+ OrthogonalBarPosition
+ -1
+ Points
+
+ {168, 149.5}
+ {222.232, 149.5}
+
+ Style
+
+ stroke
+
+ HeadArrow
+ FilledArrow
+ LineType
+ 2
+ TailArrow
+ 0
+
+
+ Tail
+
+ ID
+ 44
+
+
+
+ Bounds
+ {{58.1159, 138}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 43
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 Fragment}
+
+
+
+ Class
+ LineGraphic
+ Head
+
+ ID
+ 23
+
+ ID
+ 41
+ OrthogonalBarAutomatic
+
+ OrthogonalBarPosition
+ -1
+ Points
+
+ {270, 299}
+ {270, 328}
+
+ Style
+
+ stroke
+
+ HeadArrow
+ FilledArrow
+ LineType
+ 2
+ TailArrow
+ 0
+
+
+ Tail
+
+ ID
+ 34
+
+
+
+ Class
+ LineGraphic
+ Head
+
+ ID
+ 29
+
+ ID
+ 40
+ OrthogonalBarAutomatic
+
+ OrthogonalBarPosition
+ -1
+ Points
+
+ {270, 83}
+ {270, 133.5}
+
+ Style
+
+ stroke
+
+ HeadArrow
+ FilledArrow
+ LineType
+ 2
+ TailArrow
+ 0
+
+
+ Tail
+
+ ID
+ 26
+
+
+
+ Class
+ LineGraphic
+ Head
+
+ ID
+ 34
+
+ ID
+ 39
+ OrthogonalBarAutomatic
+
+ OrthogonalBarPosition
+ -1
+ Points
+
+ {270, 165.5}
+ {270, 210}
+
+ Style
+
+ stroke
+
+ HeadArrow
+ FilledArrow
+ LineType
+ 2
+ TailArrow
+ 0
+
+
+ Tail
+
+ ID
+ 29
+
+
+
+ Bounds
+ {{241.464, 220}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 37
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 Whitespace Filter}
+
+
+
+ Bounds
+ {{126, 220}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 36
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 XInclude Filter}
+
+
+
+ Bounds
+ {{126, 258}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 35
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 HTML Sanitizer}
+
+
+
+ Bounds
+ {{116, 210}, {308, 89}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Color
+
+ b
+ 1
+ g
+ 1
+ r
+ 1
+
+ Font
+ Helvetica-Bold
+ Size
+ 12
+
+ ID
+ 34
+ Shape
+ Rectangle
+ Style
+
+ fill
+
+ Color
+
+ b
+ 0.835052
+ g
+ 0.669573
+ r
+ 0.544872
+
+
+ shadow
+
+ Draws
+ NO
+
+ stroke
+
+ CornerRadius
+ 5
+ Draws
+ NO
+
+
+ Text
+
+ Align
+ 2
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr\pardirnatural
+
+\f0\i\b\fs24 \cf1 filtering}
+
+
+
+ Bounds
+ {{222.732, 134}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 11
+
+ ID
+ 29
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 Stream}
+
+
+
+ Bounds
+ {{241.464, 42}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 28
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 XML Parser}
+
+
+
+ Bounds
+ {{126, 42}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 27
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 HTML Parser}
+
+
+
+ Bounds
+ {{116, 32}, {308, 51}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Color
+
+ b
+ 1
+ g
+ 1
+ r
+ 1
+
+ Font
+ Helvetica-Bold
+ Size
+ 12
+
+ ID
+ 26
+ Shape
+ Rectangle
+ Style
+
+ fill
+
+ Color
+
+ b
+ 0.835052
+ g
+ 0.669573
+ r
+ 0.544872
+
+
+ shadow
+
+ Draws
+ NO
+
+ stroke
+
+ CornerRadius
+ 5
+ Draws
+ NO
+
+
+ Text
+
+ Align
+ 2
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr\pardirnatural
+
+\f0\i\b\fs24 \cf1 parsing}
+
+
+
+ Bounds
+ {{241.464, 338}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 25
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 XML Serializer}
+
+
+
+ Bounds
+ {{126, 338}, {94.5364, 31}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Font
+ Helvetica
+ Size
+ 12
+
+ ID
+ 24
+ Shape
+ Rectangle
+ Style
+
+ shadow
+
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\fs22 \cf0 HTML Serializer}
+
+
+
+ Bounds
+ {{116, 328}, {308, 51}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Color
+
+ b
+ 1
+ g
+ 1
+ r
+ 1
+
+ Font
+ Helvetica-Bold
+ Size
+ 12
+
+ ID
+ 23
+ Shape
+ Rectangle
+ Style
+
+ fill
+
+ Color
+
+ b
+ 0.835052
+ g
+ 0.669573
+ r
+ 0.544872
+
+
+ shadow
+
+ Draws
+ NO
+
+ stroke
+
+ CornerRadius
+ 5
+ Draws
+ NO
+
+
+ Text
+
+ Align
+ 2
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qr\pardirnatural
+
+\f0\i\b\fs24 \cf1 serialization}
+
+
+
+ Bounds
+ {{42.7682, 119}, {125.232, 61}}
+ Class
+ ShapedGraphic
+ FontInfo
+
+ Color
+
+ b
+ 1
+ g
+ 1
+ r
+ 1
+
+ Font
+ Helvetica-Bold
+ Size
+ 12
+
+ ID
+ 44
+ Shape
+ Rectangle
+ Style
+
+ fill
+
+ Color
+
+ b
+ 0.835052
+ g
+ 0.669573
+ r
+ 0.544872
+
+
+ shadow
+
+ Draws
+ NO
+
+ stroke
+
+ CornerRadius
+ 5
+ Draws
+ NO
+
+
+ Text
+
+ Text
+ {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf330
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-BoldOblique;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
+
+\f0\i\b\fs24 \cf1 building}
+ VerticalPad
+ 2
+
+ TextPlacement
+ 0
+
+
+ GridInfo
+
+ GuidesLocked
+ NO
+ GuidesVisible
+ YES
+ HPages
+ 1
+ ImageCounter
+ 1
+ IsPalette
+ NO
+ KeepToScale
+
+ Layers
+
+
+ Lock
+ NO
+ Name
+ Ebene 1
+ Print
+ YES
+ View
+ YES
+
+
+ LayoutInfo
+
+ LayoutTarget
+ 3
+
+ LinksVisible
+ NO
+ MagnetsVisible
+ NO
+ MasterSheets
+
+
+ ActiveLayerIndex
+ 0
+ AutoAdjust
+
+ CanvasColor
+
+ w
+ 1
+
+ CanvasOrigin
+ {0, 0}
+ CanvasScale
+ 1
+ ColumnAlign
+ 1
+ ColumnSpacing
+ 36
+ DisplayScale
+ 1 cm = 1 cm
+ GraphicsList
+
+ GridInfo
+
+ HPages
+ 1
+ IsPalette
+ NO
+ KeepToScale
+
+ Layers
+
+
+ Lock
+ NO
+ Name
+ Ebene 1
+ Print
+ YES
+ View
+ YES
+
+
+ LayoutInfo
+
+ LayoutTarget
+ 3
+
+ Orientation
+ 2
+ RowAlign
+ 1
+ RowSpacing
+ 36
+ SheetTitle
+ Master 1
+ UniqueID
+ 1
+ VPages
+ 1
+
+
+ ModificationDate
+ 2006-05-09 01:09:46 +0200
+ Modifier
+ chris
+ NotesVisible
+ NO
+ Orientation
+ 2
+ OriginVisible
+ NO
+ PageBreaks
+ YES
+ PrintInfo
+
+ NSPaperSize
+
+ size
+ {595.276, 841.89}
+
+
+ ReadOnly
+ NO
+ RowAlign
+ 1
+ RowSpacing
+ 36
+ SheetTitle
+ Arbeitsfläche 1
+ SmartAlignmentGuidesActive
+ YES
+ SmartDistanceGuidesActive
+ NO
+ UniqueID
+ 1
+ UseEntirePage
+
+ VPages
+ 1
+ WindowInfo
+
+ CurrentSheet
+ 0
+ DrawerOpen
+
+ DrawerTab
+ Outline
+ DrawerWidth
+ 209
+ FitInWindow
+
+ Frame
+ {{28, 214}, {757, 512}}
+ ShowRuler
+
+ ShowStatusBar
+
+ VisibleRegion
+ {{-109, 0}, {742, 422}}
+ Zoom
+ 1
+
+
+
Index: /trunk/markup/__init__.py
===================================================================
--- /trunk/markup/__init__.py (revision 3)
+++ /trunk/markup/__init__.py (revision 3)
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2006 Christopher Lenz
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.com/license.html.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://projects.edgewall.com/trac/.
+
+"""This package provides various means for generating and processing web markup
+(XML or HTML).
+
+The design is centered around the concept of streams of markup events (similar
+in concept to SAX parsing events) which can be processed in a uniform manner
+independently of where or how they are produced.
+
+
+Generating content
+------------------
+
+Literal XML and HTML text can be used to easily produce markup streams
+via helper functions in the `markup.input` module:
+
+>>> from markup.input import XML
+>>> doc = XML('My document')
+
+This results in a `Stream` object that can be used in a number of way.
+
+>>> doc.render(method='html', encoding='utf-8')
+'My document'
+
+>>> from markup.input import HTML
+>>> doc = HTML('My document</HTML>')
+>>> doc.render(method='html', encoding='utf-8')
+'<html lang="en"><head><title>My document'
+
+>>> title = doc.select('head/title')
+>>> title.render(method='html', encoding='utf-8')
+'My document'
+
+
+Markup streams can also be generated programmatically using the
+`markup.builder` module:
+
+>>> from markup.builder import tag
+>>> doc = tag.DOC(tag.TITLE('My document'), lang='en')
+>>> doc.generate().render(method='html')
+'My document'
+
+"""
+
+from markup.core import *
+from markup.input import XML, HTML
Index: /trunk/markup/builder.py
===================================================================
--- /trunk/markup/builder.py (revision 3)
+++ /trunk/markup/builder.py (revision 3)
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2006 Christopher Lenz
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.com/license.html.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://projects.edgewall.com/trac/.
+
+from markup.core import Attributes, QName, Stream
+
+__all__ = ['Fragment', 'Element', 'tag']
+
+
+class Fragment(object):
+ __slots__ = ['children']
+
+ def __init__(self):
+ self.children = []
+
+ def append(self, node):
+ """Append an element or string as child node."""
+ if isinstance(node, (Element, basestring, int, float, long)):
+ # For objects of a known/primitive type, we avoid the check for
+ # whether it is iterable for better performance
+ self.children.append(node)
+ elif isinstance(node, Fragment):
+ self.children += node.children
+ elif node is not None:
+ try:
+ children = iter(node)
+ except TypeError:
+ self.children.append(node)
+ else:
+ for child in node:
+ self.append(children)
+
+ def __add__(self, other):
+ return Fragment()(self, other)
+
+ def __call__(self, *args):
+ for arg in args:
+ self.append(arg)
+ return self
+
+ def generate(self):
+ """Generator that yield tags and text nodes as strings."""
+ def _generate():
+ for child in self.children:
+ if isinstance(child, Fragment):
+ for event in child.generate():
+ yield event
+ else:
+ yield Stream.TEXT, child, (-1, -1)
+ return Stream(_generate())
+
+ def __iter__(self):
+ return iter(self.generate())
+
+ def __str__(self):
+ return str(self.generate())
+
+ def __unicode__(self):
+ return unicode(self.generate())
+
+
+class Element(Fragment):
+ """Simple XML output generator based on the builder pattern.
+
+ Construct XML elements by passing the tag name to the constructor:
+
+ >>> print Element('strong')
+
+
+ Attributes can be specified using keyword arguments. The values of the
+ arguments will be converted to strings and any special XML characters
+ escaped:
+
+ >>> print Element('textarea', rows=10, cols=60)
+
+ >>> print Element('span', title='1 < 2')
+
+ >>> print Element('span', title='"baz"')
+
+
+ The " character is escaped using a numerical entity.
+ The order in which attributes are rendered is undefined.
+
+ If an attribute value evaluates to `None`, that attribute is not included
+ in the output:
+
+ >>> print Element('a', name=None)
+
+
+ Attribute names that conflict with Python keywords can be specified by
+ appending an underscore:
+
+ >>> print Element('div', class_='warning')
+
+
+ Nested elements can be added to an element using item access notation.
+ The call notation can also be used for this and for adding attributes
+ using keyword arguments, as one would do in the constructor.
+
+ >>> print Element('ul')(Element('li'), Element('li'))
+
+ >>> print Element('a')('Label')
+ Label
+ >>> print Element('a')('Label', href="target")
+ Label
+
+ Text nodes can be nested in an element by adding strings instead of
+ elements. Any special characters in the strings are escaped automatically:
+
+ >>> print Element('em')('Hello world')
+ Hello world
+ >>> print Element('em')(42)
+ 42
+ >>> print Element('em')('1 < 2')
+ 1 < 2
+
+ This technique also allows mixed content:
+
+ >>> print Element('p')('Hello ', Element('b')('world'))
+ Hello world
+
+ Elements can also be combined with other elements or strings using the
+ addition operator, which results in a `Fragment` object that contains the
+ operands:
+
+ >>> print Element('br') + 'some text' + Element('br')
+
some text
+
+ Elements with a namespace can be generated using the `Namespace` and/or
+ `QName` classes:
+
+ >>> from markup.core import Namespace
+ >>> xhtml = Namespace('http://www.w3.org/1999/xhtml')
+ >>> print Element(xhtml.html, lang='en')
+
+ """
+ __slots__ = ['tag', 'attrib']
+
+ def __init__(self, tag_, **attrib):
+ Fragment.__init__(self)
+ self.tag = QName(tag_)
+ self.attrib = Attributes()
+ self(**attrib)
+
+ def __call__(self, *args, **kwargs):
+ for attr, value in kwargs.items():
+ if value is None:
+ continue
+ attr = attr.rstrip('_').replace('_', '-')
+ self.attrib.set(attr, value)
+ return Fragment.__call__(self, *args)
+
+ def generate(self):
+ """Generator that yield tags and text nodes as strings."""
+ def _generate():
+ yield Stream.START, (self.tag, self.attrib), (-1, -1)
+ for kind, data, pos in Fragment.generate(self):
+ yield kind, data, pos
+ yield Stream.END, self.tag, (-1, -1)
+ return Stream(_generate())
+
+
+class ElementFactory(object):
+
+ def __getattribute__(self, name):
+ return Element(name.lower())
+
+
+tag = ElementFactory()
Index: /trunk/markup/core.py
===================================================================
--- /trunk/markup/core.py (revision 3)
+++ /trunk/markup/core.py (revision 3)
@@ -0,0 +1,309 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2006 Christopher Lenz
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.com/license.html.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://projects.edgewall.com/trac/.
+
+"""Core classes for markup processing."""
+
+import htmlentitydefs
+import re
+from StringIO import StringIO
+
+__all__ = ['Stream', 'Markup', 'escape', 'unescape', 'Namespace', 'QName']
+
+
+class StreamEventKind(object):
+ """A kind of event on an XML stream."""
+
+ __slots__ = ['name']
+
+ def __init__(self, name):
+ self.name = name
+
+ def __repr__(self):
+ return self.name
+
+
+class Stream(object):
+ """Represents a stream of markup events.
+
+ This class is basically an iterator over the events.
+
+ Also provided are ways to serialize the stream to text. The `serialize()`
+ method will return an iterator over generated strings, while `render()`
+ returns the complete generated text at once. Both accept various parameters
+ that impact the way the stream is serialized.
+
+ Stream events are tuples of the form:
+
+ (kind, data, position)
+
+ where `kind` is the event kind (such as `START`, `END`, `TEXT`, etc), `data`
+ depends on the kind of event, and `position` is a `(line, offset)` tuple
+ that contains the location of the original element or text in the input.
+ """
+ __slots__ = ['events']
+
+ START = StreamEventKind('start') # a start tag
+ END = StreamEventKind('end') # an end tag
+ TEXT = StreamEventKind('text') # literal text
+ EXPR = StreamEventKind('expr') # an expression
+ SUB = StreamEventKind('sub') # a "subprogram"
+ PROLOG = StreamEventKind('prolog') # XML prolog
+ DOCTYPE = StreamEventKind('doctype') # doctype declaration
+ START_NS = StreamEventKind('start-ns') # start namespace mapping
+ END_NS = StreamEventKind('end-ns') # end namespace mapping
+ PI = StreamEventKind('pi') # processing instruction
+ COMMENT = StreamEventKind('comment') # comment
+
+ def __init__(self, events):
+ """Initialize the stream with a sequence of markup events.
+
+ @oaram events: a sequence or iterable providing the events
+ """
+ self.events = events
+
+ def __iter__(self):
+ return iter(self.events)
+
+ def render(self, method='xml', encoding='utf-8', **kwargs):
+ """Return a string representation of the stream.
+
+ @param method: determines how the stream is serialized; can be either
+ 'xml' or 'html', or a custom `Serializer` subclass
+ @param encoding: how the output string should be encoded; if set to
+ `None`, this method returns a `unicode` object
+
+ Any additional keyword arguments are passed to the serializer, and thus
+ depend on the `method` parameter value.
+ """
+ retval = u''.join(self.serialize(method=method, **kwargs))
+ if encoding is not None:
+ return retval.encode('utf-8')
+ return retval
+
+ def select(self, path):
+ """Return a new stream that contains the events matching the given
+ XPath expression.
+
+ @param path: a string containing the XPath expression
+ """
+ from markup.path import Path
+ path = Path(path)
+ return path.select(self)
+
+ def serialize(self, method='xml', **kwargs):
+ """Generate strings corresponding to a specific serialization of the
+ stream.
+
+ Unlike the `render()` method, this method is a generator this returns
+ the serialized output incrementally, as opposed to returning a single
+ string.
+
+ @param method: determines how the stream is serialized; can be either
+ 'xml' or 'html', or a custom `Serializer` subclass
+ """
+ from markup import output
+ cls = method
+ if isinstance(method, basestring):
+ cls = {'xml': output.XMLSerializer,
+ 'html': output.HTMLSerializer}[method]
+ else:
+ assert issubclass(cls, serializers.Serializer)
+ serializer = cls(**kwargs)
+ return serializer.serialize(self)
+
+ def __str__(self):
+ return self.render()
+
+ def __unicode__(self):
+ return self.render(encoding=None)
+
+
+class Attributes(list):
+
+ def __init__(self, attrib=None):
+ list.__init__(self, map(lambda (k, v): (QName(k), v), attrib or []))
+
+ def __contains__(self, name):
+ return name in [attr for attr, value in self]
+
+ def get(self, name, default=None):
+ for attr, value in self:
+ if attr == name:
+ return value
+ return default
+
+ def set(self, name, value):
+ for idx, (attr, _) in enumerate(self):
+ if attr == name:
+ self[idx] = (attr, value)
+ break
+ else:
+ self.append((QName(name), value))
+
+
+class Markup(unicode):
+ """Marks a string as being safe for inclusion in HTML/XML output without
+ needing to be escaped.
+ """
+ def __new__(self, text='', *args):
+ if args:
+ text %= tuple([escape(arg) for arg in args])
+ return unicode.__new__(self, text)
+
+ def __add__(self, other):
+ return Markup(unicode(self) + Markup.escape(other))
+
+ def __mod__(self, args):
+ if not isinstance(args, (list, tuple)):
+ args = [args]
+ return Markup(unicode.__mod__(self,
+ tuple([escape(arg) for arg in args])))
+
+ def __mul__(self, num):
+ return Markup(unicode(self) * num)
+
+ def join(self, seq):
+ return Markup(unicode(self).join([Markup.escape(item) for item in seq]))
+
+ def stripentities(self, keepxmlentities=False):
+ """Return a copy of the text with any character or numeric entities
+ replaced by the equivalent UTF-8 characters.
+
+ If the `keepxmlentities` parameter is provided and evaluates to `True`,
+ the core XML entities (&, ', >, < and ").
+ """
+ def _replace_entity(match):
+ if match.group(1): # numeric entity
+ ref = match.group(1)
+ if ref.startswith('x'):
+ ref = int(ref[1:], 16)
+ else:
+ ref = int(ref, 10)
+ return unichr(ref)
+ else: # character entity
+ ref = match.group(2)
+ if keepxmlentities and ref in ('amp', 'apos', 'gt', 'lt', 'quot'):
+ return '&%s;' % ref
+ try:
+ codepoint = htmlentitydefs.name2codepoint[ref]
+ return unichr(codepoint)
+ except KeyError:
+ if keepxmlentities:
+ return '&%s;' % ref
+ else:
+ return ref
+ return Markup(re.sub(r'&(?:#((?:\d+)|(?:[xX][0-9a-fA-F]+));?|(\w+);)',
+ _replace_entity, self))
+
+ def striptags(self):
+ """Return a copy of the text with all XML/HTML tags removed."""
+ return Markup(re.sub(r'<[^>]*?>', '', self))
+
+ def escape(cls, text, quotes=True):
+ """Create a Markup instance from a string and escape special characters
+ it may contain (<, >, & and \").
+
+ If the `quotes` parameter is set to `False`, the \" character is left
+ as is. Escaping quotes is generally only required for strings that are
+ to be used in attribute values.
+ """
+ if isinstance(text, cls):
+ return text
+ text = unicode(text)
+ if not text:
+ return cls()
+ text = text.replace('&', '&') \
+ .replace('<', '<') \
+ .replace('>', '>')
+ if quotes:
+ text = text.replace('"', '"')
+ return cls(text)
+ escape = classmethod(escape)
+
+ def unescape(self):
+ """Reverse-escapes &, <, > and \" and returns a `unicode` object."""
+ if not self:
+ return ''
+ return unicode(self).replace('"', '"') \
+ .replace('>', '>') \
+ .replace('<', '<') \
+ .replace('&', '&')
+
+ def plaintext(self, keeplinebreaks=True):
+ """Returns the text as a `unicode`with all entities and tags removed."""
+ text = unicode(self.striptags().stripentities())
+ if not keeplinebreaks:
+ text = text.replace('\n', ' ')
+ return text
+
+ def sanitize(self):
+ from markup.filters import HTMLSanitizer
+ from markup.input import HTMLParser
+ sanitize = HTMLSanitizer()
+ text = self.stripentities(keepxmlentities=True)
+ return Stream(sanitize(HTMLParser(StringIO(text)), None))
+
+
+escape = Markup.escape
+
+def unescape(text):
+ """Reverse-escapes &, <, > and \" and returns a `unicode` object."""
+ if not isinstance(text, Markup):
+ return text
+ return text.unescape()
+
+
+class Namespace(object):
+
+ def __init__(self, uri):
+ self.uri = uri
+
+ def __getitem__(self, name):
+ return QName(self.uri + '}' + name)
+
+ __getattr__ = __getitem__
+
+ def __repr__(self):
+ return '