diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | doc/plugins/contrib/htmlbalance.mdwn | 12 | ||||
| -rw-r--r-- | doc/plugins/htmlbalance.mdwn | 6 |
5 files changed, 14 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index dd19c1463..ef46370d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (2.71) UNRELEASED; urgency=low + + * htmlbalance: New plugin contributed by Simon McVittie. + + -- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500 + ikiwiki (2.70) unstable; urgency=low * Avoid crash on malformed utf-8 discovered by intrigeri. diff --git a/debian/control b/debian/control index fdf2a3a36..fb85551de 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Package: ikiwiki Architecture: all Depends: ${perl:Depends}, markdown | libtext-markdown-perl, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl -Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng +Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-atom-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table diff --git a/debian/copyright b/debian/copyright index f257234dd..546836226 100644 --- a/debian/copyright +++ b/debian/copyright @@ -76,6 +76,10 @@ Files: htmltidy.pm Copyright: © 2006 Faidon Liambotis License: GPL-2+ +Files: htmlbalance.pm +Copyright: © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/> +License: GPL-2+ + Files: polygen.pm, pagestats.pm, cutpaste.pm Copyright: © 2006 Enrico Zini License: GPL-2+ diff --git a/doc/plugins/contrib/htmlbalance.mdwn b/doc/plugins/contrib/htmlbalance.mdwn deleted file mode 100644 index 728e6afc2..000000000 --- a/doc/plugins/contrib/htmlbalance.mdwn +++ /dev/null @@ -1,12 +0,0 @@ -[[!template id=plugin name=htmlbalance author="[[Simon_McVittie|smcv]]"]] -[[!tag type/html]] - -This plugin ensures that the HTML emitted by ikiwiki contains well-balanced -HTML tags, by parsing it with [[!cpan HTML::TreeBuilder]] and re-serializing it. This -acts as a lighter-weight alternative to [[plugins/htmltidy]]; it doesn't -ensure validity, but it does at least ensure that formatting from a -blog post pulled in by the [[ikiwiki/directive/inline]] directive doesn't -leak into the rest of the page. - -htmlbalance is available from the 'htmlbalance' branch in [[smcv]]'s git repository. -I'd like to get this plugin included in ikiwiki - any code review is welcome. diff --git a/doc/plugins/htmlbalance.mdwn b/doc/plugins/htmlbalance.mdwn index 7cdb1f950..f4e2298ee 100644 --- a/doc/plugins/htmlbalance.mdwn +++ b/doc/plugins/htmlbalance.mdwn @@ -1,9 +1,9 @@ -[[!template id=plugin name=htmlbalance author="Simon McVittie"]] +[[!template id=plugin name=htmlbalance author="[[Simon_McVittie|smcv]]"]] [[!tag type/html]] This plugin ensures that the HTML emitted by ikiwiki contains well-balanced -HTML tags, by parsing it with HTML::TreeBuilder and re-serializing it. This +HTML tags, by parsing it with [[!cpan HTML::TreeBuilder]] and re-serializing it. This acts as a lighter-weight alternative to [[plugins/htmltidy]]; it doesn't ensure validity, but it does at least ensure that formatting from a -blog post pulled in by \[[![[ikiwiki/directive/inline]]]] doesn't +blog post pulled in by the [[ikiwiki/directive/inline]] directive doesn't leak into the rest of the page. |