urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into autoconfig

master
Joey Hess 2008-07-26 23:22:42 -04:00
parent 7a2a235fa4 ecc40d1769
commit 4ef96e2d99
5 changed files with 127 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
IkiWiki/Plugin/cutpaste.pm 100644
View File

@ -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;

2
IkiWiki/Plugin/toggle.pm
View File

@ -110,7 +110,7 @@ sub preprocess_toggleable (@) { #{{{
sub format (@) { #{{{ sub format (@) { #{{{
my %params=@_; 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; $params{content}=~s/<div class="toggleableend">//g;
if (! ($params{content}=~s!^<body>!<body>$javascript!m)) { if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
# no </body> tag, probably in preview mode # no </body> tag, probably in preview mode

2
debian/changelog vendored
View File

@ -41,6 +41,8 @@ ikiwiki (2.55) UNRELEASED; urgency=low
* toggle: Fix incompatability between javascript and webkit. * toggle: Fix incompatability between javascript and webkit.
* bzr: Add support for rename and delete. (Jelmer Vernooij) * bzr: Add support for rename and delete. (Jelmer Vernooij)
* attachment: Use relative paths when inserting links. * 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 -- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400

2
debian/copyright vendored
View File

@ -76,7 +76,7 @@ Files: htmltidy.pm
Copyright: © 2006 Faidon Liambotis Copyright: © 2006 Faidon Liambotis
License: GPL-2+ License: GPL-2+
Files: polygen.pm, pagestats.pm Files: polygen.pm, pagestats.pm, cutpaste.pm
Copyright: © 2006 Enrico Zini Copyright: © 2006 Enrico Zini
License: GPL-2+ License: GPL-2+

55
doc/plugins/cutpaste.mdwn 100644
View File

@ -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!
"""]]