blob: 58920cc126051ddb34d7cfb83ab18dd46621b4b5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
[[!template id=gitbranch branch=wtk/raw_inline author="[[wtk]]"]]
summary
=======
Extend inlining to handle raw files (files with unrecognized extensions).
Also raise an error in `IkiWiki::pagetype($file)` if `$file` is blank, which avoids trying to do much with missing files, etc.
I'm using the new code in my [blog][].
[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/
usage
=====
\[[!inline pagenames="somefile.txt" template="raw" feeds="no"]]
> But inline already supports raw files in two ways:
>
> * setting raw=yes will cause a page to be inlined raw without
> using any template, as if it were part of the page at the location
> of the inline
> * otherwise, the file becomes an enclosure in the rss feed, for use with
> podcasting.
>
> So I don't see the point of your patch. Although since your text
> editor seems to like to make lots of whitespace changes, it's possible
> I missed something in the large quantity of noise introduced by it.
> --[[Joey]]
>> As I understand it, setting `raw=yes` causes the page to be inlined
>> as if the page contents had appeared in place of the directive. The
>> content is then processed by whatever `htmlize()` applies to the
>> inlining page. I want the inlined page to be unprocessed, and
>> wrapped in `<pre><code>...</code></pre>` (as they are on the blog
>> post I link to above).
>>
>> Enclosures do not include the page contents at all, just a link to
>> them. I'm trying to inline the content so I can comment on it from
>> the inlining page.
>>
>> Apologies for my cluttered version history, I should have branched my
>> earlier changes off to make things clearer. I tried to isolate my
>> whitespace changes (fixes?) in c9ae012d245154c3374d155958fcb0b60fda57ce.
>> 157389355d01224b2d3c3f6e4c1eb42a20ec8a90 should hold all the content
>> changes.
>>
>> A list of other things globbed into my master branch that should have
>> been separate branches:
>>
>> * Make it easy to select a Markdown executable for mdwn.pm.
>> * Included an updated form of
>> [[Javier Rojas' linktoimgonly.pm|forum/link_to_an_image_inside_the_wiki_without_inlining_it]].
>> * Included an updated form of
>> [Jason Blevins' mdwn_itex.pm](http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm).
>> * Assorted minor documentation changes.
>>
>> --[[wtk]]
>>> I haven't heard anything in a while, so I've reorganized my version
>>> history and rebased it on the current ikiwiki head. Perhaps now it
>>> will be easier to merge or reject. Note the new branch name:
>>> `raw_inline`. I'll open separate todo items for items mentioned in my
>>> previous comment. --[[wtk]]
|