From 54fc4d578e655fe3136d8d245021d78db82ac507 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jan 2008 20:49:35 -0500 Subject: [PATCH 01/14] web commit by test --- doc/sandbox/hello.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox/hello.mdwn b/doc/sandbox/hello.mdwn index 8136fdef1..a0e2270db 100644 --- a/doc/sandbox/hello.mdwn +++ b/doc/sandbox/hello.mdwn @@ -1 +1 @@ -hehe \ No newline at end of file +hehe hohoho From 3e11f9ad94036bd03d787ca9f9295ea277d703bb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 07:32:56 -0500 Subject: [PATCH 02/14] web commit by http://madduck.myopenid.com/ --- ...2___tags_are_removed_from_markdown_inline_HTML.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn diff --git a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn new file mode 100644 index 000000000..d32b2e978 --- /dev/null +++ b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn @@ -0,0 +1,10 @@ +I am trying to add a post address to a document: + +
+ First line
+ Second line +
+ +As you can see, the `
` is being removed. I disabled [[htmlscrubber]], but that was not it. The [markdown Dingus](http://daringfireball.net/projects/markdown/dingus) on its homepage processes the inline HTML just fine. + +I tried searching the web and wiki but could not find any information on why
would be removed. From fd65bf754502b6a6ec63ec0dbd0f90e0b9e358e9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 08:55:23 -0500 Subject: [PATCH 03/14] web commit by tschwinge: How to do this. --- ...__tags_are_removed_from_markdown_inline_HTML.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn index d32b2e978..e4f6be997 100644 --- a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn +++ b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn @@ -8,3 +8,15 @@ I am trying to add a post address to a document: As you can see, the `
` is being removed. I disabled [[htmlscrubber]], but that was not it. The [markdown Dingus](http://daringfireball.net/projects/markdown/dingus) on its homepage processes the inline HTML just fine. I tried searching the web and wiki but could not find any information on why
would be removed. + +> It does work if you use `
`: +> +> First line
+> Second line +> +> Or, as we've just been told in #ikiwiki: put two spaces at the end of the first line. +> +> First line +> Second line +> +> --[[tschwinge]] From da41fcb1cd34f092a2350185ef272b796f308a63 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 09:03:28 -0500 Subject: [PATCH 04/14] web commit by http://madduck.myopenid.com/: note about this still being a bug in ways --- ...60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn index e4f6be997..f329d5208 100644 --- a/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn +++ b/doc/bugs/__60__br__62___tags_are_removed_from_markdown_inline_HTML.mdwn @@ -20,3 +20,5 @@ I tried searching the web and wiki but could not find any information on why
Second line > > --[[tschwinge]] + +> > `
` is also valid, so this is a bug still. --[[madduck]] From e2f1277d96090132d019e443fa1b624b74d1651a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 10:52:11 -0500 Subject: [PATCH 05/14] web commit by http://madduck.myopenid.com/ --- ..._HTML::Template_with_Template_Toolkit.mdwn | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn new file mode 100644 index 000000000..19f138fee --- /dev/null +++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn @@ -0,0 +1,49 @@ +HTML::Template is an okay templating kit, but it lacks a lot of powerful +features and thus makes it rather hard to give an ikiwiki site a consistent +look. If you browse the templates provided in the tarball, you'll notice that +more than one of them contain the `` tag, which is unnecessary. + +Maybe it's just me, I also find HTML::Template cumbersome to use, due in part +to its use of capital letters. + +Finally, the software seems unmaintained: the mailing list and searchable +archives linked from + +are broken and the author has not replied to my query in months. + +I would love to see ikiwiki use the [Template +Toolkit](http://template-toolkit.org/) as templating engine. + +One major reason for TT is its use of slots, a concept I first encountered +with Zope Page Templates and never wanted to miss it again. Let me quickly +illustrate, using the HTML::Template syntax for simplicity. Traditionally, +templating is done with includes: + + Page A Page B + + this is page A this is page B + + +This involves four pages, and if you mistype "footer" on page B, +it'll be broken in potentially subtle ways. + +Now look at the approach with slots: + + MainTemplate + This is the header + + This is the footer + + Page A Page B + + + This is page A This is page B + + + +As soon as you think about more structure pages with various slots +to fill, I am sure you can see the appeal of that approach. If not, +here is some more documentation: + +I would be glad to volunteer time to make this switch happen, such as rewrite +the templates. I'd prefer not having to touch Perl though... From c9b62ad8661095858f3eac12c9cbf003a53c8cb2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 10:52:58 -0500 Subject: [PATCH 06/14] web commit by http://madduck.myopenid.com/: make it wishlist --- doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn index 19f138fee..feb31a128 100644 --- a/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn +++ b/doc/todo/replace_HTML::Template_with_Template_Toolkit.mdwn @@ -1,3 +1,5 @@ +[[tag wishlist]] + HTML::Template is an okay templating kit, but it lacks a lot of powerful features and thus makes it rather hard to give an ikiwiki site a consistent look. If you browse the templates provided in the tarball, you'll notice that From e92c51f5e546a3286dbe96389fafa7aa21c88516 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 12:00:20 -0500 Subject: [PATCH 07/14] web commit by http://madduck.myopenid.com/ --- doc/plugins/pagestats.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn index 06079414e..f766a1ac8 100644 --- a/doc/plugins/pagestats.mdwn +++ b/doc/plugins/pagestats.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=pagestate author="Enrico Zini"]] +[[template id=plugin name=pagestats author="Enrico Zini"]] [[tag type/meta type/tags]] This plugin can generate stats about how pages link to each other. It can From 27261da09be059c6400d71138f060eb94faa407e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Jan 2008 18:25:43 -0500 Subject: [PATCH 08/14] web commit by adb --- doc/bugs/taint_issue_with_regular_expressions.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/bugs/taint_issue_with_regular_expressions.mdwn b/doc/bugs/taint_issue_with_regular_expressions.mdwn index e05a59879..5ba9e19f6 100644 --- a/doc/bugs/taint_issue_with_regular_expressions.mdwn +++ b/doc/bugs/taint_issue_with_regular_expressions.mdwn @@ -19,4 +19,13 @@ which is exactly the same regular expression drawn out as a constant. It appear > checking in the debian package. You can do the same by building ikiwiki > with NOTAINT=1. :-( --[[Joey]] -[[tag done]] +---------------- +Continuing to dig into the problem I reported, it may not be taint after all. Running strings on the ikiwiki.cgi wrapper, I see stuff like: + + 'wiki_file_regexp' => bless( do{\(my $o = undef)}, 'Regexp' ) + +without any payload of the actual regexp, and that would also certainly also have the observed effect of the regexps being completely broken while running in CGI mode. This seems to implicate Data::Dumper (2.101). After upgrading Data::Dumper to 2.121 I get: + + 'wiki_file_regexp' => qr/(?-xism:(^[-[:alnum:]_.:\/+]+$))/ + +This would call for at most an installation prerequisite of Data::Dumper >= 1.121. A look at the module's changelog shows that no intervening versions were actually released, so 1.121 would be the minimal good one. From 1173b6e6a2abf39a84a211c4d60e877b9900b6b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 09:16:40 -0500 Subject: [PATCH 09/14] web commit by http://madduck.myopenid.com/ --- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn new file mode 100644 index 000000000..74e5b7da3 --- /dev/null +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -0,0 +1,5 @@ +It would be great if I could tell ikiwiki to automatically instantiate pages for each tag, according to a template, especially when `$tagbase` is set. + +Tags are mainly specific to the object to which they’re stuck. However, I often use them the other way around, too: as concepts. And sometimes I’d like to see all pages related to a given concept (“tagged with a given tag”). The only way to do this with ikiwiki is to instantiate a page for each tag and slap a map on it. This is quite tedious and I’d really love to see Ikiwiki do so by default for all tags. + +Also see: and From cd43ea1c990194bcddc408ac4d1ead05c6cc46eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 09:17:51 -0500 Subject: [PATCH 10/14] web commit by http://madduck.myopenid.com/: add wishlist tag --- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 74e5b7da3..7211bfe41 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -3,3 +3,5 @@ It would be great if I could tell ikiwiki to automatically instantiate pages for Tags are mainly specific to the object to which they’re stuck. However, I often use them the other way around, too: as concepts. And sometimes I’d like to see all pages related to a given concept (“tagged with a given tag”). The only way to do this with ikiwiki is to instantiate a page for each tag and slap a map on it. This is quite tedious and I’d really love to see Ikiwiki do so by default for all tags. Also see: and + +[tag wishlist] From 2f64f6d35298fccfc9c39281d95c1a4bd436cfa6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 09:18:19 -0500 Subject: [PATCH 11/14] web commit by http://madduck.myopenid.com/: idiot i am, forgot the second pair of brackets --- doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 7211bfe41..90864d514 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -4,4 +4,4 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte Also see: and -[tag wishlist] +[[tag wishlist]] From d8326263959c2df7e5c20befa29ae1e286e4b00a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 10:19:04 -0500 Subject: [PATCH 12/14] web commit by http://madduck.myopenid.com/ --- doc/todo/allow_CGI_to_create_dynamic_pages.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/allow_CGI_to_create_dynamic_pages.mdwn diff --git a/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn new file mode 100644 index 000000000..ea20231ef --- /dev/null +++ b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn @@ -0,0 +1,3 @@ +[[tag wishlist]] + +It would be cool if the CGI could be used to render dynamic pages. For instance, I might want to create a page with a `[[map]]` according to a [[pagespec]] to be passed in the query string, instead of creating/hardcoding all possible pagespecs I might want to call. From 8831f3ca3e5a1f93afe2eaeddbb7080e75fada20 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 10:46:49 -0500 Subject: [PATCH 13/14] web commit by http://madduck.myopenid.com/: fix map verbatim --- doc/todo/allow_CGI_to_create_dynamic_pages.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn index ea20231ef..6125bc413 100644 --- a/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn +++ b/doc/todo/allow_CGI_to_create_dynamic_pages.mdwn @@ -1,3 +1,3 @@ [[tag wishlist]] -It would be cool if the CGI could be used to render dynamic pages. For instance, I might want to create a page with a `[[map]]` according to a [[pagespec]] to be passed in the query string, instead of creating/hardcoding all possible pagespecs I might want to call. +It would be cool if the CGI could be used to render dynamic pages. For instance, I might want to create a page with a `\[[map]]` according to a [[pagespec]] to be passed in the query string, instead of creating/hardcoding all possible pagespecs I might want to call. From caa68884c7c057fcdd88a517f48bb945c9b7c69c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Jan 2008 13:40:09 -0500 Subject: [PATCH 14/14] web commit by http://jumbanho.myopenid.com/ --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9dd99d6f1..a9d72086e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -81,7 +81,7 @@ Bulleted list * three * four * five - + * six ---- [[template id=note text="this is generated by the [[plugins/haiku]] plugin"]]