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

master
Joey Hess 2008-11-08 12:35:28 -05:00
commit d552b28430
3 changed files with 8 additions and 1 deletions

View File

@ -16,4 +16,6 @@ How can I create a new version of this clone?
> can just make a new clone and move .ikiwiki into it before running > can just make a new clone and move .ikiwiki into it before running
> ikiwiki. --[[Joey]] > ikiwiki. --[[Joey]]
> > Great, that worked. Thanks Joey!
[[!tag done]] [[!tag done]]

View File

@ -0,0 +1,5 @@
Is there any way to tell if an htmlize hook have been called from a format directive?
I am currently modifying the [[contrib/highlightcode]] plugin by [[sabr]] and I wanted to have a different behavior depending on the fact that the htmlize hook is called from a format directive or not. For instance, this could disable the raw copy of the highlighted code. Since I have enabled the keepextension option, I tried to rely on the page extension to decide whenever I have to create the raw file or not but this does not seems a reliable approach.
One possible solution is to add an optional parameter to the htmlize hook (and thus to htmlize function in IkiWiki.pm) which could tell if this is the format directive that called the function but I am not sure that is a good way to do this.

View File

@ -23,7 +23,7 @@ pages, as well as doing syntax highlighting as a preprocessor directive
* [[sourcecode|todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion]] * [[sourcecode|todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion]]
also uses src-highlight, and operates on whole source files. 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`. 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 * [[users/jasonblevins]]'s code plugin uses src-highlight, and supports both
while file and directive use. while file and directive use.
## General problems ## General problems