Merge commit 'upstream/master' into pub/master

diff --git a/doc/forum/wiki_name_in_page_titles.mdwn b/doc/forum/wiki_name_in_page_titles.mdwn
index 385e7a3f28280e759584fb4f767d454b9ba6860d..01ff8d81729e22c3eaadd62c19b1f900ef584da3 100644 (file)
--- a/doc/forum/wiki_name_in_page_titles.mdwn
+++ b/doc/forum/wiki_name_in_page_titles.mdwn
@@ -8,3 +8,19 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
 > Hmm, one way to work around this is to put a meta title directive on the
 > index page. Then TITLE will be that, rather than WIKINAME, and your
 > template should work. --[[Joey]]
+
+>> I ended up writing a [path][] plugin since I had some other
+>> path-specific conditional things to include in my templates.
+>>
+>> So now I can do things like this:
+>>
+>>     <title>
+>>     <TMPL_VAR WIKINAME><TMPL_UNLESS IS_HOMEPAGE>: <TMPL_VAR TITLE></TMPL_UNLESS>
+>>     </title>
+>>
+>> But also more complicated path-specific conditionals like
+>> `IN_DIR_SUBDIR` to indicate subpages of `/dir/subdir/`.  I've got a
+>> few other small plugins brewing so I'll try to put up some contrib
+>> pages for them soon. --[[JasonBlevins]]
+
+[path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index 91b2ff46242db91b8a21c5f9863ac1224402c0ce..e301190bf2204b8f4d1fe41162b5677dd37af8d5 100644 (file)
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -19,3 +19,14 @@ take it as far as implementing "replies" to other comments.
 ## More dynamic `rootpage` parameter of inline plugin?
 
 (Moved to [[todo/dynamic_rootpage]])
+
+---
+
+## Excluding Images
+
+Is there a simple way to exclude images, stylesheets, and other
+"non-page" files other than a blacklist approach like
+`pages="* and !*.png and !*.css"`?  --[[JasonBlevins]]
+
+> The [[plugins/filecheck]] plugin adds a 'ispage()' pagespec test that can do that.
+> --[[Joey]]

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 5df1857050e0585daf457f0109517af387e59823..97526bae6fa83300d461cea5648ee3ab99cfb27d 100644 (file)
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -23,6 +23,8 @@ pages, as well as doing syntax highlighting as a preprocessor directive
 * [[sourcecode|todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion]]
   also uses src-highlight, and operates on whole source files.
   Updated to work with the fix for [[bugs/multiple_pages_with_same_name]].  Untested with files with no extension, e.g. `Makefile`.
+* [[user/jrblevin]]'s code plugin uses src-highlight, and supports both
+  while file and directive use.
 
 ## General problems
 

diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index f69a8040ca5c4933d8edef7cd010bdd83ceab2d9..61c381d961e5d6b2763d56e47617393fb8c10ecb 100644 (file)
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -29,7 +29,8 @@ Current ikiwki issues of interest:
 ## Plugins
 
 These plugins are experimental.  Use them at your own risk.  Read the
-perldoc documentation for more details.
+perldoc documentation for more details.  Patches and suggestions are
+welcome.
 
  * [mdwn_itex][] - Works with the `mdwn` plugin to convert inline LaTeX
    expressions to MathML using `itex2MML`.
@@ -37,6 +38,30 @@ perldoc documentation for more details.
  * [h1title][] - If present, use the leading level 1 Markdown header to
    set the page title and remove it from the page body.
 
+ * [code][] - Whole file and inline code snippet syntax highlighting
+   via GNU Source-highlight.  The list of supported file extensions is
+   configurable.  There is also some preliminary [documentation][code-doc].
+   See the [FortranWiki](http://fortranwiki.org) for examples.
+
+ * [metamail][] - a plugin for loading metadata from email-style
+   headers at top of a file (e.g., `title: Page Title` or
+   `date: November 2, 2008 11:14 EST`).
+
+ * [pandoc][] - Markdown page processing via Pandoc.  LaTeX and
+   reStructuredText are optional.
+
+ * [path][] - Provides path-specific template conditionals such as
+   `IS_HOMEPAGE` and `IN_DIR_SUBDIR`.
+
+ [mdwn_itex]: http://code.jblevins.org/ikiwiki/plugins.git/plain/mdwn_itex.pm
+ [h1title]: http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm
+ [code]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.pm
+ [code-doc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.text
+ [metamail]: http://code.jblevins.org/ikiwiki/plugins.git/plain/metamail.pm
+ [pandoc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/pandoc.pm
+ [path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
+
+
 ## MathML and SVG support
 
 So far, I've made some notes on sanitizing MathML and SVG via
@@ -82,5 +107,3 @@ page in the first place (unless they post directly to the right URL).
 
  [template-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=templates/page.tmpl;h=380ef699fa72223744eb5c1ee655fb79aa6bce5b;hp=9084ba7e11e92a10528b2ab12c9b73cf7b0f40a7;hb=416d5d1b15b94e604442e4e209a30dee4b77b684;hpb=ececf4fb8766a4ff7eff943b3ef600be81a0df49
  [cgi-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=commitdiff;h=fa538c375250ab08f396634135f7d79fce2a9d36
- [mdwn_itex]: http://code.jblevins.org/ikiwiki/plugins/mdwn_itex.pm
- [h1title]: http://code.jblevins.org/ikiwiki/plugins/h1title.pm