Revision: 4350 Author: hans URL: http://bknr.net/trac/changeset/4350
update from upstream git U trunk/thirdparty/cxml-stp/.git/FETCH_HEAD U trunk/thirdparty/cxml-stp/.git/index U trunk/thirdparty/cxml-stp/.git/logs/HEAD U trunk/thirdparty/cxml-stp/.git/logs/refs/heads/master U trunk/thirdparty/cxml-stp/.git/logs/refs/remotes/origin/master A trunk/thirdparty/cxml-stp/.git/objects/37/ A trunk/thirdparty/cxml-stp/.git/objects/37/3eeb4750a7448c425aa08a4123dccc8c26b6a7 A trunk/thirdparty/cxml-stp/.git/objects/44/ A trunk/thirdparty/cxml-stp/.git/objects/44/c2d7ea183bb7746c8dec78c7469167b0c21e29 A trunk/thirdparty/cxml-stp/.git/objects/84/4c2543657b4273a0b2ec82264d5f2d6bc0def4 A trunk/thirdparty/cxml-stp/.git/objects/90/e7c128acd839cf07eba29860e7196f6f0b684d A trunk/thirdparty/cxml-stp/.git/objects/a1/ A trunk/thirdparty/cxml-stp/.git/objects/a1/245567613230a4a6328d92e29a6136f71b92dc A trunk/thirdparty/cxml-stp/.git/objects/c0/e7ef595c9832aa8c196f312f87f939396ddb34 A trunk/thirdparty/cxml-stp/.git/objects/fd/ A trunk/thirdparty/cxml-stp/.git/objects/fd/2d7acb25b02c60e388998db7ff46c88b872c3c U trunk/thirdparty/cxml-stp/.git/refs/heads/master U trunk/thirdparty/cxml-stp/.git/refs/remotes/origin/master D trunk/thirdparty/cxml-stp/build/atdoc.lisp D trunk/thirdparty/cxml-stp/build/dist.sh A trunk/thirdparty/cxml-stp/dist.lisp A trunk/thirdparty/cxml-stp/dist.sh A trunk/thirdparty/cxml-stp/index.html U trunk/thirdparty/cxml-stp/node.lisp
Modified: trunk/thirdparty/cxml-stp/.git/FETCH_HEAD =================================================================== --- trunk/thirdparty/cxml-stp/.git/FETCH_HEAD 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/FETCH_HEAD 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1 @@ -3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 branch 'master' of http://www.lichteblau.com/git/cxml-stp +44c2d7ea183bb7746c8dec78c7469167b0c21e29 branch 'master' of http://www.lichteblau.com/git/cxml-stp
Modified: trunk/thirdparty/cxml-stp/.git/index =================================================================== (Binary files differ)
Modified: trunk/thirdparty/cxml-stp/.git/logs/HEAD =================================================================== --- trunk/thirdparty/cxml-stp/.git/logs/HEAD 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/logs/HEAD 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 Hans Huebner hans@netzhansa.com 1210314287 +0000 +3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 44c2d7ea183bb7746c8dec78c7469167b0c21e29 Hans HÃŒbner hans@hertha.local 1238852654 +0200 pull : Fast forward
Modified: trunk/thirdparty/cxml-stp/.git/logs/refs/heads/master =================================================================== --- trunk/thirdparty/cxml-stp/.git/logs/refs/heads/master 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/logs/refs/heads/master 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 Hans Huebner hans@netzhansa.com 1210314287 +0000 +3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 44c2d7ea183bb7746c8dec78c7469167b0c21e29 Hans HÃŒbner hans@hertha.local 1238852654 +0200 pull : Fast forward
Modified: trunk/thirdparty/cxml-stp/.git/logs/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml-stp/.git/logs/refs/remotes/origin/master 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/logs/refs/remotes/origin/master 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 Hans Huebner hans@netzhansa.com 1210314287 +0000 fetch from http://www.lichteblau.com/git/cxml-stp.git +3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 44c2d7ea183bb7746c8dec78c7469167b0c21e29 Hans HÃŒbner hans@hertha.local 1238852654 +0200 pull : fast forward
Added: trunk/thirdparty/cxml-stp/.git/objects/37/3eeb4750a7448c425aa08a4123dccc8c26b6a7 =================================================================== --- trunk/thirdparty/cxml-stp/.git/objects/37/3eeb4750a7448c425aa08a4123dccc8c26b6a7 (rev 0) +++ trunk/thirdparty/cxml-stp/.git/objects/37/3eeb4750a7448c425aa08a4123dccc8c26b6a7 2009-04-04 13:44:57 UTC (rev 4350) @@ -0,0 +1,2 @@ +x}œÂ0 óV¶C@Ly·q€$àí1D'6ûüÝûÈ=/§C5 (ͶEÆàžG <tæ/3ÜStUJg{ñ~¢Œn=©rMeál iwh¹2gLT +UÃÑêðn 8Îêw+EÍžýè1.9žúšBi÷M§é~& KÀ~eÛ'T \ No newline at end of file
Added: trunk/thirdparty/cxml-stp/.git/objects/44/c2d7ea183bb7746c8dec78c7469167b0c21e29 =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/44/c2d7ea183bb7746c8dec78c7469167b0c21e29 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Added: trunk/thirdparty/cxml-stp/.git/objects/84/4c2543657b4273a0b2ec82264d5f2d6bc0def4 =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/84/4c2543657b4273a0b2ec82264d5f2d6bc0def4 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Added: trunk/thirdparty/cxml-stp/.git/objects/90/e7c128acd839cf07eba29860e7196f6f0b684d =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/90/e7c128acd839cf07eba29860e7196f6f0b684d ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Added: trunk/thirdparty/cxml-stp/.git/objects/a1/245567613230a4a6328d92e29a6136f71b92dc =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/a1/245567613230a4a6328d92e29a6136f71b92dc ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Added: trunk/thirdparty/cxml-stp/.git/objects/c0/e7ef595c9832aa8c196f312f87f939396ddb34 =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/c0/e7ef595c9832aa8c196f312f87f939396ddb34 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Added: trunk/thirdparty/cxml-stp/.git/objects/fd/2d7acb25b02c60e388998db7ff46c88b872c3c =================================================================== (Binary files differ)
Property changes on: trunk/thirdparty/cxml-stp/.git/objects/fd/2d7acb25b02c60e388998db7ff46c88b872c3c ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
Modified: trunk/thirdparty/cxml-stp/.git/refs/heads/master =================================================================== --- trunk/thirdparty/cxml-stp/.git/refs/heads/master 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/refs/heads/master 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1 @@ -3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 +44c2d7ea183bb7746c8dec78c7469167b0c21e29
Modified: trunk/thirdparty/cxml-stp/.git/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml-stp/.git/refs/remotes/origin/master 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/.git/refs/remotes/origin/master 2009-04-04 13:44:57 UTC (rev 4350) @@ -1 +1 @@ -3011465d3c18f9a4a2d8c6fc0412a7c0c64e13e9 +44c2d7ea183bb7746c8dec78c7469167b0c21e29
Deleted: trunk/thirdparty/cxml-stp/build/atdoc.lisp =================================================================== --- trunk/thirdparty/cxml-stp/build/atdoc.lisp 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/build/atdoc.lisp 2009-04-04 13:44:57 UTC (rev 4350) @@ -1,10 +0,0 @@ -(asdf:operate 'asdf:load-op :cxml-stp) -(asdf:operate 'asdf:load-op :atdoc) -(let* ((base (asdf:component-pathname (asdf:find-system :cxml-stp))) - (atdoc-directory (merge-pathnames "doc/" base))) - (ensure-directories-exist atdoc-directory) - (atdoc:generate-documentation '(:cxml-stp) - atdoc-directory - :index-title "cxml-stp API reference" - :heading "cxml-stp" - :css "cxml-stp.css"))
Deleted: trunk/thirdparty/cxml-stp/build/dist.sh =================================================================== --- trunk/thirdparty/cxml-stp/build/dist.sh 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/build/dist.sh 2009-04-04 13:44:57 UTC (rev 4350) @@ -1,28 +0,0 @@ -#!/bin/sh -cd $(dirname $0)/.. -home=$(pwd) -name=$(basename $home) -dir=${name}-$(date --iso) - -TMPDIR=`mktemp -d /tmp/dist.XXXXXXXXXX` -cleanup() { - cd - rm -rf $TMPDIR -} -trap cleanup exit - -sbcl --load build/atdoc.lisp --eval '(quit)' - -cd $TMPDIR -git clone $home $dir -rm -rf $dir/.git -rsync -a $home/doc $dir/ - -make -C $dir -make -C $dir/tutorial - -tgz=$TMPDIR/${dir}.tgz -tar czf $tgz $dir -gpg -b -a $tgz - -mv $tgz $tgz.asc $home/build/
Added: trunk/thirdparty/cxml-stp/dist.lisp =================================================================== --- trunk/thirdparty/cxml-stp/dist.lisp (rev 0) +++ trunk/thirdparty/cxml-stp/dist.lisp 2009-04-04 13:44:57 UTC (rev 4350) @@ -0,0 +1,9 @@ +(asdf:operate 'asdf:load-op :atdoc) +(asdf:operate 'asdf:load-op :cxml-stp) + +(atdoc:generate-html-documentation + '(:cxml-stp) + (merge-pathnames + "doc/" + (asdf:component-relative-pathname (asdf:find-system :cxml-stp))) + :heading "cxml-stp")
Added: trunk/thirdparty/cxml-stp/dist.sh =================================================================== --- trunk/thirdparty/cxml-stp/dist.sh (rev 0) +++ trunk/thirdparty/cxml-stp/dist.sh 2009-04-04 13:44:57 UTC (rev 4350) @@ -0,0 +1,53 @@ +#!/bin/sh -e +set -x + +cd $(dirname $0) +home=$(pwd) +name=$(basename $home) +name_and_date=${name}-$(date --iso) + +TMPDIR=`mktemp -d /tmp/dist.XXXXXXXXXX` +cleanup() { + cd + rm -rf $TMPDIR +} +trap cleanup exit + +mkdir -p doc/ +make +make -C tutorial/ + +git tag -f $name_and_date +git archive --prefix=$name_and_date/ $name_and_date | \ + ( cd $TMPDIR && tar xvf - ) + +echo '(progn (load "dist.lisp") (quit))' | clbuild lisp + +rsync -a doc tutorial $TMPDIR/$name_and_date + +cd $TMPDIR + +tgz=$TMPDIR/${name_and_date}.tgz +tar czf $tgz $name_and_date +gpg -b -a $tgz + +mkdir -p ~/bob/public_html/cxml-stp/download/ + +rsync -av \ + $name_and_date/doc \ + $name_and_date/tutorial \ + $name_and_date/*.html \ + $name_and_date/*.css \ + ~/bob/public_html/cxml-stp/ + +rsync $tgz $tgz.asc ~/bob/public_html/cxml-stp/download/ + +rm -f ~/bob/public_html/cxml-stp/download/cxml-stp.tar.gz +rm -f ~/bob/public_html/cxml-stp/download/cxml-stp.tar.gz.asc + +ln -sf ${name_and_date}.tgz ~/bob/public_html/cxml-stp/download/cxml-stp.tar.gz +ln -sf ${name_and_date}.tgz.asc ~/bob/public_html/cxml-stp/download/cxml-stp.tar.gz.asc + +echo done +exit 0 +rsync -av ~/bob/public_html bob.askja.de
Property changes on: trunk/thirdparty/cxml-stp/dist.sh ___________________________________________________________________ Name: svn:executable + *
Added: trunk/thirdparty/cxml-stp/index.html =================================================================== --- trunk/thirdparty/cxml-stp/index.html (rev 0) +++ trunk/thirdparty/cxml-stp/index.html 2009-04-04 13:44:57 UTC (rev 4350) @@ -0,0 +1,125 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title> + cxml-stp + </title> +<link rel="stylesheet" type="text/css" href="index.css"> +</head> +<body style="width: 62em"> +<div id="header"><div style="margin-left: 30px"><b><span>cxmlâ</span><span style="color: #55a6e0">stp</span></b></div></div> +<div id="homepage" class="main"> + <p> + A data structure for well-formed XML documents, designed for Common + Lisp. + </p> + + <h3>About</h3> + + <p> + cxml-stp is an alternative to the + W3C's <a href="http://common-lisp.net/project/cxml/dom.html">DOM</a>, + which cxml also implements. It was written + by <a href="mailto:david@lichteblau.com">David Lichteblau</a> as an + add-on library for + <a href="http://common-lisp.net/project/cxml">Closure XML</a> and is + available under an X11-style license. + </p> + <p> + Please send bug reports + to <a href="mailto:cxml-devel@common-lisp.net"> + cxml-devel@common-lisp.net</a> + (<a href="http://common-lisp.net/cgi-bin/mailman/listinfo/cxml-devel">list information</a>). + </p> + <p> + <i>Acknowledgements:</i> + cxml-stp is inspired by <a href="http://www.xom.nu/">XOM</a>. + </p> + <h3>Download</h3> + <p> + Download a + <a href="http://www.lichteblau.com/cxml-stp/download/">tarball</a>. + </p> + + <h3>Installation</h3> + <p> + cxml-stp needs + <a href="http://common-lisp.net/project/cxml">Closure XML</a>, + <a href="http://common-lisp.net/project/alexandria/">Alexandria</a>, + and <a href="http://common-lisp.net/project/plexippus-xpath/">Plexippus + XPath</a>. + </p> + <p> + <a href="http://www.cliki.net/asdf">ASDF</a> is used for + compilation. Register the .asd file, e.g. by symlinking it, + then compile cxml-stp using <tt>asdf:operate</tt>. + </p> + <pre>$ ln -sf `pwd`/cxml-stp.asd /path/to/your/registry/ +* (asdf:operate 'asdf:load-op :cxml-stp)</pre> + <p> + <i>Implementation-specific notes:</i> + At this point, cxml-stp is written to work with Lisp strings + (as opposed to runes and rods), and is meant to be used on + Lisp implementations with Unicode support. + </p> + + <h3>Documentation</h3> + <p> + <span style="font-size: 12pt">â¬</span> <a href="tutorial/index.html">Tutorial</a> + </p> + <p> + <span style="font-size: 12pt">â¬</span> <a href="tutorial/examples.html">Code</a> snippets + from the tutorial collected on one page + </p> + <p> + <span style="font-size: 12pt">â¬</span> <a href="doc/pages/cxml-stp.html">API documentation</a> + </p> + <p> + There is also a rough "STP for DOM + users" <a href="DOM-COMPARISON">comparison</a> which should be + useful if you have a specific DOM function in mind and are looking + for STP's equivalent. + </p> + + <h3>Recent changes</h3> + <p><b>2008-11-30</b></p> + <ul> + <li> + XPath support. (Thanks to Ivan Shvedunov for his contributions.) + </li> + <li> + Use 21 bit characters on Lisps offering them. + </li> + <li> + New function NUMBER-OF-CHILDREN. + </li> + <li> + Fixed FILTER-CHILDREN to return a list, not a vector. + </li> + <li> + Shortcut syntax using symbol in WITH-ATTRIBUTE (thanks to Cyrus Harmon). + </li> + <li> + Minor changes: Disabled uri syntax warnings. Represent uris as + strings, not puri objects. + </li> + </ul> + <p><b>2007-10-21</b></p> + <ul> + <li> + New function FIND-RECURSIVELY-IF. + </li> + <li> + Minor changes: Update to current CXML's SAX builders. + </li> + </ul> + <p><b>2007-08-05</b></p> + <ul> + <li> + Initial public release. + </li> + </ul> +</div> +</body> +</html>
Modified: trunk/thirdparty/cxml-stp/node.lisp =================================================================== --- trunk/thirdparty/cxml-stp/node.lisp 2009-04-04 13:41:01 UTC (rev 4349) +++ trunk/thirdparty/cxml-stp/node.lisp 2009-04-04 13:44:57 UTC (rev 4350) @@ -262,7 +262,7 @@ (defun number-of-children (parent) "@arg[parent]{a @class{node}} @return{the number of child nodes} - Returns the number of {parent}'s child nodes. + Returns the number of @code{parent}'s child nodes. @see{count-children}" (length (%children parent)))