Merge branch 'master' into autoconfig

author: Joey Hess <joey@kodama.kitenet.net> 2008-07-26 23:22:42 -0400
committer: Joey Hess <joey@kodama.kitenet.net> 2008-07-26 23:22:42 -0400
commit: 4ef96e2d9994c407f0f2f46301eb91fab6b48a37 (patch)
tree: 776e011ceeac1c0bc3f2aa1d7c374c1a6919d21c
parent: 7a2a235fa45d84e4a5f3f6bb3b5059d08939cddc (diff)
parent: ecc40d1769c84a2cca3070e848adfd8710f27d8b (diff)
5 files changed, 127 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
new file mode 100644
index 000000000..b1161ba06
--- /dev/null
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::cutpaste;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+use UNIVERSAL;
+
+my %savedtext;
+
+sub import { #{{{
+	hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
+	hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
+	hook(type => "preprocess", id => "paste", call => \&preprocess_paste);
+} # }}}
+
+sub preprocess_cut (@) { #{{{
+	my %params=@_;
+
+	foreach my $param (qw{id text}) {
+		if (! exists $params{$param}) {
+			error sprintf(gettext('%s parameter is required'), $param);
+		}
+	}
+
+	$savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
+	$savedtext{$params{page}}->{$params{id}} = $params{text};
+
+	return "" if defined wantarray;
+} # }}}
+
+sub preprocess_copy (@) { #{{{
+	my %params=@_;
+
+	foreach my $param (qw{id text}) {
+		if (! exists $params{$param}) {
+			error sprintf(gettext('%s parameter is required'), $param);
+		}
+	}
+
+	$savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
+	$savedtext{$params{page}}->{$params{id}} = $params{text};
+
+	return IkiWiki::preprocess($params{page}, $params{destpage}, 
+		IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
+} # }}}
+
+sub preprocess_paste (@) { #{{{
+	my %params=@_;
+
+	foreach my $param (qw{id}) {
+		if (! exists $params{$param}) {
+			error sprintf(gettext('%s parameter is required'), $param);
+		}
+	}
+
+	if (! exists $savedtext{$params{page}}) {
+		error gettext('no text was copied in this page');
+	}
+	if (! exists $savedtext{$params{page}}->{$params{id}}) {
+		error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
+	}
+
+	return IkiWiki::preprocess($params{page}, $params{destpage}, 
+		IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
+} # }}}
+
+1;
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index cd9617e25..e203defb0 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -110,7 +110,7 @@ sub preprocess_toggleable (@) { #{{{
 sub format (@) { #{{{
         my %params=@_;
 
-	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">)</div>!$1!g) {
+	if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
 		$params{content}=~s/<div class="toggleableend">//g;
 		if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
 			# no </body> tag, probably in preview mode
diff --git a/debian/changelog b/debian/changelog
index 78a18b615..08be87fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * toggle: Fix incompatability between javascript and webkit.
   * bzr: Add support for rename and delete. (Jelmer Vernooij)
   * attachment: Use relative paths when inserting links.
+  * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
+  * cutpaste: New plugin by Enrico Zini
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
diff --git a/debian/copyright b/debian/copyright
index d25e0861a..d22edb03b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,7 +76,7 @@ Files: htmltidy.pm
 Copyright: © 2006 Faidon Liambotis
 License: GPL-2+
 
-Files: polygen.pm, pagestats.pm
+Files: polygen.pm, pagestats.pm, cutpaste.pm
 Copyright: © 2006 Enrico Zini
 License: GPL-2+
 
diff --git a/doc/plugins/cutpaste.mdwn b/doc/plugins/cutpaste.mdwn
new file mode 100644
index 000000000..a5dff08ab
--- /dev/null
+++ b/doc/plugins/cutpaste.mdwn
@@ -0,0 +1,55 @@
+[[!template id=plugin name=toggle author="[[Enrico]]"]]
+[[!tag type/chrome]]
+
+With this plugin you can store and recall pieces of text.  It defines three
+preprocessing commands:
+
+ * `\[[!cut id=name text="text"]]` memorizes the text allowing to recall it
+   using the given ID.  The text being cut is not included in the output.
+ * `\[[!copy id=name text="text"]]` memorizes the text allowing to recall it
+   using the given ID.  The text being cut *is* included in the output.
+ * `\[[!paste id=name]]` is replaced by the previously memorized text.
+
+The text being cut, copied and pasted can freely include wiki markup, including
+more calls to cut, copy and paste.
+
+You do not need to memorize the text before using it: a cut directive can
+follow the paste directive that uses its text.  In fact, this is quite useful
+to postpone big blocks of text like long annotations and have a more natural
+flow.  For example:
+
+	This plugin provides three directives:
+
+	 * \[[!toggle id="cut" text="cut"]] that cuts text
+	 * \[[!toggle id="copy" text="copy"]] that copies text
+	 * \[[!toggle id="paste" text="paste"]] that pastes text
+
+	\[[!toggleable id="cut" text="\[[!paste id=cutlongdesc]]"]]
+	\[[!toggleable id="copy" text="\[[!paste id=copylongdesc]]"]]
+	\[[!toggleable id="paste" text="\[[!paste id=pastelongdesc]]"]]
+
+	\[...some time later...]
+
+	\[[!cut id=cutlongdesc text="""
+	   blah blah blah
+	"""]]
+	\[[!cut id=copylongdesc text="""
+	   blah blah blah
+	"""]]
+	\[[!cut id=pastelongdesc text="""
+	   blah blah blah
+	"""]]
+
+This can potentially be used to create loops, but ikiwiki is clever and breaks
+them.
+
+Since you can paste without using double quotes, copy and paste can be used to
+nest directive that require multiline parameters inside each other:
+
+	\[[!toggleable id=foo text="""
+	  \[[!toggleable id=bar text="\[[!paste id=baz]]"]]
+	"""]]
+
+	\[[!cut id=baz text="""
+	multiline parameter!
+	"""]]
author	Joey Hess <joey@kodama.kitenet.net>	2008-07-26 23:22:42 -0400
committer	Joey Hess <joey@kodama.kitenet.net>	2008-07-26 23:22:42 -0400
commit	4ef96e2d9994c407f0f2f46301eb91fab6b48a37 (patch)
tree	776e011ceeac1c0bc3f2aa1d7c374c1a6919d21c
parent	7a2a235fa45d84e4a5f3f6bb3b5059d08939cddc (diff)
parent	ecc40d1769c84a2cca3070e848adfd8710f27d8b (diff)