Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b10d085174c5d808c322f8c78bc48c8ecaa6bc39..338468e23b8bb7d0353424c2b849b153b1d75ee4 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -54,10 +54,17 @@ sub htmlize (@) {
                        eval q{use Text::Markdown::Discount};
                        if (! $@) {
                                $markdown_sub=sub {
+                                       my $t=shift;
                                        # Workaround for discount binding bug
                                        # https://rt.cpan.org/Ticket/Display.html?id=73657
-                                       return "" if $_[0]=~/^\s*$/;
-                                       Text::Markdown::Discount::markdown(@_);
+                                       return "" if $t=~/^\s*$/;
+                                       # Workaround for discount's eliding
+                                       # of <style> blocks.
+                                       # https://rt.cpan.org/Ticket/Display.html?id=74016
+                                       $t=~s/<style/<elyts/ig;
+                                       my $r=Text::Markdown::Discount::markdown($t);
+                                       $r=~s/<elyts/<style/ig;
+                                       return $r;
                                }
                        }
                }

diff --git a/debian/changelog b/debian/changelog
index 142ca24ea95965672c92eb2b77cb873947f3e6ac..9c4e83c2f0fa50423b65ce0b23546b048016348e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ikiwiki (3.20120110) UNRELEASED; urgency=low
+ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
+  * Workaround discount's eliding of <style> blocks.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 13 Jan 2012 13:43:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400
 
 ikiwiki (3.20120109) unstable; urgency=low
 

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 52b338111ead2cb4716a724c341a7956fb02bf32..fff50b7409950d1befa965f3c82aa41774e4358a 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20120109
+Version: 3.20120115
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 047371251f9c8e0577eb89e9ec9277decc9e44be..cdeac3534a2a688a412a95ab9327785027ef022c 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"
-"POT-Creation-Date: 2011-12-29 12:03-0400\n"
+"POT-Creation-Date: 2012-01-15 16:20-0400\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"
@@ -508,7 +508,7 @@ msgstr ""
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:70
+#: ../IkiWiki/Plugin/mdwn.pm:88
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""