Merge branch 'master' of ssh://git.ikiwiki.info
commit
03ee0fd9f7
|
@ -17,6 +17,20 @@ the attached [[!taglink patch]] fixes this; from its commit message:
|
||||||
|
|
||||||
the output will look much better (at least in my wikis) with the "[[bugs/pagetitle function does not respect meta titles]]" issue fixed.
|
the output will look much better (at least in my wikis) with the "[[bugs/pagetitle function does not respect meta titles]]" issue fixed.
|
||||||
|
|
||||||
|
> I agree that it's (likely to be) a bug to not use `pagetitle()`. I
|
||||||
|
> haven't reviewed this particular implementation yet but I'll try to
|
||||||
|
> do that soon.
|
||||||
|
>
|
||||||
|
> I don't think it's correct for `pagetitle()` to output `\[[!meta title]]`
|
||||||
|
> though, as discussed on the linked bug: it appears in an assortment of
|
||||||
|
> contexts where the full formal title of the page seems inappropriate.
|
||||||
|
> If you want linkmap to use `\[[!meta title]]`, I think it would be
|
||||||
|
> better to give it a `show` parameter, like `\[[!map]]` has?
|
||||||
|
> --[[smcv]]
|
||||||
|
|
||||||
|
>> sounds good; i'll have a look at it the next time i touch the linkmap
|
||||||
|
>> plugin. the patch at hand would be a starting point for that. --[[chrysn]]
|
||||||
|
|
||||||
the patch is stored in [[the patch.pl]] as created by git-format-patch, and can
|
the patch is stored in [[the patch.pl]] as created by git-format-patch, and can
|
||||||
be pulled from the abovementioned branch.
|
be pulled from the abovementioned branch.
|
||||||
|
|
||||||
|
|
|
@ -18,17 +18,17 @@ patch.
|
||||||
> update 2014-06-29: the problem persists, but i found it is not trivial to
|
> update 2014-06-29: the problem persists, but i found it is not trivial to
|
||||||
> reproduce. to demonstrate, use this test plugin:
|
> reproduce. to demonstrate, use this test plugin:
|
||||||
>
|
>
|
||||||
> #!/usr/bin/env python
|
> #!/usr/bin/env python
|
||||||
> # -*- coding: utf-8 -*-
|
> # -*- coding: utf-8 -*-
|
||||||
>
|
>
|
||||||
> from proxy import IkiWikiProcedureProxy
|
> from proxy import IkiWikiProcedureProxy
|
||||||
>
|
>
|
||||||
> def preprocess(self, proxy, *args):
|
> def preprocess(self, proxy, *args):
|
||||||
> return repr(self.rpc('pagetype', 'schön'))
|
> return repr(self.rpc('pagetype', 'schön'))
|
||||||
>
|
>
|
||||||
> proxy = IkiWikiProcedureProxy(__name__)
|
> proxy = IkiWikiProcedureProxy(__name__)
|
||||||
> proxy.hook('preprocess', preprocess, id='testdirective')
|
> proxy.hook('preprocess', preprocess, id='testdirective')
|
||||||
> proxy.run()
|
> proxy.run()
|
||||||
>
|
>
|
||||||
> note that when the 'schön' is stored in a variable, the exception changes --
|
> note that when the 'schön' is stored in a variable, the exception changes --
|
||||||
> it seems to me that the issue is related to the way exceptions are encoded.
|
> it seems to me that the issue is related to the way exceptions are encoded.
|
||||||
|
@ -46,3 +46,9 @@ patch.
|
||||||
>>
|
>>
|
||||||
>> Other than that it looks good to me. I like the use of `repr` in debug
|
>> Other than that it looks good to me. I like the use of `repr` in debug
|
||||||
>> messages. --[[smcv]]
|
>> messages. --[[smcv]]
|
||||||
|
|
||||||
|
>>> afaict, encode is fine there -- the relevant methods in python2 are
|
||||||
|
>>> `unicode.encode` which gives a `str`, and `str.decode` which usually gives
|
||||||
|
>>> a `unicode`. (i'd happily ditch python2 and port all plugins to python3,
|
||||||
|
>>> where this is all easier, but my [[todo/vCard rendering]] still uses an
|
||||||
|
>>> ancient module.) --[[chrysn]]
|
||||||
|
|
|
@ -152,3 +152,21 @@ I have removed a similar comment from the album discussion.
|
||||||
> tend to be more personal/private than typical wikis, so you don't
|
> tend to be more personal/private than typical wikis, so you don't
|
||||||
> necessarily want to link the real thing - that's why my album demos
|
> necessarily want to link the real thing - that's why my album demos
|
||||||
> tend to use dummy data). --[[smcv]]
|
> tend to use dummy data). --[[smcv]]
|
||||||
|
|
||||||
|
>> I was expecting the same depends pattern you describe.
|
||||||
|
>> My photo wikis are mostly public so I've set up a publicly accessible repo
|
||||||
|
>> (update-server-info type, git clone the first link below), a low-res copy of
|
||||||
|
>> the underlay and a quick sanitized setup file.
|
||||||
|
|
||||||
|
>>* [[http://www.kalleswork.net/downloads/stockholm/.git]]
|
||||||
|
>>* [[http://www.kalleswork.net/downloads/stockholm.underlay.tar.gz]]
|
||||||
|
>>* [[http://www.kalleswork.net/downloads/stockholm.setup]]
|
||||||
|
|
||||||
|
>> It might be a bit unwieldly and the site itself at [[http://stockholm.kalleswork.net]]
|
||||||
|
>> uses a few tweaks to the album templates and css, but I don't currently
|
||||||
|
>> have access to the machine where I setup a cleaner debug wiki to test.
|
||||||
|
>> (travelling atm). The images will likely be distorted due to the up scaling
|
||||||
|
>> bug in the [[img]] plugin but other than that it should work.
|
||||||
|
|
||||||
|
>> Let me know if you need anything else. Would be great to hear it works
|
||||||
|
>> as expected for everyone else ;) --[[kjs]]
|
||||||
|
|
Loading…
Reference in New Issue