urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2009-10-02 12:38:02 -04:00
parent 0c6648f02c 827c2c8bbe
commit 1c5a9c0cc8
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bugs/unicode_encoded_urls_and_recentchanges.mdwn
View File

@ -2,7 +2,7 @@ it appears that unicode characters in the title that are unicode letters are spa
> Filenames can have any alphanumerics in them without the __ escaping. > Filenames can have any alphanumerics in them without the __ escaping.
> Your locale determines whether various unicode characters are considered > Your locale determines whether various unicode characters are considered
> alphanumeric. In other words, it just looks at the [[:alpha:]] character > alphanumeric. In other words, it just looks at the \[[:alpha:]] character
> class, whatever your locale defines it to be. --[[Joey]] > class, whatever your locale defines it to be. --[[Joey]]
this is not a problem per se, but (at least with git backend) the recent changes missinterpret the file name character set (it seems to read the filenames as latin1) and both display wrong titles and create broken links. this is not a problem per se, but (at least with git backend) the recent changes missinterpret the file name character set (it seems to read the filenames as latin1) and both display wrong titles and create broken links.

1
doc/ikiwikiusers.mdwn
View File

@ -126,6 +126,7 @@ Personal sites and blogs
* [tumashu's page](http://tumashu.github.com) This is my personal site in github created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master) * [tumashu's page](http://tumashu.github.com) This is my personal site in github created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)
* [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
* [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang) * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
* [Weakish Jiang's Homepage](http://weakish.pigro.net)
Please feel free to add your own ikiwiki site! Please feel free to add your own ikiwiki site!

12
doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
View File

@ -286,7 +286,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
} }
# Called to handle bookmarks like [[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span> # Called to handle bookmarks like \[[#heading]] or <span class="createlink"><a href="http://u32.net/cgi-bin/ikiwiki.cgi?page=%20text%20&amp;from=Mediawiki_Plugin%2Fmediawiki&amp;do=create" rel="nofollow">?</a>#a</span>
sub generate_fragment_link sub generate_fragment_link
{ {
my $url = shift; my $url = shift;
@ -316,10 +316,10 @@ Mediawiki.pm - A plugin which supports mediawiki format.
# Ikiwiki's link link plugin wrecks this line when displaying on the site. # Ikiwiki's link link plugin wrecks this line when displaying on the site.
# Until the code highlighter plugin can turn off link finding, # Until the code highlighter plugin can turn off link finding,
# always escape double brackets in double quotes: [[ # always escape double brackets in double quotes: \[[
if($inlink eq '..') { if($inlink eq '..') {
# Mediawiki doesn't touch links like [[..#hi|ho]]. # Mediawiki doesn't touch links like \[[..#hi|ho]].
return "[[" . $inlink . ($anchor?"#$anchor":"") . return "\[[" . $inlink . ($anchor?"#$anchor":"") .
($title?"|$title":"") . "]]" . $trailing; ($title?"|$title":"") . "]]" . $trailing;
} }
@ -380,7 +380,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
add_depends($page, $redir_page); add_depends($page, $redir_page);
my $link=bestlink($page, underscorize(translate_path($page,$redir_page))); my $link=bestlink($page, underscorize(translate_path($page,$redir_page)));
if (! length $link) { if (! length $link) {
return "<b>Redirect Error:</b> <nowiki>[[$redir_page]] not found.</nowiki>"; return "<b>Redirect Error:</b> <nowiki>\[[$redir_page]] not found.</nowiki>";
} }
$value=urlto($link, $page); $value=urlto($link, $page);
@ -393,7 +393,7 @@ Mediawiki.pm - A plugin which supports mediawiki format.
my %seen; my %seen;
while (exists $pagestate{$at}{mediawiki}{redir}) { while (exists $pagestate{$at}{mediawiki}{redir}) {
if ($seen{$at}) { if ($seen{$at}) {
return "<b>Redirect Error:</b> cycle found on <nowiki>[[$at]]</nowiki>"; return "<b>Redirect Error:</b> cycle found on <nowiki>\[[$at]]</nowiki>";
} }
$seen{$at}=1; $seen{$at}=1;
$at=$pagestate{$at}{mediawiki}{redir}; $at=$pagestate{$at}{mediawiki}{redir};

16
doc/todo/Resolve_native_reStructuredText_links_to_ikiwiki_pages.mdwn
View File

@ -87,6 +87,17 @@ be very convenient.
>> rst_header (that you sensibly would do, I think) that couldn't be done in >> rst_header (that you sensibly would do, I think) that couldn't be done in
>> the Python script. `rst_header` has very limited use, but it is another >> the Python script. `rst_header` has very limited use, but it is another
>> possibility, mainly for the user-editable aspect. --[[ulrik]] >> possibility, mainly for the user-editable aspect. --[[ulrik]]
>>
>> (I foresaw only two things to be added to the rst_header: the default
>> role could be configured there (as with rst_wikirole), and if you have a
>> meta-role like :shortcut:, shortcuts could be defined there.)
>
> I have some discussion on the [docutils mailing list][dml], the developers
> of docutils seems to favor "Proposal 1", while I defend my ideas. They
> want all users of ReST to use only the basic featureset to remain
> compatible, of course. -- [[ulrik]]
[dml]: http://thread.gmane.org/gmane.text.docutils.user/5376
Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/) Some rst-custom [examples are here](http://kaizer.se/wiki/rst_examples/)
@ -203,6 +214,11 @@ picture before it.
>> -- [[ulrik]] >> -- [[ulrik]]
>>> Seems it could be, yes. --[[Joey]] >>> Seems it could be, yes. --[[Joey]]
>>>
>>>> It is not clear how we can work around reST wrapping directives with
>>>> paragraph tags. Also, some escaping of xml characters & <> might
>>>> happen, but I can't imagine right now what breakage can come from that.
>>>> -- [[ulrik]]
[tracrst]: http://trac.edgewall.org/wiki/WikiRestructuredText [tracrst]: http://trac.edgewall.org/wiki/WikiRestructuredText