From 297ff849b93e5a75074e321fe65500f0e091601c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 21 Jul 2008 12:31:57 +0100 Subject: Migrate doc/plugins via prefix_directives This is a partial commit of: egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition prefix_directives --- doc/plugins/contrib/attach.mdwn | 2 +- ..._42__copyright__42___and___42__license__42__.mdwn | 6 +++--- doc/plugins/contrib/gallery.mdwn | 4 ++-- doc/plugins/contrib/gallery/discussion.mdwn | 6 +++--- doc/plugins/contrib/googlemaps.mdwn | 4 ++-- doc/plugins/contrib/headinganchors.mdwn | 2 +- doc/plugins/contrib/img.mdwn | 4 ++-- doc/plugins/contrib/linguas.mdwn | 2 +- doc/plugins/contrib/navbar.mdwn | 2 +- doc/plugins/contrib/sar.mdwn | 20 ++++++++++---------- doc/plugins/contrib/siterel2pagerel.mdwn | 2 +- doc/plugins/contrib/syntax.mdwn | 6 +++--- doc/plugins/contrib/texinfo.mdwn | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) (limited to 'doc/plugins/contrib') diff --git a/doc/plugins/contrib/attach.mdwn b/doc/plugins/contrib/attach.mdwn index ab50715c7..f44125b10 100644 --- a/doc/plugins/contrib/attach.mdwn +++ b/doc/plugins/contrib/attach.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=attach author="[[Ben]]"]] +[[!template id=plugin name=attach author="[[Ben]]"]] **Note: This plugin is currently pending upload. It is also most assuredly beta.** diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index 27e0ffefd..168b35668 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -1,7 +1,7 @@ -[[template id=plugin name=copyright author="[[tschwinge]]"]] -[[template id=plugin name=license author="[[tschwinge]]"]] +[[!template id=plugin name=copyright author="[[tschwinge]]"]] +[[!template id=plugin name=license author="[[tschwinge]]"]] -[[meta title="default content for *copyright* and *license*"]] +[[!meta title="default content for *copyright* and *license*"]] Someone was just asking for it and I had written these two plugins already some months ago, so I'm now publishing them here. diff --git a/doc/plugins/contrib/gallery.mdwn b/doc/plugins/contrib/gallery.mdwn index 06c1844f7..0af39bcdf 100644 --- a/doc/plugins/contrib/gallery.mdwn +++ b/doc/plugins/contrib/gallery.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=gallery author="[[arpitjain]]"]] +[[!template id=plugin name=gallery author="[[arpitjain]]"]] This plugin would create a nice looking gallery of the images. It has been build over the img plugin in Ikiwiki @@ -35,4 +35,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig -- [[arpitjain]] -[[tag plugins]] [[tag patch]] [[tag soc]] [[tag wishlist]] +[[!tag plugins]] [[!tag patch]] [[!tag soc]] [[!tag wishlist]] diff --git a/doc/plugins/contrib/gallery/discussion.mdwn b/doc/plugins/contrib/gallery/discussion.mdwn index 37fa6f884..08fc2456f 100644 --- a/doc/plugins/contrib/gallery/discussion.mdwn +++ b/doc/plugins/contrib/gallery/discussion.mdwn @@ -6,13 +6,13 @@ rebased it onto the *origin/master*, built a Debian package and installed that o However, I can't even get simply things like this to work: $ cat web/index.mdwn - [[gallery imagedir="b" vcs="0"]] + [[!gallery imagedir="b" vcs="0"]] $ ls web/b/ 1.jpg 2.jpg 3.jpg 4.jpg $ ikiwiki [...] --plugin gallery web web.rendered [...] $ grep gallery web.rendered/index.html -

[[gallery Failed to Read Directory b.]]

+

[[!gallery Failed to Read Directory b.]]

