* Fix the template, toggle, and conditional plugins to filter text before

  preprocessing it.
* Fix smiley plugin to support smileys at the very beginning or end of
  the content.

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 35418a3ba448aee3dd8191ab3e7f3ece876d0b9b..293fbc1914597ef2364e81ad4978c381bf812f76 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -53,7 +53,8 @@ sub preprocess_if (@) { #{{{
        else {
                $ret="";
        }
        else {
                $ret="";
        }

-       return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
+       return IkiWiki::preprocess($params{page}, $params{destpage}, 
+               IkiWiki::filter($params{page}, $ret));

 } # }}}
 
 package IkiWiki::PageSpec;
 } # }}}
 
 package IkiWiki::PageSpec;

diff --git a/IkiWiki/Plugin/smiley.pm b/IkiWiki/Plugin/smiley.pm
index 85a719337518fc3443b501318ce54ec3847af63b..45d00abea2cbec47df02e05d9d93d5c8fcf9d08e 100644 (file)
--- a/IkiWiki/Plugin/smiley.pm
+++ b/IkiWiki/Plugin/smiley.pm
@@ -34,10 +34,10 @@ sub setup () { #{{{
 sub filter (@) { #{{{
        my %params=@_;
        
 sub filter (@) { #{{{
        my %params=@_;
        

-       $params{content} =~ s{(?<=\s)(\\?)$smiley_regexp(?=\s)}{
+       $params{content} =~ s{(?:^|(?<=\s))(\\?)$smiley_regexp(?:(?=\s)|$)}{

                $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2)
        }egs;
                $1 ? $2 : htmllink($params{page}, $params{page}, $smileys{$2}, 0, 0, $2)
        }egs;

-       
+

        return $params{content};
 } # }}}
 
        return $params{content};
 } # }}}
 

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 23d9d65d88835c12f81ea27134221965f89754dc..16a3c1e37e49f406861b1b2526ba2898b2ff92fd 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -50,7 +50,8 @@ sub preprocess (@) { #{{{
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},

-               $template->output);
+               IkiWiki::filter($params{page},
+               $template->output));

 } # }}}
 
 1
 } # }}}
 
 1

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index c68e308925860f3510fb04010f617923b16c2997..7318731c54808c01ee73ec4b8b660708bb8a066a 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -88,7 +88,8 @@ sub preprocess_toggleable (@) { #{{{
 
        # Preprocess the text to expand any preprocessor directives
        # embedded inside it.
 
        # Preprocess the text to expand any preprocessor directives
        # embedded inside it.

-       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+               IkiWiki::filter($params{page}, $params{text}));

        
        my $id=genid($params{page}, $params{id});
 
        
        my $id=genid($params{page}, $params{id});
 

diff --git a/debian/changelog b/debian/changelog
index d77b97dcd1f98799e3c6a8e316f70f50608d7606..80a47c458f283e0a88b70ce65c730135b20f60e6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,12 @@ ikiwiki (1.43) UNRELEASED; urgency=low
   * Make the basewiki be full of symlinks to pages that should be the same
     in the doc wiki. This will allow direct edits to alter the base wiki
     without manual munging.
   * Make the basewiki be full of symlinks to pages that should be the same
     in the doc wiki. This will allow direct edits to alter the base wiki
     without manual munging.

+  * Fix the template, toggle, and conditional plugins to filter text before
+    preprocessing it.
+  * Fix smiley plugin to support smileys at the very beginning or end of
+    the content.

 
 

- -- Joey Hess <joeyh@debian.org>  Tue, 13 Feb 2007 18:06:02 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 13 Feb 2007 18:40:36 -0500

 
 ikiwiki (1.42) unstable; urgency=low
 
 
 ikiwiki (1.42) unstable; urgency=low
 

diff --git a/doc/todo/smileys_do_not_work_in_PreprocessorDirective_arguments.mdwn b/doc/todo/smileys_do_not_work_in_PreprocessorDirective_arguments.mdwn
index 3f327820e93ebfb84ea1208d16e660cdcc443761..dabc58dee67aa4f5de5f3cc41e093ae180e91830 100644 (file)
--- a/doc/todo/smileys_do_not_work_in_PreprocessorDirective_arguments.mdwn
+++ b/doc/todo/smileys_do_not_work_in_PreprocessorDirective_arguments.mdwn
@@ -13,4 +13,6 @@ after [[PreprocessorDirective]]s.
 >
 > Also, for an example of this issue, consider the sample conditional on [[plugins/conditional]].
 >
 >
 > Also, for an example of this issue, consider the sample conditional on [[plugins/conditional]].
 >

