summaryrefslogtreecommitdiff
path: root/.library/IkiWiki/Plugin
diff options
context:
space:
mode:
Diffstat (limited to '.library/IkiWiki/Plugin')
-rw-r--r--.library/IkiWiki/Plugin/getfield.pm12
-rw-r--r--.library/IkiWiki/Plugin/texinfo.pm2
2 files changed, 7 insertions, 7 deletions
diff --git a/.library/IkiWiki/Plugin/getfield.pm b/.library/IkiWiki/Plugin/getfield.pm
index 971e7ecb..fb876f35 100644
--- a/.library/IkiWiki/Plugin/getfield.pm
+++ b/.library/IkiWiki/Plugin/getfield.pm
@@ -65,13 +65,13 @@ sub do_filter (@) {
my $page_type=pagetype($page_file);
if (defined $page_type)
{
- while ($params{content} =~ /{{\$([-\w\/]+#)?[-\w]+}}/)
+ while ($params{content} =~ /\{\{\$([-\w\/]+#)?[-\w]+\}\}/)
{
# substitute {{$var}} variables (source-page)
- $params{content} =~ s/{{\$([-\w]+)}}/get_field_value($1,$page)/eg;
+ $params{content} =~ s/\{\{\$([-\w]+)\}\}/get_field_value($1,$page)/eg;
# substitute {{$page#var}} variables (source-page)
- $params{content} =~ s/{{\$([-\w\/]+)#([-\w]+)}}/get_other_page_field_value($2,$page,$1)/eg;
+ $params{content} =~ s/\{\{\$([-\w\/]+)#([-\w]+)\}\}/get_other_page_field_value($2,$page,$1)/eg;
}
}
@@ -79,12 +79,12 @@ sub do_filter (@) {
$page_type=pagetype($page_file);
if (defined $page_type)
{
- while ($params{content} =~ /{{\+\$([-\w\/]+#)?[-\w]+\+}}/)
+ while ($params{content} =~ /\{\{\+\$([-\w\/]+#)?[-\w]+\+\}\}/)
{
# substitute {{+$var+}} variables (dest-page)
- $params{content} =~ s/{{\+\$([-\w]+)\+}}/get_field_value($1,$destpage)/eg;
+ $params{content} =~ s/\{\{\+\$([-\w]+)\+\}\}/get_field_value($1,$destpage)/eg;
# substitute {{+$page#var+}} variables (source-page)
- $params{content} =~ s/{{\+\$([-\w\/]+)#([-\w]+)\+}}/get_other_page_field_value($2,$destpage,$1)/eg;
+ $params{content} =~ s/\{\{\+\$([-\w\/]+)#([-\w]+)\+\}\}/get_other_page_field_value($2,$destpage,$1)/eg;
}
}
diff --git a/.library/IkiWiki/Plugin/texinfo.pm b/.library/IkiWiki/Plugin/texinfo.pm
index 8c651160..0950fb66 100644
--- a/.library/IkiWiki/Plugin/texinfo.pm
+++ b/.library/IkiWiki/Plugin/texinfo.pm
@@ -107,7 +107,7 @@ sub filter (@)
# ``Render'' by hand some stuff that is commonly found in this section.
if (defined $copyright{$page})
{
- $copyright{$page} =~ s/\@copyright{}/©/g;
+ $copyright{$page} =~ s/\@copyright\{\}/©/g;
}
if (defined $license{$page})
{