When using `vcs="1"` it's no better: @@ -25,7 +25,7 @@ When using `vcs="1"` it's no better: Its probably because of the restriction of permissions by plugins in newer version of IkiWiki. For the time being, you can turn resizing off till I look into conditional underlay directory feature. -USAGE : [[gallery imagedir="directory" resize="0"]] +USAGE : [[!gallery imagedir="directory" resize="0"]] New version updated at SVN REPO : http://ned.snow-crash.org:8080/svn/ikiwiki-gallery/ diff --git a/doc/plugins/contrib/googlemaps.mdwn b/doc/plugins/contrib/googlemaps.mdwn index 93f415fb5..953f296ab 100644 --- a/doc/plugins/contrib/googlemaps.mdwn +++ b/doc/plugins/contrib/googlemaps.mdwn @@ -1,5 +1,5 @@ -[[template id=plugin name=googlemaps author="Christian Mock"]] -[[tag type/special-purpose todo/geotagging]] +[[!template id=plugin name=googlemaps author="Christian Mock"]] +[[!tag type/special-purpose todo/geotagging]] `googlemaps` is a plugin that allows using the [Google Maps API][2] from ikiwiki. diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn index 287afa0f5..ef2fa122a 100644 --- a/doc/plugins/contrib/headinganchors.mdwn +++ b/doc/plugins/contrib/headinganchors.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=headinganchors author="[[PaulWise]]"]] +[[!template id=plugin name=headinganchors author="[[PaulWise]]"]] This is a simple plugin to add ids to all headings, based on their text. It works as a postprocessing filter, allowing it to work on mdwn, wiki, html, diff --git a/doc/plugins/contrib/img.mdwn b/doc/plugins/contrib/img.mdwn index c55338bf5..6c25966e0 100644 --- a/doc/plugins/contrib/img.mdwn +++ b/doc/plugins/contrib/img.mdwn @@ -1,5 +1,5 @@ -[[template id=plugin name=img author="Christian Mock"]] -[[tag type/chrome]] +[[!template id=plugin name=img author="Christian Mock"]] +[[!tag type/chrome]] `img` is an enhanced image handling plugin. diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn index 204910290..5879acc73 100644 --- a/doc/plugins/contrib/linguas.mdwn +++ b/doc/plugins/contrib/linguas.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=linguas author="Jordà Polo"]] +[[!template id=plugin name=linguas author="Jordà Polo"]] Linguas ======= diff --git a/doc/plugins/contrib/navbar.mdwn b/doc/plugins/contrib/navbar.mdwn index 830179999..061e4588c 100644 --- a/doc/plugins/contrib/navbar.mdwn +++ b/doc/plugins/contrib/navbar.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=navbar author="[[TobiOetiker]]"]] +[[!template id=plugin name=navbar author="[[TobiOetiker]]"]] The Navbar Plugin renders a Navigation Bar into your page. It is based on code from the [[sidebar_plugin|plugins/sidebar]]. diff --git a/doc/plugins/contrib/sar.mdwn b/doc/plugins/contrib/sar.mdwn index a28f79e20..4320f959d 100644 --- a/doc/plugins/contrib/sar.mdwn +++ b/doc/plugins/contrib/sar.mdwn @@ -1,5 +1,5 @@ -[[template id=plugin name=sar author="[[VictorMoral]]"]] -[[tag type/chrome type/slow ]] +[[!template id=plugin name=sar author="[[VictorMoral]]"]] +[[!tag type/chrome type/slow ]] The `sar` plugin is useful to make global or local search and replace operations using common or specific terms. @@ -14,19 +14,19 @@ The global dictionary page is like this: ## Sites and projects - - [[sar search="ikiwiki" first="[IkiWiki](http://ikiwiki.info)" next="_IkiWiki_"]] - - [[sar search="debian" first="[Debian](http://debian.org)" next="_Debian_"]] - - [[sar search="perl" first="[Perl](http://perl.org)" next="_Perl_"]] - - [[sar search="linux" replace="GNU/Linux"]] + - [[!sar search="ikiwiki" first="[IkiWiki](http://ikiwiki.info)" next="_IkiWiki_"]] + - [[!sar search="debian" first="[Debian](http://debian.org)" next="_Debian_"]] + - [[!sar search="perl" first="[Perl](http://perl.org)" next="_Perl_"]] + - [[!sar search="linux" replace="GNU/Linux"]] ## Persons - - [[sar search="joey" first="[Joey Hess](http://ikiwiki.info/users/joey]]" next="_Joey_" ]] - - [[sar search="angel" first="[Angel](http://triptico.com)" next="Angel"]] + - [[!sar search="joey" first="[Joey Hess](http://ikiwiki.info/users/joey]]" next="_Joey_" ]] + - [[!sar search="angel" first="[Angel](http://triptico.com)" next="Angel"]] ## Technical terms - - [[sar search="smtp" first="\[[wp SMTP]]" next="‘SMTP‘"]] - - [[sar search="pop3" first="\[[wp POP3]]" next="’POP3’"]] + - [[!sar search="smtp" first="\[[wp SMTP]]" next="‘SMTP‘"]] + - [[!sar search="pop3" first="\[[wp POP3]]" next="’POP3’"]] The search expressions must be surrounded by double dashes in a source ikiwiki page, like this: diff --git a/doc/plugins/contrib/siterel2pagerel.mdwn b/doc/plugins/contrib/siterel2pagerel.mdwn index 06c9bbc29..956b6728f 100644 --- a/doc/plugins/contrib/siterel2pagerel.mdwn +++ b/doc/plugins/contrib/siterel2pagerel.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=siterel2pagerel author="[[PaulWise]]"]] +[[!template id=plugin name=siterel2pagerel author="[[PaulWise]]"]] This is a simple plugin to convert all site-relative links to page-relative links (converts /foo into ../../../foo or similar). It works as a diff --git a/doc/plugins/contrib/syntax.mdwn b/doc/plugins/contrib/syntax.mdwn index 3ea3b8e32..58cd31394 100644 --- a/doc/plugins/contrib/syntax.mdwn +++ b/doc/plugins/contrib/syntax.mdwn @@ -1,7 +1,7 @@ -[[template id=plugin name=syntax author="[[VictorMoral]]"]] -[[tag type/chrome type/slow]] +[[!template id=plugin name=syntax author="[[VictorMoral]]"]] +[[!tag type/chrome type/slow]] -The `syntax` plugin adds support to ikiwiki for syntax highlighting through the *vim* editor and its perl interface [[cpan Text::VimColor]]. It depends on a functional vim installation. +The `syntax` plugin adds support to ikiwiki for syntax highlighting through the *vim* editor and its perl interface [[!cpan Text::VimColor]]. It depends on a functional vim installation. The plugin inserts a fragment of HTML with special marks from a file or a string text. It accepts the following parameters: diff --git a/doc/plugins/contrib/texinfo.mdwn b/doc/plugins/contrib/texinfo.mdwn index c33a370ea..595bd27aa 100644 --- a/doc/plugins/contrib/texinfo.mdwn +++ b/doc/plugins/contrib/texinfo.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=texinfo author="[[tschwinge]]"]] +[[!template id=plugin name=texinfo author="[[tschwinge]]"]] [[I|tschwinge]] started writing a plugin to render [GNU Texinfo](http://www.gnu.org/software/texinfo/) -- cgit v1.2.3 From 953a959be72c021121d8d3c4a737f48bf52149fe Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 21 Jul 2008 12:46:35 +0100 Subject: Migrate escaped directives (\[[) in doc/plugins to have \[[! prefix --- doc/plugins/calendar.mdwn | 6 +++--- doc/plugins/conditional.mdwn | 2 +- doc/plugins/conditional/discussion.mdwn | 6 +++--- doc/plugins/contrib/gallery.mdwn | 2 +- doc/plugins/contrib/img/discussion.mdwn | 6 +++--- doc/plugins/contrib/linguas.mdwn | 6 +++--- doc/plugins/contrib/sar.mdwn | 8 ++++---- doc/plugins/contrib/syntax.mdwn | 4 ++-- doc/plugins/fortune.mdwn | 2 +- doc/plugins/googlecalendar.mdwn | 2 +- doc/plugins/graphviz.mdwn | 2 +- doc/plugins/haiku.mdwn | 2 +- doc/plugins/img.mdwn | 10 +++++----- doc/plugins/inline.mdwn | 2 +- doc/plugins/linkmap.mdwn | 2 +- doc/plugins/more.mdwn | 2 +- doc/plugins/pagecount.mdwn | 2 +- doc/plugins/pagestats.mdwn | 4 ++-- doc/plugins/pagetemplate.mdwn | 2 +- doc/plugins/poll.mdwn | 2 +- doc/plugins/polygen.mdwn | 2 +- doc/plugins/postsparkline.mdwn | 4 ++-- doc/plugins/recentchanges.mdwn | 6 +++--- doc/plugins/sparkline.mdwn | 4 ++-- doc/plugins/table.mdwn | 6 +++--- doc/plugins/tag.mdwn | 6 +++--- doc/plugins/tag/discussion.mdwn | 2 +- doc/plugins/testpagespec.mdwn | 6 +++--- doc/plugins/teximg.mdwn | 12 ++++++------ doc/plugins/toc.mdwn | 6 +++--- doc/plugins/toggle.mdwn | 6 +++--- doc/plugins/version.mdwn | 2 +- doc/plugins/write/tutorial.mdwn | 2 +- 33 files changed, 69 insertions(+), 69 deletions(-) (limited to 'doc/plugins/contrib') diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index 07f4a7b5f..20da26400 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -6,11 +6,11 @@ some blogs. # examples - \[[calendar ]] + \[[!calendar ]] - \[[calendar type="month" pages="blog/* and !*/Discussion"]] + \[[!calendar type="month" pages="blog/* and !*/Discussion"]] - \[[calendar type="year" year="2005" pages="blog/* and !*/Discussion"]] + \[[!calendar type="year" year="2005" pages="blog/* and !*/Discussion"]] This plugin is inspired by the calendar plugin for Blosxom, but derives no code from it. This plugin is essentially a fancy front end diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn index c44770891..5793cb30e 100644 --- a/doc/plugins/conditional.mdwn +++ b/doc/plugins/conditional.mdwn @@ -4,7 +4,7 @@ With this plugin, you can make text be conditionally displayed on a page. For example: - \[[if test="enabled(smiley)" + \[[!if test="enabled(smiley)" then="The smiley plugin is enabled :-)" else="No smiley plugin here.."]] diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn index ff37623c3..629d05940 100644 --- a/doc/plugins/conditional/discussion.mdwn +++ b/doc/plugins/conditional/discussion.mdwn @@ -38,10 +38,10 @@ I have a sidebar that contains
   #### Archives
 