-> --[[JoshTriplett]]
\ No newline at end of file
+> --[[JoshTriplett]]
+
+[[todo/done]] --[[Joey]]

diff --git a/po/es.po b/po/es.po
index 5a541c6726c4ee462134778e4e02d38b985fb71f..b39851725e48fc0bbc2cfaac739caafeac8555c6 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-11 22:01-0500\n"
+"POT-Creation-Date: 2007-02-13 18:43-0500\n"

 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "PO-Revision-Date: 2007-02-12 10:31+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"


@@ -52,7 +52,9 @@ msgstr "Ha sido expulsado."
 
 #: ../IkiWiki/CGI.pm:660
 msgid "login failed, perhaps you need to turn on cookies?"
 
 #: ../IkiWiki/CGI.pm:660
 msgid "login failed, perhaps you need to turn on cookies?"

-msgstr "registro fallido, ¿ tal vez es necesario activar las cookies en el navegador ?"
+msgstr ""
+"registro fallido, ¿ tal vez es necesario activar las cookies en el "
+"navegador ?"

 
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format


@@ -115,7 +117,8 @@ msgstr "el programa fortune ha fallado"
 
 #: ../IkiWiki/Plugin/googlecalendar.pm:22
 msgid "googlecalendar failed to find url in html"
 
 #: ../IkiWiki/Plugin/googlecalendar.pm:22
 msgid "googlecalendar failed to find url in html"

-msgstr "El complemento googlecalendar no ha encontrado un URL en el código HTML"
+msgstr ""
+"El complemento googlecalendar no ha encontrado un URL en el código HTML"

 
 #: ../IkiWiki/Plugin/inline.pm:36
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 
 #: ../IkiWiki/Plugin/inline.pm:36
 msgid "Must specify url to wiki with --url when using --rss or --atom"


@@ -295,7 +298,9 @@ msgstr "convirtiendo la página %s, la cual depende de %s"
 #: ../IkiWiki/Render.pm:402
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 #: ../IkiWiki/Render.pm:402
 #, perl-format
 msgid "rendering %s, to update its backlinks"

-msgstr "convirtiendo la página %s para actualizar la lista de páginas que hacen referencia a ella."
+msgstr ""
+"convirtiendo la página %s para actualizar la lista de páginas que hacen "
+"referencia a ella."

 
 #: ../IkiWiki/Render.pm:414
 #, perl-format
 
 #: ../IkiWiki/Render.pm:414
 #, perl-format


@@ -346,7 +351,8 @@ msgstr "el programa %s no parece ser ejecutable"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"

-msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración"
+msgstr ""
+"no puedo crear un programa envoltorio que utiliza un archivo de configuración"

 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"


@@ -378,8 +384,8 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 #: ../IkiWiki.pm:103
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 #: ../IkiWiki.pm:103
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""

-"Es obligatorio especificar un url al wiki con el parámetro --url si se utiliza "
-"el parámetro --cgi"
+"Es obligatorio especificar un url al wiki con el parámetro --url si se "
+"utiliza el parámetro --cgi"

 
 #: ../IkiWiki.pm:148 ../IkiWiki.pm:149
 msgid "Error"
 
 #: ../IkiWiki.pm:148 ../IkiWiki.pm:149
 msgid "Error"


@@ -395,4 +401,3 @@ msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado un bucle de preprocesado %s en la página %s en la vuelta "
 "número %i"
 msgstr ""
 "se ha detectado un bucle de preprocesado %s en la página %s en la vuelta "
 "número %i"

-

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 90ff014b64edb861383401b04725f8da3a4f3e5b..fd29aba175c960ce8b5b14a8f988c6a9f47692ef 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-11 22:01-0500\n"
+"POT-Creation-Date: 2007-02-13 19:10-0500\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"