-  \[[calendar type="year" months_per_row="6"  pages="blog/* and !*/Discussion"]]
-  \[[calendar type="month" pages="blog/* and !*/Discussion"]]
+  \[[!calendar type="year" months_per_row="6"  pages="blog/* and !*/Discussion"]]
+  \[[!calendar type="month" pages="blog/* and !*/Discussion"]]
   <h4>Indices</h4>
-  \[[map pages="archives/* and !*/Discussion"]]
+  \[[!map pages="archives/* and !*/Discussion"]]
 
I am trying to make it so that the archives and index only show up if the destpage is either blog/* or / -- the top of the wiki. Unfortunately, I don't think I am getting the conditional right -- I have a "]] left over at the end (looking at the rendered html). Ideally, I would like to be able to do todays calendar on the top level pagel and diff --git a/doc/plugins/contrib/gallery.mdwn b/doc/plugins/contrib/gallery.mdwn index 0af39bcdf..ed9e17f32 100644 --- a/doc/plugins/contrib/gallery.mdwn +++ b/doc/plugins/contrib/gallery.mdwn @@ -6,7 +6,7 @@ SVN repository of plugin is located at * imagedir(required) => Directory containing images. It will scan all the files with jpg|png|gif extension from the directory and will put it in the gallery.
diff --git a/doc/plugins/contrib/img/discussion.mdwn b/doc/plugins/contrib/img/discussion.mdwn index d4b38fb61..ea4ccb042 100644 --- a/doc/plugins/contrib/img/discussion.mdwn +++ b/doc/plugins/contrib/img/discussion.mdwn @@ -10,18 +10,18 @@ differently scaled versions of the image, why not just create three pages and use the plugin once per page? Something like this on the first one if it's got multiple clickable thumbnails: - \[[img foo.jpg width=256 link=page2]] + \[[!img foo.jpg width=256 link=page2]] This on the second: - \[[img foo.jpg width=1024 link=page3]] + \[[!img foo.jpg width=1024 link=page3]] \[[small|page1]] \[[medium|page2]] \[[large|page3]] This on the third: - \[[img foo.jpg link=page3]] + \[[!img foo.jpg link=page3]] \[[small|page1]] \[[medium|page2]] \[[large|parge3]] diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn index 5879acc73..0c3366846 100644 --- a/doc/plugins/contrib/linguas.mdwn +++ b/doc/plugins/contrib/linguas.mdwn @@ -20,14 +20,14 @@ Translatable pages and translations must have the following format: `pagename.$LANG`, where `$LANG` is a ISO639-1 (two-letter) language code. To enable linguas, add the following line in the source code of the page: - \[[linguas ]] + \[[!linguas ]] Note that linguas is only required in one of the pages (the original, for instance); the rest of translations will be automatically updated. Additionally, it is also possible to specify the title of the translation: - \[[linguas title="Translated title"]] + \[[!linguas title="Translated title"]] Template @@ -103,4 +103,4 @@ The following fixes it: + push @links, IkiWiki::htmllink($page, $destpage, $trans, noimageinline => 0, forcesubpage => 0, linktext => $link); } - my $otherlinguas = 'Translations:'; \ No newline at end of file + my $otherlinguas = 'Translations:'; diff --git a/doc/plugins/contrib/sar.mdwn b/doc/plugins/contrib/sar.mdwn index 4320f959d..77c41a955 100644 --- a/doc/plugins/contrib/sar.mdwn +++ b/doc/plugins/contrib/sar.mdwn @@ -25,8 +25,8 @@ The global dictionary page is like this: ## Technical terms - - [[!sar search="smtp" first="\[[wp SMTP]]" next="‘SMTP‘"]] - - [[!sar search="pop3" first="\[[wp POP3]]" next="’POP3’"]] + - [[!sar search="smtp" first="\[[!wp SMTP]]" next="‘SMTP‘"]] + - [[!sar search="pop3" first="\[[!wp POP3]]" next="’POP3’"]] The search expressions must be surrounded by double dashes in a source ikiwiki page, like this: @@ -70,11 +70,11 @@ value is `*`, but a recommended value is `link(tag/sar)`. In a ikiwiki source page we can write this - \[[sar search=debian replace="__Debian__"]] + \[[!sar search=debian replace="__Debian__"]] for define a global replace for the term `--debian--` or - \[[sar search=ibm first=’[IBM](http://www.ibm.com)’ + \[[!sar search=ibm first=’[IBM](http://www.ibm.com)’ next="_IBM_"]] to define a replace for the first match of the string `--ibm--` and a different diff --git a/doc/plugins/contrib/syntax.mdwn b/doc/plugins/contrib/syntax.mdwn index 58cd31394..5ca6311f9 100644 --- a/doc/plugins/contrib/syntax.mdwn +++ b/doc/plugins/contrib/syntax.mdwn @@ -17,7 +17,7 @@ In the case of file parameter, `syntax` will build a html link for direct downlo Example: - \[[syntax type="perl" text=""" + \[[!syntax type="perl" text=""" #!/usr/bin/perl my $a = "World"; @@ -26,7 +26,7 @@ Example: or - \[[syntax file="/examples/hello.pl" description="My first perl program"]] + \[[!syntax file="/examples/hello.pl" description="My first perl program"]] This plugin create the following CSS styles: diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn index d8130d631..c47c02e6f 100644 --- a/doc/plugins/fortune.mdwn +++ b/doc/plugins/fortune.mdwn @@ -4,7 +4,7 @@ This just uses the `fortune` program to insert a fortune into the page. Usage: - \[[fortune ]] + \[[!fortune ]] [[!if test="enabled(fortune)" then=""" Here's a fortune for you: diff --git a/doc/plugins/googlecalendar.mdwn b/doc/plugins/googlecalendar.mdwn index 941c79be5..bca2ae74f 100644 --- a/doc/plugins/googlecalendar.mdwn +++ b/doc/plugins/googlecalendar.mdwn @@ -11,7 +11,7 @@ content. This plugin is an example of how to deal with this in ikiwiki. Example use: - \[[googlecalendar html=""" + \[[!googlecalendar html=""" """]] diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn index 13ea13426..f8cf094f4 100644 --- a/doc/plugins/graphviz.mdwn +++ b/doc/plugins/graphviz.mdwn @@ -4,7 +4,7 @@ This plugin allows embedding [graphviz](http://www.graphviz.org/) graphs in a page. Example usage: - \[[graph src="a -> b -> c; a -> c;"]] + \[[!graph src="a -> b -> c; a -> c;"]] Note that graphs will only show up in previews if your browser has [[!wikipedia data: URI]] support, or if the same graph already exists on that diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn index 2cc56ca5c..ac340e42d 100644 --- a/doc/plugins/haiku.mdwn +++ b/doc/plugins/haiku.mdwn @@ -4,7 +4,7 @@ This plugin allows inserting a randomly generated haiku into a wiki page. Just type: - \[[haiku hint="argument"]] + \[[!haiku hint="argument"]] [[!haiku hint="argument test"]] diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn index 3941ca204..898609a29 100644 --- a/doc/plugins/img.mdwn +++ b/doc/plugins/img.mdwn @@ -14,7 +14,7 @@ Note that this is a stripped down version of Christian Mock's ## usage - \[[img image1.jpg size="200x200" alt="clouds"]] + \[[!img image1.jpg size="200x200" alt="clouds"]] The image file will be searched for using the same rules as used to find the file pointed to by a [[ikiwiki/WikiLink]]. @@ -35,7 +35,7 @@ to another page instead, or "link=no" to disable the link, or You can also set default values that will be applied to all later images on the page, unless overridden. Useful when including many images on a page. - \[[img defaults size=200x200 alt="wedding photo"]] - \[[img photo1.jpg]] - \[[img photo2.jpg]] - \[[img photo3.jpg size=200x600]] + \[[!img defaults size=200x200 alt="wedding photo"]] + \[[!img photo1.jpg]] + \[[!img photo2.jpg]] + \[[!img photo3.jpg size=200x600]] diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn index 0aa773f5a..e66c9103f 100644 --- a/doc/plugins/inline.mdwn +++ b/doc/plugins/inline.mdwn @@ -3,7 +3,7 @@ This is a [[ikiwiki/PreProcessorDirective]] that allows including one wiki page inside another. For example: - \[[inline pages="blog/*"]] + \[[!inline pages="blog/*"]] The most common use of inlining is generating blogs and RSS or Atom feeds. See [[ikiwiki/blog]] for details. diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn index b52d222bd..935f3d3cd 100644 --- a/doc/plugins/linkmap.mdwn +++ b/doc/plugins/linkmap.mdwn @@ -4,7 +4,7 @@ This plugin uses [graphviz](http://www.graphviz.org/) to generate a graph showing the links between a set of pages in the wiki. Example usage: - \[[linkmap pages="* and !blog/* and !*/Discussion"]] + \[[!linkmap pages="* and !blog/* and !*/Discussion"]] Only links between mapped pages will be shown; links pointing to or from unmapped pages will be omitted. If the pages to include are not specified, diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn index a0ac32323..a17e78eb2 100644 --- a/doc/plugins/more.mdwn +++ b/doc/plugins/more.mdwn @@ -4,7 +4,7 @@ This plugin provides a way to have a "more" link on a page in a blog, that leads to the full version of the page. Use it like this: - \[[more linktext="click for more" text=""" + \[[!more linktext="click for more" text=""" This is the rest of my post. Not intended for people catching up on their blogs at 30,000 feet. Because I like to make things difficult. diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn index d5b4d8716..790f033ca 100644 --- a/doc/plugins/pagecount.mdwn +++ b/doc/plugins/pagecount.mdwn @@ -1,7 +1,7 @@ [[!template id=plugin name=pagecount author="[[Joey]]"]] [[!tag type/meta]] -Provides a \\[[pagecount ]] [[ikiwiki/PreProcessorDirective]] that is +Provides a \\[[!pagecount ]] [[ikiwiki/PreProcessorDirective]] that is replaced with the total number of pages currently in the wiki. The optional parameter "pages" can be a [[ikiwiki/PageSpec]] specifying the diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn index 81a069f53..ab32fb002 100644 --- a/doc/plugins/pagestats.mdwn +++ b/doc/plugins/pagestats.mdwn @@ -7,8 +7,8 @@ links to each page. Here's how to use it to create a [[tag]] cloud: - \[[pagestats pages="tags/*"]] + \[[!pagestats pages="tags/*"]] And here's how to create a table of all the pages on the wiki: - \[[pagestats style="table"]] + \[[!pagestats style="table"]] diff --git a/doc/plugins/pagetemplate.mdwn b/doc/plugins/pagetemplate.mdwn index d5edf2097..57d78483d 100644 --- a/doc/plugins/pagetemplate.mdwn +++ b/doc/plugins/pagetemplate.mdwn @@ -11,4 +11,4 @@ This plugin can only use templates that are already installed in /usr/share/ikiwiki/templates (or wherever ikiwiki is configured to look for them). You can choose to use any .tmpl files in that directory. Example: - \[[pagetemplate template=my_fancy.tmpl]] + \[[!pagetemplate template=my_fancy.tmpl]] diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn index fb3eadc02..17b1c4efc 100644 --- a/doc/plugins/poll.mdwn +++ b/doc/plugins/poll.mdwn @@ -4,7 +4,7 @@ This plugin allows you to create online polls in the wiki. Here's an example use: - \[[poll 0 "red" 0 "green" 0 "blue"]] + \[[!poll 0 "red" 0 "green" 0 "blue"]] The numbers indicate how many users voted for that choice. When a user votes for a choice in the poll, the page is modified and the number diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn index 5edbf5a30..09195e694 100644 --- a/doc/plugins/polygen.mdwn +++ b/doc/plugins/polygen.mdwn @@ -4,7 +4,7 @@ This plugin allows inserting text generated by polygen into a wiki page. For example: - \[[polygen grammar="genius"]] + \[[!polygen grammar="genius"]] It's also possible to specify a starting nonterminal for the grammar by including `symbol="text"` in the directive. diff --git a/doc/plugins/postsparkline.mdwn b/doc/plugins/postsparkline.mdwn index 8ed705d59..73c6801a1 100644 --- a/doc/plugins/postsparkline.mdwn +++ b/doc/plugins/postsparkline.mdwn @@ -7,11 +7,11 @@ statistics about a set of pages, such as posts to a blog. # examples Post interval: - \[[postsparkline pages="blog/* and !*/Discussion" max=100 + \[[!postsparkline pages="blog/* and !*/Discussion" max=100 formula=interval style=bar barwidth=2 barspacing=1 height=13]] Posts per month this year: - \[[postsparkline pages="blog/* and !*/Discussion" max=12 + \[[!postsparkline pages="blog/* and !*/Discussion" max=12 formula=permonth style=bar barwidth=2 barspacing=1 height=13]] # usage diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index bbb3fcd25..4ab2cd078 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -8,19 +8,19 @@ pages can be joined together with [[inline]] to generate the Typically only the RecentChanges page will use the pages generated by this plugin, but you can use it elsewhere too if you like. It's used like this: - \[[inline pages="internal(recentchanges/change_*)" + \[[!inline pages="internal(recentchanges/change_*)" template=recentchanges show=0]] Here's an example of how to show only changes to "bugs/*". This matches against the title of the change, which includes a list of modified pages. - \[[inline pages="internal(recentchanges/change_*) and title(*bugs/*)" + \[[!inline pages="internal(recentchanges/change_*) and title(*bugs/*)" template=recentchanges show=0]] Here's an example of how to show only changes that Joey didn't make. (Joey commits sometimes as user `joey`, and sometimes via openid.) - \[[inline pages="internal(recentchanges/change_*) and + \[[!inline pages="internal(recentchanges/change_*) and !author(joey) and !author(http://joey.kitenet.net*)" template=recentchanges show=0]] diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn index 00ed4b5c5..19b07b812 100644 --- a/doc/plugins/sparkline.mdwn +++ b/doc/plugins/sparkline.mdwn @@ -24,7 +24,7 @@ This plugin also uses the [[!cpan Digest::SHA1]] perl module. # examples - \[[sparkline 1 3 5 -3 10 0 width=40 height=16 + \[[!sparkline 1 3 5 -3 10 0 width=40 height=16 featurepoint="4,-3,red,3" featurepoint="5,10,green,3"]] This creates a simple line graph, graphing several points. @@ -35,7 +35,7 @@ featurepoint="4,-3,red,3" featurepoint="5,10,green,3"]] It will be drawn 40 pixels wide and 16 pixels high. The high point in the line has a green marker, and the low point has a red marker. - \[[sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2 + \[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar barwidth=2 barspacing=1 height=13]] This more complex example generates a bar graph. diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn index 6ff6a54de..b99bb7cd5 100644 --- a/doc/plugins/table.mdwn +++ b/doc/plugins/table.mdwn @@ -8,14 +8,14 @@ It needs the perl module [[!cpan Text::CSV]] for the CSV data. ## examples - \[[table data=""" + \[[!table data=""" Customer|Amount Fulanito|134,34 Menganito|234,56 Menganito|234,56 """]] - \[[table class="book_record" format=csv file="data/books/record1"]] + \[[!table class="book_record" format=csv file="data/books/record1"]] In this second example the `record1` page should be similar to: @@ -26,7 +26,7 @@ In this second example the `record1` page should be similar to: To make a cell span multiple columns, follow it with one or more empty cells. For example: - \[[table data=""" + \[[!table data=""" left||right| a|b|c|d this cell spans 4 columns||| diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index b5eebf513..a2f0c7e57 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -3,7 +3,7 @@ This plugin allows tagging pages. List tags as follows: - \[[tag tech life linux]] + \[[!tag tech life linux]] The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all @@ -14,8 +14,8 @@ in RSS and Atom feeds. If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink instead: - \[[taglink foo]] - \[[taglink tagged_as_foo|foo]] + \[[!taglink foo]] + \[[!taglink tagged_as_foo|foo]] This plugin has a configuration option. Set --tagbase=tags and links to tags will be located under the specified base page. If ikiwiki is configured diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn index 7e830fc13..7e7b88bc5 100644 --- a/doc/plugins/tag/discussion.mdwn +++ b/doc/plugins/tag/discussion.mdwn @@ -1,4 +1,4 @@ -I'd like to modify this plugin such that the tag pages are automatically created and populated with a list of relevant posts. The content of the tag page is simply `"\[[inline pages="link(tag/$tag)"]]`. The tag plugin will have to determine whether a page for the given tag already exists, and if not use that Markdown fragment to generate it. +I'd like to modify this plugin such that the tag pages are automatically created and populated with a list of relevant posts. The content of the tag page is simply `"\[[!inline pages="link(tag/$tag)"]]`. The tag plugin will have to determine whether a page for the given tag already exists, and if not use that Markdown fragment to generate it. There are clearly many ways to do this, but any opinions on which is the cleanest? diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn index 36043cae8..a173f5a96 100644 --- a/doc/plugins/testpagespec.mdwn +++ b/doc/plugins/testpagespec.mdwn @@ -6,18 +6,18 @@ page, and to see the part that matches, or causes the match to fail. Example uses: - \[[testpagespec pagespec="foopage and barpage" match="foopage"]] + \[[!testpagespec pagespec="foopage and barpage" match="foopage"]] This will print out something like "no match: barpage does not match foopage", highlighting which part of the [[ikiwiki/PageSpec]] is causing the match to fail. - \[[testpagespec pagespec="foopage or !bar*" match="barpage"]] + \[[!testpagespec pagespec="foopage or !bar*" match="barpage"]] This will print out something like "no match: bar* matches barpage", since the part of the [[ikiwiki/PageSpec]] that fails is this negated match. - \[[testpagespec pagespec="foopage or barpage" match="barpage"]] + \[[!testpagespec pagespec="foopage or barpage" match="barpage"]] This will print out something like "match: barpage matches barpage", indicating the part of the [[ikiwiki/PageSpec]] that caused it to match. diff --git a/doc/plugins/teximg.mdwn b/doc/plugins/teximg.mdwn index c866f17cc..1908cfb79 100644 --- a/doc/plugins/teximg.mdwn +++ b/doc/plugins/teximg.mdwn @@ -9,14 +9,14 @@ may not be part of a regular texlive installation. ## examples - \[[teximg code="\ce{[Cu(NH3)3]^{2+}}"]] - \[[teximg code="\frac{1}{2}"]] - \[[teximg code="E = - \frac{Z^2 \cdot \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]] + \[[!teximg code="\ce{[Cu(NH3)3]^{2+}}"]] + \[[!teximg code="\frac{1}{2}"]] + \[[!teximg code="E = - \frac{Z^2 \cdot \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]] To scale the image, use height=x: - \[[teximg code="\ce{[Cu(NH3)3]^{2+}}" height="17"]] - \[[teximg code="\ce{[Cu(NH3)3]^{2+}}" height="8"]] + \[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="17"]] + \[[!teximg code="\ce{[Cu(NH3)3]^{2+}}" height="8"]] If no height is choosen the default height 12 is used. Valid heights are: 8, 9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest available @@ -24,6 +24,6 @@ height is used. To add an alt text to the image, use alt="text": - \[[teximg code="\frac{1}{2}" alt="1/2"]] + \[[!teximg code="\frac{1}{2}" alt="1/2"]] See [this site](http://www.der-winnie.de/opensource/gsoc2007) for rendered images. diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn index 38db1d6af..149ac041e 100644 --- a/doc/plugins/toc.mdwn +++ b/doc/plugins/toc.mdwn @@ -3,18 +3,18 @@ Add a table of contents to a page: - \[[toc ]] + \[[!toc ]] The table of contents will be automatically generated based on the headers of the page. By default only the largest headers present on the page will be shown; to control how many levels of headers are shown, use the `levels` parameter: - \[[toc levels=2]] + \[[!toc levels=2]] The toc plugin will take the level of the first header as the topmost level, even if there are higher levels seen later in the file. The table of contents will be created as an ordered list. If you want an unordered list instead, you can change the list-style in your local -style sheet. \ No newline at end of file +style sheet. diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn index f25719ad3..5e0b8392a 100644 --- a/doc/plugins/toggle.mdwn +++ b/doc/plugins/toggle.mdwn @@ -9,15 +9,15 @@ always see the full page content. Example use: - \[[toggle id="ipsum" text="show"]] + \[[!toggle id="ipsum" text="show"]] - \[[toggleable id="ipsum" text=""" + \[[!toggleable id="ipsum" text=""" Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. - [[toggle id="ipsum" text="hide"]] + [[!toggle id="ipsum" text="hide"]] """]] Note that you can include wiki markup in the toggleable text, diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn index 4ceb48f7a..7c076362e 100644 --- a/doc/plugins/version.mdwn +++ b/doc/plugins/version.mdwn @@ -8,4 +8,4 @@ updating the version number. Use is simple: - \[[version ]] + \[[!version ]] diff --git a/doc/plugins/write/tutorial.mdwn b/doc/plugins/write/tutorial.mdwn index cc2b33a57..5b810a18f 100644 --- a/doc/plugins/write/tutorial.mdwn +++ b/doc/plugins/write/tutorial.mdwn @@ -139,7 +139,7 @@ Ok, one more enhancement. Just incrementing the numbers is pretty boring. It would be nice to be able to jump directly to a given point in the sequence: - \[[fib seed=20]], [[!fib ]], [[!fib ]] + \[[!fib seed=20]], [[!fib ]], [[!fib ]] Just insert these lines of code inside `preprocess`, in the appropriate spot: -- cgit v1.2.3